svn commit: r15582 - branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels: ui xml

Author: penyaskito
Date: 2008-08-19 08:51:22-0700
New Revision: 15582

Modified:
   branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
   branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml

Log:
Issue 5321: Added participant to the AssociationEnd panel.

Modified: branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&rev=15582&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java&r1=15581&r2=15582
==============================================================================
--- branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	(original)
+++ branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	2008-08-19 08:51:22-0700
@@ -102,6 +102,7 @@
 import org.argouml.uml.ui.foundation.core.ActionAddAssociationSpecification;
 import org.argouml.uml.ui.foundation.core.ActionAddClientDependencyAction;
 import org.argouml.uml.ui.foundation.core.ActionAddSupplierDependencyAction;
+import org.argouml.uml.ui.foundation.core.ActionSetAssociationEndType;
 import org.argouml.uml.ui.foundation.core.ActionSetGeneralizationPowertype;
 import org.argouml.uml.ui.foundation.core.ActionSetModelElementNamespace;
 import org.argouml.uml.ui.foundation.core.ActionSetStructuralFeatureType;
@@ -115,6 +116,7 @@
 import org.argouml.uml.ui.foundation.core.UMLAssociationEndQualifiersListModel;
 import org.argouml.uml.ui.foundation.core.UMLAssociationEndSpecificationListModel;
 import org.argouml.uml.ui.foundation.core.UMLAssociationEndTargetScopeCheckbox;
+import org.argouml.uml.ui.foundation.core.UMLAssociationEndTypeComboBoxModel;
 import org.argouml.uml.ui.foundation.core.UMLAssociationLinkListModel;
 import org.argouml.uml.ui.foundation.core.UMLBehavioralFeatureQueryCheckBox;
 import org.argouml.uml.ui.foundation.core.UMLClassActiveCheckBox;
@@ -966,6 +968,13 @@
                     new UMLSearchableComboBox(model,
                             new ActionSetLinkAssociation(), true));
         }
+        else if ("participant".equals(prop.getName())) {
+            final UMLComboBoxModel2 model = 
+                new UMLAssociationEndTypeComboBoxModel();
+            model.setTarget(target);
+            comp = new UMLComboBox2(model,
+                    ActionSetAssociationEndType.getInstance(), true);
+        }
         if (comp != null) {
             String name = prop.getName();
 

Modified: branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml
Url: http://argouml.tigris.org/source/browse/argouml/branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml?view=diff&rev=15582&p1=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml&p2=branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml&r1=15581&r2=15582
==============================================================================
--- branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml	(original)
+++ branches/xmlpropertypanels-penyaskito-soc08/argouml-core-propertypanels-scratch/src/org/argouml/core/propertypanels/xml/panels.xml	2008-08-19 08:51:22-0700
@@ -352,7 +352,7 @@
   </panel>
   <panel name="AssociationEnd">
     <text name="name" type="Name" />
-    
+    <combo name="participant" type="Classifier" />
     <combo name="multiplicity" type="Multiplicity" />
 	<singlerow name="association" type="Association" />
 	<separator />
@@ -387,8 +387,7 @@
     <list name="collaboration" type="ModelElement" />
     <list name="collaborationInstanceSet" type="ModelElement" />
     <list name="partition" type="ModelElement" />
-    <attribute name="elementImport" type="ModelElement" />
-    <attribute name="participant" type="Classifier" />
+    <attribute name="elementImport" type="ModelElement" />    
     <list name="linkEnd" type="AssociationEnd" />
     <list name="associationEndRole" type="AssociationEnd" />
   </panel>