svnno****@sourc*****
svnno****@sourc*****
2009年 3月 21日 (土) 12:42:38 JST
Revision: 2974
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2974
Author: daisuke_m
Date: 2009-03-21 12:42:38 +0900 (Sat, 21 Mar 2009)
Log Message:
-----------
importのorgamize /
pom微調整。
Modified Paths:
--------------
artemis/trunk/jiemamy-artemis/pom.xml
artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AllValidator.java
artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/test/TestModelBuilder2Test.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddBendpointCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddConnectionViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddNodeViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/MoveBendpointCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveBendpointCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveConnectionViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveNodeViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RevertBendpointsCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/enhance/ViewFactoryExtensionEnhancer2.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/ConnectionProfileImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/DiagramPresentationModelImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/NodeProfileImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/test/ViewTestModelBuilder.java
hestia/trunk/jiemamy-hestia/pom.xml
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/TypeOptionManager.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
zeus/trunk/jiemamy-zeus/pom.xml
-------------- next part --------------
Modified: artemis/trunk/jiemamy-artemis/pom.xml
===================================================================
--- artemis/trunk/jiemamy-artemis/pom.xml 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-artemis/pom.xml 2009-03-21 03:42:38 UTC (rev 2974)
@@ -128,12 +128,27 @@
</plugins>
</build>
<repositories>
+ <repository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>JBoss</id>
+ <name>JBoss</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ <repository>
+ <id>coderepos.org</id>
+ <name>CodeRepos svn repository</name>
+ <url>http://svn.coderepos.org/share/lang/java/misc/maven2repo</url>
+ </repository>
<repository>
- <id>coderepos.org</id>
- <name>CodeRepos svn repository</name>
- <url>http://svn.coderepos.org/share/lang/java/misc/maven2repo</url>
- </repository>
- <repository>
<id>jiemamy.org</id>
<name>Jiemamy Repository</name>
<url>http://maven.jiemamy.org/release</url>
@@ -143,6 +158,12 @@
<pluginRepository>
<id>Codehaus Snapshots</id>
<url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</pluginRepository>
</pluginRepositories>
<reporting>
Modified: artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AllValidator.java
===================================================================
--- artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AllValidator.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-core/src/main/java/org/jiemamy/validator/AllValidator.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -20,7 +20,6 @@
import java.util.List;
-import org.jiemamy.validator.Validator;
import org.jiemamy.validator.impl.ColumnValidator;
import org.jiemamy.validator.impl.EntityNameCollisionValidator;
import org.jiemamy.validator.impl.ForeignKeyValidator;
Modified: artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/test/TestModelBuilder2Test.java
===================================================================
--- artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/test/TestModelBuilder2Test.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-core/src/test/java/org/jiemamy/internal/test/TestModelBuilder2Test.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -39,8 +39,6 @@
import org.jiemamy.Artemis;
import org.jiemamy.Jiemamy;
-import org.jiemamy.internal.test.ReflectionDialectProvider;
-import org.jiemamy.internal.test.TestModelBuilder2;
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.utils.model.RootModelUtil;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddBendpointCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -22,7 +22,6 @@
import java.util.List;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractAddToCollectionCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.geometory.JmPoint;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddConnectionViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddConnectionViewCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddConnectionViewCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,7 +19,6 @@
package org.jiemamy.internal.editcommand;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.JiemamyElement;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddNodeViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddNodeViewCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/AddNodeViewCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,7 +19,6 @@
package org.jiemamy.internal.editcommand;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.NodeProfile;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/MoveBendpointCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/MoveBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/MoveBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,7 +19,6 @@
package org.jiemamy.internal.editcommand;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.geometory.JmPoint;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveBendpointCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -21,7 +21,6 @@
import java.util.Collection;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractRemoveFromCollectionCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.geometory.JmPoint;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveConnectionViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveConnectionViewCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveConnectionViewCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,7 +19,6 @@
package org.jiemamy.internal.editcommand;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveNodeViewCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveNodeViewCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RemoveNodeViewCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,7 +19,6 @@
package org.jiemamy.internal.editcommand;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.DiagramPresentations;
import org.jiemamy.model.JiemamyElement;
import org.jiemamy.model.NodeProfile;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/ResetBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -21,7 +21,6 @@
import java.util.List;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RevertBendpointsCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RevertBendpointsCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/editcommand/RevertBendpointsCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -21,7 +21,6 @@
import java.util.List;
import org.jiemamy.editcommand.Command;
-import org.jiemamy.internal.editcommand.AbstractCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/enhance/ViewFactoryExtensionEnhancer2.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/enhance/ViewFactoryExtensionEnhancer2.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/enhance/ViewFactoryExtensionEnhancer2.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -22,7 +22,6 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
-import org.jiemamy.internal.enhance.FactoryExtension.JiemamyElementComparator;
import org.jiemamy.internal.model.ConnectionProfileImpl;
import org.jiemamy.internal.model.DiagramPresentationModelImpl;
import org.jiemamy.internal.model.DiagramPresentationsImpl;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/ConnectionProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/ConnectionProfileImpl.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/ConnectionProfileImpl.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -24,7 +24,6 @@
import org.apache.commons.lang.Validate;
import org.jiemamy.Jiemamy;
-import org.jiemamy.internal.model.AbstractJiemamyElement;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmPoint;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/DiagramPresentationModelImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/DiagramPresentationModelImpl.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/DiagramPresentationModelImpl.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -24,7 +24,6 @@
import org.apache.commons.lang.Validate;
import org.jiemamy.Jiemamy;
-import org.jiemamy.internal.model.AbstractJiemamyElement;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.Level;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/NodeProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/NodeProfileImpl.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/model/NodeProfileImpl.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -21,7 +21,6 @@
import java.util.UUID;
import org.jiemamy.Jiemamy;
-import org.jiemamy.internal.model.AbstractJiemamyElement;
import org.jiemamy.model.NodeProfile;
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmRectangle;
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/test/ViewTestModelBuilder.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/test/ViewTestModelBuilder.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/internal/test/ViewTestModelBuilder.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -22,9 +22,6 @@
import org.jiemamy.Jiemamy;
import org.jiemamy.OfficialSpecs;
-import org.jiemamy.internal.test.Instruction;
-import org.jiemamy.internal.test.TestModelBuilder;
-import org.jiemamy.internal.test.UuidStrategy;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
import org.jiemamy.model.DiagramPresentations;
Modified: hestia/trunk/jiemamy-hestia/pom.xml
===================================================================
--- hestia/trunk/jiemamy-hestia/pom.xml 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/jiemamy-hestia/pom.xml 2009-03-21 03:42:38 UTC (rev 2974)
@@ -132,21 +132,42 @@
<name>Central Repository - Eclipse</name>
<url>http://repo1.maven.org/eclipse/</url>
</repository>
+ <repository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>JBoss</id>
+ <name>JBoss</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
<repository>
<id>coderepos.org</id>
<name>CodeRepos svn repository</name>
<url>http://svn.coderepos.org/share/lang/java/misc/maven2repo</url>
</repository>
- <repository>
- <id>jiemamy.org</id>
- <name>Jiemamy Repository</name>
- <url>http://jiemamy.sourceforge.jp/maven2</url>
- </repository>
+ <repository>
+ <id>jiemamy.org</id>
+ <name>Jiemamy Repository</name>
+ <url>http://maven.jiemamy.org/release</url>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>Codehaus Snapshots</id>
<url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</pluginRepository>
</pluginRepositories>
<reporting>
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/DiagramEditor.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -86,6 +86,9 @@
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.ui.part.IPageSite;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Artemis;
import org.jiemamy.ArtemisView;
import org.jiemamy.DispatchStrategy;
@@ -106,8 +109,6 @@
import org.jiemamy.utils.CollectionsUtil;
import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.RootModelUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* ERダイアグラムエディタ。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/ModelContainer.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -23,6 +23,7 @@
import org.apache.commons.lang.ClassUtils;
import org.apache.commons.lang.Validate;
+
import org.jiemamy.Jiemamy;
import org.jiemamy.internal.model.AbstractAdaptable;
import org.jiemamy.model.JiemamyElement;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeColorCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,6 +19,7 @@
package org.jiemamy.eclipse.editor.command;
import org.eclipse.gef.commands.Command;
+
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
import org.jiemamy.internal.JiemamyViewFacadeImpl;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/ChangeNodeConstraintCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -24,6 +24,9 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPartViewer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
@@ -37,8 +40,6 @@
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.JmPointUtil;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* ノードの位置・サイズ変更GEFコマンド。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,6 +19,7 @@
package org.jiemamy.eclipse.editor.command;
import org.eclipse.draw2d.geometry.Point;
+
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateConnectionCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -22,6 +22,10 @@
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.gef.commands.Command;
+import org.seasar.eclipse.common.util.LogUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.eclipse.JiemamyUIPlugin;
import org.jiemamy.exception.ElementNotFoundException;
import org.jiemamy.facade.JiemamyViewFacade;
@@ -36,9 +40,6 @@
import org.jiemamy.model.node.StickyModel;
import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.TableUtil;
-import org.seasar.eclipse.common.util.LogUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* コネクション作成GEFコマンド。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/CreateNodeCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -20,6 +20,9 @@
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.commands.Command;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
@@ -27,8 +30,6 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* ノード作成GEFコマンド。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,6 +19,7 @@
package org.jiemamy.eclipse.editor.command;
import org.eclipse.gef.commands.Command;
+
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
import org.jiemamy.internal.JiemamyViewFacadeImpl;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteConnectionCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,6 +19,7 @@
package org.jiemamy.eclipse.editor.command;
import org.eclipse.gef.commands.Command;
+
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
import org.jiemamy.internal.JiemamyViewFacadeImpl;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DeleteNodeCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,6 +19,7 @@
package org.jiemamy.eclipse.editor.command;
import org.eclipse.gef.commands.Command;
+
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
import org.jiemamy.internal.JiemamyViewFacadeImpl;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/DirectEditNodeCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -18,8 +18,11 @@
*/
package org.jiemamy.eclipse.editor.command;
+import ch.qos.logback.core.status.Status;
+
import org.apache.commons.lang.Validate;
import org.eclipse.gef.commands.Command;
+
import org.jiemamy.JiemamyProperty.EntityProperty;
import org.jiemamy.JiemamyViewProperty.StickyProperty;
import org.jiemamy.eclipse.JiemamyUIPlugin;
@@ -34,8 +37,6 @@
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.model.node.StickyModel;
-import ch.qos.logback.core.status.Status;
-
/**
* ノードのダイレクト編集GEFコマンド。
*
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/command/MoveBendpointCommand.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -19,6 +19,7 @@
package org.jiemamy.eclipse.editor.command;
import org.eclipse.draw2d.geometry.Point;
+
import org.jiemamy.eclipse.utils.ConvertUtil;
import org.jiemamy.facade.JiemamyViewFacade;
import org.jiemamy.facade.SavePoint;
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/TypeOptionManager.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/TypeOptionManager.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/TypeOptionManager.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -31,6 +31,9 @@
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.eclipse.ui.UIConstant;
import org.jiemamy.eclipse.ui.helper.TextSelectionAdapter;
import org.jiemamy.internal.model.datatype.adapter.PrecisionedDataTypeAdapter;
@@ -38,8 +41,6 @@
import org.jiemamy.internal.model.datatype.adapter.SizedDataTypeAdapter;
import org.jiemamy.internal.model.datatype.adapter.TimezonedDataTypeAdapter;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* データ型変更時における、オプションコントロール（サイズ・精度・位取り等）の再構築を担うクラス。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/foreignkey/ForeignKeyEditDialog.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -35,6 +35,9 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Jiemamy;
import org.jiemamy.ReferenceResolver;
import org.jiemamy.JiemamyProperty.AttributeProperty;
@@ -62,8 +65,6 @@
import org.jiemamy.utils.model.JiemamyPropertyUtil;
import org.jiemamy.utils.model.KeyConstraintUtil;
import org.jiemamy.utils.model.TableUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* 外部キー設定ダイアログクラス。
@@ -71,42 +72,42 @@
* @author daisuke
*/
public class ForeignKeyEditDialog extends JiemamyEditDialog<ForeignKey> {
-
+
private static Logger logger = LoggerFactory.getLogger(ForeignKeyEditDialog.class);
-
+
private List<ColumnModel> sourceColumns;
-
+
private List<LocalKeyConstraint> referenceKeys;
-
+
private List<Combo> keyColumnCombos;
-
+
private List<Label> referenceColumnLabels;
-
+
private Text txtKeyName;
-
+
private Combo cmbReferenceKey;
-
+
private Button chkDeferrable;
-
+
private Button radImmediate;
-
+
private Button radDeferred;
-
+
private Combo cmbMatchType;
-
+
private Combo cmbOnDelete;
-
+
private Combo cmbOnUpdate;
-
+
private Jiemamy jiemamy;
-
+
private Group grpMapping;
-
+
private final JiemamyFacade jiemamyFacade;
-
+
private Composite composite;
+
-
/**
* コンストラクタ。
*
@@ -117,10 +118,10 @@
*/
public ForeignKeyEditDialog(Shell shell, ForeignKey foreignKey, JiemamyFacade jiemamyFacade) {
super(shell, foreignKey, ForeignKey.class);
-
+
Validate.notNull(foreignKey);
Validate.notNull(jiemamyFacade);
-
+
this.jiemamyFacade = jiemamyFacade;
setShellStyle(getShellStyle() | SWT.RESIZE);
jiemamy = foreignKey.getJiemamy();
@@ -128,35 +129,35 @@
TableModel targetTableModel = (TableModel) ForeignKeyUtil.getReferenceEntity(foreignKey);
sourceColumns = TableUtil.getColumns(sourceTableModel);
referenceKeys = TableUtil.getAttributes(targetTableModel, LocalKeyConstraint.class, true);
-
+
keyColumnCombos = CollectionsUtil.newArrayList(referenceKeys.size());
referenceColumnLabels = CollectionsUtil.newArrayList(referenceKeys.size());
logger.debug(LogMarker.LIFECYCLE, "construct");
}
-
+
@Override
public int open() {
logger.debug(LogMarker.LIFECYCLE, "open");
ForeignKey foreignKey = getTargetModel();
-
+
// 本来 super.open() 内でコントロール生成が行われるのだが、事前に値をセットする為に、このタイミングでコントロール生成を行う。
// ここで生成を行ってしまっても、二度コントロール生成されることはない。 {@link org.eclipse.jface.window.Window#open()}の実装を参照。
create();
-
+
logger.debug(LogMarker.LIFECYCLE, "set current value to controls");
txtKeyName.setText(StringUtils.defaultIfEmpty(foreignKey.getName(), ""));
-
+
MatchType matchType = foreignKey.getMatchType();
cmbMatchType.setText(matchType == null ? "" : matchType.name());
-
+
ReferentialAction onDelete = foreignKey.getOnDelete();
cmbOnDelete.setText(onDelete == null ? "" : onDelete.name());
-
+
ReferentialAction onUpdate = foreignKey.getOnUpdate();
cmbOnUpdate.setText(onUpdate == null ? "" : onUpdate.name());
-
+
Deferrability deferrability = foreignKey.getDeferrability();
-
+
if (deferrability == null) {
radImmediate.setSelection(true);
radDeferred.setSelection(false);
@@ -164,7 +165,7 @@
radImmediate.setSelection(deferrability.getInitiallyCheckTime() == InitiallyCheckTime.IMMEDIATE);
radDeferred.setSelection(deferrability.getInitiallyCheckTime() == InitiallyCheckTime.DEFERRED);
}
-
+
if (deferrability != null && deferrability.isDeferrable()) {
chkDeferrable.setSelection(true);
radImmediate.setEnabled(true);
@@ -174,20 +175,20 @@
radImmediate.setEnabled(false);
radDeferred.setEnabled(false);
}
-
+
KeyConstraint referenceKeyConstraint = ForeignKeyUtil.getReferenceKeyConstraint(foreignKey);
if (referenceKeyConstraint == null) {
cmbReferenceKey.setText(cmbReferenceKey.getItem(0));
} else {
cmbReferenceKey.setText(KeyConstraintUtil.toStringKeyColumns(referenceKeyConstraint));
}
-
+
assert composite != null;
createMappingControls(composite);
-
+
return super.open();
}
-
+
@Override
protected boolean canExecuteOk() {
for (Combo combo : keyColumnCombos) {
@@ -197,57 +198,57 @@
}
return super.canExecuteOk();
}
-
+
@Override
protected void constrainShellSize() {
Shell shell = getShell();
shell.pack();
shell.setSize(400, shell.getSize().y);
}
-
+
@Override
protected Control createDialogArea(Composite parent) {
logger.debug(LogMarker.LIFECYCLE, "createDialogArea");
getShell().setText(Messages.Dialog_Title);
-
+
composite = (Composite) super.createDialogArea(parent);
composite.setLayout(new GridLayout(5, false));
-
+
Label label;
GridData gd;
-
+
label = new Label(composite, SWT.NULL);
label.setText("制約名(&N):"); // RESOURCE
-
+
txtKeyName = new Text(composite, SWT.BORDER);
gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 4;
txtKeyName.setLayoutData(gd);
txtKeyName.addFocusListener(new TextSelectionAdapter(txtKeyName));
-
+
label = new Label(composite, SWT.NULL);
label.setText("参照キー(&K):"); // RESOURCE
-
+
cmbReferenceKey = new Combo(composite, SWT.READ_ONLY); // TODO CComboにしてPKラベルを表示
cmbReferenceKey.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
for (LocalKeyConstraint referenceKey : referenceKeys) {
cmbReferenceKey.add(KeyConstraintUtil.toStringKeyColumns(referenceKey));
}
-
+
cmbReferenceKey.addSelectionListener(new SelectionAdapter() {
-
+
@Override
public void widgetSelected(SelectionEvent evt) {
logger.debug(LogMarker.LIFECYCLE, "cmbReferenceKey selected");
createMappingControls(grpMapping);
}
-
+
});
-
+
chkDeferrable = new Button(composite, SWT.CHECK);
chkDeferrable.setText("遅延可能(&A)"); // RESOURCE
chkDeferrable.addSelectionListener(new SelectionAdapter() {
-
+
@Override
public void widgetSelected(SelectionEvent evt) {
if (chkDeferrable.getSelection()) {
@@ -259,19 +260,19 @@
}
}
});
-
+
radImmediate = new Button(composite, SWT.RADIO);
radImmediate.setText("即時評価(&I)"); // RESOURCE
-
+
radDeferred = new Button(composite, SWT.RADIO);
radDeferred.setText("遅延評価(&R)"); // RESOURCE
-
+
final Composite option = new Composite(composite, SWT.NULL);
option.setLayout(new GridLayout(4, false));
gd = new GridData(GridData.FILL_BOTH);
gd.horizontalSpan = 5;
option.setLayoutData(gd);
-
+
label = new Label(option, SWT.NULL);
label.setText("ON DELETE(&D)"); // RESOURCE
cmbOnDelete = new Combo(option, SWT.READ_ONLY);
@@ -280,7 +281,7 @@
for (ReferentialAction referentialAction : ReferentialAction.values()) {
cmbOnDelete.add(referentialAction.name());
}
-
+
label = new Label(option, SWT.NULL);
label.setText("ON UPDATE(&U)"); // RESOURCE
cmbOnUpdate = new Combo(option, SWT.READ_ONLY);
@@ -289,7 +290,7 @@
for (ReferentialAction referentialAction : ReferentialAction.values()) {
cmbOnUpdate.add(referentialAction.name());
}
-
+
label = new Label(option, SWT.NULL);
label.setText("マッチ型(&M)"); // RESOURCE
cmbMatchType = new Combo(option, SWT.READ_ONLY);
@@ -300,18 +301,18 @@
for (MatchType matchType : MatchType.values()) {
cmbMatchType.add(matchType.name());
}
-
+
return composite;
}
-
+
@Override
protected boolean performOk() {
logger.debug(LogMarker.LIFECYCLE, "performOk");
ForeignKey foreignKey = getTargetModel();
-
+
String name = JiemamyPropertyUtil.careNull(txtKeyName.getText(), true);
jiemamyFacade.changeModelProperty(foreignKey, AttributeProperty.name, name);
-
+
MatchType matchType = null;
try {
matchType = MatchType.valueOf(cmbMatchType.getText());
@@ -319,7 +320,7 @@
logger.warn(cmbMatchType.getText() + " is not MatchType element.");
}
jiemamyFacade.changeModelProperty(foreignKey, ForeignKeyProperty.matchType, matchType);
-
+
ReferentialAction onDelete = null;
try {
onDelete = ReferentialAction.valueOf(cmbOnDelete.getText());
@@ -327,7 +328,7 @@
logger.warn(cmbOnDelete.getText() + " is not ReferentialAction element.");
}
jiemamyFacade.changeModelProperty(foreignKey, ForeignKeyProperty.onDelete, onDelete);
-
+
ReferentialAction onUpdate = null;
try {
onUpdate = ReferentialAction.valueOf(cmbOnUpdate.getText());
@@ -335,16 +336,16 @@
logger.warn(cmbOnUpdate.getText() + " is not ReferentialAction element.");
}
jiemamyFacade.changeModelProperty(foreignKey, ForeignKeyProperty.onUpdate, onUpdate);
-
+
if (chkDeferrable.getSelection()) {
Deferrability deferrability = foreignKey.getDeferrability();
if (deferrability == null) {
deferrability = jiemamy.getFactory().newModel(Deferrability.class);
jiemamyFacade.changeModelProperty(foreignKey, KeyConstraintModelProperty.deferrability, deferrability);
}
-
+
jiemamyFacade.changeModelProperty(deferrability, DeferrabilityProperty.deferrable, true);
-
+
InitiallyCheckTime initiallyCheckTime = null;
if (radImmediate.getSelection()) {
initiallyCheckTime = InitiallyCheckTime.IMMEDIATE;
@@ -354,33 +355,33 @@
jiemamyFacade.changeModelProperty(deferrability, DeferrabilityProperty.initiallyCheckTime,
initiallyCheckTime);
}
-
+
int selectionIndex = cmbReferenceKey.getSelectionIndex();
LocalKeyConstraint referenceKeyConstraint = referenceKeys.get(selectionIndex);
List<ColumnRef> newReferenceColumns = CollectionsUtil.newArrayList();
for (ColumnRef referenceColumnRef : referenceKeyConstraint.getKeyColumns()) {
newReferenceColumns.add(new ColumnRefImpl(jiemamy, referenceColumnRef.getReferenceId()));
}
-
+
List<ColumnRef> newKeyColumns = CollectionsUtil.newArrayList();
for (int i = 0; i < keyColumnCombos.size(); i++) {
int index = keyColumnCombos.get(i).getSelectionIndex();
ColumnModel keyColumn = sourceColumns.get(index);
newKeyColumns.add(jiemamy.getFactory().newReference(keyColumn));
- foreignKey.getKeyColumns().add(new ColumnRefImpl(jiemamy, keyColumn.getId()));
+ jiemamyFacade.addKeyColumn(foreignKey, keyColumn);
}
jiemamyFacade.updateForeignKeyMapping(getTargetModel(), newKeyColumns, newReferenceColumns);
-
+
return true;
}
-
+
private void createMappingControls(final Composite composite) {
keyColumnCombos.clear();
referenceColumnLabels.clear();
-
+
Label label;
GridData gd;
-
+
if (grpMapping == null || grpMapping.isDisposed()) {
grpMapping = new Group(composite, SWT.NULL);
grpMapping.setText("マッピング"); // RESOURCE
@@ -389,10 +390,10 @@
gd.horizontalSpan = 5;
grpMapping.setLayoutData(gd);
}
-
+
int selectionIndex = cmbReferenceKey.getSelectionIndex();
LocalKeyConstraint referenceKeyConstraint = referenceKeys.get(selectionIndex);
-
+
if (referenceKeyConstraint.getKeyColumns().size() == 0) {
label = new Label(grpMapping, SWT.NULL);
gd = new GridData(GridData.FILL_HORIZONTAL);
@@ -403,21 +404,21 @@
for (Control control : grpMapping.getChildren()) {
control.dispose();
}
-
+
// ヘッダ
label = new Label(grpMapping, SWT.BORDER);
label.setText("参照元"); // RESOURCE
label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
label.setAlignment(SWT.CENTER);
-
+
label = new Label(grpMapping, SWT.NULL);
label.setText("=>");
-
+
label = new Label(grpMapping, SWT.BORDER);
label.setText("参照先"); // RESOURCE
label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
label.setAlignment(SWT.CENTER);
-
+
ReferenceResolver resolver = jiemamy.getReferenceResolver();
ForeignKey foreignKey = getTargetModel();
for (ColumnRef referenceColumnRef : referenceKeyConstraint.getKeyColumns()) {
@@ -426,7 +427,7 @@
for (ColumnModel col : sourceColumns) {
cmbKeyColumn.add(col.getName());
}
-
+
int index = foreignKey.getReferenceColumns().indexOf(referenceColumnRef);
if (index != -1) {
ColumnRef keyColumnRef = foreignKey.getKeyColumns().get(index);
@@ -437,17 +438,17 @@
}
cmbKeyColumn.setVisibleItemCount(20);
keyColumnCombos.add(cmbKeyColumn);
-
+
label = new Label(grpMapping, SWT.NULL);
label.setText("=>");
-
+
ColumnModel referenceColumnModel = resolver.resolve(referenceColumnRef);
Label lblReferenceColumn = new Label(grpMapping, SWT.BORDER);
lblReferenceColumn.setText(referenceColumnModel.getName());
lblReferenceColumn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
referenceColumnLabels.add(lblReferenceColumn);
}
-
+
getShell().pack(true);
composite.layout(false);
}
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/root/RootEditDialogDomainTab.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -47,6 +47,9 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.EventBroker;
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
@@ -86,8 +89,6 @@
import org.jiemamy.utils.model.DataTypeUtil;
import org.jiemamy.utils.model.JiemamyPropertyUtil;
import org.jiemamy.utils.model.RootModelUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* データベース編集ダイアログの「ドメイン」タブ。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/dialog/table/TableEditDialogColumnTab.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -50,6 +50,9 @@
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.Text;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.EventBroker;
import org.jiemamy.Jiemamy;
import org.jiemamy.JiemamyFactory;
@@ -99,8 +102,6 @@
import org.jiemamy.utils.model.JiemamyPropertyUtil;
import org.jiemamy.utils.model.RootModelUtil;
import org.jiemamy.utils.model.TableUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* テーブル編集ダイアログの「カラム」タブ。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ForeignKeyEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -31,6 +31,9 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.command.DialogEditCommand;
import org.jiemamy.eclipse.editor.dialog.foreignkey.ForeignKeyEditDialog;
@@ -44,8 +47,6 @@
import org.jiemamy.model.attribute.constraint.ForeignKey;
import org.jiemamy.model.connection.ConnectionAdapter;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* 外部キーモデルに対するDiagram用EditPart（コントローラ）。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/RootEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -33,6 +33,9 @@
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Migration;
import org.jiemamy.eclipse.JiemamyUIPlugin;
import org.jiemamy.eclipse.editor.command.DialogEditCommand;
@@ -52,8 +55,6 @@
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.CollectionsUtil;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link RootModel}に対するDiagram用EditPart。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/StickyEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -30,6 +30,9 @@
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.command.DialogEditCommand;
import org.jiemamy.eclipse.editor.dialog.sticky.StickyEditDialog;
@@ -49,8 +52,6 @@
import org.jiemamy.model.geometory.JmRectangle;
import org.jiemamy.model.node.StickyModel;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* ビューモデルに対するDiagram用EditPart（コントローラ）。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/TableEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -28,6 +28,9 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.command.DialogEditCommand;
@@ -51,8 +54,6 @@
import org.jiemamy.utils.LogMarker;
import org.jiemamy.utils.model.ColumnUtil;
import org.jiemamy.utils.model.TableUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* テーブルモデルに対するDiagram用EditPart（コントローラ）。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/diagram/ViewEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -28,6 +28,9 @@
import org.eclipse.gef.commands.Command;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Migration;
import org.jiemamy.eclipse.editor.DisplayPlace;
import org.jiemamy.eclipse.editor.command.DialogEditCommand;
@@ -46,8 +49,6 @@
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.node.NodeAdapter;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link ViewModel}に対するDiagram用EditPart（コントローラ）。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/TableTreeEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -26,6 +26,9 @@
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Migration;
import org.jiemamy.eclipse.Images;
import org.jiemamy.eclipse.JiemamyUIPlugin;
@@ -42,8 +45,6 @@
import org.jiemamy.model.attribute.AttributeModel;
import org.jiemamy.model.entity.TableModel;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* {@link TableModel}に対するTree用EditPart（コントローラ）。
Modified: hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java
===================================================================
--- hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java 2009-03-21 02:54:10 UTC (rev 2973)
+++ hestia/trunk/org.jiemamy.eclipse.ui/src/main/java/org/jiemamy/eclipse/editor/editpart/outlinetree/ViewTreeEditPart.java 2009-03-21 03:42:38 UTC (rev 2974)
@@ -24,6 +24,9 @@
import org.eclipse.jface.resource.ImageRegistry;
import org.eclipse.jface.window.Window;
import org.eclipse.swt.widgets.Shell;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.jiemamy.Migration;
import org.jiemamy.eclipse.Images;
import org.jiemamy.eclipse.JiemamyUIPlugin;
@@ -39,8 +42,6 @@
import org.jiemamy.model.RootModel;
import org.jiemamy.model.entity.ViewModel;
import org.jiemamy.utils.LogMarker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* ViewModelに対するTree用EditPart
Modified: zeus/trunk/jiemamy-zeus/pom.xml
===================================================================
--- zeus/trunk/jiemamy-zeus/pom.xml 2009-03-21 02:54:10 UTC (rev 2973)
+++ zeus/trunk/jiemamy-zeus/pom.xml 2009-03-21 03:42:38 UTC (rev 2974)
@@ -125,22 +125,16 @@
</plugin>
</plugins>
</build>
- <repositories>
- <repository>
- <id>coderepos.org</id>
- <name>CodeRepos svn repository</name>
- <url>http://svn.coderepos.org/share/lang/java/misc/maven2repo</url>
- </repository>
- <repository>
- <id>jiemamy.org</id>
- <name>Jiemamy Repository</name>
- <url>http://jiemamy.sourceforge.jp/maven2</url>
- </repository>
- </repositories>
<pluginRepositories>
<pluginRepository>
<id>Codehaus Snapshots</id>
<url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
</pluginRepository>
</pluginRepositories>
<reporting>