Author: tfmorris
Date: 2008-11-21 16:33:46-0800
New Revision: 16124
Modified:
trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java
Log:
Refactor to eliminate duplicate code. Use standard utility method for stereotypes
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java?view=diff&rev=16124&p1=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java&p2=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java&r1=16123&r2=16124
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/AssociationNameNotationUml.java 2008-11-21 16:33:46-0800
@@ -25,9 +25,7 @@
package org.argouml.notation.providers.uml;
import java.text.ParseException;
-import java.util.Collection;
import java.util.Map;
-import java.util.Iterator;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
@@ -114,26 +112,7 @@
* @return a string which represents the stereotypes
*/
protected static String generateStereotypes(Object modelElement) {
- Collection c = Model.getFacade().getStereotypes(modelElement);
- StringBuffer sb = new StringBuffer(50);
- Iterator i = c.iterator();
- boolean first = true;
- while (i.hasNext()) {
- Object o = i.next();
- if (!first) {
- sb.append(',');
- }
- if (o != null) {
- sb.append(Model.getFacade().getName(o));
- first = false;
- }
- }
- Project project =
- ProjectManager.getManager().getCurrentProject();
- ProjectSettings ps = project.getProjectSettings();
- return first ? "" : ps.getLeftGuillemot()
- + sb.toString()
- + ps.getRightGuillemot();
+ return NotationUtilityUml.generateStereotype(modelElement);
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java?view=diff&rev=16124&p1=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java&p2=trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java&r1=16123&r2=16124
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java (original)
+++ trunk/src/argouml-app/src/org/argouml/notation/providers/uml/ModelElementNameNotationUml.java 2008-11-21 16:33:46-0800
@@ -25,18 +25,13 @@
package org.argouml.notation.providers.uml;
import java.text.ParseException;
-import java.util.Collection;
import java.util.Map;
-import java.util.Iterator;
import java.util.Stack;
import org.argouml.application.events.ArgoEventPump;
import org.argouml.application.events.ArgoEventTypes;
import org.argouml.application.events.ArgoHelpEvent;
import org.argouml.i18n.Translator;
-import org.argouml.kernel.Project;
-import org.argouml.kernel.ProjectManager;
-import org.argouml.kernel.ProjectSettings;
import org.argouml.model.Model;
import org.argouml.notation.providers.ModelElementNameNotation;
@@ -109,26 +104,7 @@
* @return a string which represents the stereotypes
*/
protected String generateStereotypes(Object modelElement, Map args) {
- Collection c = Model.getFacade().getStereotypes(modelElement);
- StringBuffer sb = new StringBuffer(50);
- Iterator i = c.iterator();
- boolean first = true;
- while (i.hasNext()) {
- Object o = i.next();
- if (!first) {
- sb.append(',');
- }
- if (o != null) {
- sb.append(Model.getFacade().getName(o));
- first = false;
- }
- }
- Project project =
- ProjectManager.getManager().getCurrentProject();
- ProjectSettings ps = project.getProjectSettings();
- return first ? "" : ps.getLeftGuillemot()
- + sb.toString()
- + ps.getRightGuillemot();
+ return NotationUtilityUml.generateStereotype(modelElement, args);
}
/**
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.