svn commit: r13653 - trunk/src_new/org/argouml/notation/providers/uml

Author: penyaskito
Date: 2007-10-10 04:37:47-0700
New Revision: 13653

Modified:
   trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java
   trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java

Log:
Fixed some failing JUnit tests.

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=13653&p1=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java&r1=13652&r2=13653
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java	(original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AttributeNotationUml.java	2007-10-10 04:37:47-0700
@@ -417,10 +417,9 @@
         if (LOG.isDebugEnabled()) {
             LOG.debug("ParseAttribute [name: " + name 
                     + " visibility: " + visibility 
-                    + " type: " + type + " value: " + value.toString() 
-                    + " stereo: "
-                    + (stereotype != null ? stereotype.toString() : "null")
-                    + " mult: " + multiplicity.toString());
+                    + " type: " + type + " value: " + value 
+                    + " stereo: " + stereotype
+                    + " mult: " + multiplicity);
         }
         if (properties != null && LOG.isDebugEnabled()) {
             for (int i = 0; i + 1 < properties.size(); i += 2) {

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=13653&p1=trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java&r1=13652&r2=13653
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java	(original)
+++ trunk/src_new/org/argouml/notation/providers/uml/OperationNotationUml.java	2007-10-10 04:37:47-0700
@@ -194,7 +194,7 @@
         String token;
         String type = null;
         String visibility = null;
-        Vector properties = null;
+        Vector<String> properties = null;
         int paramOffset = 0;
 
         s = s.trim();
@@ -349,9 +349,10 @@
         // Don't create a stereotype for <<signal>> on a Reception
         // but create any other parsed stereotypes as needed
         if (!Model.getFacade().isAReception(op) 
-                || !RECEPTION_KEYWORD.equals(stereotype)) {
+                || !RECEPTION_KEYWORD.equals(stereotype.toString())) {
             StereotypeUtility.dealWithStereotypes(op, 
-                    stereotype.toString(), true);
+                    stereotype != null ? stereotype.toString() : null, 
+                    true);
         }
     }
 
@@ -385,7 +386,7 @@
         throws ParseException {
         String token;
         StringBuilder propname = new StringBuilder();
-        StringBuilder propvalue = null;
+        String propvalue = null;
 
         if (properties == null) {
             properties = new Vector();
@@ -394,7 +395,7 @@
             token = st.nextToken();
             if (",".equals(token) || "}".equals(token)) {
                 if (propname.length() > 0) {
-                    properties.add(propname);
+                    properties.add(propname.toString());
                     properties.add(propvalue);
                 }
                 propname = new StringBuilder();
@@ -413,16 +414,16 @@
                             args), 
                             st.getTokenIndex());
                 }
-                propvalue = new StringBuilder();
+                propvalue = "";
             } else if (propvalue == null) {
                 propname.append(token);
             } else {
-                propvalue.append(token);
+                propvalue += token;
             }
         }
         if (propname.length() > 0) {
             properties.add(propname.toString());
-            properties.add(propvalue.toString());
+            properties.add(propvalue);
         }
         return properties;
     }