svnno****@sourc*****
svnno****@sourc*****
2009年 3月 20日 (金) 02:21:56 JST
Revision: 2963
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2963
Author: daisuke_m
Date: 2009-03-20 02:21:56 +0900 (Fri, 20 Mar 2009)
Log Message:
-----------
テストコケ対応。
XMLを読み込む時に、IndexModel#sortOrderを読んでいなかった。
Modified Paths:
--------------
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/composer/exporter/AbstractFileExportConfig.java
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/composer/exporter/AbstractFileExportConfig.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/composer/exporter/AbstractFileExportConfig.java 2009-03-19 16:44:30 UTC (rev 2962)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/composer/exporter/AbstractFileExportConfig.java 2009-03-19 17:21:56 UTC (rev 2963)
@@ -22,8 +22,10 @@
import org.apache.commons.lang.Validate;
+import org.jiemamy.composer.Exporter;
+
/**
- * {@link HtmlExporter}に関する設定情報保持クラス。
+ * ファイルに対する{@link Exporter}に関する設定情報保持クラスの骨格実装。
*
* @author daisuke
*/
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java 2009-03-19 16:44:30 UTC (rev 2962)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/serializer/JiemamyDomParser.java 2009-03-19 17:21:56 UTC (rev 2963)
@@ -75,6 +75,7 @@
import org.jiemamy.model.entity.ViewModel;
import org.jiemamy.model.index.IndexColumnModel;
import org.jiemamy.model.index.IndexModel;
+import org.jiemamy.model.index.IndexColumnModel.SortOrder;
import org.jiemamy.utils.Adaptable;
import org.jiemamy.utils.DomUtil;
import org.jiemamy.utils.IterableNodeList;
@@ -495,6 +496,12 @@
ColumnRef columnRef = new ColumnRefImpl(jiemamy, DomUtil.getUUID(columnRefNode, CoreQName.REF));
indexColumnModel.setColumnRef(columnRef);
indexModel.getIndexColumns().add(indexColumnModel);
+
+ String sortOrderString = XpathUtil.getTextContent(node, "core:sortOrder");
+ if (StringUtils.isEmpty(sortOrderString) == false) {
+ indexColumnModel.setSortOrder(SortOrder.valueOf(sortOrderString));
+ }
+
}
tableModel.getIndexes().add(indexModel);
}