Author: mvw
Date: 2007-07-22 11:52:42-0700
New Revision: 13108
Added:
trunk/src_new/org/argouml/uml/ActionAddStereotype.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java
trunk/src_new/org/argouml/uml/StereotypeUtility.java
- copied, changed from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java
Removed:
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java
trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java
Modified:
trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java
trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java
trunk/src_new/org/argouml/uml/ui/TabStereotype.java
trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java
Log:
Reduce the dependency on org.argouml.notation.providers.uml from the UI.
Move the StereotypeUtility class to the org.argouml.uml package.
Modified: trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java 2007-07-22 11:52:42-0700
@@ -34,6 +34,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.notation.providers.AssociationEndNameNotation;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.util.MyTokenizer;
/**
@@ -166,7 +167,7 @@
Model.getCoreHelper().setName(role, name);
}
- NotationUtilityUml.dealWithStereotypes(role, stereotype, true);
+ StereotypeUtility.dealWithStereotypes(role, stereotype, true);
}
/*
Modified: trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java 2007-07-22 11:52:42-0700
@@ -40,6 +40,7 @@
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
import org.argouml.notation.providers.AttributeNotation;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.util.MyTokenizer;
/**
@@ -473,7 +474,7 @@
NotationUtilityUml.attributeSpecialStrings);
}
- NotationUtilityUml.dealWithStereotypes(attribute, stereotype, true);
+ StereotypeUtility.dealWithStereotypes(attribute, stereotype, true);
}
/*
Modified: trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java 2007-07-22 11:52:42-0700
@@ -37,8 +37,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.kernel.ProjectSettings;
import org.argouml.model.Model;
-import org.argouml.uml.Profile;
-import org.argouml.uml.ProfileException;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.util.MyTokenizer;
/**
@@ -367,7 +366,7 @@
Model.getCoreHelper().setName(me, name);
}
- NotationUtilityUml.dealWithStereotypes(me, stereotype, false);
+ StereotypeUtility.dealWithStereotypes(me, stereotype, false);
if (path != null) {
Object nspe =
@@ -396,160 +395,160 @@
}
- /**
- * This function shall replace the previous set of stereotypes
- * of the given modelelement with a new set,
- * given in the form of a "," seperated string of stereotype names.
- *
- * @param umlobject the UML element to adapt
- * @param stereotype comma seperated stereotype names
- * @param full false if stereotypes are only added,
- * true if removal should be done, too.
- */
- public static void dealWithStereotypes(Object umlobject, String stereotype,
- boolean full) {
- String token;
- MyTokenizer mst;
- Collection stereotypes = new ArrayList();
-
- /* Convert the string (e.g. "aaa,bbb,ccc")
- * into seperate stereotype-names (e.g. "aaa", "bbb", "ccc").
- */
- if (stereotype != null) {
- mst = new MyTokenizer(stereotype, " ,\\,");
- while (mst.hasMoreTokens()) {
- token = mst.nextToken();
- if (!",".equals(token) && !" ".equals(token)) {
- stereotypes.add(token);
- }
- }
- }
-
- if (full) {
- // collect the to be removed stereotypes
- Collection toBeRemoved = new ArrayList();
- Iterator i = Model.getFacade().getStereotypes(umlobject).iterator();
- while (i.hasNext()) {
- String stereotypename = Model.getFacade().getName(i.next());
- if (stereotypename != null
- && !stereotypes.contains(stereotypename)) {
- toBeRemoved.add(getStereotype(umlobject, stereotypename));
- }
- }
-
- // and now remove them
- i = toBeRemoved.iterator();
- while (i.hasNext()) {
- Model.getCoreHelper().removeStereotype(umlobject, i.next());
- }
- }
-
- // add stereotypes
- if (!stereotypes.isEmpty()) {
- Iterator i = stereotypes.iterator();
- while (i.hasNext()) {
- String stereotypename = (String) i.next();
- Object umlstereo = getStereotype(umlobject, stereotypename);
- if (umlstereo != null) {
- Model.getCoreHelper().addStereotype(umlobject, umlstereo);
- }
- }
- }
- }
-
- /**
- * Finds a stereotype named name either in the subtree of the model rooted
- * at root, or in the the ProfileJava model.
- *
- * @param obj
- * A ModelElement to find a suitable stereotype for.
- * @param name
- * The name of the stereotype to search for.
- * @return A stereotype named name, or possibly null.
- */
- private static Object getStereotype(Object obj, String name) {
- Object root = Model.getFacade().getModel(obj);
- Object stereo;
-
- stereo = recFindStereotype(obj, root, name);
- if (stereo != null) {
- return stereo;
- }
-
- try {
- Project project = ProjectManager.getManager().getCurrentProject();
- Profile profile = project.getProfile();
- stereo = recFindStereotype(obj, profile.getProfileModel(), name);
- } catch (ProfileException e) {
- // TODO: How are we going to handle exceptions here?
- // I suspect the profile should be part of the project
- // and not a singleton.
- }
-
- if (stereo != null) {
- return Model.getModelManagementHelper().getCorrespondingElement(
- stereo, root);
- }
-
- if (root != null && name.length() > 0) {
- stereo =
- Model.getExtensionMechanismsFactory().buildStereotype(
- obj, name, root);
- }
-
- return stereo;
- }
-
- /**
- * Recursively search a hive of a model for a stereotype with the name given
- * in name.
- *
- * @param obj
- * The model element to be suitable for.
- * @param root
- * The model element to search from.
- * @param name
- * The name of the stereotype to search for.
- * @return An stereotype named name, or null if none is found.
- */
- private static Object recFindStereotype(
- Object obj, Object root, String name) {
- Object stereo;
-
- if (root == null) {
- return null;
- }
-
- if (Model.getFacade().isAStereotype(root)
- && name.equals(Model.getFacade().getName(root))) {
- if (Model.getExtensionMechanismsHelper().isValidStereoType(obj,
- /* (MStereotype) */root)) {
- return root;
- }
- }
-
- if (!Model.getFacade().isANamespace(root)) {
- return null;
- }
-
- Collection ownedElements = Model.getFacade().getOwnedElements(root);
-
- if (ownedElements == null) {
- return null;
- }
-
- // Loop through each element in the namespace, recursing.
-
- Iterator iter = ownedElements.iterator();
-
- while (iter.hasNext()) {
- stereo = recFindStereotype(obj, iter.next(), name);
- if (stereo != null) {
- return stereo;
- }
- }
- return null;
- }
+// /**
+// * This function shall replace the previous set of stereotypes
+// * of the given modelelement with a new set,
+// * given in the form of a "," seperated string of stereotype names.
+// *
+// * @param umlobject the UML element to adapt
+// * @param stereotype comma seperated stereotype names
+// * @param full false if stereotypes are only added,
+// * true if removal should be done, too.
+// */
+// public static void dealWithStereotypes(Object umlobject, String stereotype,
+// boolean full) {
+// String token;
+// MyTokenizer mst;
+// Collection stereotypes = new ArrayList();
+//
+// /* Convert the string (e.g. "aaa,bbb,ccc")
+// * into seperate stereotype-names (e.g. "aaa", "bbb", "ccc").
+// */
+// if (stereotype != null) {
+// mst = new MyTokenizer(stereotype, " ,\\,");
+// while (mst.hasMoreTokens()) {
+// token = mst.nextToken();
+// if (!",".equals(token) && !" ".equals(token)) {
+// stereotypes.add(token);
+// }
+// }
+// }
+//
+// if (full) {
+// // collect the to be removed stereotypes
+// Collection toBeRemoved = new ArrayList();
+// Iterator i = Model.getFacade().getStereotypes(umlobject).iterator();
+// while (i.hasNext()) {
+// String stereotypename = Model.getFacade().getName(i.next());
+// if (stereotypename != null
+// && !stereotypes.contains(stereotypename)) {
+// toBeRemoved.add(getStereotype(umlobject, stereotypename));
+// }
+// }
+//
+// // and now remove them
+// i = toBeRemoved.iterator();
+// while (i.hasNext()) {
+// Model.getCoreHelper().removeStereotype(umlobject, i.next());
+// }
+// }
+//
+// // add stereotypes
+// if (!stereotypes.isEmpty()) {
+// Iterator i = stereotypes.iterator();
+// while (i.hasNext()) {
+// String stereotypename = (String) i.next();
+// Object umlstereo = getStereotype(umlobject, stereotypename);
+// if (umlstereo != null) {
+// Model.getCoreHelper().addStereotype(umlobject, umlstereo);
+// }
+// }
+// }
+// }
+//
+// /**
+// * Finds a stereotype named name either in the subtree of the model rooted
+// * at root, or in the the ProfileJava model.
+// *
+// * @param obj
+// * A ModelElement to find a suitable stereotype for.
+// * @param name
+// * The name of the stereotype to search for.
+// * @return A stereotype named name, or possibly null.
+// */
+// private static Object getStereotype(Object obj, String name) {
+// Object root = Model.getFacade().getModel(obj);
+// Object stereo;
+//
+// stereo = recFindStereotype(obj, root, name);
+// if (stereo != null) {
+// return stereo;
+// }
+//
+// try {
+// Project project = ProjectManager.getManager().getCurrentProject();
+// Profile profile = project.getProfile();
+// stereo = recFindStereotype(obj, profile.getProfileModel(), name);
+// } catch (ProfileException e) {
+// // TODO: How are we going to handle exceptions here?
+// // I suspect the profile should be part of the project
+// // and not a singleton.
+// }
+//
+// if (stereo != null) {
+// return Model.getModelManagementHelper().getCorrespondingElement(
+// stereo, root);
+// }
+//
+// if (root != null && name.length() > 0) {
+// stereo =
+// Model.getExtensionMechanismsFactory().buildStereotype(
+// obj, name, root);
+// }
+//
+// return stereo;
+// }
+//
+// /**
+// * Recursively search a hive of a model for a stereotype with the name given
+// * in name.
+// *
+// * @param obj
+// * The model element to be suitable for.
+// * @param root
+// * The model element to search from.
+// * @param name
+// * The name of the stereotype to search for.
+// * @return An stereotype named name, or null if none is found.
+// */
+// private static Object recFindStereotype(
+// Object obj, Object root, String name) {
+// Object stereo;
+//
+// if (root == null) {
+// return null;
+// }
+//
+// if (Model.getFacade().isAStereotype(root)
+// && name.equals(Model.getFacade().getName(root))) {
+// if (Model.getExtensionMechanismsHelper().isValidStereoType(obj,
+// /* (MStereotype) */root)) {
+// return root;
+// }
+// }
+//
+// if (!Model.getFacade().isANamespace(root)) {
+// return null;
+// }
+//
+// Collection ownedElements = Model.getFacade().getOwnedElements(root);
+//
+// if (ownedElements == null) {
+// return null;
+// }
+//
+// // Loop through each element in the namespace, recursing.
+//
+// Iterator iter = ownedElements.iterator();
+//
+// while (iter.hasNext()) {
+// stereo = recFindStereotype(obj, iter.next(), name);
+// if (stereo != null) {
+// return stereo;
+// }
+// }
+// return null;
+// }
/**
* Returns a visibility String eihter for a MVisibilityKind (according to
Modified: trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java 2007-07-22 11:52:42-0700
@@ -41,6 +41,7 @@
import org.argouml.model.InvalidElementException;
import org.argouml.model.Model;
import org.argouml.notation.providers.OperationNotation;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.util.MyTokenizer;
/**
@@ -349,7 +350,7 @@
// but create any other parsed stereotypes as needed
if (!Model.getFacade().isAReception(op)
|| !RECEPTION_KEYWORD.equals(stereotype)) {
- NotationUtilityUml.dealWithStereotypes(op, stereotype, true);
+ StereotypeUtility.dealWithStereotypes(op, stereotype, true);
}
}
Copied: trunk/src_new/org/argouml/uml/ActionAddStereotype.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ActionAddStereotype.java?view=diff&rev=13108&p1=/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java&p2=trunk/src_new/org/argouml/uml/ActionAddStereotype.java&r1=13061&r2=13108
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java (original)
+++ trunk/src_new/org/argouml/uml/ActionAddStereotype.java 2007-07-22 11:52:42-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml;
import java.awt.event.ActionEvent;
@@ -40,7 +40,7 @@
* Action to add a sterotype to a model element.
* @author Bob Tarling
*/
-class ActionAddStereotype extends UndoableAction {
+public class ActionAddStereotype extends UndoableAction {
private Object modelElement;
private Object stereotype;
Copied: trunk/src_new/org/argouml/uml/StereotypeUtility.java (from r13061, /trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/StereotypeUtility.java?view=diff&rev=13108&p1=/trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java&p2=trunk/src_new/org/argouml/uml/StereotypeUtility.java&r1=13061&r2=13108
==============================================================================
--- /trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java (original)
+++ trunk/src_new/org/argouml/uml/StereotypeUtility.java 2007-07-22 11:52:42-0700
@@ -22,8 +22,9 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.uml.diagram.ui;
+package org.argouml.uml;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
@@ -33,8 +34,10 @@
import javax.swing.Action;
+import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.util.MyTokenizer;
/**
* @author BTarling
@@ -120,4 +123,159 @@
}
}
+ /**
+ * This function shall replace the previous set of stereotypes
+ * of the given modelelement with a new set,
+ * given in the form of a "," seperated string of stereotype names.
+ *
+ * @param umlobject the UML element to adapt
+ * @param stereotype comma seperated stereotype names
+ * @param full false if stereotypes are only added,
+ * true if removal should be done, too.
+ */
+ public static void dealWithStereotypes(Object umlobject, String stereotype,
+ boolean full) {
+ String token;
+ MyTokenizer mst;
+ Collection stereotypes = new ArrayList();
+
+ /* Convert the string (e.g. "aaa,bbb,ccc")
+ * into seperate stereotype-names (e.g. "aaa", "bbb", "ccc").
+ */
+ if (stereotype != null) {
+ mst = new MyTokenizer(stereotype, " ,\\,");
+ while (mst.hasMoreTokens()) {
+ token = mst.nextToken();
+ if (!",".equals(token) && !" ".equals(token)) {
+ stereotypes.add(token);
+ }
+ }
+ }
+
+ if (full) {
+ // collect the to be removed stereotypes
+ Collection toBeRemoved = new ArrayList();
+ Iterator i = Model.getFacade().getStereotypes(umlobject).iterator();
+ while (i.hasNext()) {
+ String stereotypename = Model.getFacade().getName(i.next());
+ if (stereotypename != null
+ && !stereotypes.contains(stereotypename)) {
+ toBeRemoved.add(getStereotype(umlobject, stereotypename));
+ }
+ }
+
+ // and now remove them
+ i = toBeRemoved.iterator();
+ while (i.hasNext()) {
+ Model.getCoreHelper().removeStereotype(umlobject, i.next());
+ }
+ }
+
+ // add stereotypes
+ if (!stereotypes.isEmpty()) {
+ Iterator i = stereotypes.iterator();
+ while (i.hasNext()) {
+ String stereotypename = (String) i.next();
+ Object umlstereo = getStereotype(umlobject, stereotypename);
+ if (umlstereo != null) {
+ Model.getCoreHelper().addStereotype(umlobject, umlstereo);
+ }
+ }
+ }
+ }
+
+ /**
+ * Finds a stereotype named name either in the subtree of the model rooted
+ * at root, or in the the ProfileJava model.
+ *
+ * @param obj
+ * A ModelElement to find a suitable stereotype for.
+ * @param name
+ * The name of the stereotype to search for.
+ * @return A stereotype named name, or possibly null.
+ */
+ private static Object getStereotype(Object obj, String name) {
+ Object root = Model.getFacade().getModel(obj);
+ Object stereo;
+
+ stereo = recFindStereotype(obj, root, name);
+ if (stereo != null) {
+ return stereo;
+ }
+
+ try {
+ Project project = ProjectManager.getManager().getCurrentProject();
+ Profile profile = project.getProfile();
+ stereo = recFindStereotype(obj, profile.getProfileModel(), name);
+ } catch (ProfileException e) {
+ // TODO: How are we going to handle exceptions here?
+ // I suspect the profile should be part of the project
+ // and not a singleton.
+ }
+
+ if (stereo != null) {
+ return Model.getModelManagementHelper().getCorrespondingElement(
+ stereo, root);
+ }
+
+ if (root != null && name.length() > 0) {
+ stereo =
+ Model.getExtensionMechanismsFactory().buildStereotype(
+ obj, name, root);
+ }
+
+ return stereo;
+ }
+
+ /**
+ * Recursively search a hive of a model for a stereotype with the name given
+ * in name.
+ *
+ * @param obj
+ * The model element to be suitable for.
+ * @param root
+ * The model element to search from.
+ * @param name
+ * The name of the stereotype to search for.
+ * @return An stereotype named name, or null if none is found.
+ */
+ private static Object recFindStereotype(
+ Object obj, Object root, String name) {
+ Object stereo;
+
+ if (root == null) {
+ return null;
+ }
+
+ if (Model.getFacade().isAStereotype(root)
+ && name.equals(Model.getFacade().getName(root))) {
+ if (Model.getExtensionMechanismsHelper().isValidStereoType(obj,
+ /* (MStereotype) */root)) {
+ return root;
+ }
+ }
+
+ if (!Model.getFacade().isANamespace(root)) {
+ return null;
+ }
+
+ Collection ownedElements = Model.getFacade().getOwnedElements(root);
+
+ if (ownedElements == null) {
+ return null;
+ }
+
+ // Loop through each element in the namespace, recursing.
+
+ Iterator iter = ownedElements.iterator();
+
+ while (iter.hasNext()) {
+ stereo = recFindStereotype(obj, iter.next(), name);
+ if (stereo != null) {
+ return stereo;
+ }
+ }
+ return null;
+ }
+
}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/SelectionStereotype.java 2007-07-22 11:52:42-0700
@@ -30,7 +30,7 @@
import org.argouml.application.helpers.ResourceLoaderWrapper;
import org.argouml.model.Model;
-import org.argouml.notation.providers.uml.NotationUtilityUml;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.diagram.deployment.DeploymentDiagramGraphModel;
import org.argouml.uml.diagram.ui.SelectionNodeClarifiers2;
import org.tigris.gef.base.Globals;
@@ -96,7 +96,7 @@
switch (index) {
case 10:
Object clazz = Model.getCoreFactory().buildClass(ns);
- NotationUtilityUml.dealWithStereotypes(clazz, "metaclass", false);
+ StereotypeUtility.dealWithStereotypes(clazz, "metaclass", false);
return clazz;
case 11:
Object st =
@@ -121,7 +121,7 @@
@Override
protected Object createEdgeAbove(MutableGraphModel mgm, Object newNode) {
Object dep = super.createEdgeAbove(mgm, newNode);
- NotationUtilityUml.dealWithStereotypes(dep, "stereotype", false);
+ StereotypeUtility.dealWithStereotypes(dep, "stereotype", false);
return dep;
}
Removed: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddStereotype.java?view=auto&rev=13107
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2007-07-22 11:52:42-0700
@@ -79,6 +79,7 @@
import org.argouml.ui.Clarifier;
import org.argouml.ui.ProjectActions;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.IItemUID;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-07-22 11:52:42-0700
@@ -80,6 +80,7 @@
import org.argouml.ui.Clarifier;
import org.argouml.ui.ProjectActions;
import org.argouml.ui.targetmanager.TargetManager;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.IItemUID;
import org.argouml.uml.diagram.PathContainer;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigStereotypesCompartment.java 2007-07-22 11:52:42-0700
@@ -65,7 +65,7 @@
* Logger.
*/
private static final Logger LOG =
- Logger.getLogger(ActionAddStereotype.class);
+ Logger.getLogger(FigStereotypesCompartment.class);
/**
* One UML keyword is allowed. These are not strictly stereotypes but are
Removed: trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/StereotypeUtility.java?view=auto&rev=13107
Modified: trunk/src_new/org/argouml/uml/ui/TabStereotype.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/TabStereotype.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/uml/ui/TabStereotype.java&p2=trunk/src_new/org/argouml/uml/ui/TabStereotype.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/TabStereotype.java (original)
+++ trunk/src_new/org/argouml/uml/ui/TabStereotype.java 2007-07-22 11:52:42-0700
@@ -47,7 +47,7 @@
import org.argouml.model.Model;
import org.argouml.swingext.SpacerPanel;
import org.argouml.ui.targetmanager.TargetManager;
-import org.argouml.uml.diagram.ui.StereotypeUtility;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.ui.foundation.core.UMLModelElementStereotypeListModel;
import org.tigris.gef.presentation.Fig;
import org.tigris.swidgets.Horizontal;
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java?view=diff&rev=13108&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java&r1=13107&r2=13108
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLModelElementStereotypeListModel.java 2007-07-22 11:52:42-0700
@@ -31,7 +31,7 @@
import javax.swing.SwingConstants;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.ui.StereotypeUtility;
+import org.argouml.uml.StereotypeUtility;
import org.argouml.uml.ui.UMLModelElementListModel2;
/**
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.