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

Author: bobtarling
Date: 2010-08-28 01:37:50-0700
New Revision: 18693

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

Log:
Make the multiplicity checkbox immutable

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=18693&r1=18692&r2=18693
==============================================================================
--- 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:37:50-0700
@@ -87,10 +87,14 @@
             final Object target) {
         super(new BorderLayout());
         
+        if (target == null) {
+            throw new IllegalArgumentException("A target must be supplied");
+        }
+        
         multiplicityComboBoxModel =
             new MultiplicityComboBoxModel(target, propertyName);
         
-        checkBox = new MultiplicityCheckBox();
+        checkBox = new MultiplicityCheckBox(target);
         multiplicityComboBox =
 		new MultiplicityComboBox(
 		        multiplicityComboBoxModel,
@@ -100,7 +104,6 @@
         add(checkBox, BorderLayout.WEST);
         add(multiplicityComboBox, BorderLayout.CENTER);
         multiplicityComboBox.setTarget(target);
-        checkBox.setTarget(target);
     }
     
     /**
@@ -334,8 +337,10 @@
     private class MultiplicityCheckBox extends JCheckBox
         implements ItemListener {
 	
-	public MultiplicityCheckBox() {
-	    addItemListener(this);
+	public MultiplicityCheckBox(
+		final Object target) {
+            setSelected(Model.getFacade().getMultiplicity(target) != null);
+            addItemListener(this);
 	}
 
 	public void itemStateChanged(ItemEvent e) {
@@ -357,18 +362,7 @@
                 Model.getCoreHelper().setMultiplicity(getTarget(), null);
 	    }
 	}
-	
-	/**
-	 * Sets the target
-	 * @param theTarget
-	 */
-	public void setTarget (Object theTarget) {
-	    boolean exists = theTarget != null 
-	        && Model.getFacade().getMultiplicity(theTarget) != null;
-	    setSelected(exists);
-        }
     }
-    
 }

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

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