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

Author: bobtarling
Date: 2010-03-26 10:22:38-0700
New Revision: 18172

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

Log:
Part revert my code in favour of better solution from Andreas

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=18172&r1=18171&r2=18172
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/PerspectiveManager.java	2010-03-26 10:22:38-0700
@@ -389,10 +389,8 @@
         packagePerspective.addRule(new GoStimulusToAction());
         packagePerspective.addRule(new GoClassifierToCollaboration());
         // TODO: We need a factory pattern for GoXXX classes that can determine if they are required
-        if (Model.getFacade().getUmlVersion().charAt(0) == '1') {
-            packagePerspective.addRule(new GoOperationToCollaboration());
-            packagePerspective.addRule(new GoOperationToSequenceDiagram());
-        }
+        packagePerspective.addRule(new GoOperationToCollaboration());
+        packagePerspective.addRule(new GoOperationToSequenceDiagram());
         packagePerspective.addRule(new GoModelElementToComment());
         packagePerspective.addRule(new GoCollaborationToDiagram());
         packagePerspective.addRule(new GoModelElementToTemplateParameter());
@@ -563,7 +561,9 @@
             new GoModelToNode(), new GoNamespaceToClassifierAndPackage(),
             new GoNamespaceToDiagram(), new GoNamespaceToOwnedElements(),
             new GoNodeToResidentComponent(),
+            new GoOperationToCollaboration(),
             new GoOperationToCollaborationDiagram(),
+            new GoOperationToSequenceDiagram(),
             new GoPackageToClass(),
             new GoPackageToElementImport(),
             new GoProjectToCollaboration(), new GoProjectToDiagram(),
@@ -595,8 +595,7 @@
         // TODO: We need a factory pattern for GoXXX classes that can determine if they are required
         PerspectiveRule[] ruleNamesArray14 = {
             // Enter here go rules only relevant for UML 1.4
-            new GoOperationToCollaboration(),
-            new GoOperationToSequenceDiagram()
+            // empty for now
         };
 
         PerspectiveRule[] ruleNamesArray2 = {

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

To unsubscribe from this discussion, e-mail: [[email protected]].