svn commit: r13360 - branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml

Author: b00__1
Date: 2007-08-15 01:50:41-0700
New Revision: 13360

Modified:
   branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java
   branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java

Log:
Minor changes

Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java?view=diff&rev=13360&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java&r1=13359&r2=13360
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java	(original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesFactoryEUMLImpl.java	2007-08-15 01:50:41-0700
@@ -31,7 +31,6 @@
 import org.argouml.model.AbstractModelFactory;
 import org.argouml.model.DataTypesFactory;
 import org.argouml.model.NotImplementedException;
-import org.eclipse.uml2.uml.Expression;
 import org.eclipse.uml2.uml.OpaqueExpression;
 import org.eclipse.uml2.uml.UMLFactory;
 
@@ -137,7 +136,7 @@
         if (i == -1) {
             return "*";
         } else {
-            return "" + i;
+            return Integer.toString(i);
         }
     }
 
@@ -155,8 +154,7 @@
                 return Integer.parseInt(b);
             }
         } catch (Exception ex) {
-            throw new IllegalArgumentException("illegal range bound : "
-                    + (b == null ? "null" : b));
+            throw new IllegalArgumentException("illegal range bound : " + b);
         }
     }
 

Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java?view=diff&rev=13360&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java&r1=13359&r2=13360
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java	(original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/DataTypesHelperEUMLImpl.java	2007-08-15 01:50:41-0700
@@ -50,8 +50,7 @@
     }
 
     public void copyTaggedValues(Object from, Object to) {
-        // TODO Auto-generated method stub
-        
+        throw new NotYetImplementedException();
     }
 
     public boolean equalsCHOICEKind(Object kind) {
@@ -100,6 +99,9 @@
     }
 
     public String multiplicityToString(Object multiplicity) {
+        if (!(multiplicity instanceof MultiplicityElement)) {
+            throw new IllegalArgumentException("multiplicity must be instance of MultiplicityElement"); //$NON-NLS-1$
+        }
         MultiplicityElement mult = (MultiplicityElement) multiplicity;
         if (mult.getLower() == mult.getUpper()) {
             return DataTypesFactoryEUMLImpl.boundToString(mult.getLower());
@@ -110,7 +112,6 @@
                     + DataTypesFactoryEUMLImpl.boundToString(mult.getUpper());
         }
     }
-
     
     public Object setBody(Object handle, String body) {
         // TODO Auto-generated method stub
@@ -122,5 +123,4 @@
         return null;
     }
 
-
 }