svn commit: r19403 - trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java

[email protected]
Newsgroups gmane.comp.lang.uml.argouml.cvs
Message-ID <[email protected]>
Author: bobtarling
Date: 2011-05-11 08:07:22-0700
New Revision: 19403

Modified:
   trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java

Log:
Drop UML1.4 rules from UML2

Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java?view=diff&pathrev=19403&r1=19402&r2=19403
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java	2011-05-11 08:07:22-0700
@@ -404,9 +404,7 @@
         packagePerspective.addRule(new GoStatemachineToDiagram());
         if (Model.getFacade().getUmlVersion().startsWith("1")) {
             packagePerspective.addRule(new GoStateMachineToState());
-        }
-        packagePerspective.addRule(new GoCompositeStateToSubvertex());
-        if (Model.getFacade().getUmlVersion().startsWith("1")) {
+            packagePerspective.addRule(new GoCompositeStateToSubvertex());
             packagePerspective.addRule(new GoStateToInternalTrans());
         }
         packagePerspective.addRule(new GoStateToDoActivity());
@@ -550,7 +548,7 @@
             new GoClassToSummary(), new GoCollaborationToDiagram(),
             new GoCollaborationToInteraction(),
             new GoComponentToResidentModelElement(),
-            new GoCompositeStateToSubvertex(), new GoDiagramToEdge(),
+            new GoDiagramToEdge(),
             new GoDiagramToNode(), new GoElementToMachine(),
             new GoEnumerationToLiterals(),
             new GoGeneralizableElementToSpecialized(),
@@ -599,6 +597,7 @@
         
         // TODO: We need a factory pattern for GoXXX classes that can determine if they are required
         PerspectiveRule[] ruleNamesArray14 = {
+            new GoCompositeStateToSubvertex(),
             new GoStateMachineToState(),
             new GoStateToInternalTrans()
         };

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2734417

To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.