svn commit: r15056 - trunk/src/argouml-app/src/org/argouml/uml/ui

Author: mvw
Date: 2008-06-23 10:46:24-0700
New Revision: 15056

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

Log:
Fixed the problem of the missing proppanels for ElementImport and ElementResidence.

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=15056&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=15055&r2=15056
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	2008-06-23 10:46:24-0700
@@ -89,7 +89,6 @@
 import org.argouml.uml.ui.foundation.core.PropPanelConstraint;
 import org.argouml.uml.ui.foundation.core.PropPanelDataType;
 import org.argouml.uml.ui.foundation.core.PropPanelDependency;
-import org.argouml.uml.ui.foundation.core.PropPanelElementResidence;
 import org.argouml.uml.ui.foundation.core.PropPanelEnumeration;
 import org.argouml.uml.ui.foundation.core.PropPanelEnumerationLiteral;
 import org.argouml.uml.ui.foundation.core.PropPanelFlow;
@@ -105,7 +104,6 @@
 import org.argouml.uml.ui.foundation.extension_mechanisms.PropPanelStereotype;
 import org.argouml.uml.ui.foundation.extension_mechanisms.PropPanelTagDefinition;
 import org.argouml.uml.ui.foundation.extension_mechanisms.PropPanelTaggedValue;
-import org.argouml.uml.ui.model_management.PropPanelElementImport;
 import org.argouml.uml.ui.model_management.PropPanelModel;
 import org.argouml.uml.ui.model_management.PropPanelPackage;
 import org.argouml.uml.ui.model_management.PropPanelSubsystem;
@@ -162,10 +160,6 @@
                 return new PropPanelConstraint();
             } else if (Model.getFacade().isAEnumerationLiteral(element)) {
                 return new PropPanelEnumerationLiteral();
-            } else if (Model.getFacade().isAElementImport(element)) {
-                return new PropPanelElementImport();
-            } else if (Model.getFacade().isAElementResidence(element)) {
-                return new PropPanelElementResidence();
             } else if (Model.getFacade().isAExtensionPoint(element)) {
                 return new PropPanelExtensionPoint();
             } else if (Model.getFacade().isAGuard(element)) {

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/UmlObjectPropPanelFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/UmlObjectPropPanelFactory.java?view=diff&rev=15056&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/UmlObjectPropPanelFactory.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/UmlObjectPropPanelFactory.java&r1=15055&r2=15056
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/UmlObjectPropPanelFactory.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/UmlObjectPropPanelFactory.java	2008-06-23 10:46:24-0700
@@ -25,11 +25,22 @@
 package org.argouml.uml.ui;
 
 import org.argouml.model.Model;
+import org.argouml.uml.ui.foundation.core.PropPanelElementResidence;
+import org.argouml.uml.ui.model_management.PropPanelElementImport;
 
 /**
  * This factory creates the right PropPanel
  * for a given UML Object that is not an "element", 
- * such as Expression and Multiplicity.
+ * such as Expression and Multiplicity. <p>
+ * 
+ * The complete list of UML objects that are not Element:
+ * ElementImport,
+ * ElementResidence
+ * Expression (9 types)
+ * Multiplicity
+ * MultiplicityRange
+ * TemplateArgument
+ * TemplateParameter
  *
  * @author Michiel
  */
@@ -42,6 +53,12 @@
         if (Model.getFacade().isAMultiplicity(object)) {
             return getMultiplicityPropPanel(object);
         }
+        if (Model.getFacade().isAElementImport(object)) {
+            return new PropPanelElementImport();
+        }
+        if (Model.getFacade().isAElementResidence(object)) {
+            return new PropPanelElementResidence();
+        }
         return null;
     }