Author: bobtarling Date: 2009-12-18 11:12:39-0800 New Revision: 17674 Removed: trunk/src/argouml-core-umlpropertypanels/ArgoUML XML Property Panels.launch Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionDeleteStereotypeBaseClass.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveContextSignal.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSParameter.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSState.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveReceptionSignal.java 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/UMLClassifierRoleAvailableContentsListModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.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/UMLMetaClassComboBoxModel.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 all the references to GEF that we can Removed: trunk/src/argouml-core-umlpropertypanels/ArgoUML XML Property Panels.launch Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/ArgoUML%20XML%20Property%20Panels.launch?view=markup&pathrev=17673 Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionDeleteStereotypeBaseClass.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionDeleteStereotypeBaseClass.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionDeleteStereotypeBaseClass.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionDeleteStereotypeBaseClass.java 2009-12-18 11:12:39-0800 @@ -29,7 +29,6 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; import org.argouml.uml.ui.AbstractActionRemoveElement; -import org.tigris.gef.undo.UndoManager; /** * The Action to remove a baseclass from a stereotype. @@ -44,7 +43,6 @@ @Override public void actionPerformed(ActionEvent e) { - UndoManager.getInstance().startChain(); Object baseclass = getObjectToRemove(); if (baseclass != null) { Object st = getTarget(); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveContextSignal.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveContextSignal.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveContextSignal.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveContextSignal.java 2009-12-18 11:12:39-0800 @@ -49,9 +49,6 @@ super(Translator.localize("menu.popup.remove")); } - /* - * @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent) - */ @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSParameter.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSParameter.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSParameter.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSParameter.java 2009-12-18 11:12:39-0800 @@ -41,9 +41,6 @@ super(Translator.localize("menu.popup.remove")); } - /* - * @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent) - */ @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSState.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSState.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSState.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveOFSState.java 2009-12-18 11:12:39-0800 @@ -44,9 +44,6 @@ super(Translator.localize("menu.popup.remove")); } - /* - * @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent) - */ @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveReceptionSignal.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveReceptionSignal.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveReceptionSignal.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ActionRemoveReceptionSignal.java 2009-12-18 11:12:39-0800 @@ -32,22 +32,23 @@ /** * This Action removes a Reception from a Signal. - * TODO: We shouldn't have knowledge of GEF classes here * * @author Michiel */ class ActionRemoveReceptionSignal extends AbstractActionRemoveElement { /** + * The class uid + */ + private static final long serialVersionUID = 8213584329453727152L; + + /** * Construct an Action which removes a Reception from a Signal. */ public ActionRemoveReceptionSignal() { super(Translator.localize("menu.popup.remove")); } - /* - * @see org.tigris.gef.undo.UndoableAction#actionPerformed(java.awt.event.ActionEvent) - */ @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -31,7 +31,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * @since Nov 2, 2002 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -31,7 +31,7 @@ import javax.swing.Action; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * The combo box model for the base of an association-role. 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -35,8 +35,8 @@ import org.argouml.model.AttributeChangeEvent; import org.argouml.model.Model; import org.argouml.model.UmlChangeEvent; +import org.argouml.ui.UndoableAction; import org.argouml.ui.targetmanager.TargetManager; -import org.tigris.gef.undo.UndoableAction; class UMLCallActionOperationComboBoxModel extends UMLComboBoxModel { Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableContentsListModel.java 2009-12-18 11:12:39-0800 @@ -26,14 +26,11 @@ import java.beans.PropertyChangeEvent; import java.util.Collection; -import java.util.Enumeration; import java.util.Iterator; import org.argouml.model.AddAssociationEvent; import org.argouml.model.Model; import org.argouml.model.RemoveAssociationEvent; -import org.tigris.gef.base.Diagram; -import org.tigris.gef.presentation.Fig; /** * List model which implements allAvailableContents operation for a @@ -45,6 +42,13 @@ extends UMLModelElementListModel { /** + * The class uid + */ + private static final long serialVersionUID = 7868841277838127325L; + + + + /** * Constructor for UMLClassifierRoleAvailableContentsListModel. */ public UMLClassifierRoleAvailableContentsListModel(final Object modelElement) { Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleAvailableFeaturesListModel.java 2009-12-18 11:12:39-0800 @@ -26,13 +26,11 @@ import java.beans.PropertyChangeEvent; import java.util.Collection; -import java.util.Enumeration; import java.util.Iterator; import org.argouml.model.AddAssociationEvent; import org.argouml.model.Model; import org.argouml.model.RemoveAssociationEvent; -import org.tigris.gef.presentation.Fig; /** * List model which implements allAvailableFeatures operation for a Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedClassifierComboBoxModel.java 2009-12-18 11:12:39-0800 @@ -35,7 +35,7 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * The ComboBox model for the represented classifier Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java?view=diff&pathrev=17674&r1=17673&r2=17674 ============================================================================== --- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java (original) +++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCollaborationRepresentedOperationComboBoxModel.java 2009-12-18 11:12:39-0800 @@ -35,7 +35,7 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * The ComboBox model for the represented Operation 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -38,7 +38,7 @@ import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; import org.argouml.uml.util.PathComparator; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * TODO: For UML 2.x, powertypes are accessed indirectly through the 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -33,7 +33,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * The model for the combobox to show the Association of the Link. 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -35,7 +35,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * A model for selecting a UML metaclass. Originally designed for use in 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -38,7 +38,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * A compound control containing all the visual controls for specifying 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -35,7 +35,7 @@ import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; import org.argouml.model.UmlChangeEvent; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * Listmodel for the context of a statemachine. 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -26,7 +26,7 @@ import org.argouml.i18n.Translator; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; import java.awt.event.ActionEvent; import java.util.ArrayList; 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=17674&r1=17673&r2=17674 ============================================================================== --- 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 11:12:39-0800 @@ -32,7 +32,7 @@ import org.argouml.kernel.Project; import org.argouml.kernel.ProjectManager; import org.argouml.model.Model; -import org.tigris.gef.undo.UndoableAction; +import org.argouml.ui.UndoableAction; /** * @since Dec 15, 2002 ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2431565 To unsubscribe from this discussion, e-mail: [[email protected]].
