svn commit: r14246 - trunk/src/model-mdr: src/org/argouml/model/mdr tests/org/argouml/model/mdr

Author: tfmorris
Date: 2008-03-27 23:33:58-0700
New Revision: 14246

Modified:
   trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
   trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
   trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java
   trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java
   trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java

Log:
Style cleanup

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java?view=diff&rev=14246&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java&r1=14245&r2=14246
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/CommonBehaviorHelperMDRImpl.java	2008-03-27 23:33:58-0700
@@ -28,7 +28,6 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
 
 import javax.jmi.reflect.InvalidObjectException;
 
@@ -339,7 +338,7 @@
                 }
             }
             for (Object context : c) {
-                    addContext(handle, context);
+                addContext(handle, context);
             }
             return;
         }
@@ -424,7 +423,7 @@
                 }
             }
             for (Object reception : c) {
-                    addReception(handle, reception);
+                addReception(handle, reception);
             }
             return;
         }

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java?view=diff&rev=14246&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java&r1=14245&r2=14246
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/UseCasesFactoryMDRImpl.java	2008-03-27 23:33:58-0700
@@ -137,7 +137,7 @@
                         + "part of the base " + "usecase");
             }
         } else {
-            point = (ExtensionPoint) buildExtensionPoint(base);
+            point = buildExtensionPoint(base);
         }
         Extend extend = createExtend();
         extend.setBase(base);

Modified: trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java?view=diff&rev=14246&p1=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&p2=trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java&r1=14245&r2=14246
==============================================================================
--- trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java	(original)
+++ trunk/src/model-mdr/src/org/argouml/model/mdr/XmiWriterMDRImpl.java	2008-03-27 23:33:58-0700
@@ -29,7 +29,6 @@
 import java.io.Writer;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Iterator;
 
 import javax.jmi.reflect.RefObject;
@@ -172,7 +171,7 @@
                     RefObject obj = (RefObject) it.next();
                     // Find top level objects which aren't part of profile
                     if (obj.refImmediateComposite() == null ) {
-                            elements.add(obj);
+                        elements.add(obj);
                     }
                 }
                 LOG.info("Saving " + elements.size() 

Modified: trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java?view=diff&rev=14246&p1=trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java&p2=trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java&r1=14245&r2=14246
==============================================================================
--- trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java	(original)
+++ trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementation.java	2008-03-27 23:33:58-0700
@@ -26,7 +26,6 @@
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.OutputStream;
 
 import junit.framework.TestCase;
 

Modified: trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java?view=diff&rev=14246&p1=trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java&p2=trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java&r1=14245&r2=14246
==============================================================================
--- trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java	(original)
+++ trunk/src/model-mdr/tests/org/argouml/model/mdr/TestMDRModelImplementationCreate.java	2008-03-27 23:33:58-0700
@@ -80,7 +80,7 @@
         assertEquals(m1, m);
         assertEquals(m2, m);
         XmiReader xmiReader = mi.getXmiReader();
-        String model = "tests/testmodels/test.xmi";//!"ALittleBit.xmi";
+        String model = "tests/testmodels/test.xmi"; //!"ALittleBit.xmi";
         File fileModel = new File(model);
         assertTrue(fileModel.exists());
         InputSource source = new InputSource(new FileInputStream(fileModel));

Modified: trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java?view=diff&rev=14246&p1=trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java&p2=trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java&r1=14245&r2=14246
==============================================================================
--- trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java	(original)
+++ trunk/src/model-mdr/tests/org/argouml/model/mdr/TestModelEventPump.java	2008-03-27 23:33:58-0700
@@ -35,7 +35,7 @@
  */
 public class TestModelEventPump extends TestCase {
 
-    private Registry<String> registry ;
+    private Registry<String> registry;
     
     /*
      * @see junit.framework.TestCase#setUp()