svn commit: r18695 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java

Author: bobtarling
Date: 2010-08-28 01:56:55-0700
New Revision: 18695

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

Log:
The combo model does not have to be an instance variable

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java?view=diff&pathrev=18695&r1=18694&r2=18695
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java	2010-08-28 01:56:55-0700
@@ -68,7 +68,6 @@
     private static final long serialVersionUID = -3087728411434482078L;
     private MultiplicityComboBox multiplicityComboBox;
     private MultiplicityCheckBox checkBox;
-    private MultiplicityComboBoxModel multiplicityComboBoxModel;
     
     private static List multiplicityList = new ArrayList();
     
@@ -91,7 +90,7 @@
             throw new IllegalArgumentException("A target must be supplied");
         }
         
-        multiplicityComboBoxModel =
+        MultiplicityComboBoxModel multiplicityComboBoxModel =
             new MultiplicityComboBoxModel(target, propertyName);
         
         checkBox = new MultiplicityCheckBox(target);
@@ -126,7 +125,7 @@
     public void itemStateChanged(ItemEvent event) {
         if (event.getSource() == multiplicityComboBox && getTarget() != null) {
             Object item = multiplicityComboBox.getSelectedItem();
-            Object target = multiplicityComboBoxModel.getTarget();
+            Object target = multiplicityComboBox.getTarget();
             Object multiplicity = Model.getFacade().getMultiplicity(target);
             if (Model.getFacade().isAMultiplicity(item)) {
                 if (!multiplicity.equals(item)) {
@@ -146,7 +145,7 @@
     }
     
     private Object getTarget() {
-	return multiplicityComboBoxModel.getTarget();
+	return multiplicityComboBox.getTarget();
     }
     
     /**

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

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