svnno****@sourc*****
svnno****@sourc*****
2009年 4月 10日 (金) 21:50:46 JST
Revision: 3212
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=3212
Author: daisuke_m
Date: 2009-04-10 21:50:46 +0900 (Fri, 10 Apr 2009)
Log Message:
-----------
テストコケ対応。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultDataTypeResolver.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultMoldManager.java
zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/MoldManager.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultDataTypeResolver.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultDataTypeResolver.java 2009-04-10 12:34:16 UTC (rev 3211)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultDataTypeResolver.java 2009-04-10 12:50:46 UTC (rev 3212)
@@ -66,7 +66,8 @@
public List<Token> resolveDataType(DataType dataType, ReferenceResolver resolver) {
List<Token> tokens = CollectionsUtil.newArrayList();
BuiltinDataType builtinDataType = DataTypeUtil.toBuiltinDataType(dataType, resolver);
- tokens.add(Keyword.of(builtinDataType.getTypeName()));
+
+ tokens.add(Keyword.of(moldManager.findDataTypeMold(builtinDataType).getName()));
if (isSupport(SizedDataTypeAdapter.class, builtinDataType.getCategory())
&& builtinDataType.hasAdapter(SizedDataTypeAdapter.class)) {
Integer size = builtinDataType.getAdapter(SizedDataTypeAdapter.class).getSize();
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultMoldManager.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultMoldManager.java 2009-04-10 12:34:16 UTC (rev 3211)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/dialect/internal/impl/DefaultMoldManager.java 2009-04-10 12:50:46 UTC (rev 3212)
@@ -24,6 +24,7 @@
import org.jiemamy.dialect.BuiltinDataTypeMold;
import org.jiemamy.dialect.MoldManager;
+import org.jiemamy.model.datatype.BuiltinDataType;
import org.jiemamy.model.datatype.DataTypeCategory;
/**
@@ -45,6 +46,10 @@
this.typeList = typeList;
}
+ public BuiltinDataTypeMold findDataTypeMold(BuiltinDataType builtinDataType) {
+ return findDataTypeMold(builtinDataType.getCategory(), builtinDataType.getTypeName());
+ }
+
public BuiltinDataTypeMold findDataTypeMold(DataTypeCategory category) {
Validate.notNull(category);
return findDataTypeMold(category, category.name());
Modified: zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/MoldManager.java
===================================================================
--- zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/MoldManager.java 2009-04-10 12:34:16 UTC (rev 3211)
+++ zeus/trunk/jiemamy-spec-core/src/main/java/org/jiemamy/dialect/MoldManager.java 2009-04-10 12:50:46 UTC (rev 3212)
@@ -20,6 +20,7 @@
import java.util.List;
+import org.jiemamy.model.datatype.BuiltinDataType;
import org.jiemamy.model.datatype.DataTypeCategory;
/**
@@ -30,6 +31,15 @@
public interface MoldManager {
/**
+ * TODO for daisuke
+ *
+ * @param builtinDataType
+ * @return
+ * @since 0.2
+ */
+ BuiltinDataTypeMold findDataTypeMold(BuiltinDataType builtinDataType);
+
+ /**
* 指定したカテゴリに最も適したモールドを取得する。
*
* <p>typeNameには、{@code category.name()}を用いる。</p>