svn commit: r12726 - trunk/src/model-mdr/src/org/argouml/model/mdr

Author: tfmorris
Date: 2007-05-30 12:02:22-0700
New Revision: 12726

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java

Log:
Clean up compiler warnings and Javadoc

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java?view=diff&rev=12726&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java&r1=12725&r2=12726
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CollaborationsHelperMDRImpl.java	2007-05-30 12:02:22-0700
@@ -119,8 +119,8 @@
         ClassifierRole role = (ClassifierRole) roleArg;
 
         try {
-            if (role == null || role.getBase().isEmpty()) {
-                return new ArrayList();
+            if (role.getBase().isEmpty()) {
+                return Collections.EMPTY_LIST;
             }
             Iterator it = role.getBase().iterator();
             Set associations = new HashSet();

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java?view=diff&rev=12726&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java&r1=12725&r2=12726
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CoreFactoryMDRImpl.java	2007-05-30 12:02:22-0700
@@ -1987,23 +1987,22 @@
             Attribute attr = (Attribute) createAttribute();
             doCopyAttribute((Attribute) source, attr);
             f = attr;
-        }
-        if (source instanceof Operation) {
+        } else if (source instanceof Operation) {
             Operation oper = (Operation) createOperation();
             doCopyOperation((Operation) source, oper);
             // TODO: build a return parameter
             f = oper;
-        }
-        if (source instanceof Method) {
+        } else if (source instanceof Method) {
             Method method = (Method) createMethod();
             doCopyMethod((Method) source, method);
             f = method;
-        }
-        if (source instanceof Reception) {
+        } else if (source instanceof Reception) {
             Reception reception = (Reception) 
                 nsmodel.getCommonBehaviorFactory().createReception();
             doCopyReception((Reception) source, reception);
             f = reception;
+        } else {
+            throw new IllegalArgumentException("source: " + source);
         }
 
         f.setOwner((Classifier) classifier);

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java?view=diff&rev=12726&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java&r1=12725&r2=12726
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/ExtensionMechanismsHelperMDRImpl.java	2007-05-30 12:02:22-0700
@@ -100,9 +100,6 @@
         if (!(ns instanceof Namespace)) {
             throw new IllegalArgumentException();
         }
-        if (ns == null) {
-            return Collections.EMPTY_LIST;
-        }
         
         List l = new ArrayList();
         // TODO: this could be a huge collection - find a more efficient way

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java?view=diff&rev=12726&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java&r1=12725&r2=12726
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java	2007-05-30 12:02:22-0700
@@ -118,11 +118,6 @@
  */
 final class MetaTypesMDRImpl implements MetaTypes {
 
-    /**
-     * Given a model element instance returns the name of its meta type.
-     * @param modelElement The ModelElement on which extract the name
-     * @return A string which is the metatype name of the modelElement 
-     */
     public String getName(Object modelElement) {
         Class clazz;
         if (modelElement instanceof Class) {

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java?view=diff&rev=12726&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java&r1=12725&r2=12726
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/StateMachinesHelperMDRImpl.java	2007-05-30 12:02:22-0700
@@ -240,10 +240,7 @@
         if (!(sm instanceof StateMachine)) {
             throw new IllegalArgumentException();
         }
-        if (sm == null) {
-            return null;
-        }
-        
+
         try  {
             return ((StateMachine) sm).getTop();
         } catch (InvalidObjectException e) {

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java?view=diff&rev=12726&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java&r1=12725&r2=12726
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UmlHelperMDRImpl.java	2007-05-30 12:02:22-0700
@@ -55,16 +55,6 @@
         nsmodel = implementation;
     }
 
-    /**
-     * Ensures that all of the elements in a model are registered to the
-     * UmlModelListener. 
-     * 
-     * This does nothing for the MDR implementation since we get events
-     * for all model elements by default.
-     * 
-     * @param model
-     *            the UML model
-     */
     public void addListenersToModel(Object model) {
         // Nothing to do - we get all events automatically
     }