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

Author: tfmorris
Date: 2009-03-26 12:39:44-0700
New Revision: 16964

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

Log:
Quick patch to allow property panel to be fetched for UML 2.x Associations which are both a Classifier and Relationship.  More work needed.

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&pathrev=16964&r1=16963&r2=16964
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ElementPropPanelFactory.java	2009-03-26 12:39:44-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2008 The Regents of the University of California. All
+// Copyright (c) 2008, 2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -83,7 +83,6 @@
 import org.argouml.uml.ui.foundation.core.PropPanelAssociationEnd;
 import org.argouml.uml.ui.foundation.core.PropPanelAttribute;
 import org.argouml.uml.ui.foundation.core.PropPanelClass;
-import org.argouml.uml.ui.foundation.core.PropPanelClassifier;
 import org.argouml.uml.ui.foundation.core.PropPanelComment;
 import org.argouml.uml.ui.foundation.core.PropPanelComponent;
 import org.argouml.uml.ui.foundation.core.PropPanelConstraint;
@@ -223,7 +222,7 @@
     }
 
 
-    private PropPanelClassifier getClassifierPropPanel(Object element) {
+    private PropPanel getClassifierPropPanel(Object element) {
         if (Model.getFacade().isAActor(element)) {
             return new PropPanelActor();
         } else if (Model.getFacade().isAAssociationClass(element)) {
@@ -254,7 +253,9 @@
             }
         } else if (Model.getFacade().isAUseCase(element)) {
             return new PropPanelUseCase();
-        } 
+        } else if (Model.getFacade().isARelationship(element)) {
+            return getRelationshipPropPanel(element);
+        }
         
         // TODO: A Subsystem is a Classifier, but its PropPanel is derived from
         // PropPanelPackage

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

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