svn commit: r16093 - trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java

Author: tfmorris
Date: 2008-11-19 13:31:09-0800
New Revision: 16093

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java

Log:
Change ordering so that subsystem property panels can get created

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java?view=diff&rev=16093&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java&r1=16092&r2=16093
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	2008-11-19 13:31:09-0800
@@ -121,7 +121,11 @@
 
     public PropPanel createPropPanel(Object element) {
         if (Model.getFacade().isAElement(element)) {
-            if (Model.getFacade().isAClassifier(element)) {
+            // A Subsytem is a Classifier also, so it needs to come before
+            // the classifier check
+            if (Model.getFacade().isASubsystem(element)) {
+                return new PropPanelSubsystem();
+            } else if (Model.getFacade().isAClassifier(element)) {
                 return getClassifierPropPanel(element);
             } else if (Model.getFacade().isARelationship(element)) {
                 return getRelationshipPropPanel(element);
@@ -196,8 +200,6 @@
                 return new PropPanelStereotype();
             } else if (Model.getFacade().isAStimulus(element)) {
                 return new PropPanelStimulus();
-            } else if (Model.getFacade().isASubsystem(element)) {
-                return new PropPanelSubsystem();
             } else if (Model.getFacade().isATaggedValue(element)) {
                 return new PropPanelTaggedValue();
             } else if (Model.getFacade().isATagDefinition(element)) {
@@ -254,6 +256,13 @@
             return new PropPanelUseCase();
         } 
         
+        // TODO: A Subsystem is a Classifier, but its PropPanel is derived from
+        // PropPanelPackage
+//        else if (Model.getFacade().isASubsystem(element)) {
+//            return new PropPanelSubsystem();
+//        }
+
+        
         // TODO: In UML 2.x Associations will fall through here because they
         // are Classifiers as well as Relationships, but we test for Classifier
         // first.