Author: tfmorris
Date: 2007-10-10 21:59:38-0700
New Revision: 13668
Modified:
trunk/src_new/org/argouml/notation/NotationProvider.java
trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java
trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java
trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java
trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java
trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java
trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java
Log:
Use interfaces (Map) instead of implementation types (HashMap) in APIs
Modified: trunk/src_new/org/argouml/notation/NotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/NotationProvider.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/NotationProvider.java&p2=trunk/src_new/org/argouml/notation/NotationProvider.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/NotationProvider.java (original)
+++ trunk/src_new/org/argouml/notation/NotationProvider.java 2007-10-10 21:59:38-0700
@@ -28,7 +28,7 @@
import java.beans.PropertyChangeListener;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import org.apache.log4j.Logger;
@@ -59,7 +59,7 @@
* name(s) for which a listener is registered. This facilitates easy removal
* of a complex set of listeners.
*/
- private Collection<Object[]> listeners = new ArrayList<Object[]>();
+ private final Collection<Object[]> listeners = new ArrayList<Object[]>();
/**
* @return a i18 key that represents a help string
@@ -73,11 +73,11 @@
* The default is false.
*
* @param key the string for the key
- * @param map the hashmap to check for the presence
+ * @param map the Map to check for the presence
* and value of the key
* @return true if the value for the key is true, otherwise false
*/
- public static boolean isValue(String key, HashMap map) {
+ public static boolean isValue(final String key, final Map map) {
if (map == null) {
return false;
}
@@ -105,7 +105,7 @@
* @param args arguments that may determine the notation
* @return the string written in the correct notation
*/
- public abstract String toString(Object modelElement, HashMap args);
+ public abstract String toString(Object modelElement, Map args);
/**
* Initialise the appropriate model change listeners
@@ -131,8 +131,8 @@
* @param modelElement the modelelement that we provide
* notation for
*/
- public void cleanListener(PropertyChangeListener listener,
- Object modelElement) {
+ public void cleanListener(final PropertyChangeListener listener,
+ final Object modelElement) {
removeAllElementListeners(listener);
}
@@ -157,7 +157,7 @@
* notation for
* @param pce the received event, that we base the changes on
*/
- public void updateListener(PropertyChangeListener listener,
+ public void updateListener(final PropertyChangeListener listener,
Object modelElement,
PropertyChangeEvent pce) {
// e.g. for an operation:
Modified: trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/AssociationEndNameNotationJava.java 2007-10-10 21:59:38-0700
@@ -24,7 +24,7 @@
package org.argouml.notation.providers.java;
-import java.util.HashMap;
+import java.util.Map;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -78,7 +78,8 @@
/*
* @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
*/
- public String toString(Object modelElement, HashMap args) {
+ @Override
+ public String toString(Object modelElement, Map args) {
String name = Model.getFacade().getName(modelElement);
if (name == null) {
name = "";
Modified: trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/AssociationNameNotationJava.java 2007-10-10 21:59:38-0700
@@ -26,7 +26,7 @@
import java.beans.PropertyChangeListener;
import java.text.ParseException;
-import java.util.HashMap;
+import java.util.Map;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -57,8 +57,9 @@
*
* @see org.argouml.notation.providers.AssociationNameNotation#initialiseListener(java.beans.PropertyChangeListener, java.lang.Object)
*/
- public void initialiseListener(PropertyChangeListener listener,
- Object modelElement) {
+ @Override
+ public void initialiseListener(final PropertyChangeListener listener,
+ final Object modelElement) {
addElementListener(listener, modelElement,
new String[] {"isLeaf"});
super.initialiseListener(listener, modelElement);
@@ -74,14 +75,14 @@
/*
* @see org.argouml.notation.providers.NotationProvider#parse(java.lang.Object, java.lang.String)
*/
- public void parse(Object modelElement, String text) {
+ public void parse(final Object modelElement, final String text) {
try {
ModelElementNameNotationJava.parseModelElement(modelElement, text);
} catch (ParseException pe) {
- String msg = "statusmsg.bar.error.parsing.node-modelelement";
- Object[] args = {
+ final String msg = "statusmsg.bar.error.parsing.node-modelelement";
+ final Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -92,7 +93,8 @@
/*
* @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
*/
- public String toString(Object modelElement, HashMap args) {
+ @Override
+ public String toString(final Object modelElement, final Map args) {
String name;
name = Model.getFacade().getName(modelElement);
if (name == null) return "";
Modified: trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/AttributeNotationJava.java 2007-10-10 21:59:38-0700
@@ -24,7 +24,7 @@
package org.argouml.notation.providers.java;
-import java.util.HashMap;
+import java.util.Map;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -69,9 +69,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
StringBuffer sb = new StringBuffer(80);
sb.append(NotationUtilityJava.generateVisibility(modelElement));
sb.append(NotationUtilityJava.generateScope(modelElement));
Modified: trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java 2007-10-10 21:59:38-0700
@@ -25,9 +25,10 @@
package org.argouml.notation.providers.java;
import java.text.ParseException;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Vector;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -65,7 +66,7 @@
String msg = "statusmsg.bar.error.parsing.node-modelelement";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -87,7 +88,7 @@
boolean privat = false;
boolean protect = false;
String token;
- Vector path = null;
+ List<String> path = null;
String name = null;
try {
@@ -121,7 +122,7 @@
}
if (path == null) {
- path = new Vector();
+ path = new ArrayList<String>();
}
if (name != null) {
path.add(name);
@@ -216,9 +217,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String name;
name = Model.getFacade().getName(modelElement);
if (name == null) return "";
Modified: trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/NotationUtilityJava.java 2007-10-10 21:59:38-0700
@@ -24,7 +24,7 @@
package org.argouml.notation.providers.java;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Stack;
import org.argouml.model.Model;
@@ -164,7 +164,7 @@
* the generated notation
* @return a string which represents abstractness
*/
- static String generateAbstract(Object modelElement, HashMap args) {
+ static String generateAbstract(Object modelElement, Map args) {
if (Model.getFacade().isAbstract(modelElement)) {
return "abstract ";
}
@@ -177,7 +177,7 @@
* the generated notation
* @return a string which represents leaf
*/
- static String generateLeaf(Object modelElement, HashMap args) {
+ static String generateLeaf(Object modelElement, Map args) {
if (Model.getFacade().isLeaf(modelElement)) {
return "final ";
}
@@ -191,17 +191,17 @@
* @return a string which represents the path
*/
static String generatePath(Object modelElement,
- HashMap args) {
+ Map args) {
StringBuilder s = new StringBuilder();
if (NotationProvider.isValue("pathVisible", args)) {
- Stack stack = new Stack();
+ Stack<String> stack = new Stack<String>();
Object ns = Model.getFacade().getNamespace(modelElement);
while (ns != null && !Model.getFacade().isAModel(ns)) {
stack.push(Model.getFacade().getName(ns));
ns = Model.getFacade().getNamespace(ns);
}
while (!stack.isEmpty()) {
- s.append((String) stack.pop() + ".");
+ s.append(stack.pop() + ".");
}
if (s.length() > 0 && !(s.lastIndexOf(".") == s.length() - 1)) {
@@ -218,7 +218,7 @@
* @return a string which represents the visibility
*/
static String generateVisibility(Object modelElement,
- HashMap args) {
+ Map args) {
String s = "";
if (NotationProvider.isValue("visibilityVisible", args)) {
s = NotationUtilityJava.generateVisibility(modelElement);
Modified: trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/OperationNotationJava.java 2007-10-10 21:59:38-0700
@@ -24,10 +24,11 @@
package org.argouml.notation.providers.java;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
-import java.util.Vector;
+import java.util.List;
+import java.util.Map;
import org.apache.log4j.Logger;
import org.argouml.application.events.ArgoEventPump;
@@ -75,9 +76,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
StringBuffer sb = new StringBuffer(80);
String nameStr = null;
boolean constructor = false;
@@ -132,7 +133,7 @@
}
// name and params
- Vector params = new Vector(
+ List params = new ArrayList(
Model.getFacade().getParameters(modelElement));
params.remove(rp);
@@ -144,7 +145,7 @@
sb.append(", ");
}
sb.append(NotationUtilityJava.generateParameter(
- params.elementAt(i)));
+ params.get(i)));
}
}
Modified: trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ActionStateNotationUml.java 2007-10-10 21:59:38-0700
@@ -24,7 +24,7 @@
package org.argouml.notation.providers.uml;
-import java.util.HashMap;
+import java.util.Map;
import org.argouml.model.Model;
import org.argouml.notation.providers.ActionStateNotation;
@@ -77,7 +77,8 @@
/*
* @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
*/
- public String toString(Object modelElement, HashMap args) {
+ @Override
+ public String toString(Object modelElement, Map args) {
String ret = "";
Object action = Model.getFacade().getEntry(modelElement);
if (action != null) {
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=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AssociationEndNameNotationUml.java 2007-10-10 21:59:38-0700
@@ -25,7 +25,7 @@
package org.argouml.notation.providers.uml;
import java.text.ParseException;
-import java.util.HashMap;
+import java.util.Map;
import java.util.NoSuchElementException;
import org.argouml.application.events.ArgoEventPump;
@@ -77,7 +77,7 @@
String msg = "statusmsg.bar.error.parsing.association-end-name";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -174,7 +174,8 @@
/*
* @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
*/
- public String toString(Object modelElement, HashMap args) {
+ @Override
+ public String toString(Object modelElement, Map args) {
String name = Model.getFacade().getName(modelElement);
if (name == null) {
name = "";
Modified: trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AssociationNameNotationUml.java 2007-10-10 21:59:38-0700
@@ -26,7 +26,7 @@
import java.text.ParseException;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import org.argouml.application.events.ArgoEventPump;
@@ -76,7 +76,7 @@
String msg = "statusmsg.bar.error.parsing.association-name";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -85,9 +85,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String name = Model.getFacade().getName(modelElement);
StringBuffer sb = new StringBuffer("");
if (isValue("fullyHandleStereotypes", args)) {
@@ -135,7 +135,7 @@
* @param args arguments that influence the generation
* @return a string representing the visibility
*/
- protected String generateVisibility(Object modelElement, HashMap args) {
+ protected String generateVisibility(Object modelElement, Map args) {
String s = "";
if (isValue("visibilityVisible", args)) {
Object v = Model.getFacade().getVisibility(modelElement);
Modified: trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java 2007-10-10 21:59:38-0700
@@ -26,7 +26,7 @@
import java.text.ParseException;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import org.argouml.application.events.ArgoEventPump;
@@ -70,7 +70,7 @@
String msg = "statusmsg.bar.error.parsing.association-end-name";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -191,7 +191,7 @@
*
* {@inheritDoc}
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
//get the associationRole name
String name = Model.getFacade().getName(modelElement);
if (name == null) name = "";
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=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java 2007-10-10 21:59:38-0700
@@ -25,9 +25,10 @@
package org.argouml.notation.providers.uml;
import java.text.ParseException;
-import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Vector;
import org.apache.log4j.Logger;
import org.argouml.application.events.ArgoEventPump;
@@ -82,7 +83,7 @@
String msg = "statusmsg.bar.error.parsing.attribute";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -217,12 +218,13 @@
* when it detects an error in the attribute string. See also
* ParseError.getErrorOffset().
*/
+ // TODO: This method is WAY too long. Split it up.
protected void parseAttribute(
String text,
Object attribute) throws ParseException {
StringBuilder multiplicity = null;
String name = null;
- Vector<String> properties = null;
+ List<String> properties = null;
StringBuilder stereotype = null; // This is null as until
// the first stereotype declaration is seen.
// After that it is non-null.
@@ -298,7 +300,7 @@
String propvalue = null;
if (properties == null) {
- properties = new Vector<String>();
+ properties = new ArrayList<String>();
}
while (true) {
token = st.nextToken();
@@ -502,7 +504,7 @@
*
* {@inheritDoc}
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
Project p = ProjectManager.getManager().getCurrentProject();
ProjectSettings ps = p.getProjectSettings();
Modified: trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/CallStateNotationUml.java 2007-10-10 21:59:38-0700
@@ -26,7 +26,7 @@
import java.text.ParseException;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -72,7 +72,7 @@
} catch (ParseException pe) {
String msg = "statusmsg.bar.error.parsing.callstate";
Object[] args = {pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()), };
+ Integer.valueOf(pe.getErrorOffset()), };
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
Translator.messageFormat(msg, args)));
@@ -212,9 +212,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String ret = "";
Object action = Model.getFacade().getEntry(modelElement);
if (Model.getFacade().isACallAction(action)) {
Modified: trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java 2007-10-10 21:59:38-0700
@@ -27,10 +27,10 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Vector;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -85,7 +85,7 @@
} catch (ParseException pe) {
String msg = "statusmsg.bar.error.parsing.classifierrole";
Object[] args = {pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()), };
+ Integer.valueOf(pe.getErrorOffset()), };
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
Translator.messageFormat(msg, args)));
@@ -120,7 +120,7 @@
String token;
String role = null;
String base = null;
- Vector bases = null;
+ List<String> bases = null;
boolean hasColon = false;
boolean hasSlash = false;
@@ -137,7 +137,7 @@
if (base != null) {
if (bases == null) {
- bases = new Vector();
+ bases = new ArrayList<String>();
}
bases.add(base);
}
@@ -147,7 +147,7 @@
hasSlash = false;
if (bases == null) {
- bases = new Vector();
+ bases = new ArrayList<String>();
}
if (base != null) {
bases.add(base);
@@ -156,7 +156,7 @@
} else if (",".equals(token)) {
if (base != null) {
if (bases == null) {
- bases = new Vector();
+ bases = new ArrayList<String>();
}
bases.add(base);
}
@@ -197,7 +197,7 @@
if (base != null) {
if (bases == null) {
- bases = new Vector();
+ bases = new ArrayList<String>();
}
bases.add(base);
}
@@ -256,9 +256,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String nameString = Model.getFacade().getName(modelElement);
if (nameString == null) {
nameString = "";
@@ -270,12 +270,12 @@
Collection c = Model.getFacade().getBases(modelElement);
if (c != null && c.size() > 0) {
- Vector bases = new Vector(c);
- baseString.append(Model.getFacade().getName(bases.elementAt(0)));
+ List<String> bases = new ArrayList<String>(c);
+ baseString.append(Model.getFacade().getName(bases.get(0)));
for (int i = 1; i < bases.size(); i++) {
baseString.append(
- ", " + Model.getFacade().getName(bases.elementAt(i)));
+ ", " + Model.getFacade().getName(bases.get(i)));
}
}
baseString = new StringBuilder(baseString.toString().trim());
Modified: trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ComponentInstanceNotationUml.java 2007-10-10 21:59:38-0700
@@ -24,11 +24,12 @@
package org.argouml.notation.providers.uml;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Vector;
import org.argouml.model.Model;
import org.argouml.notation.providers.ComponentInstanceNotation;
@@ -77,19 +78,20 @@
tokenizer = new StringTokenizer(bases, ",");
- Vector v = new Vector();
+ List classifiers = new ArrayList();
Object ns = Model.getFacade().getNamespace(modelElement);
if (ns != null) {
while (tokenizer.hasMoreElements()) {
String newBase = tokenizer.nextToken();
Object cls = Model.getFacade().lookupIn(ns, newBase.trim());
if (cls != null) {
- v.add(cls);
+ classifiers.add(cls);
}
}
}
- Model.getCommonBehaviorHelper().setClassifiers(modelElement, v);
+ Model.getCommonBehaviorHelper().setClassifiers(modelElement,
+ classifiers);
Model.getCoreHelper().setName(modelElement, name);
}
@@ -101,9 +103,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String nameStr = "";
if (Model.getFacade().getName(modelElement) != null) {
nameStr = Model.getFacade().getName(modelElement).trim();
Modified: trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ExtensionPointNotationUml.java 2007-10-10 21:59:38-0700
@@ -24,7 +24,7 @@
package org.argouml.notation.providers.uml;
-import java.util.HashMap;
+import java.util.Map;
import java.util.StringTokenizer;
import org.argouml.kernel.ProjectManager;
@@ -59,7 +59,7 @@
// String msg = "statusmsg.bar.error.parsing.extensionpoint";
// Object[] args = {
// pe.getLocalizedMessage(),
-// new Integer(pe.getErrorOffset()),
+// Integer.valueOf(pe.getErrorOffset()),
// };
// ProjectBrowser.getInstance().getStatusBar().showStatus(
// Translator.messageFormat(msg, args));
@@ -212,7 +212,7 @@
*
* {@inheritDoc}
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
// if (Model.getUmlFactory().isRemoved(modelElement)) {
// /* This is a normal situation,
// * e.g. when an extensionpoint is removed by parsing,
Modified: trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java 2007-10-10 21:59:38-0700
@@ -27,11 +27,10 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.NoSuchElementException;
-import java.util.Vector;
import org.apache.log4j.Logger;
import org.argouml.application.events.ArgoEventPump;
@@ -43,6 +42,7 @@
import org.argouml.kernel.ProjectSettings;
import org.argouml.model.Model;
import org.argouml.notation.providers.MessageNotation;
+import org.argouml.util.CustomSeparator;
import org.argouml.util.MyTokenizer;
/**
@@ -88,9 +88,9 @@
Logger.getLogger(MessageNotationUml.class);
/**
- * The vector of CustomSeparators to use when tokenizing parameters.
+ * The list of CustomSeparators to use when tokenizing parameters.
*/
- private Vector parameterCustomSep;
+ private final List<CustomSeparator> parameterCustomSep;
/**
* The constructor.
@@ -99,7 +99,7 @@
*/
public MessageNotationUml(Object message) {
super(message);
- parameterCustomSep = new Vector();
+ parameterCustomSep = new ArrayList<CustomSeparator>();
parameterCustomSep.add(MyTokenizer.SINGLE_QUOTED_SEPARATOR);
parameterCustomSep.add(MyTokenizer.DOUBLE_QUOTED_SEPARATOR);
parameterCustomSep.add(MyTokenizer.PAREN_EXPR_STRING_SEPARATOR);
@@ -108,13 +108,13 @@
/*
* @see org.argouml.notation.providers.NotationProvider#parse(java.lang.Object, java.lang.String)
*/
- public void parse(Object modelElement, String text) {
+ public void parse(final Object modelElement, final String text) {
try {
parseMessage(modelElement, text);
} catch (ParseException pe) {
- String msg = "statusmsg.bar.error.parsing.message";
- Object[] args = {pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()), };
+ final String msg = "statusmsg.bar.error.parsing.message";
+ final Object[] args = {pe.getLocalizedMessage(),
+ Integer.valueOf(pe.getErrorOffset()), };
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
Translator.messageFormat(msg, args)));
@@ -132,9 +132,9 @@
* Generates a textual description for a Message m.
*
* @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object,
- * java.util.HashMap)
+ * java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(final Object modelElement, final Map args) {
Iterator it;
Collection pre;
Object act;
@@ -459,10 +459,10 @@
String paramExpr = null;
String token;
StringBuilder varname = null;
- Vector predecessors = new Vector();
- Vector seqno = null;
- Vector currentseq = new Vector();
- Vector args = null;
+ List<List> predecessors = new ArrayList<List>();
+ List seqno = null;
+ List currentseq = new ArrayList();
+ List args = null;
boolean mustBePre = false;
boolean mustBeSeq = false;
boolean parallell = false;
@@ -591,7 +591,7 @@
predecessors.add(currentseq);
- currentseq = new Vector();
+ currentseq = new ArrayList();
currentseq.add(null);
currentseq.add(null);
}
@@ -629,7 +629,7 @@
predecessors.add(currentseq);
- currentseq = new Vector();
+ currentseq = new ArrayList();
currentseq.add(null);
currentseq.add(null);
}
@@ -695,7 +695,7 @@
if (!hasVal && !assigned && bp == token.length()) {
try {
- currentseq.set(currentseq.size() - 2, new Integer(
+ currentseq.set(currentseq.size() - 2, Integer.valueOf(
token));
assigned = true;
} catch (NumberFormatException nfe) { }
@@ -703,7 +703,7 @@
if (!hasOrd && !assigned && bp == 0) {
try {
- currentseq.set(currentseq.size() - 1, new Integer(
+ currentseq.set(currentseq.size() - 1, Integer.valueOf(
parseMsgOrder(token)));
assigned = true;
} catch (NumberFormatException nfe) { }
@@ -713,8 +713,8 @@
&& bp < token.length()) {
Integer nbr, ord;
try {
- nbr = new Integer(token.substring(0, bp));
- ord = new Integer(
+ nbr = Integer.valueOf(token.substring(0, bp));
+ ord = Integer.valueOf(
parseMsgOrder(token.substring(bp)));
currentseq.set(currentseq.size() - 2, nbr);
currentseq.set(currentseq.size() - 1, ord);
@@ -741,7 +741,7 @@
if (paramExpr != null) {
MyTokenizer st = new MyTokenizer(paramExpr, "\\,",
parameterCustomSep);
- args = new Vector();
+ args = new ArrayList();
while (st.hasMoreTokens()) {
token = st.nextToken();
@@ -767,7 +767,7 @@
}
}
} else if (mayDeleteExpr) {
- args = new Vector();
+ args = new ArrayList();
}
if (LOG.isDebugEnabled()) {
@@ -784,7 +784,7 @@
buf.append("predecessors: " + predecessors.size() + "\n");
for (i = 0; i < predecessors.size(); i++) {
int j;
- Vector v = (Vector) predecessors.get(i);
+ List v = predecessors.get(i);
buf.append(" Predecessor: ");
for (j = 0; v != null && j + 1 < v.size(); j += 2) {
if (j > 0) {
@@ -1096,7 +1096,7 @@
if (fname != null && refindOperation) {
Object role = Model.getFacade().getReceiver(mes);
- Vector ops =
+ List ops =
getOperation(
Model.getFacade().getBases(role),
fname.trim(),
@@ -1131,14 +1131,14 @@
Model.getFacade().getInteraction(mes)),
null,
null);
- Vector pre = new Vector();
+ List pre = new ArrayList();
Iterator it;
predfor:
for (i = 0; i < predecessors.size(); i++) {
it = roots.iterator();
while (it.hasNext()) {
Object msg =
- walkTree(it.next(), (Vector) predecessors.get(i));
+ walkTree(it.next(), predecessors.get(i));
if (msg != null && msg != mes) {
if (isBadPreMsg(mes, msg)) {
String parseMsg = "parsing.error.message.one-pred";
@@ -1170,7 +1170,7 @@
* @param path The path to walk in the call tree.
* @return The message at the end of path, or <code>null</code>.
*/
- private Object walkTree(Object root, Vector path) {
+ private Object walkTree(Object root, List path) {
int i;
for (i = 0; i + 1 < path.size(); i += 2) {
int bv = 0;
@@ -1511,13 +1511,13 @@
* MMessage
*/
private void insertSuccessor(Object m, Object s, int p) {
- Vector v = new Vector(Model.getFacade().getSuccessors(m));
- if (v.size() > p) {
- v.insertElementAt(s, p);
+ List successors = new ArrayList(Model.getFacade().getSuccessors(m));
+ if (successors.size() > p) {
+ successors.add(p, s);
} else {
- v.add(s);
+ successors.add(s);
}
- Model.getCollaborationsHelper().setSuccessors(m, v);
+ Model.getCollaborationsHelper().setSuccessors(m, successors);
}
/**
@@ -1530,8 +1530,8 @@
* @param params the number of parameters of the operation to be found
* @return the sought operation
*/
- private Vector getOperation(Collection c, String name, int params) {
- Vector options = new Vector();
+ private List getOperation(Collection c, String name, int params) {
+ List options = new ArrayList();
Iterator it;
if (name == null || name.length() == 0) {
@@ -1600,18 +1600,12 @@
* Counts the number of parameters that are not return values.
*/
private int countParameters(Object bf) {
- Collection c = Model.getFacade().getParameters(bf);
- Iterator it = c.iterator();
int count = 0;
-
- while (it.hasNext()) {
- Object p = it.next();
- if (Model.getFacade().isReturn(p)) {
- continue;
+ for (Object parameter : Model.getFacade().getParameters(bf)) {
+ if (!Model.getFacade().isReturn(parameter)) {
+ count++;
}
- count++;
}
-
return count;
}
Modified: trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java 2007-10-10 21:59:38-0700
@@ -26,7 +26,7 @@
import java.text.ParseException;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import java.util.Stack;
@@ -69,7 +69,7 @@
String msg = "statusmsg.bar.error.parsing.node-modelelement";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -85,9 +85,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String name = Model.getFacade().getName(modelElement);
StringBuffer sb = new StringBuffer("");
if (isValue("fullyHandleStereotypes", args)) {
@@ -108,7 +108,7 @@
* @param args arguments that influence the generation
* @return a string which represents the stereotypes
*/
- protected String generateStereotypes(Object modelElement, HashMap args) {
+ protected String generateStereotypes(Object modelElement, Map args) {
Collection c = Model.getFacade().getStereotypes(modelElement);
StringBuffer sb = new StringBuffer(50);
Iterator i = c.iterator();
@@ -136,7 +136,7 @@
* @param args arguments that influence the generation
* @return a string which represents the path
*/
- protected String generatePath(Object modelElement, HashMap args) {
+ protected String generatePath(Object modelElement, Map args) {
StringBuilder s = new StringBuilder();
if (isValue("pathVisible", args)) {
Object p = modelElement;
@@ -162,7 +162,7 @@
* @param args arguments that influence the generation
* @return a string representing the visibility
*/
- protected String generateVisibility(Object modelElement, HashMap args) {
+ protected String generateVisibility(Object modelElement, Map args) {
String s = "";
if (isValue("visibilityVisible", args)) {
Object v = Model.getFacade().getVisibility(modelElement);
Modified: trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/MultiplicityNotationUml.java 2007-10-10 21:59:38-0700
@@ -25,7 +25,7 @@
package org.argouml.notation.providers.uml;
import java.text.ParseException;
-import java.util.HashMap;
+import java.util.Map;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -57,21 +57,21 @@
}
@Override
- public void parse(Object multiplicityOwner, String text) {
+ public void parse(final Object multiplicityOwner, final String text) {
try {
parseMultiplicity(multiplicityOwner, text);
} catch (ParseException pe) {
- String msg = "statusmsg.bar.error.parsing.multiplicity";
- Object[] args = {pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()), };
+ final String msg = "statusmsg.bar.error.parsing.multiplicity";
+ final Object[] args = {pe.getLocalizedMessage(),
+ Integer.valueOf(pe.getErrorOffset()), };
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
Translator.messageFormat(msg, args)));
}
}
- protected Object parseMultiplicity(Object multiplicityOwner, String s1)
- throws ParseException {
+ protected Object parseMultiplicity(final Object multiplicityOwner,
+ final String s1) throws ParseException {
String s = s1.trim();
Object multi = null;
try {
@@ -84,7 +84,7 @@
}
@Override
- public String toString(Object multiplicityOwner, HashMap args) {
+ public String toString(Object multiplicityOwner, Map args) {
Object mulitiplicity =
Model.getFacade().getMultiplicity(multiplicityOwner);
return NotationUtilityUml.generateMultiplicity(mulitiplicity);
Modified: trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/NodeInstanceNotationUml.java 2007-10-10 21:59:38-0700
@@ -24,11 +24,12 @@
package org.argouml.notation.providers.uml;
+import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Vector;
import org.argouml.model.Model;
import org.argouml.notation.providers.NodeInstanceNotation;
@@ -75,19 +76,20 @@
tokenizer = new StringTokenizer(bases, ",");
- Vector v = new Vector();
+ List classifiers = new ArrayList();
Object ns = Model.getFacade().getNamespace(modelElement);
if (ns != null) {
while (tokenizer.hasMoreElements()) {
String newBase = tokenizer.nextToken();
Object cls = Model.getFacade().lookupIn(ns, newBase.trim());
if (cls != null) {
- v.add(cls);
+ classifiers.add(cls);
}
}
}
- Model.getCommonBehaviorHelper().setClassifiers(modelElement, v);
+ Model.getCommonBehaviorHelper().setClassifiers(modelElement,
+ classifiers);
Model.getCoreHelper().setName(modelElement, name);
}
@@ -99,9 +101,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String nameStr = "";
if (Model.getFacade().getName(modelElement) != null) {
nameStr = Model.getFacade().getName(modelElement).trim();
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=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java 2007-10-10 21:59:38-0700
@@ -65,12 +65,12 @@
/**
* The vector of CustomSeparators to use when tokenizing attributes.
*/
- static List<CustomSeparator> operationCustomSep;
+ static final List<CustomSeparator> operationCustomSep;
/**
* The vector of CustomSeparators to use when tokenizing parameters.
*/
- private static List<CustomSeparator> parameterCustomSep;
+ private static final List<CustomSeparator> parameterCustomSep;
/**
* The character with a meaning as a visibility at the start
Modified: trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateStateNotationUml.java 2007-10-10 21:59:38-0700
@@ -27,7 +27,7 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -73,7 +73,7 @@
} catch (ParseException pe) {
String msg = "statusmsg.bar.error.parsing.objectflowstate";
Object[] args = {pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()), };
+ Integer.valueOf(pe.getErrorOffset()), };
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
Translator.messageFormat(msg, args)));
@@ -221,9 +221,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
StringBuffer theNewText = new StringBuffer("");
Object cis = Model.getFacade().getType(modelElement);
if (Model.getFacade().isAClassifierInState(cis)) {
Modified: trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ObjectFlowStateTypeNotationUml.java 2007-10-10 21:59:38-0700
@@ -25,7 +25,7 @@
package org.argouml.notation.providers.uml;
import java.text.ParseException;
-import java.util.HashMap;
+import java.util.Map;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -59,7 +59,7 @@
String msg = "statusmsg.bar.error.parsing.objectflowstate";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -118,9 +118,9 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
Object classifier = Model.getFacade().getType(modelElement);
if (Model.getFacade().isAClassifierInState(classifier)) {
classifier = Model.getFacade().getType(classifier);
Modified: trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ObjectNotationUml.java 2007-10-10 21:59:38-0700
@@ -24,9 +24,10 @@
package org.argouml.notation.providers.uml;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
import java.util.StringTokenizer;
-import java.util.Vector;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
@@ -80,7 +81,7 @@
}
Model.getCommonBehaviorHelper().setClassifiers(modelElement,
- new Vector());
+ Collections.EMPTY_LIST);
if (baseTokens != null) {
while (baseTokens.hasMoreElements()) {
String typeString = baseTokens.nextToken();
@@ -96,26 +97,23 @@
}
/*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
String nameStr = "";
if (Model.getFacade().getName(modelElement) != null) {
nameStr = Model.getFacade().getName(modelElement).trim();
}
- Vector bases = new Vector(
- Model.getFacade().getClassifiers(modelElement));
StringBuilder baseString = new StringBuilder();
-
- if (Model.getFacade().getClassifiers(modelElement) != null
- && Model.getFacade().getClassifiers(modelElement).size() > 0) {
-
- baseString.append(Model.getFacade().getName(bases.elementAt(0)));
- for (int i = 1; i < bases.size(); i++) {
- baseString.append(
- ", " + Model.getFacade().getName(bases.elementAt(i)));
+ Iterator bases = Model.getFacade().getClassifiers(modelElement)
+ .iterator();
+ if (bases.hasNext()) {
+ baseString.append(Model.getFacade().getName(bases.next()));
+ while (bases.hasNext()) {
+ baseString.append(", ").append(
+ Model.getFacade().getName(bases.next()));
}
}
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=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java 2007-10-10 21:59:38-0700
@@ -27,9 +27,9 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.NoSuchElementException;
import org.argouml.application.events.ArgoEventPump;
@@ -74,7 +74,7 @@
String msg = "statusmsg.bar.error.parsing.operation";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -481,9 +481,9 @@
*
* @author [email protected]
*
- * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.notation.providers.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
Project p = ProjectManager.getManager().getCurrentProject();
ProjectSettings ps = p.getProjectSettings();
Modified: trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/StateBodyNotationUml.java 2007-10-10 21:59:38-0700
@@ -27,7 +27,7 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -65,7 +65,7 @@
String msg = "statusmsg.bar.error.parsing.statebody";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -81,9 +81,9 @@
}
/*
- * @see org.argouml.uml.notation.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.uml.notation.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
StringBuffer s = new StringBuffer();
Object entryAction = Model.getFacade().getEntry(modelElement);
Modified: trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java?view=diff&rev=13668&p1=trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java&r1=13667&r2=13668
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java 2007-10-10 21:59:38-0700
@@ -27,7 +27,7 @@
import java.beans.PropertyChangeListener;
import java.text.ParseException;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import java.util.StringTokenizer;
@@ -66,7 +66,7 @@
String msg = "statusmsg.bar.error.parsing.transition";
Object[] args = {
pe.getLocalizedMessage(),
- new Integer(pe.getErrorOffset()),
+ Integer.valueOf(pe.getErrorOffset()),
};
ArgoEventPump.fireEvent(new ArgoHelpEvent(
ArgoEventTypes.HELP_CHANGED, this,
@@ -440,9 +440,9 @@
}
/*
- * @see org.argouml.uml.notation.NotationProvider#toString(java.lang.Object, java.util.HashMap)
+ * @see org.argouml.uml.notation.NotationProvider#toString(java.lang.Object, java.util.Map)
*/
- public String toString(Object modelElement, HashMap args) {
+ public String toString(Object modelElement, Map args) {
Object trigger = Model.getFacade().getTrigger(modelElement);
Object guard = Model.getFacade().getGuard(modelElement);
Object effect = Model.getFacade().getEffect(modelElement);
@@ -610,6 +610,8 @@
if (action != null) {
addElementListener(listener, action,
new String[] {
+ // TODO: Action isn't a valid property name
+ // Or is it? Double check validity checking code
"script", "actualArgument", "action"
});
Collection args = Model.getFacade().getActualArguments(action);
@@ -632,10 +634,19 @@
private void addListenersForEvent(PropertyChangeListener listener,
Object event) {
if (event != null) {
- addElementListener(listener, event,
- new String[] {
- "parameter", "name", "when", "changeExpression"
- });
+ if (Model.getFacade().isAEvent(event)) {
+ addElementListener(listener, event,
+ new String[] {
+ "parameter", "name"});
+ }
+ if (Model.getFacade().isATimeEvent(event)) {
+ addElementListener(listener, event, new String[] {"when"});
+ }
+ if (Model.getFacade().isAChangeEvent(event)) {
+ addElementListener(listener, event,
+ new String[] {"changeExpression"});
+ }
+
Collection prms = Model.getFacade().getParameters(event);
Iterator i = prms.iterator();
while (i.hasNext()) {
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.