svnno****@sourc*****
svnno****@sourc*****
2009年 3月 17日 (火) 02:08:50 JST
Revision: 2882
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2882
Author: daisuke_m
Date: 2009-03-17 02:08:50 +0900 (Tue, 17 Mar 2009)
Log Message:
-----------
テストコケ対応。
Modified Paths:
--------------
artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java
zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java
-------------- next part --------------
Modified: artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java
===================================================================
--- artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java 2009-03-16 17:04:39 UTC (rev 2881)
+++ artemis/trunk/jiemamy-artemis-test/src/test/java/org/jiemamy/EventBrokerImplTest.java 2009-03-16 17:08:50 UTC (rev 2882)
@@ -29,7 +29,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.jiemamy.JiemamyViewProperty.DiagramPresentationModelProperty;
+import org.jiemamy.JiemamyViewProperty.DiagramPresentationProperty;
import org.jiemamy.editcommand.Command;
import org.jiemamy.editcommand.CommandListener;
import org.jiemamy.editcommand.CommandProcessor;
@@ -115,7 +115,7 @@
// DiagramPresentationModelを変更する。
- new ModifyModelPropertyCommand<DiagramPresentationModel>(presentation, DiagramPresentationModelProperty.name,
+ new ModifyModelPropertyCommand<DiagramPresentationModel>(presentation, DiagramPresentationProperty.name,
"newName").execute(commandProcessor);
assertThat(rootModelListener.commandList.size(), is(1));
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java 2009-03-16 17:04:39 UTC (rev 2881)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/DiagramPresentationModelImpl.java 2009-03-16 17:08:50 UTC (rev 2882)
@@ -43,7 +43,7 @@
*
* 表示されるノードであれば矩形情報を持ち、非表示であればエントリを持たない。
*/
- private Map<NodeAdapter, NodeProfile> figureProfiles;
+ private Map<NodeAdapter, NodeProfile> nodeProfiles;
/**
* コネクションのベンドポイント情報
@@ -74,11 +74,6 @@
return connectionProfiles;
}
- public Map<NodeAdapter, NodeProfile> getNodeProfiles() {
- assert figureProfiles != null;
- return figureProfiles;
- }
-
public Level getLevel() {
return level;
}
@@ -91,6 +86,11 @@
return name;
}
+ public Map<NodeAdapter, NodeProfile> getNodeProfiles() {
+ assert nodeProfiles != null;
+ return nodeProfiles;
+ }
+
/**
* コネクションのベンドポイント情報を設定する。
*
@@ -125,7 +125,7 @@
*/
public void setNodeProfiles(Map<NodeAdapter, NodeProfile> nodeProfiles) {
Validate.notNull(nodeProfiles);
- ValidateUtil.injectionSetter(figureProfiles);
- figureProfiles = nodeProfiles;
+ ValidateUtil.injectionSetter(this.nodeProfiles);
+ this.nodeProfiles = nodeProfiles;
}
}
Modified: zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java
===================================================================
--- zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java 2009-03-16 17:04:39 UTC (rev 2881)
+++ zeus/trunk/jiemamy-spec-view/src/main/java/org/jiemamy/JiemamyViewProperty.java 2009-03-16 17:08:50 UTC (rev 2882)
@@ -56,13 +56,13 @@
* @author shin1ogawa
*/
@TargetModel(DiagramPresentationModel.class)
- public enum DiagramPresentationModelProperty implements JiemamyViewProperty<DiagramPresentationModel> {
+ public enum DiagramPresentationProperty implements JiemamyViewProperty<DiagramPresentationModel> {
/** {@link DiagramPresentationModel#getConnectionProfiles()}で取得できるプロパティ */
connectionProfiles,
- /** {@link DiagramPresentationModel#getFigureProfiles()}で取得できるプロパティ */
- figureProfiles,
+ /** {@link DiagramPresentationModel#getNodeProfiles()}で取得できるプロパティ */
+ nodeProfiles,
/** {@link DiagramPresentationModel#getLevel()}で取得できるプロパティ */
level,