svnno****@sourc*****
svnno****@sourc*****
2008年 9月 11日 (木) 00:11:49 JST
Revision: 1908
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=1908
Author: daisuke_m
Date: 2008-09-11 00:11:49 +0900 (Thu, 11 Sep 2008)
Log Message:
-----------
DataType#toString() の整備。 /
DataTypeAdapterのサブクラスをリネーム。
Modified Paths:
--------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java
artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java
artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java
artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java
artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
Added Paths:
-----------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataTypeAdapter.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataTypeAdapter.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataTypeAdapter.java
Removed Paths:
-------------
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataType.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataType.java
artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataType.java
-------------- next part --------------
Modified: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/AbstractDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -77,11 +77,18 @@
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ return this.getClass().getName();
+ }
+
+ /**
* 自身に適用可能なアダプタを登録する。
* @param adapter アダプタのインスタンス
*/
protected void register(DataTypeAdapter adapter) {
adapters.add(adapter);
}
-
}
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -1,80 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/20
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.core.model.typedef.datatype.adapter;
-
-import org.jiemamy.core.model.AbstractModel;
-
-/**
- * 精度とスケールを持つDataType用のアダプタ。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class PrecisionedDataType extends AbstractModel implements DataTypeAdapter {
-
- /** 精度 */
- private int precision;
-
- /** スケール */
- private int scale;
-
-
- /**
- * {@inheritDoc}
- */
- public void copy(DataTypeAdapter src) {
- if (src instanceof PrecisionedDataType) {
- precision = ((PrecisionedDataType) src).precision;
- scale = ((PrecisionedDataType) src).scale;
- } else {
- throw new IllegalArgumentException();
- }
- }
-
- /**
- * 精度を取得する。
- * @return 精度
- */
- public int getPrecision() {
- return precision;
- }
-
- /**
- * スケールを取得する。
- * @return スケール
- */
- public int getScale() {
- return scale;
- }
-
- /**
- * 精度を設定する。
- * @param precision 精度
- */
- public void setPrecision(int precision) {
- this.precision = precision;
- }
-
- /**
- * スケールを設定する。
- * @param scale スケール
- */
- public void setScale(int scale) {
- this.scale = scale;
- }
-}
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataTypeAdapter.java (from rev 1901, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataType.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataTypeAdapter.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataTypeAdapter.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/20
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.core.model.typedef.datatype.adapter;
+
+import org.jiemamy.core.model.AbstractModel;
+
+/**
+ * 精度とスケールを持つDataType用のアダプタ。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class PrecisionedDataTypeAdapter extends AbstractModel implements DataTypeAdapter {
+
+ /** 精度 */
+ private Integer precision;
+
+ /** スケール */
+ private Integer scale;
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void copy(DataTypeAdapter src) {
+ if (src instanceof PrecisionedDataTypeAdapter) {
+ precision = ((PrecisionedDataTypeAdapter) src).precision;
+ scale = ((PrecisionedDataTypeAdapter) src).scale;
+ } else {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ /**
+ * 精度を取得する。
+ * @return 精度
+ */
+ public int getPrecision() {
+ return precision;
+ }
+
+ /**
+ * スケールを取得する。
+ * @return スケール
+ */
+ public int getScale() {
+ return scale;
+ }
+
+ /**
+ * 精度を設定する。
+ * @param precision 精度
+ */
+ public void setPrecision(Integer precision) {
+ this.precision = precision;
+ }
+
+ /**
+ * スケールを設定する。
+ * @param scale スケール
+ */
+ public void setScale(Integer scale) {
+ this.scale = scale;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ if (precision != null) {
+ sb.append("(");
+ sb.append(precision);
+ if (scale != null) {
+ sb.append(", ");
+ sb.append(scale);
+ }
+ sb.append(")");
+ }
+ return sb.toString();
+ }
+}
Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/PrecisionedDataTypeAdapter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -1,61 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/20
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.core.model.typedef.datatype.adapter;
-
-import org.jiemamy.core.model.AbstractModel;
-
-/**
- * サイズを持つDataType用のアダプタ。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class SizedDataType extends AbstractModel implements DataTypeAdapter {
-
- /** サイズ */
- private int size;
-
-
- /**
- * {@inheritDoc}
- */
- public void copy(DataTypeAdapter src) {
- if (src instanceof SizedDataType) {
- size = ((SizedDataType) src).size;
- } else {
- throw new IllegalArgumentException();
- }
- }
-
- /**
- * サイズを取得する。
- * @return サイズ
- */
- public int getSize() {
- return size;
- }
-
- /**
- * サイズを設定する。
- * @param size サイズ
- */
- public void setSize(int size) {
- this.size = size;
- }
-
-}
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataTypeAdapter.java (from rev 1901, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataType.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataTypeAdapter.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataTypeAdapter.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/20
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.core.model.typedef.datatype.adapter;
+
+import org.jiemamy.core.model.AbstractModel;
+
+/**
+ * サイズを持つDataType用のアダプタ。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class SizedDataTypeAdapter extends AbstractModel implements DataTypeAdapter {
+
+ /** サイズ */
+ private int size;
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void copy(DataTypeAdapter src) {
+ if (src instanceof SizedDataTypeAdapter) {
+ size = ((SizedDataTypeAdapter) src).size;
+ } else {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ /**
+ * サイズを取得する。
+ * @return サイズ
+ */
+ public int getSize() {
+ return size;
+ }
+
+ /**
+ * サイズを設定する。
+ * @param size サイズ
+ */
+ public void setSize(int size) {
+ this.size = size;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("(");
+ sb.append(size);
+ sb.append(")");
+ return sb.toString();
+ }
+}
Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/SizedDataTypeAdapter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -1,60 +0,0 @@
-/*
- * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
- * Created on 2008/07/20
- *
- * This file is part of Jiemamy.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
- */
-package org.jiemamy.core.model.typedef.datatype.adapter;
-
-import org.jiemamy.core.model.AbstractModel;
-
-/**
- * タイムゾーン管理の有無を持つDataType用のアダプタ。
- * @author daisuke
- */
- ＠ SuppressWarnings("serial")
-public class TimezonedDataType extends AbstractModel implements DataTypeAdapter {
-
- /** タイムゾーンを管理するかどうか */
- private boolean withTimezone;
-
-
- /**
- * {@inheritDoc}
- */
- public void copy(DataTypeAdapter src) {
- if (src instanceof TimezonedDataType) {
- withTimezone = ((TimezonedDataType) src).withTimezone;
- } else {
- throw new IllegalArgumentException();
- }
- }
-
- /**
- * タイムゾーンを管理するかどうかを取得する。
- * @return 精度
- */
- public boolean isWithTimezone() {
- return withTimezone;
- }
-
- /**
- * タイムゾーンを管理するかどうかを設定する。
- * @param withTimezone 精度
- */
- public void setWithTimezone(boolean withTimezone) {
- this.withTimezone = withTimezone;
- }
-}
Copied: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataTypeAdapter.java (from rev 1901, artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataType.java)
===================================================================
--- artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataTypeAdapter.java (rev 0)
+++ artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataTypeAdapter.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2007-2008 MIYAMOTO Daisuke, jiemamy.org and the Others.
+ * Created on 2008/07/20
+ *
+ * This file is part of Jiemamy.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language
+ * governing permissions and limitations under the License.
+ */
+package org.jiemamy.core.model.typedef.datatype.adapter;
+
+import org.jiemamy.core.model.AbstractModel;
+
+/**
+ * タイムゾーン管理の有無を持つDataType用のアダプタ。
+ * @author daisuke
+ */
+ ＠ SuppressWarnings("serial")
+public class TimezonedDataTypeAdapter extends AbstractModel implements DataTypeAdapter {
+
+ /** タイムゾーンを管理するかどうか */
+ private boolean withTimezone;
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public void copy(DataTypeAdapter src) {
+ if (src instanceof TimezonedDataTypeAdapter) {
+ withTimezone = ((TimezonedDataTypeAdapter) src).withTimezone;
+ } else {
+ throw new IllegalArgumentException();
+ }
+ }
+
+ /**
+ * タイムゾーンを管理するかどうかを取得する。
+ * @return 精度
+ */
+ public boolean isWithTimezone() {
+ return withTimezone;
+ }
+
+ /**
+ * タイムゾーンを管理するかどうかを設定する。
+ * @param withTimezone 精度
+ */
+ public void setWithTimezone(boolean withTimezone) {
+ this.withTimezone = withTimezone;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(" ");
+ sb.append(withTimezone ? "WITH" : "WITHOUT");
+ sb.append(" TIMEZONE");
+ return sb.toString();
+ }
+}
Property changes on: artemis/trunk/org.jiemamy.core/src/main/java/org/jiemamy/core/model/typedef/datatype/adapter/TimezonedDataTypeAdapter.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/ApplicationModelCreator.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -68,8 +68,6 @@
SingletonS2ContainerFactory.init();
RootModel rootModel = new ApplicationModelCreator().createModel();
System.out.println(rootModel);
- DomainModel domainModel = rootModel.getDomains().get(0);
- System.out.println(domainModel);
}
/**
@@ -90,11 +88,9 @@
idDomain.addConstraint(new NotNullConstraintModel());
idDomain.addConstraint(new UniqueConstraintModel("UNIQUE_CONSTTRAINT_ID"));
// TODO AUTO_INCREMENTの追加 [CORE-21]
- rootModel.getDomains().add(idDomain);
DomainModel nameDomain = rootModel.process(new CreateNewDomainProcessor("NAME", new VarcharDataTypeMock(32)));
nameDomain.setDescription("人名用の型です。");
- rootModel.getDomains().add(nameDomain);
// ノードの生成
TableModel deptTable = createDeptTable(rootModel, idDomain, nameDomain);
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericNumericDataTypeMock.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.core.model.typedef.datatype.impl;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
/**
* NUMERIC型DataType。テスト用Mock。
@@ -52,10 +52,20 @@
* @category instance creation
*/
public GenericNumericDataTypeMock(int precision, int scale) {
- PrecisionedDataType adapter = new PrecisionedDataType();
+ PrecisionedDataTypeAdapter adapter = new PrecisionedDataTypeAdapter();
adapter.setPrecision(precision);
adapter.setScale(scale);
register(adapter);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append(getAdapter(PrecisionedDataTypeAdapter.class).toString());
+ return sb.toString();
+ }
}
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericTimestampDataTypeMock.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.core.model.typedef.datatype.impl;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
/**
* TIEMSTAMP型DataType。テスト用Mock。
@@ -42,9 +42,19 @@
* @category instance creation
*/
public GenericTimestampDataTypeMock(boolean withTimezone) {
- TimezonedDataType adapter = new TimezonedDataType();
+ TimezonedDataTypeAdapter adapter = new TimezonedDataTypeAdapter();
adapter.setWithTimezone(withTimezone);
register(adapter);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append(getAdapter(TimezonedDataTypeAdapter.class).toString());
+ return sb.toString();
+ }
}
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/GenericVarcharDataTypeMock.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.core.model.typedef.datatype.impl;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
/**
* VARCHAR型DataType。テスト用Mock。
@@ -46,9 +46,19 @@
* @category instance creation
*/
public GenericVarcharDataTypeMock(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append(getAdapter(SizedDataTypeAdapter.class).toString());
+ return sb.toString();
+ }
}
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/NumericDataTypeMock.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
/**
* NUMERIC型DataType。テスト用Mock。
@@ -54,10 +54,20 @@
* @category instance creation
*/
public NumericDataTypeMock(int precision, int scale) {
- PrecisionedDataType adapter = new PrecisionedDataType();
+ PrecisionedDataTypeAdapter adapter = new PrecisionedDataTypeAdapter();
adapter.setPrecision(precision);
adapter.setScale(scale);
register(adapter);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append(getAdapter(PrecisionedDataTypeAdapter.class).toString());
+ return sb.toString();
+ }
}
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/TimestampDataTypeMock.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
/**
* TIEMSTAMP型DataType。テスト用Mock。
@@ -44,9 +44,19 @@
* @category instance creation
*/
public TimestampDataTypeMock(boolean withTimezone) {
- TimezonedDataType adapter = new TimezonedDataType();
+ TimezonedDataTypeAdapter adapter = new TimezonedDataTypeAdapter();
adapter.setWithTimezone(withTimezone);
register(adapter);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append(getAdapter(TimezonedDataTypeAdapter.class).toString());
+ return sb.toString();
+ }
}
Modified: artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java
===================================================================
--- artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.core/src/test/java/org/jiemamy/core/model/typedef/datatype/impl/VarcharDataTypeMock.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
/**
* VARCHAR型DataType。テスト用Mock。
@@ -48,9 +48,19 @@
* @category instance creation
*/
public VarcharDataTypeMock(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append(super.toString());
+ sb.append(getAdapter(SizedDataTypeAdapter.class).toString());
+ return sb.toString();
+ }
}
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/AbstractDialect.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -46,7 +46,7 @@
import org.jiemamy.core.model.typedef.constraint.PrimaryKeyConstraintModel;
import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.core.utils.ForEachUtil;
import org.jiemamy.core.utils.JmIOUtil;
import org.jiemamy.core.utils.processor.entity.table.CreateNewColumnProcessor;
@@ -190,8 +190,8 @@
ColumnModel column = tableModel.process(new CreateNewColumnProcessor(name, dataType));
- if (dataType.hasAdapter(SizedDataType.class)) {
- SizedDataType sized = dataType.getAdapter(SizedDataType.class);
+ if (dataType.hasAdapter(SizedDataTypeAdapter.class)) {
+ SizedDataTypeAdapter sized = dataType.getAdapter(SizedDataTypeAdapter.class);
try {
int size = Integer.valueOf(element.getString("COLUMN_SIZE"));
sized.setSize(size);
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericCharacterDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.dialect.datatype.generic;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
/**
* CHARACTER型の汎用DataTypeクラス。
@@ -42,7 +42,7 @@
* @category instance creation
*/
public GenericCharacterDataType(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericNumericDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.dialect.datatype.generic;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
/**
* NUMERIC型の汎用DataTypeクラス。
@@ -52,7 +52,7 @@
* @category instance creation
*/
public GenericNumericDataType(int precision, int scale) {
- PrecisionedDataType adapter = new PrecisionedDataType();
+ PrecisionedDataTypeAdapter adapter = new PrecisionedDataTypeAdapter();
adapter.setPrecision(precision);
adapter.setScale(scale);
register(adapter);
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericTimestampDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.dialect.datatype.generic;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
/**
* TIMESTAMP型の汎用DataTypeクラス。
@@ -42,7 +42,7 @@
* @category instance creation
*/
public GenericTimestampDataType(boolean withTimezone) {
- TimezonedDataType adapter = new TimezonedDataType();
+ TimezonedDataTypeAdapter adapter = new TimezonedDataTypeAdapter();
adapter.setWithTimezone(withTimezone);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect/src/main/java/org/jiemamy/dialect/datatype/generic/GenericVarcharDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -19,7 +19,7 @@
package org.jiemamy.dialect.datatype.generic;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
/**
* VARCHAR型の汎用DataTypeクラス。
@@ -42,7 +42,7 @@
* @category instance creation
*/
public GenericVarcharDataType(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect/src/test/java/org/jiemamy/dialect/generic/GenericDialectTest.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -30,9 +30,9 @@
import org.jiemamy.core.model.typedef.datatype.AbstractDataType;
import org.jiemamy.core.model.typedef.datatype.DataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericBigIntegerDataType;
import org.jiemamy.dialect.datatype.generic.GenericBlobDataType;
import org.jiemamy.dialect.datatype.generic.GenericCharacterDataType;
@@ -112,20 +112,20 @@
*/
@Test
public void test03_各型が持っているアダプタのチェック() throws Exception {
- assertThat(new GenericIntegerDataType().hasAdapter(SizedDataType.class), is(false));
- assertThat(new GenericVarcharDataType().hasAdapter(SizedDataType.class), is(true)); // TRUE
- assertThat(new GenericNumericDataType().hasAdapter(SizedDataType.class), is(false));
- assertThat(new GenericTimestampDataType().hasAdapter(SizedDataType.class), is(false));
+ assertThat(new GenericIntegerDataType().hasAdapter(SizedDataTypeAdapter.class), is(false));
+ assertThat(new GenericVarcharDataType().hasAdapter(SizedDataTypeAdapter.class), is(true)); // TRUE
+ assertThat(new GenericNumericDataType().hasAdapter(SizedDataTypeAdapter.class), is(false));
+ assertThat(new GenericTimestampDataType().hasAdapter(SizedDataTypeAdapter.class), is(false));
- assertThat(new GenericIntegerDataType().hasAdapter(PrecisionedDataType.class), is(false));
- assertThat(new GenericVarcharDataType().hasAdapter(PrecisionedDataType.class), is(false));
- assertThat(new GenericNumericDataType().hasAdapter(PrecisionedDataType.class), is(true)); // TRUE
- assertThat(new GenericTimestampDataType().hasAdapter(PrecisionedDataType.class), is(false));
+ assertThat(new GenericIntegerDataType().hasAdapter(PrecisionedDataTypeAdapter.class), is(false));
+ assertThat(new GenericVarcharDataType().hasAdapter(PrecisionedDataTypeAdapter.class), is(false));
+ assertThat(new GenericNumericDataType().hasAdapter(PrecisionedDataTypeAdapter.class), is(true)); // TRUE
+ assertThat(new GenericTimestampDataType().hasAdapter(PrecisionedDataTypeAdapter.class), is(false));
- assertThat(new GenericIntegerDataType().hasAdapter(TimezonedDataType.class), is(false));
- assertThat(new GenericVarcharDataType().hasAdapter(TimezonedDataType.class), is(false));
- assertThat(new GenericNumericDataType().hasAdapter(TimezonedDataType.class), is(false));
- assertThat(new GenericTimestampDataType().hasAdapter(TimezonedDataType.class), is(true)); // TRUE
+ assertThat(new GenericIntegerDataType().hasAdapter(TimezonedDataTypeAdapter.class), is(false));
+ assertThat(new GenericVarcharDataType().hasAdapter(TimezonedDataTypeAdapter.class), is(false));
+ assertThat(new GenericNumericDataType().hasAdapter(TimezonedDataTypeAdapter.class), is(false));
+ assertThat(new GenericTimestampDataType().hasAdapter(TimezonedDataTypeAdapter.class), is(true)); // TRUE
}
/**
@@ -135,8 +135,8 @@
@Test
public void test04_VARCHAR型にサイズをセットして_その値を取得できる() throws Exception {
DataType type = new GenericVarcharDataType();
- type.getAdapter(SizedDataType.class).setSize(304);
+ type.getAdapter(SizedDataTypeAdapter.class).setSize(304);
- assertThat(type.getAdapter(SizedDataType.class).getSize(), is(304));
+ assertThat(type.getAdapter(SizedDataTypeAdapter.class).getSize(), is(304));
}
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/BitDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
/**
@@ -45,7 +45,7 @@
* @category instance creation
*/
public BitDataType(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/CharacterDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericCharacterDataType;
/**
@@ -48,7 +48,7 @@
* @category instance creation
*/
public CharacterDataType(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/DecimalDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericNumericDataType;
/**
@@ -56,7 +56,7 @@
* @category instance creation
*/
public DecimalDataType(int precision, int scale) {
- PrecisionedDataType adapter = new PrecisionedDataType();
+ PrecisionedDataTypeAdapter adapter = new PrecisionedDataTypeAdapter();
adapter.setPrecision(precision);
adapter.setScale(scale);
register(adapter);
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/NumericDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericNumericDataType;
/**
@@ -55,7 +55,7 @@
* @category instance creation
*/
public NumericDataType(int precision, int scale) {
- PrecisionedDataType adapter = new PrecisionedDataType();
+ PrecisionedDataTypeAdapter adapter = new PrecisionedDataTypeAdapter();
adapter.setPrecision(precision);
adapter.setScale(scale);
register(adapter);
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimeDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
/**
@@ -49,7 +49,7 @@
* @category instance creation
*/
public TimeDataType(boolean withTimeZone) {
- TimezonedDataType adapter = new TimezonedDataType();
+ TimezonedDataTypeAdapter adapter = new TimezonedDataTypeAdapter();
adapter.setWithTimezone(withTimeZone);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/TimestampDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericTimestampDataType;
/**
@@ -49,7 +49,7 @@
* @category instance creation
*/
public TimestampDataType(boolean withTimeZone) {
- TimezonedDataType adapter = new TimezonedDataType();
+ TimezonedDataTypeAdapter adapter = new TimezonedDataTypeAdapter();
adapter.setWithTimezone(withTimeZone);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarbitDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
/**
@@ -45,7 +45,7 @@
* @category instance creation
*/
public VarbitDataType(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/main/java/org/jiemamy/dialect/postgresql/datatype/VarcharDataType.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -20,7 +20,7 @@
import org.jiemamy.core.extension.dialect.mapping.MappingInfo;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericVarcharDataType;
/**
@@ -45,7 +45,7 @@
* @category instance creation
*/
public VarcharDataType(int size) {
- SizedDataType adapter = new SizedDataType();
+ SizedDataTypeAdapter adapter = new SizedDataTypeAdapter();
adapter.setSize(size);
register(adapter);
}
Modified: artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java
===================================================================
--- artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java 2008-09-10 14:49:45 UTC (rev 1907)
+++ artemis/trunk/org.jiemamy.dialect.postgresql/src/test/java/org/jiemamy/dialect/postgresql/PostgresqlDialectTest.java 2008-09-10 15:11:49 UTC (rev 1908)
@@ -37,9 +37,9 @@
import org.jiemamy.core.model.typedef.datatype.DataType;
import org.jiemamy.core.model.typedef.datatype.GeneralDataType;
import org.jiemamy.core.model.typedef.datatype.SpecialDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataType;
-import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataType;
+import org.jiemamy.core.model.typedef.datatype.adapter.PrecisionedDataTypeAdapter;
+import org.jiemamy.core.model.typedef.datatype.adapter.SizedDataTypeAdapter;
+import org.jiemamy.core.model.typedef.datatype.adapter.TimezonedDataTypeAdapter;
import org.jiemamy.dialect.datatype.generic.GenericIntegerDataType;
import org.jiemamy.dialect.datatype.generic.GenericVarcharDataType;
import org.jiemamy.dialect.postgresql.datatype.IntegerDataType;
@@ -106,20 +106,20 @@
*/
@Test
public void test03_各型が持っているアダプタのチェック() throws Exception {
- assertThat((new IntegerDataType()).hasAdapter(SizedDataType.class), is(false));
- assertThat((new VarcharDataType()).hasAdapter(SizedDataType.class), is(true)); // TRUE
-// assertThat(new NumericDataType().hasAdapter(SizedDataType.class), is(false));
-// assertThat(new TimestampDataType().hasAdapter(SizedDataType.class), is(false));
+ assertThat((new IntegerDataType()).hasAdapter(SizedDataTypeAdapter.class), is(false));
+ assertThat((new VarcharDataType()).hasAdapter(SizedDataTypeAdapter.class), is(true)); // TRUE
+// assertThat(new NumericDataType().hasAdapter(SizedDataTypeAdapter.class), is(false));
+// assertThat(new TimestampDataType().hasAdapter(SizedDataTypeAdapter.class), is(false));
- assertThat((new IntegerDataType()).hasAdapter(PrecisionedDataType.class), is(false));
- assertThat((new VarcharDataType()).hasAdapter(PrecisionedDataType.class), is(false));
-// assertThat(new NumericDataType().hasAdapter(PrecisionedDataType.class), is(true)); // TRUE
-// assertThat(new TimestampDataType().hasAdapter(PrecisionedDataType.class), is(false));
+ assertThat((new IntegerDataType()).hasAdapter(PrecisionedDataTypeAdapter.class), is(false));
+ assertThat((new VarcharDataType()).hasAdapter(PrecisionedDataTypeAdapter.class), is(false));
+// assertThat(new NumericDataType().hasAdapter(PrecisionedDataTypeAdapter.class), is(true)); // TRUE
+// assertThat(new TimestampDataType().hasAdapter(PrecisionedDataTypeAdapter.class), is(false));
- assertThat((new IntegerDataType()).hasAdapter(TimezonedDataType.class), is(false));
- assertThat((new VarcharDataType()).hasAdapter(TimezonedDataType.class), is(false));
-// assertThat(new NumericDataType().hasAdapter(TimezonedDataType.class), is(false));
-// assertThat(new TimestampDataType().hasAdapter(TimezonedDataType.class), is(true)); // TRUE
+ assertThat((new IntegerDataType()).hasAdapter(TimezonedDataTypeAdapter.class), is(false));
+ assertThat((new VarcharDataType()).hasAdapter(TimezonedDataTypeAdapter.class), is(false));
+// assertThat(new NumericDataType().hasAdapter(TimezonedDataTypeAdapter.class), is(false));
+// assertThat(new TimestampDataType().hasAdapter(TimezonedDataTypeAdapter.class), is(true)); // TRUE
}
/**
@@ -129,8 +129,8 @@
@Test
public void test04_VARCHAR型にサイズをセットして_その値を取得できる() throws Exception {
DataType type = new VarcharDataType();
- type.getAdapter(SizedDataType.class).setSize(304);
- assertThat(type.getAdapter(SizedDataType.class).getSize(), is(304));
+ type.getAdapter(SizedDataTypeAdapter.class).setSize(304);
+ assertThat(type.getAdapter(SizedDataTypeAdapter.class).getSize(), is(304));
}
/**
@@ -158,8 +158,8 @@
instanceOf(GenericVarcharDataType.class));
SpecialDataType specialDataType = new VarcharDataType();
- specialDataType.getAdapter(SizedDataType.class).setSize(923);
+ specialDataType.getAdapter(SizedDataTypeAdapter.class).setSize(923);
GeneralDataType generalDataType = dataTypeMapping.resolveGeneralDataType(specialDataType);
- assertThat(generalDataType.getAdapter(SizedDataType.class).getSize(), is(923));
+ assertThat(generalDataType.getAdapter(SizedDataTypeAdapter.class).getSize(), is(923));
}
}