Author: bobtarling Date: 2009-12-18 10:21:50-0800 New Revision: 17672 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMultiplicityPanel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java
Log: Remove references to UMLComboBox2 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndTypeComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -31,8 +31,6 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; -import org.argouml.uml.ui.foundation.core.ActionSetAssociationEndType; import org.tigris.gef.undo.UndoableAction; /** Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationRoleBaseComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -31,7 +31,6 @@ import javax.swing.Action; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; import org.tigris.gef.undo.UndoableAction; /** @@ -169,19 +168,17 @@ */ public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - if (e.getSource() instanceof UMLComboBox2) { - UMLComboBox2 source = (UMLComboBox2) e.getSource(); - Object assoc = source.getSelectedItem(); - Object ar = source.getTarget(); - if (Model.getFacade().getBase(ar) == assoc) { - return; // base is already set to this assoc... - /* This check is needed, otherwise the setbase() - * below gives an exception.*/ - } - if (Model.getFacade().isAAssociation(assoc) - && Model.getFacade().isAAssociationRole(ar)) { - Model.getCollaborationsHelper().setBase(ar, assoc); - } + UMLComboBox source = (UMLComboBox) e.getSource(); + Object assoc = source.getSelectedItem(); + Object ar = source.getTarget(); + if (Model.getFacade().getBase(ar) == assoc) { + return; // base is already set to this assoc... + /* This check is needed, otherwise the setbase() + * below gives an exception.*/ + } + if (Model.getFacade().isAAssociation(assoc) + && Model.getFacade().isAAssociationRole(ar)) { + Model.getCollaborationsHelper().setBase(ar, assoc); } } Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCallActionOperationComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -36,7 +36,6 @@ import org.argouml.model.Model; import org.argouml.model.UmlChangeEvent; import org.argouml.ui.targetmanager.TargetManager; -import org.argouml.uml.ui.UMLComboBox2; import org.tigris.gef.undo.UndoableAction; class UMLCallActionOperationComboBoxModel extends UMLComboBoxModel { @@ -172,15 +171,13 @@ public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Object source = e.getSource(); - if (source instanceof UMLComboBox2) { - Object selected = ((UMLComboBox2) source).getSelectedItem(); - Object target = ((UMLComboBox2) source).getTarget(); - if (Model.getFacade().isACallAction(target) - && Model.getFacade().isAOperation(selected)) { - if (Model.getFacade().getOperation(target) != selected) { - Model.getCommonBehaviorHelper() - .setOperation(target, selected); - } + Object selected = ((UMLComboBox) source).getSelectedItem(); + Object target = getTarget(); + if (Model.getFacade().isACallAction(target) + && Model.getFacade().isAOperation(selected)) { + if (Model.getFacade().getOperation(target) != selected) { + Model.getCommonBehaviorHelper() + .setOperation(target, selected); } } } Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLEditableComboBox.java 2009-12-18 10:21:50-0800 @@ -239,7 +239,7 @@ } /* - * @see org.argouml.uml.ui.UMLComboBox2#UMLComboBox2( UMLComboBoxModel2, + * @see org.argouml.uml.ui.UMLComboBox#UMLComboBox( UMLComboBoxModel, * Action, boolean) */ public UMLEditableComboBox(UMLComboBoxModel model, Action selectAction, Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLGeneralizationPowertypeComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -37,7 +37,6 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; import org.argouml.uml.util.PathComparator; import org.tigris.gef.undo.UndoableAction; @@ -151,17 +150,15 @@ Object oldClassifier = null; Object newClassifier = null; Object gen = null; - if (source instanceof UMLComboBox2) { - UMLComboBox2 box = (UMLComboBox2) source; - Object o = box.getTarget(); - if (Model.getFacade().isAGeneralization(o)) { - gen = o; - oldClassifier = Model.getFacade().getPowertype(gen); - } - o = box.getSelectedItem(); - if (Model.getFacade().isAClassifier(o)) { - newClassifier = o; - } + UMLComboBox box = (UMLComboBox) source; + Object o = box.getTarget(); + if (Model.getFacade().isAGeneralization(o)) { + gen = o; + oldClassifier = Model.getFacade().getPowertype(gen); + } + o = box.getSelectedItem(); + if (Model.getFacade().isAClassifier(o)) { + newClassifier = o; } if (newClassifier != oldClassifier && gen != null) { Model.getCoreHelper().setPowertype(gen, newClassifier); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLLinkAssociationComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -33,7 +33,6 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; import org.tigris.gef.undo.UndoableAction; /** @@ -149,17 +148,15 @@ Object oldAssoc = null; Object newAssoc = null; Object link = null; - if (source instanceof UMLComboBox2) { - UMLComboBox2 box = (UMLComboBox2) source; - Object o = box.getTarget(); - if (Model.getFacade().isALink(o)) { - link = o; - oldAssoc = Model.getFacade().getAssociation(o); - } - Object n = box.getSelectedItem(); - if (Model.getFacade().isAAssociation(n)) { - newAssoc = n; - } + UMLComboBox box = (UMLComboBox) source; + Object o = box.getTarget(); + if (Model.getFacade().isALink(o)) { + link = o; + oldAssoc = Model.getFacade().getAssociation(o); + } + Object n = box.getSelectedItem(); + if (Model.getFacade().isAAssociation(n)) { + newAssoc = n; } if (newAssoc != oldAssoc && link != null && newAssoc != null) { Model.getCoreHelper().setAssociation(link, newAssoc); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessageActivatorComboBox.java 2009-12-18 10:21:50-0800 @@ -55,7 +55,7 @@ } /* - * @see org.argouml.uml.ui.UMLComboBox2#doIt(ActionEvent) + * @see org.argouml.uml.ui.UMLComboBox#doIt(ActionEvent) */ protected void doIt(ActionEvent event) { Object o = getModel().getElementAt(getSelectedIndex()); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMetaClassComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -33,11 +33,8 @@ import javax.swing.Action; -import org.apache.log4j.Logger; import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; -import org.argouml.uml.ui.foundation.extension_mechanisms.ActionSetTagDefinitionType; import org.tigris.gef.undo.UndoableAction; /** @@ -138,15 +135,13 @@ String oldType = null; String newType = null; Object tagDef = null; - if (source instanceof UMLComboBox2) { - UMLComboBox2 box = (UMLComboBox2) source; - Object t = box.getTarget(); - if (Model.getFacade().isATagDefinition(t)) { - tagDef = t; - oldType = (String) Model.getFacade().getType(tagDef); - } - newType = (String) box.getSelectedItem(); + UMLComboBox box = (UMLComboBox) source; + Object t = box.getTarget(); + if (Model.getFacade().isATagDefinition(t)) { + tagDef = t; + oldType = (String) Model.getFacade().getType(tagDef); } + newType = (String) box.getSelectedItem(); if (newType != null && !newType.equals(oldType) && tagDef != null) { Model.getExtensionMechanismsHelper().setTagType(tagDef, newType); } Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementNamespaceComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -36,10 +36,7 @@ import org.apache.log4j.Logger; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; -import org.argouml.model.UmlChangeEvent; import org.argouml.ui.UndoableAction; -import org.argouml.uml.ui.UMLComboBox2; -import org.argouml.uml.ui.UMLComboBoxModel2; import org.argouml.uml.util.PathComparator; /** @@ -175,17 +172,15 @@ Object oldNamespace = null; Object newNamespace = null; Object m = null; - if (source instanceof UMLComboBox2) { - UMLComboBox2 box = (UMLComboBox2) source; - Object o = box.getTarget(); - if (Model.getFacade().isAModelElement(o)) { - m = o; - oldNamespace = Model.getFacade().getNamespace(m); - } - o = box.getSelectedItem(); - if (Model.getFacade().isANamespace(o)) { - newNamespace = o; - } + UMLComboBox box = (UMLComboBox) source; + Object o = getTarget(); + if (Model.getFacade().isAModelElement(o)) { + m = o; + oldNamespace = Model.getFacade().getNamespace(m); + } + o = box.getSelectedItem(); + if (Model.getFacade().isANamespace(o)) { + newNamespace = o; } if (newNamespace != oldNamespace && m != null && newNamespace != null) { super.actionPerformed(e); 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=17672&r1=17671&r2=17672 ============================================================================== --- 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 2009-12-18 10:21:50-0800 @@ -193,7 +193,7 @@ * When we change target make sure that the check box is only selected * if the multiplicty exists * @param e - * @see org.argouml.uml.ui.UMLComboBox2#targetSet(org.argouml.ui.targetmanager.TargetEvent) + * @see org.argouml.uml.ui.UMLComboBox#targetSet(org.argouml.ui.targetmanager.TargetEvent) */ public void targetSet(TargetEvent e) { super.targetSet(e); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateMachineContextComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -35,8 +35,6 @@ import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; import org.argouml.model.UmlChangeEvent; -import org.argouml.uml.ui.UMLComboBox2; -import org.argouml.uml.ui.behavior.state_machines.ActionSetContextStateMachine; import org.tigris.gef.undo.UndoableAction; /** Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStubStateComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -26,8 +26,6 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; -import org.argouml.uml.ui.behavior.state_machines.ActionSetStubStateReferenceState; import org.tigris.gef.undo.UndoableAction; import java.awt.event.ActionEvent; @@ -145,15 +143,13 @@ */ public void actionPerformed(ActionEvent e) { super.actionPerformed(e); - if (e.getSource() instanceof UMLComboBox2) { - UMLComboBox2 box = (UMLComboBox2) e.getSource(); - Object o = box.getSelectedItem(); - if (o != null) { - String name = Model.getStateMachinesHelper().getPath(o); - if (name != null) - Model.getStateMachinesHelper() - .setReferenceState(box.getTarget(), name); - } + UMLComboBox box = (UMLComboBox) e.getSource(); + Object o = box.getSelectedItem(); + if (o != null) { + String name = Model.getStateMachinesHelper().getPath(o); + if (name != null) + Model.getStateMachinesHelper() + .setReferenceState(box.getTarget(), name); } } } Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java?view=diff&pathrev=17672&r1=17671&r2=17672 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSubmachineStateComboBoxModel.java 2009-12-18 10:21:50-0800 @@ -32,8 +32,6 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; -import org.argouml.uml.ui.UMLComboBox2; -import org.argouml.uml.ui.behavior.state_machines.ActionSetSubmachineStateSubmachine; import org.tigris.gef.undo.UndoableAction; /** ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2431548 To unsubscribe from this discussion, e-mail: [[email protected]].
