svnno****@sourc*****
svnno****@sourc*****
2009年 3月 1日 (日) 22:49:01 JST
Revision: 2756
http://svn.sourceforge.jp/view?root=jiemamy&view=rev&rev=2756
Author: daisuke_m
Date: 2009-03-01 22:49:01 +0900 (Sun, 01 Mar 2009)
Log Message:
-----------
javadoc / refactor
Modified Paths:
--------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java
Added Paths:
-----------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java
Removed Paths:
-------------
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionToDiagramCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeToDiagramCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionFromDiagramCommand.java
artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeFromDiagramCommand.java
-------------- next part --------------
Deleted: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionToDiagramCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionToDiagramCommand.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionToDiagramCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -1,104 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/22
- *
- * 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.editcommand;
-
-import org.jiemamy.editcommand.impl.AbstractCommand;
-import org.jiemamy.model.ConnectionProfile;
-import org.jiemamy.model.DiagramPresentations;
-import org.jiemamy.model.JiemamyElement;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.connection.ConnectionAdapter;
-import org.jiemamy.model.node.NodeAdapter;
-
-/**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link ConnectionAdapter}を追加するコマンド。
- *
- * @see DeleteConnectionFromDiagramCommand
- * @author shin1ogawa
- */
-public class AddConnectionToDiagramCommand extends AbstractCommand {
-
- private final RootModel rootModel;
-
- private final ConnectionAdapter connectionAdapter;
-
- private final ConnectionProfile connectionProfile;
-
- private final int diagramIndex;
-
-
- /**
- * インスタンスを生成する。
- *
- * @param rootModel {@link DiagramPresentations}がアダプトされた{@link RootModel}
- * @param diagramIndex ダイアグラムエディタのタブインデックス
- * @param connectionAdapter ノードを識別するための{@link NodeAdapter}
- * @param connectionProfile
- */
- public AddConnectionToDiagramCommand(RootModel rootModel, int diagramIndex, ConnectionAdapter connectionAdapter,
- ConnectionProfile connectionProfile) {
- this.rootModel = rootModel;
- this.diagramIndex = diagramIndex;
- this.connectionAdapter = connectionAdapter;
- this.connectionProfile = connectionProfile;
- }
-
- /**
- * TODO for daisuke
- *
- * @return
- */
- public ConnectionProfile getConnectionProfile() {
- return connectionProfile;
- }
-
- /**
- * @return the diagramIndex
- */
- public int getDiagramIndex() {
- return diagramIndex;
- }
-
- public Command getNegateCommand() {
- return new DeleteConnectionFromDiagramCommand(rootModel, getDiagramIndex(), connectionAdapter,
- connectionProfile);
- }
-
- /**
- * @return ノードを識別するための{@link NodeAdapter}
- */
- public ConnectionAdapter getNodeAdapter() {
- return connectionAdapter;
- }
-
- /**
- * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
- */
- public RootModel getRootModel() {
- return rootModel;
- }
-
- /**
- * {@inheritDoc}
- */
- public JiemamyElement getTarget() {
- return getRootModel();
- }
-
-}
Copied: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java (from rev 2752, artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionToDiagramCommand.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/22
+ *
+ * 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.editcommand;
+
+import org.jiemamy.editcommand.impl.AbstractCommand;
+import org.jiemamy.model.ConnectionProfile;
+import org.jiemamy.model.DiagramPresentations;
+import org.jiemamy.model.JiemamyElement;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.connection.ConnectionAdapter;
+import org.jiemamy.model.node.NodeAdapter;
+
+/**
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link ConnectionAdapter}を追加するコマンド。
+ *
+ * @see DeleteConnectionViewCommand
+ * @author shin1ogawa
+ */
+public class AddConnectionViewCommand extends AbstractCommand {
+
+ private final RootModel rootModel;
+
+ private final ConnectionAdapter connectionAdapter;
+
+ private final ConnectionProfile connectionProfile;
+
+ private final int diagramIndex;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param rootModel {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ * @param diagramIndex ダイアグラムエディタのタブインデックス
+ * @param connectionAdapter ノードを識別するための{@link NodeAdapter}
+ * @param connectionProfile
+ */
+ public AddConnectionViewCommand(RootModel rootModel, int diagramIndex, ConnectionAdapter connectionAdapter,
+ ConnectionProfile connectionProfile) {
+ this.rootModel = rootModel;
+ this.diagramIndex = diagramIndex;
+ this.connectionAdapter = connectionAdapter;
+ this.connectionProfile = connectionProfile;
+ }
+
+ /**
+ * TODO for daisuke
+ *
+ * @return
+ */
+ public ConnectionProfile getConnectionProfile() {
+ return connectionProfile;
+ }
+
+ /**
+ * @return the diagramIndex
+ */
+ public int getDiagramIndex() {
+ return diagramIndex;
+ }
+
+ public Command getNegateCommand() {
+ return new DeleteConnectionViewCommand(rootModel, getDiagramIndex(), connectionAdapter,
+ connectionProfile);
+ }
+
+ /**
+ * @return ノードを識別するための{@link NodeAdapter}
+ */
+ public ConnectionAdapter getNodeAdapter() {
+ return connectionAdapter;
+ }
+
+ /**
+ * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ */
+ public RootModel getRootModel() {
+ return rootModel;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public JiemamyElement getTarget() {
+ return getRootModel();
+ }
+
+}
Property changes on: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddConnectionViewCommand.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeToDiagramCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeToDiagramCommand.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeToDiagramCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -1,100 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/22
- *
- * 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.editcommand;
-
-import org.jiemamy.editcommand.impl.AbstractCommand;
-import org.jiemamy.model.DiagramPresentations;
-import org.jiemamy.model.JiemamyElement;
-import org.jiemamy.model.NodeProfile;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.node.NodeAdapter;
-
-/**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link NodeProfile}を追加するコマンド。
- *
- * @see DeleteNodeFromDiagramCommand
- * @author shin1ogawa
- */
-public class AddNodeToDiagramCommand extends AbstractCommand {
-
- private final RootModel rootModel;
-
- private final NodeAdapter nodeAdapter;
-
- private final NodeProfile nodeProfile;
-
- private final int diagramIndex;
-
-
- /**
- * インスタンスを生成する。
- *
- * @param rootModel {@link DiagramPresentations}がアダプトされた{@link RootModel}
- * @param diagramIndex ダイアグラムエディタのタブインデックス
- * @param nodeAdapter ノードを識別するための{@link NodeAdapter}
- * @param nodeProfile ノードの見た目の情報を保持する{@link NodeProfile}
- */
- public AddNodeToDiagramCommand(RootModel rootModel, int diagramIndex, NodeAdapter nodeAdapter,
- NodeProfile nodeProfile) {
- this.rootModel = rootModel;
- this.diagramIndex = diagramIndex;
- this.nodeAdapter = nodeAdapter;
- this.nodeProfile = nodeProfile;
- }
-
- /**
- * @return the diagramIndex
- */
- public int getDiagramIndex() {
- return diagramIndex;
- }
-
- public Command getNegateCommand() {
- return new DeleteNodeFromDiagramCommand(rootModel, getDiagramIndex(), nodeAdapter);
- }
-
- /**
- * @return ノードを識別するための{@link NodeAdapter}
- */
- public NodeAdapter getNodeAdapter() {
- return nodeAdapter;
- }
-
- /**
- * @return ノードの見た目の情報を保持する{@link NodeProfile}
- */
- public NodeProfile getNodeProfile() {
- return nodeProfile;
- }
-
- /**
- * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
- */
- public RootModel getRootModel() {
- return rootModel;
- }
-
- /**
- * {@inheritDoc}
- */
- public JiemamyElement getTarget() {
- return getRootModel();
- }
-
-}
Copied: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java (from rev 2752, artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeToDiagramCommand.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/22
+ *
+ * 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.editcommand;
+
+import org.jiemamy.editcommand.impl.AbstractCommand;
+import org.jiemamy.model.DiagramPresentations;
+import org.jiemamy.model.JiemamyElement;
+import org.jiemamy.model.NodeProfile;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.node.NodeAdapter;
+
+/**
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタに{@link NodeProfile}を追加するコマンド。
+ *
+ * @see DeleteNodeViewCommand
+ * @author shin1ogawa
+ */
+public class AddNodeViewCommand extends AbstractCommand {
+
+ private final RootModel rootModel;
+
+ private final NodeAdapter nodeAdapter;
+
+ private final NodeProfile nodeProfile;
+
+ private final int diagramIndex;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param rootModel {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ * @param diagramIndex ダイアグラムエディタのタブインデックス
+ * @param nodeAdapter ノードを識別するための{@link NodeAdapter}
+ * @param nodeProfile ノードの見た目の情報を保持する{@link NodeProfile}
+ */
+ public AddNodeViewCommand(RootModel rootModel, int diagramIndex, NodeAdapter nodeAdapter,
+ NodeProfile nodeProfile) {
+ this.rootModel = rootModel;
+ this.diagramIndex = diagramIndex;
+ this.nodeAdapter = nodeAdapter;
+ this.nodeProfile = nodeProfile;
+ }
+
+ /**
+ * @return the diagramIndex
+ */
+ public int getDiagramIndex() {
+ return diagramIndex;
+ }
+
+ public Command getNegateCommand() {
+ return new DeleteNodeViewCommand(rootModel, getDiagramIndex(), nodeAdapter);
+ }
+
+ /**
+ * @return ノードを識別するための{@link NodeAdapter}
+ */
+ public NodeAdapter getNodeAdapter() {
+ return nodeAdapter;
+ }
+
+ /**
+ * @return ノードの見た目の情報を保持する{@link NodeProfile}
+ */
+ public NodeProfile getNodeProfile() {
+ return nodeProfile;
+ }
+
+ /**
+ * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ */
+ public RootModel getRootModel() {
+ return rootModel;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public JiemamyElement getTarget() {
+ return getRootModel();
+ }
+
+}
Property changes on: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/AddNodeViewCommand.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionFromDiagramCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionFromDiagramCommand.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionFromDiagramCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -1,94 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/22
- *
- * 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.editcommand;
-
-import org.jiemamy.editcommand.impl.AbstractCommand;
-import org.jiemamy.model.ConnectionProfile;
-import org.jiemamy.model.DiagramPresentations;
-import org.jiemamy.model.JiemamyElement;
-import org.jiemamy.model.NodeProfile;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.connection.ConnectionAdapter;
-import org.jiemamy.model.node.NodeAdapter;
-
-/**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するコマンド。
- *
- * @see AddConnectionToDiagramCommand
- * @author shin1ogawa
- */
-public class DeleteConnectionFromDiagramCommand extends AbstractCommand {
-
- private final RootModel root;
-
- private final ConnectionAdapter connectionAdapter;
-
- private final int diagramIndex;
-
- private final ConnectionProfile connectionProfile;
-
-
- /**
- * インスタンスを生成する。
- *
- * @param root {@link DiagramPresentations}がアダプトされた{@link RootModel}
- * @param diagramIndex ダイアグラムエディタのタブインデックス
- * @param connectionAdapter ノードを識別するための{@link NodeAdapter}
- * @param connectionProfile
- */
- public DeleteConnectionFromDiagramCommand(RootModel root, int diagramIndex, ConnectionAdapter connectionAdapter,
- ConnectionProfile connectionProfile) {
- this.root = root;
- this.diagramIndex = diagramIndex;
- this.connectionAdapter = connectionAdapter;
- this.connectionProfile = connectionProfile;
- }
-
- /**
- * @return the diagramIndex
- */
- public int getDiagramIndex() {
- return diagramIndex;
- }
-
- public Command getNegateCommand() {
- return new AddConnectionToDiagramCommand(root, getDiagramIndex(), connectionAdapter, connectionProfile);
- }
-
- /**
- * @return ノードを識別するための{@link NodeAdapter}
- */
- public ConnectionAdapter getNodeAdapter() {
- return connectionAdapter;
- }
-
- /**
- * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
- */
- public RootModel getRoot() {
- return root;
- }
-
- /**
- * {@inheritDoc}
- */
- public JiemamyElement getTarget() {
- return getRoot();
- }
-}
Copied: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java (from rev 2752, artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionFromDiagramCommand.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/22
+ *
+ * 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.editcommand;
+
+import org.jiemamy.editcommand.impl.AbstractCommand;
+import org.jiemamy.model.ConnectionProfile;
+import org.jiemamy.model.DiagramPresentations;
+import org.jiemamy.model.JiemamyElement;
+import org.jiemamy.model.NodeProfile;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.connection.ConnectionAdapter;
+import org.jiemamy.model.node.NodeAdapter;
+
+/**
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するコマンド。
+ *
+ * @see AddConnectionViewCommand
+ * @author shin1ogawa
+ */
+public class DeleteConnectionViewCommand extends AbstractCommand {
+
+ private final RootModel root;
+
+ private final ConnectionAdapter connectionAdapter;
+
+ private final int diagramIndex;
+
+ private final ConnectionProfile connectionProfile;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param root {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ * @param diagramIndex ダイアグラムエディタのタブインデックス
+ * @param connectionAdapter ノードを識別するための{@link NodeAdapter}
+ * @param connectionProfile
+ */
+ public DeleteConnectionViewCommand(RootModel root, int diagramIndex, ConnectionAdapter connectionAdapter,
+ ConnectionProfile connectionProfile) {
+ this.root = root;
+ this.diagramIndex = diagramIndex;
+ this.connectionAdapter = connectionAdapter;
+ this.connectionProfile = connectionProfile;
+ }
+
+ /**
+ * @return the diagramIndex
+ */
+ public int getDiagramIndex() {
+ return diagramIndex;
+ }
+
+ public Command getNegateCommand() {
+ return new AddConnectionViewCommand(root, getDiagramIndex(), connectionAdapter, connectionProfile);
+ }
+
+ /**
+ * @return ノードを識別するための{@link NodeAdapter}
+ */
+ public ConnectionAdapter getNodeAdapter() {
+ return connectionAdapter;
+ }
+
+ /**
+ * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ */
+ public RootModel getRoot() {
+ return root;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public JiemamyElement getTarget() {
+ return getRoot();
+ }
+}
Property changes on: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteConnectionViewCommand.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeFromDiagramCommand.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeFromDiagramCommand.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeFromDiagramCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -1,104 +0,0 @@
-/*
- * Copyright 2007-2009 Jiemamy Project and the Others.
- * Created on 2009/02/22
- *
- * 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.editcommand;
-
-import org.jiemamy.editcommand.impl.AbstractCommand;
-import org.jiemamy.model.DiagramPresentations;
-import org.jiemamy.model.JiemamyElement;
-import org.jiemamy.model.NodeProfile;
-import org.jiemamy.model.RootModel;
-import org.jiemamy.model.node.NodeAdapter;
-
-/**
- * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するコマンド。
- *
- * @see AddNodeToDiagramCommand
- * @author shin1ogawa
- */
-public class DeleteNodeFromDiagramCommand extends AbstractCommand {
-
- private final RootModel root;
-
- private final NodeAdapter nodeAdapter;
-
- private final int diagramIndex;
-
- private NodeProfile nodeProfile;
-
-
- /**
- * インスタンスを生成する。
- *
- * @param root {@link DiagramPresentations}がアダプトされた{@link RootModel}
- * @param diagramIndex ダイアグラムエディタのタブインデックス
- * @param nodeAdapter ノードを識別するための{@link NodeAdapter}
- */
- public DeleteNodeFromDiagramCommand(RootModel root, int diagramIndex, NodeAdapter nodeAdapter) {
- this.root = root;
- this.diagramIndex = diagramIndex;
- this.nodeAdapter = nodeAdapter;
- }
-
- /**
- * @return the diagramIndex
- */
- public int getDiagramIndex() {
- return diagramIndex;
- }
-
- public Command getNegateCommand() {
- return new AddNodeToDiagramCommand(root, getDiagramIndex(), nodeAdapter, getNodeProfile());
- }
-
- /**
- * @return ノードを識別するための{@link NodeAdapter}
- */
- public NodeAdapter getNodeAdapter() {
- return nodeAdapter;
- }
-
- /**
- * @return ノードの見た目の情報を保持する{@link NodeProfile}
- */
- public NodeProfile getNodeProfile() {
- return nodeProfile;
- }
-
- /**
- * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
- */
- public RootModel getRoot() {
- return root;
- }
-
- /**
- * {@inheritDoc}
- */
- public JiemamyElement getTarget() {
- return getRoot();
- }
-
- /**
- * @param nodeProfile ノードの見た目の情報を保持する{@link NodeProfile}
- */
- public void setNodeProfile(NodeProfile nodeProfile) {
- this.nodeProfile = nodeProfile;
- }
-
-}
Copied: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java (from rev 2752, artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeFromDiagramCommand.java)
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java (rev 0)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2007-2009 Jiemamy Project and the Others.
+ * Created on 2009/02/22
+ *
+ * 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.editcommand;
+
+import org.jiemamy.editcommand.impl.AbstractCommand;
+import org.jiemamy.model.DiagramPresentations;
+import org.jiemamy.model.JiemamyElement;
+import org.jiemamy.model.NodeProfile;
+import org.jiemamy.model.RootModel;
+import org.jiemamy.model.node.NodeAdapter;
+
+/**
+ * {@link RootModel}に登録された{@link DiagramPresentations}アダプタから{@link NodeProfile}を削除するコマンド。
+ *
+ * @see AddNodeViewCommand
+ * @author shin1ogawa
+ */
+public class DeleteNodeViewCommand extends AbstractCommand {
+
+ private final RootModel root;
+
+ private final NodeAdapter nodeAdapter;
+
+ private final int diagramIndex;
+
+ private NodeProfile nodeProfile;
+
+
+ /**
+ * インスタンスを生成する。
+ *
+ * @param root {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ * @param diagramIndex ダイアグラムエディタのタブインデックス
+ * @param nodeAdapter ノードを識別するための{@link NodeAdapter}
+ */
+ public DeleteNodeViewCommand(RootModel root, int diagramIndex, NodeAdapter nodeAdapter) {
+ this.root = root;
+ this.diagramIndex = diagramIndex;
+ this.nodeAdapter = nodeAdapter;
+ }
+
+ /**
+ * @return the diagramIndex
+ */
+ public int getDiagramIndex() {
+ return diagramIndex;
+ }
+
+ public Command getNegateCommand() {
+ return new AddNodeViewCommand(root, getDiagramIndex(), nodeAdapter, getNodeProfile());
+ }
+
+ /**
+ * @return ノードを識別するための{@link NodeAdapter}
+ */
+ public NodeAdapter getNodeAdapter() {
+ return nodeAdapter;
+ }
+
+ /**
+ * @return ノードの見た目の情報を保持する{@link NodeProfile}
+ */
+ public NodeProfile getNodeProfile() {
+ return nodeProfile;
+ }
+
+ /**
+ * @return {@link DiagramPresentations}がアダプトされた{@link RootModel}
+ */
+ public RootModel getRoot() {
+ return root;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public JiemamyElement getTarget() {
+ return getRoot();
+ }
+
+ /**
+ * @param nodeProfile ノードの見た目の情報を保持する{@link NodeProfile}
+ */
+ public void setNodeProfile(NodeProfile nodeProfile) {
+ this.nodeProfile = nodeProfile;
+ }
+
+}
Property changes on: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/editcommand/DeleteNodeViewCommand.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/facade/JiemamyViewFacadeImpl.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -22,13 +22,14 @@
import org.jiemamy.EventBroker;
import org.jiemamy.Jiemamy;
-import org.jiemamy.editcommand.AddConnectionToDiagramCommand;
-import org.jiemamy.editcommand.AddNodeToDiagramCommand;
+import org.jiemamy.JiemamyViewProperty.NodeProfileProperty;
+import org.jiemamy.editcommand.AddConnectionViewCommand;
+import org.jiemamy.editcommand.AddNodeViewCommand;
import org.jiemamy.editcommand.Command;
import org.jiemamy.editcommand.CommandProcessor;
import org.jiemamy.editcommand.CommandProcessorImpl;
-import org.jiemamy.editcommand.DeleteConnectionFromDiagramCommand;
-import org.jiemamy.editcommand.DeleteNodeFromDiagramCommand;
+import org.jiemamy.editcommand.DeleteConnectionViewCommand;
+import org.jiemamy.editcommand.DeleteNodeViewCommand;
import org.jiemamy.editcommand.impl.ModifyModelPropertyCommand;
import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.DiagramPresentationModel;
@@ -61,11 +62,17 @@
commandProcessor = new ViewCommandProcessorImpl(jiemamy.getEventBroker());
}
+ /**
+ * TODO for shin1ogawa
+ *
+ * @param diagramIndex
+ * @param connectionAdapter
+ * @param connectionProfile
+ */
public void addConnectionProfile(int diagramIndex, ConnectionAdapter connectionAdapter,
ConnectionProfile connectionProfile) {
RootModel rootModel = jiemamy.getFactory().getRootModel();
- Command command =
- new AddConnectionToDiagramCommand(rootModel, diagramIndex, connectionAdapter, connectionProfile);
+ Command command = new AddConnectionViewCommand(rootModel, diagramIndex, connectionAdapter, connectionProfile);
command.execute(commandProcessor);
undoStack.push(command.getNegateCommand());
redoStack.push(command);
@@ -80,7 +87,7 @@
*/
public void addNodeProfile(int diagramIndex, NodeAdapter nodeAdapter, NodeProfile nodeProfile) {
RootModel rootModel = jiemamy.getFactory().getRootModel();
- Command command = new AddNodeToDiagramCommand(rootModel, diagramIndex, nodeAdapter, nodeProfile);
+ Command command = new AddNodeViewCommand(rootModel, diagramIndex, nodeAdapter, nodeProfile);
command.execute(commandProcessor);
undoStack.push(command.getNegateCommand());
redoStack.push(command);
@@ -103,7 +110,8 @@
figureProfiles.put(nodeAdapter, profile);
}
NodeProfile nodeProfile = figureProfiles.get(nodeAdapter);
- Command redoCommand = new ModifyModelPropertyCommand<NodeProfile>(nodeProfile, "boudary", boundary);
+ Command redoCommand =
+ new ModifyModelPropertyCommand<NodeProfile>(nodeProfile, NodeProfileProperty.boundary, boundary);
redoCommand.execute(commandProcessor);
undoStack.push(redoCommand.getNegateCommand());
redoStack.push(redoCommand);
@@ -117,7 +125,7 @@
*/
public void deleteNodeProfile(int diagramIndex, final NodeAdapter nodeAdapter) {
RootModel rootModel = jiemamy.getFactory().getRootModel();
- Command command = new DeleteNodeFromDiagramCommand(rootModel, diagramIndex, nodeAdapter);
+ Command command = new DeleteNodeViewCommand(rootModel, diagramIndex, nodeAdapter);
command.execute(commandProcessor);
undoStack.push(command.getNegateCommand());
redoStack.push(command);
@@ -145,7 +153,7 @@
*
* @param command
*/
- public void process(AddConnectionToDiagramCommand command) {
+ public void process(AddConnectionViewCommand command) {
DiagramPresentations diagramPresentations = command.getRootModel().getAdapter(DiagramPresentations.class);
DiagramPresentationModel diagramPresentationModel = diagramPresentations.get(command.getDiagramIndex());
diagramPresentationModel.getConnectionProfiles().put(command.getNodeAdapter(),
@@ -158,7 +166,7 @@
*
* @param command
*/
- public void process(AddNodeToDiagramCommand command) {
+ public void process(AddNodeViewCommand command) {
DiagramPresentations diagramPresentations = command.getRootModel().getAdapter(DiagramPresentations.class);
DiagramPresentationModel diagramPresentationModel = diagramPresentations.get(command.getDiagramIndex());
diagramPresentationModel.getFigureProfiles().put(command.getNodeAdapter(), command.getNodeProfile());
@@ -170,7 +178,7 @@
*
* @param command
*/
- public void process(DeleteConnectionFromDiagramCommand command) {
+ public void process(DeleteConnectionViewCommand command) {
DiagramPresentations diagramPresentations = command.getRoot().getAdapter(DiagramPresentations.class);
DiagramPresentationModel diagramPresentationModel = diagramPresentations.get(command.getDiagramIndex());
diagramPresentationModel.getConnectionProfiles().remove(command.getNodeAdapter());
@@ -182,7 +190,7 @@
*
* @param command
*/
- public void process(DeleteNodeFromDiagramCommand command) {
+ public void process(DeleteNodeViewCommand command) {
DiagramPresentations diagramPresentations = command.getRoot().getAdapter(DiagramPresentations.class);
DiagramPresentationModel diagramPresentationModel = diagramPresentations.get(command.getDiagramIndex());
NodeProfile nodeProfile = diagramPresentationModel.getFigureProfiles().get(command.getNodeAdapter());
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/ConnectionProfileImpl.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -21,15 +21,15 @@
import java.util.List;
import java.util.UUID;
+import org.apache.commons.lang.Validate;
+
import org.jiemamy.Jiemamy;
-import org.jiemamy.model.AbstractJiemamyElement;
-import org.jiemamy.model.ConnectionProfile;
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmPoint;
import org.jiemamy.utils.ValidateUtil;
/**
- * TODO for daisuke
+ * {@link ConnectionProfile}の実装クラス。
*
* @author daisuke
*/
@@ -38,7 +38,7 @@
/** コネクションの色情報 */
private JmColor color;
- /** コネクションのレイアウト情報 */
+ /** ベンドポイントのリスト */
private List<JmPoint> bendpoints;
@@ -61,11 +61,13 @@
}
/**
- * TODO for daisuke
+ * ベンドポイントのリストを設定する。
*
- * @param bendpoints
+ * @param bendpoints ベンドポイントのリスト
+ * @throws IllegalArgumentException 引数に{@code null}を与えた場合
*/
public void setBendpoints(List<JmPoint> bendpoints) {
+ Validate.notNull(bendpoints);
ValidateUtil.injectionSetter(this.bendpoints);
this.bendpoints = bendpoints;
}
Modified: artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java
===================================================================
--- artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java 2009-03-01 13:48:26 UTC (rev 2755)
+++ artemis/trunk/jiemamy-view/src/main/java/org/jiemamy/model/NodeProfileImpl.java 2009-03-01 13:49:01 UTC (rev 2756)
@@ -21,13 +21,11 @@
import java.util.UUID;
import org.jiemamy.Jiemamy;
-import org.jiemamy.model.AbstractJiemamyElement;
-import org.jiemamy.model.NodeProfile;
import org.jiemamy.model.geometory.JmColor;
import org.jiemamy.model.geometory.JmRectangle;
/**
- * TODO for daisuke
+ * {@link NodeProfile}の実装クラス。
*
* @author daisuke
*/