Author: penyaskito Date: 2008-10-07 03:17:49-0700 New Revision: 15898 Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java
Log: Issue 5416: ComboBoxModels do not mutate on AWT thread. Fixed by Bob. Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/diagram/ui/PropPanelDiagram.java 2008-10-07 03:17:49-0700 @@ -164,17 +164,7 @@ } return false; } - - /** - * @param evt - * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) - */ - @Override - public void propertyChange(PropertyChangeEvent evt) { - // TODO: Auto-generated method stub - super.propertyChange(evt); - } - + } class ActionSetDiagramHomeModel extends UndoableAction { Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/UMLComboBoxModel2.java 2008-10-07 03:17:49-0700 @@ -24,8 +24,11 @@ package org.argouml.uml.ui; +import java.awt.Dimension; +import java.awt.Rectangle; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.beans.PropertyVetoException; import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; @@ -34,6 +37,7 @@ import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; import javax.swing.JComboBox; +import javax.swing.SwingUtilities; import javax.swing.event.PopupMenuEvent; import javax.swing.event.PopupMenuListener; @@ -45,10 +49,12 @@ import org.argouml.model.InvalidElementException; import org.argouml.model.Model; import org.argouml.model.RemoveAssociationEvent; +import org.argouml.model.UmlChangeEvent; import org.argouml.ui.targetmanager.TargetEvent; import org.argouml.ui.targetmanager.TargetListener; import org.argouml.uml.diagram.ArgoDiagram; import org.tigris.gef.presentation.Fig; +import org.tigris.gef.presentation.FigText; /** * ComboBox Model for UML modelelements. <p> @@ -144,6 +150,34 @@ propertySetName = name; } + final public void propertyChange(final PropertyChangeEvent pve) { + if (pve instanceof UmlChangeEvent) { + final UmlChangeEvent event = (UmlChangeEvent) pve; + + Runnable doWorkRunnable = new Runnable() { + public void run() { + try { + modelChanged(event); + } catch (InvalidElementException e) { + LOG.error("", e); + if (LOG.isDebugEnabled()) { + LOG.debug("event = " + + event.getClass().getName()); + LOG.debug("source = " + event.getSource()); + LOG.debug("old = " + event.getOldValue()); + LOG.debug("name = " + event.getPropertyName()); + LOG.debug("updateLayout method accessed " + + "deleted element ", e); + } + } + } + }; + SwingUtilities.invokeLater(doWorkRunnable); + } + } + + + /** * If the property that this comboboxmodel depicts is changed in the UML * model, this method will make sure that the changes will be @@ -153,7 +187,7 @@ * [EMAIL PROTECTED] * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { buildingModel = true; if (evt instanceof AttributeChangeEvent) { if (evt.getPropertyName().equals(propertySetName)) { Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/PropPanelClassifierInState.java 2008-10-07 03:17:49-0700 @@ -233,7 +233,7 @@ * * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(PropertyChangeEvent evt) { if (evt instanceof AttributeChangeEvent) { if (evt.getPropertyName().equals("type")) { if (evt.getSource() == getTarget() Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLActivityGraphContextComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -24,13 +24,13 @@ package org.argouml.uml.ui.behavior.activity_graphs; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; /** @@ -89,7 +89,7 @@ /* * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChange(UmlChangeEvent evt) { /* Do nothing by design. */ } Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/activity_graphs/UMLObjectFlowStateClassifierComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -30,6 +30,7 @@ import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; /** @@ -96,9 +97,8 @@ * @param evt * A PropertyChangeEvent object describing the event source and * the property that has changed. - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { buildingModel = true; buildModelList(); buildingModel = false; Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedClassifierComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -24,13 +24,13 @@ package org.argouml.uml.ui.behavior.collaborations; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; /** @@ -86,10 +86,7 @@ return Model.getFacade().getRepresentedClassifier(getTarget()); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChange(UmlChangeEvent evt) { /* Do nothing by design. */ } } Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/collaborations/UMLCollaborationRepresentedOperationComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -31,6 +31,7 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; /** @@ -82,11 +83,8 @@ return Model.getFacade().getRepresentedOperation(getTarget()); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) - */ @Override - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { /* Do nothing by design. */ } } Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelCallAction.java 2008-10-07 03:17:49-0700 @@ -25,7 +25,6 @@ package org.argouml.uml.ui.behavior.common_behavior; import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; @@ -33,6 +32,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.AttributeChangeEvent; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.ui.targetmanager.TargetManager; import org.argouml.uml.ui.UMLComboBox2; import org.argouml.uml.ui.UMLComboBoxModel2; @@ -212,11 +212,9 @@ * It is e.g. not usefull to update the combo for removed operations, * since you can only remove operations by changing the target, * and selecting the action again re-generates the complete list. - * - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ @Override - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { if (evt instanceof AttributeChangeEvent) { if (evt.getPropertyName().equals("operation")) { if (evt.getSource() == getTarget() Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/PropPanelLink.java 2008-10-07 03:17:49-0700 @@ -38,6 +38,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.ActionNavigateNamespace; import org.argouml.uml.ui.UMLComboBox2; import org.argouml.uml.ui.UMLComboBoxModel2; @@ -182,7 +183,7 @@ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ @Override - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { /* * Rebuild the list from scratch to be sure it's correct. */ Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/common_behavior/UMLReceptionSignalComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -24,13 +24,13 @@ package org.argouml.uml.ui.behavior.common_behavior; -import java.beans.PropertyChangeEvent; import java.util.Collection; import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; import org.argouml.model.RemoveAssociationEvent; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; @@ -91,9 +91,8 @@ * the signal was removed from the namespace. * <p> * @param evt the event describing the property change - * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { if (evt instanceof RemoveAssociationEvent) { if ("ownedElement".equals(evt.getPropertyName())) { Object o = getChangedElement(evt); Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/behavior/state_machines/UMLStateMachineContextComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -24,13 +24,13 @@ package org.argouml.uml.ui.behavior.state_machines; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; /** @@ -83,10 +83,7 @@ return Model.getFacade().getContext(getTarget()); } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) - */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { /* Do nothing by design. */ } Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelMethod.java 2008-10-07 03:17:49-0700 @@ -25,7 +25,6 @@ package org.argouml.uml.ui.foundation.core; import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; import javax.swing.Action; import javax.swing.JPanel; @@ -35,6 +34,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.AttributeChangeEvent; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.ui.targetmanager.TargetManager; import org.argouml.uml.ui.ActionNavigateOwner; import org.argouml.uml.ui.UMLComboBox2; @@ -161,7 +161,7 @@ * @see java.beans.PropertyChangeListener#propertyChange( * java.beans.PropertyChangeEvent) */ - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { if (evt instanceof AttributeChangeEvent) { if (evt.getPropertyName().equals("specification")) { if (evt.getSource() == getTarget() Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLModelElementNamespaceComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -24,16 +24,15 @@ package org.argouml.uml.ui.foundation.core; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; import java.util.Set; import java.util.TreeSet; import org.apache.log4j.Logger; -import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; import org.argouml.uml.util.PathComparator; @@ -138,7 +137,7 @@ * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) */ @Override - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { /* * Rebuild the list from scratch to be sure it's correct. */ Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java 2008-10-07 03:17:49-0700 @@ -24,7 +24,6 @@ package org.argouml.uml.ui.foundation.core; -import java.beans.PropertyChangeEvent; import java.util.ArrayList; import java.util.Collection; import java.util.Set; @@ -33,6 +32,7 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.UMLComboBoxModel2; import org.argouml.uml.util.PathComparator; @@ -125,11 +125,8 @@ return o; } - /* - * @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent) - */ @Override - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { /* * The default behavior for super implementation is * to add/remove elements from the list, but it isn't Modified: branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java Url: http://argouml.tigris.org/source/browse/argouml/branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java?view=diff&rev=15898&p1=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java&p2=branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java&r1=15897&r2=15898 ============================================================================== --- branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java (original) +++ branches/BRANCH_0_26_x/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/PropPanelTagDefinition.java 2008-10-07 03:17:49-0700 @@ -43,6 +43,7 @@ import org.argouml.model.AssociationChangeEvent; import org.argouml.model.AttributeChangeEvent; import org.argouml.model.Model; +import org.argouml.model.UmlChangeEvent; import org.argouml.uml.ui.ActionNavigateContainerElement; import org.argouml.uml.ui.UMLComboBox2; import org.argouml.uml.ui.UMLComboBoxModel2; @@ -237,11 +238,8 @@ setElements(c); } - /* - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) - */ @Override - public void propertyChange(PropertyChangeEvent evt) { + public void modelChanged(UmlChangeEvent evt) { /* * Rebuild the list from scratch to be sure it's correct. */ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
