svn commit: r17139 - trunk/modules/dev: META-INF src/org/argouml/dev src/org/argouml/dev/figinspector
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2009-04-27 10:46:35-0700
New Revision: 17139
Modified:
trunk/modules/dev/META-INF/MANIFEST.MF
trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java
trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java
trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java
Log:
Issue 5780: Remove old sequence diagram references
http://argouml.tigris.org/issues/show_bug.cgi?id=5780
Modified: trunk/modules/dev/META-INF/MANIFEST.MF
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/META-INF/MANIFEST.MF?view=diff&pathrev=17139&r1=17138&r2=17139
==============================================================================
--- trunk/modules/dev/META-INF/MANIFEST.MF (original)
+++ trunk/modules/dev/META-INF/MANIFEST.MF 2009-04-27 10:46:35-0700
@@ -14,4 +14,5 @@
Require-Bundle: org.argouml.app,
org.argouml.core.model,
org.argouml.core.model.mdr,
- org.argouml.core.infra
+ org.argouml.core.infra,
+ org.argouml.sequence2;bundle-version="0.28.0"
Modified: trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java?view=diff&pathrev=17139&r1=17138&r2=17139
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/CallerListNodeBuilder.java 2009-04-27 10:46:35-0700
@@ -29,7 +29,7 @@
import javax.swing.tree.DefaultMutableTreeNode;
-import org.argouml.uml.diagram.sequence.MessageNode;
+//import org.argouml.uml.diagram.sequence.MessageNode;
/**
* TODO: Add Javadoc
@@ -38,17 +38,19 @@
*/
public class CallerListNodeBuilder {
- public static void addNodeTree(
- DefaultMutableTreeNode treeNode,
- MessageNode mn) {
- List callers = mn.getCallers();
- if (callers != null) {
- for (Iterator it = callers.iterator(); it.hasNext(); ) {
- Object o = it.next();
- DefaultMutableTreeNode tn =
- new DefaultMutableTreeNode(o.getClass().getName());
- treeNode.add(tn);
- }
- }
- }
+ // TODO: Refers to old sequence diagram implementation - needs to be updated
+
+// public static void addNodeTree(
+// DefaultMutableTreeNode treeNode,
+// MessageNode mn) {
+// List callers = mn.getCallers();
+// if (callers != null) {
+// for (Iterator it = callers.iterator(); it.hasNext(); ) {
+// Object o = it.next();
+// DefaultMutableTreeNode tn =
+// new DefaultMutableTreeNode(o.getClass().getName());
+// treeNode.add(tn);
+// }
+// }
+// }
}
Modified: trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java?view=diff&pathrev=17139&r1=17138&r2=17139
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/MessageNodeBuilder.java 2009-04-27 10:46:35-0700
@@ -26,9 +26,7 @@
import javax.swing.tree.DefaultMutableTreeNode;
-import org.argouml.uml.diagram.sequence.MessageNode;
-import org.argouml.uml.diagram.sequence.ui.FigClassifierRole;
-import org.argouml.uml.diagram.sequence.ui.FigMessagePort;
+import org.argouml.sequence2.diagram.FigClassifierRole;
/**
* TODO: Add Javadoc
@@ -40,21 +38,24 @@
public static void addNodeTree(
DefaultMutableTreeNode treeNode,
FigClassifierRole fcr) {
- int nodeCount = fcr.getNodeCount();
- for (int i = 0; i < nodeCount; ++i) {
- MessageNode mn = fcr.getNode(i);
- String descr =
- "MessageNode y="
- + fcr.getYCoordinate(mn)
- + " "
- + mn.getState();
- FigMessagePort fmp = mn.getFigMessagePort();
- if (fmp != null) {
- descr += " FigMessagePort registered";
- }
- DefaultMutableTreeNode tn = new DefaultMutableTreeNode(descr);
- treeNode.add(tn);
- CallerListNodeBuilder.addNodeTree(tn, mn);
- }
+
+ // TODO: Refers to old sequence diagrams - needs to be updated
+
+// int nodeCount = fcr.getNodeCount();
+// for (int i = 0; i < nodeCount; ++i) {
+// MessageNode mn = fcr.getNode(i);
+// String descr =
+// "MessageNode y="
+// + fcr.getYCoordinate(mn)
+// + " "
+// + mn.getState();
+// FigMessagePort fmp = mn.getFigMessagePort();
+// if (fmp != null) {
+// descr += " FigMessagePort registered";
+// }
+// DefaultMutableTreeNode tn = new DefaultMutableTreeNode(descr);
+// treeNode.add(tn);
+// CallerListNodeBuilder.addNodeTree(tn, mn);
+// }
}
}
Modified: trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java?view=diff&pathrev=17139&r1=17138&r2=17139
==============================================================================
--- trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java (original)
+++ trunk/modules/dev/src/org/argouml/dev/figinspector/FigInspectorPanel.java 2009-04-27 10:46:35-0700
@@ -32,7 +32,7 @@
import javax.swing.tree.DefaultMutableTreeNode;
import org.argouml.dev.MessageNodeBuilder;
-import org.argouml.uml.diagram.sequence.ui.FigClassifierRole;
+import org.argouml.sequence2.diagram.FigClassifierRole;
import org.tigris.gef.base.Globals;
import org.tigris.gef.base.Layer;
import org.tigris.gef.event.GraphSelectionEvent;
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1949460
To unsubscribe from this discussion, e-mail: [[email protected]].