Author: tfmorris
Date: 2007-10-11 00:58:44-0700
New Revision: 13676
Modified:
trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java
trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src_new/org/argouml/uml/GenAncestorClasses.java
trunk/src_new/org/argouml/uml/GenDescendantClasses.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java
trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java
trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java
trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java
trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java
trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java
trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java
Log:
Clean up usage of deprecated methods
Modified: trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java&p2=trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java (original)
+++ trunk/src_new/org/argouml/language/java/generator/GeneratorJava.java 2007-10-11 00:58:44-0700
@@ -85,7 +85,7 @@
private static final Set JAVA_TYPES;
static {
- HashSet types = new HashSet();
+ Set<String> types = new HashSet<String>();
types.add("void");
types.add("boolean");
types.add("byte");
@@ -431,7 +431,7 @@
// now check packages of all generalized types
for (j = c.iterator(); j.hasNext();) {
Object gen = j.next();
- Object parent = Model.getFacade().getParent(gen);
+ Object parent = Model.getFacade().getGeneral(gen);
if (parent == cls) {
continue;
}
@@ -1325,7 +1325,7 @@
// Add each constraint
class TagExtractor extends DepthFirstAdapter {
- private LinkedList llsTags = new LinkedList();
+ private LinkedList<String> llsTags = new LinkedList<String>();
private String constraintName;
private int constraintID;
@@ -1347,6 +1347,7 @@
/*
* @see tudresden.ocl.parser.analysis.Analysis#caseAConstraintBody(tudresden.ocl.parser.node.AConstraintBody)
*/
+ @Override
public void caseAConstraintBody(AConstraintBody node) {
// We don't care for anything below this node, so we
// do not use apply anymore.
@@ -1501,7 +1502,7 @@
while (it.hasNext()) {
Object generalization = it.next();
Object generalizableElement =
- Model.getFacade().getParent(generalization);
+ Model.getFacade().getGeneral(generalization);
// assert ge != null
if (generalizableElement != null) {
classes.add(generalizableElement);
@@ -1546,13 +1547,15 @@
}
/*
- * Returns a visibility String either for a MVisibilityKind (according to
+ * Returns a visibility String either for a VisibilityKind (according to
* the definition in NotationProvider2), but also for a model element,
- * because if it is a MFeature, then the tag 'src_visibility' is to be
+ * because if it is a Feature, then the tag 'src_visibility' is to be
* taken into account for generating language dependent visibilities.
*/
private String generateVisibility(Object o) {
if (Model.getFacade().isAFeature(o)) {
+ // TODO: The src_visibility tag doesn't appear to be created
+ // anywhere by ArgoUML currently
Object tv = Model.getFacade().getTaggedValue(o, "src_visibility");
if (tv != null) {
String tagged = (String) Model.getFacade().getValue(tv);
Modified: trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&p2=trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java (original)
+++ trunk/src_new/org/argouml/persistence/ModelMemberFilePersister.java 2007-10-11 00:58:44-0700
@@ -55,9 +55,7 @@
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ProjectMemberDiagram;
-import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
-import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
-import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
import org.argouml.uml.profile.ProfileConfiguration;
import org.xml.sax.InputSource;
@@ -433,7 +431,7 @@
+ facade.getUMLClassName(statemachine)
+ "<<" + facade.getName(statemachine) + ">>");
diagram = diagramFactory.createDiagram(
- UMLActivityDiagram.class,
+ DiagramType.Activity,
namespace,
statemachine);
} else {
@@ -441,7 +439,7 @@
+ facade.getUMLClassName(statemachine)
+ "<<" + facade.getName(statemachine) + ">>");
diagram = diagramFactory.createDiagram(
- UMLStateDiagram.class,
+ DiagramType.State,
namespace,
statemachine);
}
@@ -454,13 +452,13 @@
// ArgoUML requires it for correct operation
if (atLeastOne && project.getDiagramCount() < 1) {
ArgoDiagram d = diagramFactory.createDiagram(
- UMLClassDiagram.class, curModel, null);
+ DiagramType.Class, curModel, null);
project.addMember(d);
}
if (project.getDiagramCount() >= 1
&& project.getActiveDiagram() == null) {
project.setActiveDiagram(
- (ArgoDiagram) project.getDiagrams().get(0));
+ project.getDiagramList().get(0));
}
}
Modified: trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src_new/org/argouml/ui/explorer/ExplorerPopup.java 2007-10-11 00:58:44-0700
@@ -265,7 +265,7 @@
if (multiSelect) {
Collection coll = TargetManager.getInstance().getTargets();
Iterator iter = (coll != null) ? coll.iterator() : null;
- ArrayList classifiers = new ArrayList();
+ List<Object> classifiers = new ArrayList<Object>();
while (iter != null && iter.hasNext()) {
Object o = iter.next();
if (Model.getFacade().isAClassifier(o)
@@ -320,7 +320,7 @@
*/
private void initMenuCreateModelElements() {
List targets = TargetManager.getInstance().getTargets();
- List menuItems = new ArrayList();
+ List<JMenuItem> menuItems = new ArrayList<JMenuItem>();
if (targets.size() >= 2) {
// Check to see if all targets are classifiers
// before adding an option to create an association between
@@ -386,7 +386,7 @@
" " + menuLocalize("menu.popup.realizes") + " ");
}
if (menuItems.size() == 1) {
- add((JMenuItem) menuItems.get(0));
+ add(menuItems.get(0));
} else if (menuItems.size() > 1) {
JMenu menu =
new JMenu(menuLocalize("menu.popup.create-model-element"));
@@ -398,7 +398,7 @@
}
private void addCreateModelElementAction(
- Collection menuItems,
+ Collection<JMenuItem> menuItems,
Object metaType,
String relationshipDescr) {
List targets = TargetManager.getInstance().getTargets();
@@ -477,7 +477,7 @@
coll.addAll(Model.getFacade().getSuppliers(edge));
} else if (Model.getFacade().isAGeneralization(edge)) {
coll = new ArrayList();
- Object parent = Model.getFacade().getParent(edge);
+ Object parent = Model.getFacade().getGeneral(edge);
coll.add(parent);
coll.addAll(Model.getFacade().getChildren(parent));
}
Modified: trunk/src_new/org/argouml/uml/GenAncestorClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/GenAncestorClasses.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/GenAncestorClasses.java&p2=trunk/src_new/org/argouml/uml/GenAncestorClasses.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/GenAncestorClasses.java (original)
+++ trunk/src_new/org/argouml/uml/GenAncestorClasses.java 2007-10-11 00:58:44-0700
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.Enumeration;
+import java.util.List;
import java.util.Vector;
import org.argouml.model.Model;
@@ -35,7 +36,6 @@
* safe way that will not hang in case of cyclic inheritance.
*/
public class GenAncestorClasses implements ChildGenerator {
- //public static GenAncestorClasses TheInstance = new GenAncestorClasses();
/*
* @see org.tigris.gef.util.ChildGenerator#gen(java.lang.Object)
@@ -56,17 +56,17 @@
* @param cls the class (in fact any GeneralizableElement will do)
* @param accum the accumulated list of generalizations
*/
- public void accumulateAncestors(Object cls, Vector accum) {
- Vector gens = new Vector(Model.getFacade().getGeneralizations(cls));
- if (gens == null) return;
- int size = gens.size();
- for (int i = 0; i < size; i++) {
- Object g = (gens).elementAt(i);
- Object ge = Model.getFacade().getParent(g);
+ public void accumulateAncestors(Object cls, List accum) {
+ Collection gens = Model.getFacade().getGeneralizations(cls);
+ if (gens == null) {
+ return;
+ }
+ for (Object g : gens) {
+ Object ge = Model.getFacade().getGeneral(g);
if (!accum.contains(ge)) {
accum.add(ge);
accumulateAncestors(cls, accum);
}
}
}
-} /* end class GenAncestorClasses */
+}
Modified: trunk/src_new/org/argouml/uml/GenDescendantClasses.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/GenDescendantClasses.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/GenDescendantClasses.java&p2=trunk/src_new/org/argouml/uml/GenDescendantClasses.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/GenDescendantClasses.java (original)
+++ trunk/src_new/org/argouml/uml/GenDescendantClasses.java 2007-10-11 00:58:44-0700
@@ -26,6 +26,7 @@
import java.util.Collection;
import java.util.Enumeration;
+import java.util.List;
import java.util.Vector;
import org.argouml.model.Model;
@@ -58,7 +59,9 @@
Object cls = o;
Collection gens = Model.getFacade().getSpecializations(cls);
- if (gens == null) return res.elements();
+ if (gens == null) {
+ return res.elements();
+ }
accumulateDescendants(cls, res);
return res.elements();
}
@@ -66,19 +69,19 @@
/**
* @param cls the starting class (in fact GeneralizableElement)
- * @param accum the accumulated list of descendents
+ * @param accum the accumulated list of descendants
*/
- public void accumulateDescendants(Object cls, Vector accum) {
- Vector gens = new Vector(Model.getFacade().getSpecializations(cls));
- if (gens == null) return;
- int size = gens.size();
- for (int i = 0; i < size; i++) {
- Object g = (gens.elementAt(i));
- Object ge = Model.getFacade().getChild(g);
+ private void accumulateDescendants(final Object cls, List accum) {
+ Collection gens = Model.getFacade().getSpecializations(cls);
+ if (gens == null) {
+ return;
+ }
+ for (Object g : gens) {
+ Object ge = Model.getFacade().getSpecific(g);
if (!accum.contains(ge)) {
accum.add(ge);
accumulateDescendants(cls, accum);
}
}
}
-} /* end class GenDescendantClasses */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrIllegalGeneralization.java 2007-10-11 00:58:44-0700
@@ -52,13 +52,14 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAGeneralization(dm))) {
return NO_PROBLEM;
}
Object gen = dm;
- Object cls1 = Model.getFacade().getParent(gen);
- Object cls2 = Model.getFacade().getChild(gen);
+ Object cls1 = Model.getFacade().getGeneral(gen);
+ Object cls2 = Model.getFacade().getSpecific(gen);
if (cls1 == null || cls2 == null) {
return NO_PROBLEM;
}
@@ -70,4 +71,4 @@
return NO_PROBLEM;
}
-} /* end class CrIllegalGeneralization */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoAssociations.java 2007-10-11 00:58:44-0700
@@ -61,6 +61,7 @@
* @return <CODE>PROBLEM_FOUND</CODE> if there is a problem,
* otherwise <CODE>NO_PROBLEM</CODE>
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClassifier(dm)))
return NO_PROBLEM;
@@ -137,7 +138,7 @@
Iterator iter = Model.getFacade().getGeneralizations(dm).iterator();
while (iter.hasNext()) {
- Object parent = Model.getFacade().getParent(iter.next());
+ Object parent = Model.getFacade().getGeneral(iter.next());
if (parent == dm)
continue;
@@ -177,4 +178,4 @@
return false;
}
-} /* end class CrNoAssociations */
+}
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoInstanceVariables.java 2007-10-11 00:58:44-0700
@@ -39,12 +39,14 @@
* A critic to detect if a class has instance variables.
* The critic fires currently only if a class and its base classes have
* no attributes at all.
- * This is not neccesarily correct and the critic will have to deal with
+ * This is not necessarily correct and the critic will have to deal with
* static attributes or attributes which are defined in a base class but are
* private.
*/
public class CrNoInstanceVariables extends CrUML {
+ private static final int MAX_DEPTH = 50;
+
/**
* The constructor.
*/
@@ -128,13 +130,13 @@
}
// I am only prepared to go this far.
- if (depth > 50)
+ if (depth > MAX_DEPTH)
return false;
Iterator iter = Model.getFacade().getGeneralizations(dm).iterator();
while (iter.hasNext()) {
- Object parent = Model.getFacade().getParent(iter.next());
+ Object parent = Model.getFacade().getGeneral(iter.next());
if (parent == dm)
continue;
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrNoOperations.java 2007-10-11 00:58:44-0700
@@ -119,7 +119,7 @@
Iterator iter = Model.getFacade().getGeneralizations(dm).iterator();
while (iter.hasNext()) {
- Object parent = Model.getFacade().getParent(iter.next());
+ Object parent = Model.getFacade().getGeneral(iter.next());
if (parent == dm)
continue;
Modified: trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java&p2=trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java (original)
+++ trunk/src_new/org/argouml/uml/cognitive/critics/CrUselessAbstract.java 2007-10-11 00:58:44-0700
@@ -58,6 +58,7 @@
* @see org.argouml.uml.cognitive.critics.CrUML#predicate2(
* java.lang.Object, org.argouml.cognitive.Designer)
*/
+ @Override
public boolean predicate2(Object dm, Designer dsgr) {
if (!(Model.getFacade().isAClass(dm))) {
return false;
@@ -86,15 +87,13 @@
if (specs == null) {
return EnumerationEmpty.theInstance();
}
- // TODO: it would be nice to have a EnumerationXform
- // and a Functor object in uci.util
Vector specClasses = new Vector(specs.size());
for (Object g : specs) {
- Object ge = Model.getFacade().getChild(g);
+ Object ge = Model.getFacade().getSpecific(g);
if (ge != null) {
specClasses.add(ge);
}
}
return specClasses.elements();
}
-} /* end class derivedClasses */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ClassDiagramGraphModel.java 2007-10-11 00:58:44-0700
@@ -58,8 +58,8 @@
/*
* @see org.tigris.gef.graph.GraphModel#getPorts(java.lang.Object)
*/
- public List getPorts(Object nodeOrEdge) {
- List res = new ArrayList();
+ public List<Object> getPorts(Object nodeOrEdge) {
+ List<Object> res = new ArrayList<Object>();
if (Model.getFacade().isAClassifier(nodeOrEdge)) {
res.add(nodeOrEdge);
}
@@ -94,7 +94,7 @@
*/
public List getInEdges(Object port) {
- List edges = new ArrayList();
+ List<Object> edges = new ArrayList<Object>();
// top of the hierarchy is ME:
if (Model.getFacade().isAModelElement(port)) {
@@ -139,7 +139,7 @@
*/
public List getOutEdges(Object port) {
- List edges = new ArrayList();
+ List<Object> edges = new ArrayList<Object>();
// top of the hierarchy is ME:
if (Model.getFacade().isAModelElement(port)) {
@@ -168,7 +168,8 @@
while (it2.hasNext()) {
Object nextAssocEnd = it2.next();
if (!thisEnd.equals(nextAssocEnd)
- && Model.getFacade().isNavigable(nextAssocEnd)) {
+ && Model.getFacade().isNavigable(
+ nextAssocEnd)) {
edges.add(nextAssocEnd);
}
}
@@ -185,6 +186,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#canAddNode(java.lang.Object)
*/
+ @Override
public boolean canAddNode(Object node) {
if (Model.getFacade().isAAssociation(node)
&& !Model.getFacade().isANaryAssociation(node)) {
@@ -239,6 +241,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#canAddEdge(java.lang.Object)
*/
+ @Override
public boolean canAddEdge(Object edge) {
if (edge == null) {
return false;
@@ -287,8 +290,8 @@
}
} else if (Model.getFacade().isAGeneralization(edge)) {
- sourceModelElement = Model.getFacade().getChild(edge);
- destModelElement = Model.getFacade().getParent(edge);
+ sourceModelElement = Model.getFacade().getSpecific(edge);
+ destModelElement = Model.getFacade().getGeneral(edge);
} else if (Model.getFacade().isADependency(edge)) {
Collection clients = Model.getFacade().getClients(edge);
Collection suppliers = Model.getFacade().getSuppliers(edge);
@@ -344,6 +347,7 @@
/*
* @see org.tigris.gef.graph.MutableGraphModel#addNode(java.lang.Object)
*/
+ @Override
public void addNode(Object node) {
if (!canAddNode(node)) {
return;
@@ -368,6 +372,7 @@
*
* @param edge the edge to be added
*/
+ @Override
public void addEdge(Object edge) {
if (edge == null) {
throw new IllegalArgumentException("Cannot add a null edge");
@@ -411,6 +416,7 @@
* @param node
* the model element to query for connections
*/
+ @Override
public void addNodeRelatedEdges(Object node) {
super.addNodeRelatedEdges(node);
@@ -534,6 +540,7 @@
*
* @return whether or not the rerouting is allowed
*/
+ @Override
public boolean canChangeConnectedNode(Object newNode, Object oldNode,
Object edge) {
@@ -564,6 +571,7 @@
* @param edge this is the edge that is being dragged/rerouted
* @param isSource tells us which end is being rerouted.
*/
+ @Override
public void changeConnectedNode(Object newNode, Object oldNode,
Object edge, boolean isSource) {
if (Model.getFacade().isAAssociation(edge)) {
@@ -667,4 +675,4 @@
}
-} /* end class ClassDiagramGraphModel */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-10-11 00:58:44-0700
@@ -32,8 +32,8 @@
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyVetoException;
-import java.util.Enumeration;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import javax.swing.JOptionPane;
@@ -52,6 +52,7 @@
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.StereotypeContainer;
import org.argouml.uml.diagram.VisibilityContainer;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.uml.diagram.ui.FigStereotypesCompartment;
import org.tigris.gef.base.Editor;
@@ -199,6 +200,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#initNotationProviders(java.lang.Object)
*/
+ @Override
protected void initNotationProviders(Object own) {
super.initNotationProviders(own);
if (Model.getFacade().isAPackage(own)) {
@@ -210,6 +212,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
*/
+ @Override
public String placeString() {
return "new Package";
}
@@ -217,6 +220,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigPackage figClone = (FigPackage) super.clone();
Iterator thisIter = this.getFigs().iterator();
@@ -238,6 +242,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
super.setLineColor(col);
getStereotypeFig().setLineColor(col);
@@ -249,6 +254,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return body.getLineColor();
}
@@ -256,6 +262,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
super.setFillColor(col);
getStereotypeFig().setFillColor(col);
@@ -267,6 +274,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return body.getFillColor();
}
@@ -274,6 +282,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
getStereotypeFig().setFilled(f);
getNameFig().setFilled(f);
@@ -290,6 +299,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
getNameFig().setLineWidth(w);
body.setLineWidth(w);
@@ -298,6 +308,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return body.getLineWidth();
}
@@ -305,6 +316,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateStereotypeText()
*/
+ @Override
protected void updateStereotypeText() {
Object modelElement = getOwner();
@@ -344,6 +356,7 @@
* @return the class name and bounds together with compartment
* visibility.
*/
+ @Override
public String classNameAndBounds() {
return super.classNameAndBounds()
+ "stereotypeVisible=" + isStereotypeVisible()
@@ -357,6 +370,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
*/
+ @Override
public boolean getUseTrapRect() {
return true;
}
@@ -364,6 +378,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
// Use "aSize" to build up the minimum size. Start with the size of the
// name compartment and build up.
@@ -416,6 +431,7 @@
*
* @param h Desired height of the FigClass
*/
+ @Override
protected void setStandardBounds(int xa, int ya, int w, int h) {
// Save our old boundaries (needed later), and get minimum size
// info. "aSize" will be used to maintain a running calculation of our
@@ -500,6 +516,7 @@
* @param me a mouse event
* @return a collection of menu items
*/
+ @Override
public Vector getPopUpActions(MouseEvent me) {
Vector popUpActions = super.getPopUpActions(me);
@@ -514,6 +531,7 @@
return popUpActions;
}
+ @Override
protected ArgoJMenu buildShowPopUp() {
ArgoJMenu showMenu = super.buildShowPopUp();
/* Only show the menuitems if they make sense: */
@@ -630,12 +648,9 @@
Project lP =
ProjectManager.getManager().getCurrentProject();
- Vector diags = lP.getDiagrams();
- Enumeration diagEnum = diags.elements();
+ List<ArgoDiagram> diags = lP.getDiagramList();
ArgoDiagram lFirst = null;
- while (diagEnum.hasMoreElements()) {
- ArgoDiagram lDiagram =
- (ArgoDiagram) diagEnum.nextElement();
+ for (ArgoDiagram lDiagram : diags) {
Object lDiagramNS = lDiagram.getNamespace();
if ((lNS == null && lDiagramNS == null)
|| (lNS.equals(lDiagramNS))) {
@@ -714,7 +729,7 @@
ArgoDiagram classDiagram =
DiagramFactory.getInstance().
- createDiagram(UMLClassDiagram.class, namespace, null);
+ createDiagram(DiagramType.Class, namespace, null);
String diagramName = defaultName + "_" + classDiagram.getName();
@@ -763,6 +778,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
/* The following 2 lines should be retained for reference.
@@ -785,6 +801,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getClosestPoint(java.awt.Point)
*/
+ @Override
public Point getClosestPoint(Point anotherPt) {
Rectangle r = getBounds();
int[] xs = {
@@ -804,6 +821,7 @@
return p;
}
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
if (mee instanceof RemoveAssociationEvent
@@ -854,6 +872,7 @@
* @see java.awt.event.ActionListener#actionPerformed(
* java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
doStereotype(false);
@@ -884,6 +903,7 @@
* @see java.awt.event.ActionListener#actionPerformed(
* java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
doStereotype(true);
@@ -914,6 +934,7 @@
* @see java.awt.event.ActionListener#actionPerformed(
* java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
doVisibility(false);
@@ -944,6 +965,7 @@
* @see java.awt.event.ActionListener#actionPerformed(
* java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
doVisibility(true);
@@ -987,6 +1009,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getClosestPoint(java.awt.Point)
*/
+ @Override
public Point getClosestPoint(Point anotherPt) {
Rectangle r = getBounds();
int[] xs = {
Modified: trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/CompartmentFigText.java 2007-10-11 00:58:44-0700
@@ -54,45 +54,40 @@
private static final Logger LOG =
Logger.getLogger(CompartmentFigText.class);
- ///////////////////////////////////////////////////////////////////////////
- //
- // Instance variables
- //
- ///////////////////////////////////////////////////////////////////////////
-
/**
- * The bounding figure of the compartment containing this fig text.<p>
+ * The bounding figure of the compartment containing this fig text.
*/
- private Fig refFig;
+ private Fig refFig;
/**
- * Record whether we are currently highlighted.<p>
+ * Record whether we are currently highlighted.
*/
- private boolean isHighlighted;
+ private boolean isHighlighted;
/**
- * Build a new compartment figText of the given dimensions, within
- * the compartment described by <code>aFig</code>.<p>
- *
- * Invoke the parent constructor, then set the reference to the
- * associated compartment figure. The associated FigText is marked
- * as expand only.<p>
- *
- * <em>Warning</em>. Won't work properly if <code>aFig</code> is
- * null. A warning is printed.<p>
- *
- * @param x X coordinate of the top left of the FigText.
- *
- * @param y Y coordinate of the top left of the FigText.
- *
- * @param w Width of the FigText.
- *
- * @param h Height of the FigText.
- *
- * @param aFig The figure describing the whole compartment
+ * Build a new compartment figText of the given dimensions, within the
+ * compartment described by <code>aFig</code>.
+ * <p>
+ *
+ * Invoke the parent constructor, then set the reference to the associated
+ * compartment figure. The associated FigText is marked as expand only.
+ * <p>
+ *
+ * <em>Warning</em>. Won't work properly if <code>aFig</code> is null.
+ * A warning is printed.
+ * <p>
*
- * @param np The notationProvider.
- * See NotationProviderFactory2.
+ * @param x X coordinate of the top left of the FigText.
+ *
+ * @param y Y coordinate of the top left of the FigText.
+ *
+ * @param w Width of the FigText.
+ *
+ * @param h Height of the FigText.
+ *
+ * @param aFig The figure describing the whole compartment
+ *
+ * @param np The notationProvider. See NotationProviderFactory2.
*/
public CompartmentFigText(int x, int y, int w, int h, Fig aFig,
NotationProvider np) {
@@ -182,7 +177,7 @@
refFig = aFig;
}
- /**
+ /*
* @see org.argouml.uml.diagram.ui.FigSingleLineText#removeFromDiagram()
*/
@Override
@@ -210,6 +205,7 @@
* @return Current fill colour—always the fill colour of the
* associated compartment fig.
*/
+ @Override
public Color getLineColor() {
return refFig.getLineColor();
}
@@ -243,4 +239,4 @@
public boolean isHighlighted() {
return isHighlighted;
}
-} /* End of class CompartmentFigText */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java 2007-10-11 00:58:44-0700
@@ -167,9 +167,9 @@
if (Model.getFacade().isAGeneralization(own)) {
Object gen = own; // MGeneralization
Object subType =
- Model.getFacade().getChild(gen); // GeneralizableElement
+ Model.getFacade().getSpecific(gen); // GeneralizableElement
Object superType =
- Model.getFacade().getParent(gen); // GeneralizableElement
+ Model.getFacade().getGeneral(gen); // GeneralizableElement
// Due to errors in earlier releases of argouml it can
// happen that there is a generalization without a child
// or parent.
Modified: trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&p2=trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/ui/RESequenceDiagramDialog.java 2007-10-11 00:58:44-0700
@@ -63,12 +63,12 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramFactory;
+import org.argouml.uml.diagram.DiagramFactory.DiagramType;
import org.argouml.uml.diagram.sequence.MessageNode;
import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
import org.argouml.uml.diagram.sequence.ui.FigClassifierRole;
import org.argouml.uml.diagram.sequence.ui.FigMessage;
import org.argouml.uml.diagram.sequence.ui.SequenceDiagramLayer;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.reveng.ImportSettings;
import org.argouml.uml.reveng.java.JavaLexer;
import org.argouml.uml.reveng.java.JavaRecognizer;
@@ -168,9 +168,9 @@
// maybe there is an easier way to find
// the current diagram than this:
Project p = ProjectManager.getManager().getCurrentProject();
- Iterator iter = p.getDiagrams().iterator();
+ Iterator<ArgoDiagram> iter = p.getDiagramList().iterator();
while (iter.hasNext()) {
- diagram = (ArgoDiagram) iter.next();
+ diagram = iter.next();
if (graphModel == diagram.getGraphModel()) {
break;
}
@@ -274,12 +274,12 @@
&& Model.getFacade().getNamespace(target) != null) {
newTarget = Model.getFacade().getNamespace(target);
} else if (target instanceof Diagram) {
- Diagram firstDiagram = (Diagram) p.getDiagrams().get(0);
+ Diagram firstDiagram = (Diagram) p.getDiagramList().get(0);
if (target != firstDiagram) {
newTarget = firstDiagram;
} else {
- if (p.getDiagrams().size() > 1) {
- newTarget = p.getDiagrams().get(1);
+ if (p.getDiagramList().size() > 1) {
+ newTarget = p.getDiagramList().get(1);
} else {
newTarget = p.getRoot();
}
@@ -368,7 +368,7 @@
top.add(new JLabel("Assumption table:"), labelConstraints);
top.add(new JButton("Update"), fieldConstraints);
- List assumptions = new ArrayList();
+ List<String> assumptions = new ArrayList<String>();
assumptions.add("calls.hasMoreElements()");
assumptions.add("methods != null && !methods.isEmpty()");
Object[] data = null;
@@ -474,7 +474,7 @@
theClassifier);
diagram =
DiagramFactory.getInstance().createDiagram(
- UMLSequenceDiagram.class,
+ DiagramType.Sequence,
collaboration,
null);
graphModel = (SequenceDiagramGraphModel) diagram.getGraphModel();
Modified: trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java&p2=trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java (original)
+++ trunk/src_new/org/argouml/uml/ui/UMLListCellRenderer2.java 2007-10-11 00:58:44-0700
@@ -193,7 +193,7 @@
new Object[] {name, baseString});
} else if (showPath) {
List pathList =
- Model.getModelManagementHelper().getPath(value);
+ Model.getModelManagementHelper().getPathList(value);
String path;
if (pathList.size() > 1) {
path = (String) pathList.get(0);
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationChildListModel.java 2007-10-11 00:58:44-0700
@@ -46,13 +46,13 @@
return;
}
removeAllElements();
- addElement(Model.getFacade().getChild(getTarget()));
+ addElement(Model.getFacade().getSpecific(getTarget()));
}
/*
* @see org.argouml.uml.ui.UMLModelElementListModel2#isValidElement(Object)
*/
protected boolean isValidElement(Object o) {
- return (Model.getFacade().getChild(getTarget()) == o);
+ return (Model.getFacade().getSpecific(getTarget()) == o);
}
}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizationParentListModel.java 2007-10-11 00:58:44-0700
@@ -47,14 +47,14 @@
return;
}
removeAllElements();
- addElement(Model.getFacade().getParent(getTarget()));
+ addElement(Model.getFacade().getGeneral(getTarget()));
}
/*
* @see org.argouml.uml.ui.UMLModelElementListModel2#isValidElement(Object)
*/
protected boolean isValidElement(Object o) {
- return (Model.getFacade().getParent(getTarget()) == o);
+ return (Model.getFacade().getGeneral(getTarget()) == o);
}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLStructuralFeatureTypeComboBoxModel.java 2007-10-11 00:58:44-0700
@@ -72,11 +72,13 @@
* @see org.argouml.uml.ui.UMLComboBoxModel2#buildModelList()
*/
protected void buildModelList() {
- Set elements = new TreeSet(new Comparator() {
+ Set<Object> elements = new TreeSet<Object>(new Comparator<Object>() {
public int compare(Object o1, Object o2) {
- List path1 = Model.getModelManagementHelper().getPath(o1);
+ List<String> path1 = Model.getModelManagementHelper()
+ .getPathList(o1);
Collections.reverse(path1);
- List path2 = Model.getModelManagementHelper().getPath(o2);
+ List<String> path2 = Model.getModelManagementHelper()
+ .getPathList(o2);
Collections.reverse(path2);
return compareStringLists(path1, path2);
}
@@ -113,15 +115,16 @@
* Compare two lists of strings using case-insensitive comparison.
* @return equivalent of list1.compareTo(list2)
*/
- private static int compareStringLists(List list1, List list2) {
- Iterator i2 = list2.iterator();
- Iterator i1 = list1.iterator();
+ private static int compareStringLists(List<String> list1,
+ List<String> list2) {
+ Iterator<String> i2 = list2.iterator();
+ Iterator<String> i1 = list1.iterator();
while (i2.hasNext()) {
- String name2 = (String) i2.next();
+ String name2 = i2.next();
if (!i1.hasNext()) {
return -1;
}
- String name1 = (String) i1.next();
+ String name1 = i1.next();
if (name1 == null) {
return -1;
}
@@ -153,6 +156,7 @@
/*
* @see org.argouml.uml.ui.UMLComboBoxModel2#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
/*
* The default behavior for super implementation is
Modified: trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java?view=diff&rev=13676&p1=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java&r1=13675&r2=13676
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/extension_mechanisms/UMLTagDefinitionComboBoxModel.java 2007-10-11 00:58:44-0700
@@ -28,7 +28,6 @@
import java.util.Collection;
import java.util.Comparator;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.TreeSet;
@@ -49,8 +48,9 @@
* Constructor for UMLTagDefinitionComboBoxModel.
*/
public UMLTagDefinitionComboBoxModel() {
- // TODO: no such event named tagdefinition
- super("tagdefinition", false);
+ // TODO: What property name do we need here?
+ // We're forced to have something, but nothing will really work.
+ super("definedTag", false);
}
@@ -67,6 +67,7 @@
/*
* @see org.argouml.uml.ui.UMLComboBoxModel2#setSelectedItem(java.lang.Object)
*/
+ @Override
public void setSelectedItem(Object o) {
setFireListEvents(false);
super.setSelectedItem(o);
@@ -91,21 +92,22 @@
}
private Collection getApplicableTagDefinitions(Object t) {
- Set paths = new HashSet();
- Set availableTagDefs = new TreeSet(new Comparator() {
- public int compare(Object o1, Object o2) {
- try {
- String name1 = Model.getFacade().getName(o1);
- String name2 = Model.getFacade().getName(o2);
- name1 = (name1 != null ? name1 : "");
- name2 = (name2 != null ? name2 : "");
-
- return name1.compareTo(name2);
- } catch (Exception e) {
- throw new ClassCastException(e.getMessage());
- }
- }
- });
+ Set<List<String>> paths = new HashSet<List<String>>();
+ Set<Object> availableTagDefs = new TreeSet<Object>(
+ new Comparator<Object>() {
+ public int compare(Object o1, Object o2) {
+ try {
+ String name1 = Model.getFacade().getName(o1);
+ String name2 = Model.getFacade().getName(o2);
+ name1 = (name1 != null ? name1 : "");
+ name2 = (name2 != null ? name2 : "");
+
+ return name1.compareTo(name2);
+ } catch (Exception e) {
+ throw new ClassCastException(e.getMessage());
+ }
+ }
+ });
Collection stereotypes = Model.getFacade().getStereotypes(t);
Project project = ProjectManager.getManager().getCurrentProject();
for (Object model : project.getModels()) {
@@ -137,16 +139,15 @@
* never contain two objects with the same path, unless they are added by
* other means.
*/
- private static void addAllUniqueModelElementsFrom(Set elements, Set paths,
- Collection source) {
- Iterator it2 = source.iterator();
-
- while (it2.hasNext()) {
- Object obj = it2.next();
- Object path = Model.getModelManagementHelper().getPath(obj);
+ private static void addAllUniqueModelElementsFrom(Set elements,
+ Set<List<String>> paths, Collection sources) {
+
+ for (Object source : sources) {
+ List<String> path = Model.getModelManagementHelper().getPathList(
+ source);
if (!paths.contains(path)) {
paths.add(path);
- elements.add(obj);
+ elements.add(source);
}
}
}
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.