Author: bobtarling
Date: 2008-08-01 11:02:52-0700
New Revision: 15438
Modified:
trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java
trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java
trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java
Log:
Use annotation for UmlModelMutator
Modified: trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ActionAddStereotype.java 2008-08-01 11:02:52-0700
@@ -41,8 +41,8 @@
* Action to add a sterotype to a model element.
* @author Bob Tarling
*/
-public class ActionAddStereotype extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public class ActionAddStereotype extends UndoableAction {
private Object modelElement;
private Object stereotype;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddNote.java 2008-08-01 11:02:52-0700
@@ -55,8 +55,8 @@
* The modelelements that are present on the current diagram, are connected
* graphically. All others are only annotated in the model.
*/
-public class ActionAddNote extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public class ActionAddNote extends UndoableAction {
/**
* The default position (x and y) of the new fig.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionAddStereotype.java 2008-08-01 11:02:52-0700
@@ -41,8 +41,8 @@
* Action to add a stereotype to a model element.
* @author Bob Tarling
*/
-class ActionAddStereotype extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionAddStereotype extends UndoableAction {
private Object modelElement;
private Object stereotype;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionList.java 2008-08-01 11:02:52-0700
@@ -43,7 +43,7 @@
*/
class ActionList extends Vector {
- private boolean readonly;
+ final private boolean readonly;
ActionList(List list, boolean readonly) {
super(list);
@@ -135,8 +135,6 @@
* @return true if the given action mutates the UML model.
*/
private boolean isUmlMutator(Object a) {
- return a instanceof UmlModelMutator;
- // TODO: Why doesn't this work for annotation?
- //return a.getClass().isAnnotationPresent(UmlModelMutator.class);
+ return a.getClass().isAnnotationPresent(UmlModelMutator.class);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierAbstract.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionModifierAbstract extends AbstractActionCheckBoxMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionModifierAbstract extends AbstractActionCheckBoxMenuItem {
/**
* Serial version generated for rev. 1.5
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierActive.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionModifierActive extends AbstractActionCheckBoxMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionModifierActive extends AbstractActionCheckBoxMenuItem {
/**
* Serial version generated for rev. 1.5
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierLeaf.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionModifierLeaf extends AbstractActionCheckBoxMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionModifierLeaf extends AbstractActionCheckBoxMenuItem {
/**
* Serial version generated for rev. 1.5
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionModifierRoot.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionModifierRoot extends AbstractActionCheckBoxMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionModifierRoot extends AbstractActionCheckBoxMenuItem {
/**
* Serial version generated for rev. 1.5
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPackage.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionVisibilityPackage extends AbstractActionRadioMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionVisibilityPackage extends AbstractActionRadioMenuItem {
/**
* Serial version generated for rev 1.3
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPrivate.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,9 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionVisibilityPrivate extends AbstractActionRadioMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionVisibilityPrivate extends AbstractActionRadioMenuItem {
+
/**
* Serial version generated for rev 1.5
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityProtected.java 2008-08-01 11:02:52-0700
@@ -27,8 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionVisibilityProtected extends AbstractActionRadioMenuItem
- implements UmlModelMutator {
+@UmlModelMutator
+class ActionVisibilityProtected extends AbstractActionRadioMenuItem {
/**
* Serial version generated for rev 1.5
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ActionVisibilityPublic.java 2008-08-01 11:02:52-0700
@@ -27,7 +27,8 @@
import org.argouml.model.Model;
import org.argouml.model.UmlModelMutator;
-class ActionVisibilityPublic extends AbstractActionRadioMenuItem implements UmlModelMutator {
+@UmlModelMutator
+class ActionVisibilityPublic extends AbstractActionRadioMenuItem {
/**
* Serial version generated for rev 1.5
*/
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/AbstractActionNewModelElement.java 2008-08-01 11:02:52-0700
@@ -36,8 +36,8 @@
* @since Oct 3, 2002
* @author [email protected]
*/
-public abstract class AbstractActionNewModelElement extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public abstract class AbstractActionNewModelElement extends UndoableAction {
private Object target;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionDeleteModelElements.java 2008-08-01 11:02:52-0700
@@ -60,8 +60,8 @@
* Objects can be Modelelements, Diagrams (argodiagram and it's children),
* Figs without owner,...
*/
-public class ActionDeleteModelElements extends UndoableAction
-implements UmlModelMutator {
+@UmlModelMutator
+public class ActionDeleteModelElements extends UndoableAction {
/**
* Generated serial version for rev 1.4
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddAttribute.java 2008-08-01 11:02:52-0700
@@ -45,8 +45,8 @@
* This class shall be the only one that knows
* when this tool should be downlighted or not.
*/
-public class ActionAddAttribute extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public class ActionAddAttribute extends UndoableAction {
private static ActionAddAttribute targetFollower;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddEnumerationLiteral.java 2008-08-01 11:02:52-0700
@@ -36,8 +36,8 @@
/**
* Action to add an operation to a classifier.
*/
-public class ActionAddEnumerationLiteral extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public class ActionAddEnumerationLiteral extends UndoableAction {
/**
* Serial version generated by Eclipse for initial implementation.
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/ActionAddOperation.java 2008-08-01 11:02:52-0700
@@ -42,8 +42,8 @@
/**
* Action to add an operation to a classifier.
*/
-public class ActionAddOperation extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public class ActionAddOperation extends UndoableAction {
private static ActionAddOperation targetFollower;
Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java?view=diff&rev=15438&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java&r1=15437&r2=15438
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/extension_mechanisms/ActionNewTagDefinition.java 2008-08-01 11:02:52-0700
@@ -42,8 +42,8 @@
*
* @author [email protected]
*/
-public class ActionNewTagDefinition extends UndoableAction
- implements UmlModelMutator {
+@UmlModelMutator
+public class ActionNewTagDefinition extends UndoableAction {
/**
* The constructor.
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.