Author: tfmorris
Date: 2007-08-09 12:51:42-0700
New Revision: 13289
Modified:
trunk/src_new/org/argouml/ui/DisplayTextTree.java
Log:
Refactor code out of big if statement into methods for readability.
Modified: trunk/src_new/org/argouml/ui/DisplayTextTree.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/DisplayTextTree.java?view=diff&rev=13289&p1=trunk/src_new/org/argouml/ui/DisplayTextTree.java&p2=trunk/src_new/org/argouml/ui/DisplayTextTree.java&r1=13288&r2=13289
==============================================================================
--- trunk/src_new/org/argouml/ui/DisplayTextTree.java (original)
+++ trunk/src_new/org/argouml/ui/DisplayTextTree.java 2007-08-09 12:51:42-0700
@@ -147,20 +147,8 @@
if (Model.getFacade().isAModelElement(value)) {
String name = null;
try {
- // Jeremy Bennett patch
if (Model.getFacade().isATransition(value)) {
- name = Model.getFacade().getName(value);
- NotationProvider notationProvider =
- NotationProviderFactory2.getInstance()
- .getNotationProvider(
- NotationProviderFactory2.TYPE_TRANSITION,
- value);
- String signature = notationProvider.toString(value, null);
- if (name != null && name.length() > 0) {
- name += ": " + signature;
- } else {
- name = signature;
- }
+ name = formatTransitionLabel(value);
} else if (Model.getFacade().isAExtensionPoint(value)) {
NotationProvider notationProvider =
NotationProviderFactory2.getInstance()
@@ -169,33 +157,9 @@
value);
name = notationProvider.toString(value, null);
} else if (Model.getFacade().isAComment(value)) {
- /*
- * From UML 1.4 onwards, the text of the comment
- * is stored in the "body".
- */
name = (String) Model.getFacade().getBody(value);
-
} else if (Model.getFacade().isATaggedValue(value)) {
- String tagName = Model.getFacade().getTag(value);
- if (tagName == null || tagName.equals("")) {
- // TODO: Localize
- tagName = "(unnamed)";
- }
- Collection referenceValues =
- Model.getFacade().getReferenceValue(value);
- Collection dataValues =
- Model.getFacade().getDataValue(value);
- Iterator i;
- if (referenceValues.size() > 0) {
- i = referenceValues.iterator();
- } else {
- i = dataValues.iterator();
- }
- String theValue = "";
- if (i.hasNext()) theValue = i.next().toString();
- if (i.hasNext()) theValue += " , ...";
- name = (tagName + " = " + theValue);
-
+ name = formatTaggedValueLabel(value);
} else {
name = getModelElementDisplayName(value);
}
@@ -297,6 +261,50 @@
return "-";
}
+ private String formatTaggedValueLabel(Object value) {
+ String name;
+ String tagName = Model.getFacade().getTag(value);
+ if (tagName == null || tagName.equals("")) {
+ name = MessageFormat.format(
+ Translator.localize("misc.unnamed"),
+ new Object[] {
+ Model.getFacade().getUMLClassName(value)
+ });
+ }
+ Collection referenceValues =
+ Model.getFacade().getReferenceValue(value);
+ Collection dataValues =
+ Model.getFacade().getDataValue(value);
+ Iterator i;
+ if (referenceValues.size() > 0) {
+ i = referenceValues.iterator();
+ } else {
+ i = dataValues.iterator();
+ }
+ String theValue = "";
+ if (i.hasNext()) theValue = i.next().toString();
+ if (i.hasNext()) theValue += " , ...";
+ name = (tagName + " = " + theValue);
+ return name;
+ }
+
+ private String formatTransitionLabel(Object value) {
+ String name;
+ name = Model.getFacade().getName(value);
+ NotationProvider notationProvider =
+ NotationProviderFactory2.getInstance()
+ .getNotationProvider(
+ NotationProviderFactory2.TYPE_TRANSITION,
+ value);
+ String signature = notationProvider.toString(value, null);
+ if (name != null && name.length() > 0) {
+ name += ": " + signature;
+ } else {
+ name = signature;
+ }
+ return name;
+ }
+
/**
* @param st a collection of stereotypes
* @return a string representing the given stereotype(s)
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.