svn commit: r17631 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java

Author: bobtarling
Date: 2009-12-10 15:54:48-0800
New Revision: 17631

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

Log:
Complete the association role panel

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&pathrev=17631&r1=17630&r2=17631
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	2009-12-10 15:54:48-0800
@@ -49,6 +49,7 @@
 import org.argouml.uml.ui.behavior.activity_graphs.ActionSetObjectFlowStateClassifier;
 import org.argouml.uml.ui.behavior.activity_graphs.UMLActionSynchCheckBox;
 import org.argouml.uml.ui.behavior.activity_graphs.UMLObjectFlowStateClassifierComboBoxModel;
+import org.argouml.uml.ui.behavior.collaborations.ActionSetAssociationRoleBase;
 import org.argouml.uml.ui.behavior.common_behavior.UMLActionAsynchronousCheckBox;
 import org.argouml.uml.ui.behavior.state_machines.ActionSetContextStateMachine;
 import org.argouml.uml.ui.behavior.state_machines.ActionSetStubStateReferenceState;
@@ -396,6 +397,20 @@
                         ActionSetStructuralFeatureType.getInstance());
                 comp = combo;
             }
+        } else if ("base".equals(prop.getName())) {
+            if (Model.getFacade().isAAssociationRole(target)) {
+                final UMLComboBoxModel2 model = 
+                    new UMLAssociationRoleBaseComboBoxModel();
+                model.setTarget(target);
+                final JComboBox combo = new UMLSearchableComboBox(
+                        model,
+                        new ActionSetAssociationRoleBase(), true);
+                comp = new UMLComboBoxNavigator(Translator.localize(
+                        "label.association.navigate.tooltip"),
+                        combo);
+            } else {
+                //
+            }
         } else if ("powertype".equals(prop.getName())) {
             final UMLComboBoxModel2 model = 
                 new UMLGeneralizationPowertypeComboBoxModel();
@@ -541,16 +556,6 @@
         }
     }
     
-//    private void addControl(JPanel panel, String text, JComponent component) {
-//        if (text != null) {
-//            final JLabel label = new JLabel(text);
-//            label.setLabelFor(component);
-//            panel.add(label);
-//        }
-//        panel.add(component);
-//    }
-    
-    
     private void addControl(JPanel panel, String text, JComponent component) {
         LabelledComponent lc = new LabelledComponent(text, component);
         panel.add(lc);

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

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