svn commit: r17619 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui

Author: bobtarling
Date: 2009-12-09 18:30:57-0800
New Revision: 17619

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java

Log:
Reduce setTarget to the code really required as the target never changes and will always be a UML element

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java?view=diff&pathrev=17619&r1=17618&r2=17619
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java	2009-12-09 18:30:57-0800
@@ -103,38 +103,32 @@
      */
     protected void setTarget(Object theNewTarget) {
         assert (getTarget() == null);
-        assert (!(getTarget() instanceof Fig));
+        assert (Model.getFacade().isAElement(theNewTarget));
         
-        theNewTarget = theNewTarget instanceof Fig
-            ? ((Fig) theNewTarget).getOwner() : theNewTarget;
-        if (Model.getFacade().isAModelElement(theNewTarget)
-                || theNewTarget instanceof Diagram) {
-            setListTarget(theNewTarget);
-            if (getTarget() != null) {
-                Collection bases = Model.getFacade().getBases(getTarget());
-                Iterator it = bases.iterator();
-                while (it.hasNext()) {
-                    Object base =  it.next();
-                    Model.getPump().addModelEventListener(
-                        this,
-                        base,
-                        "ownedElement");
-                }
-                // make sure we know it when a classifier is added as a base
-                Model.getPump().addModelEventListener(
-                    this,
-                    getTarget(),
-                    "base");
-            }
-            if (getTarget() != null) {
-                removeAllElements();
-                setBuildingModel(true);
-                buildModelList();
-                setBuildingModel(false);
-                if (getSize() > 0) {
-                    fireIntervalAdded(this, 0, getSize() - 1);
-                }
-            }
+        setListTarget(theNewTarget);
+        
+        Collection bases = Model.getFacade().getBases(getTarget());
+        Iterator it = bases.iterator();
+        while (it.hasNext()) {
+            Object base =  it.next();
+            Model.getPump().addModelEventListener(
+                this,
+                base,
+                "ownedElement");
+        }
+        
+        // make sure we know it when a classifier is added as a base
+        Model.getPump().addModelEventListener(
+            this,
+            getTarget(),
+            "base");
+        removeAllElements();
+        setBuildingModel(true);
+        buildModelList();
+        setBuildingModel(false);
+        
+        if (getSize() > 0) {
+            fireIntervalAdded(this, 0, getSize() - 1);
         }
     }
 

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java?view=diff&pathrev=17619&r1=17618&r2=17619
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java	2009-12-09 18:30:57-0800
@@ -105,37 +105,31 @@
      */
     protected void setTarget(Object target) {
         assert (getTarget() == null);
-        assert (!(getTarget() instanceof Fig));
+        assert (Model.getFacade().isAElement(target));
         
-        target = target instanceof Fig ? ((Fig) target).getOwner() : target;
-        if (!Model.getFacade().isAModelElement(target))
-            // TODO: - isn't this an error condition? Should we not throw
-            // an exception or at least log.
-            return;
         
         setListTarget(target);
-        if (getTarget() != null) {
-            Collection bases = Model.getFacade().getBases(getTarget());
-            Iterator it = bases.iterator();
-            while (it.hasNext()) {
-                Object base = it.next();
-                Model.getPump().addModelEventListener(
-                    this,
-                    base,
-                    "feature");
-            }
-            // make sure we know it when a classifier is added as a base
+        
+        Collection bases = Model.getFacade().getBases(getTarget());
+        Iterator it = bases.iterator();
+        while (it.hasNext()) {
+            Object base = it.next();
             Model.getPump().addModelEventListener(
                 this,
-                getTarget(),
-                "base");
-            removeAllElements();
-            setBuildingModel(true);
-            buildModelList();
-            setBuildingModel(false);
-            if (getSize() > 0) {
-                fireIntervalAdded(this, 0, getSize() - 1);
-            }
+                base,
+                "feature");
+        }
+        // make sure we know it when a classifier is added as a base
+        Model.getPump().addModelEventListener(
+            this,
+            getTarget(),
+            "base");
+        removeAllElements();
+        setBuildingModel(true);
+        buildModelList();
+        setBuildingModel(false);
+        if (getSize() > 0) {
+            fireIntervalAdded(this, 0, getSize() - 1);
         }
     }

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

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