svn commit: r13069 - branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java

Author: b00__1
Date: 2007-07-14 09:43:51-0700
New Revision: 13069

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

Log:
Minor changes

Modified: branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java?view=diff&rev=13069&p1=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&p2=branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java&r1=13068&r2=13069
==============================================================================
--- branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java	(original)
+++ branches/gsoc2007/b00__1/model-euml/src/org/argouml/model/euml/CoreFactoryEUMLImpl.java	2007-07-14 09:43:51-0700
@@ -130,7 +130,6 @@
 		new ChangeCommand(editingDomain, run));
 
 	return (Association) run.getParams().get(0);
-
     }
     
     public Association buildAssociation(Object fromClassifier,
@@ -139,7 +138,6 @@
 
 	return buildAssociation(fromClassifier, true, aggregationKind1, null,
 		toClassifier, !unidirectional, aggregationKind2, null, null);
-
     }
 
     public Association buildAssociation(Object classifier1, Object classifier2) {
@@ -209,28 +207,27 @@
         return null;
     }
 
-    public Object buildClass() {
-        return createClass();
+    public org.eclipse.uml2.uml.Class buildClass() {
+        return uml.createClass();
     }
 
-    public Object buildClass(Object owner) {
+    public org.eclipse.uml2.uml.Class buildClass(Object owner) {
         return buildClass(null, owner);
     }
 
-    public Object buildClass(String name) {
+    public org.eclipse.uml2.uml.Class buildClass(String name) {
         return buildClass(name, null);
     }
 
-    public Object buildClass(String name, Object owner) {
-        org.eclipse.uml2.uml.Class cls =
-                (org.eclipse.uml2.uml.Class) createClass();
-        if (owner != null) {
-            modelImpl.getCoreHelper().addOwnedElement(owner, cls);
-        }
-        if (name != null) {
-            cls.setName(name);
-        }
-        return cls;
+    public org.eclipse.uml2.uml.Class buildClass(final String name,
+	    final Object owner) {
+	org.eclipse.uml2.uml.Class cls = uml.createClass();
+	if (name != null) {
+	    cls.setName(name);
+	}
+	if (owner != null)
+	    modelImpl.getCoreHelper().addOwnedElement(owner, cls);
+	return cls;
     }
 
     public Object buildComment(Object element, Object model) {
@@ -407,7 +404,7 @@
     }
 
     public Abstraction createAbstraction() {
-        return UMLFactory.eINSTANCE.createAbstraction();
+        return uml.createAbstraction();
     }
 
     public Artifact createArtifact() {
@@ -415,7 +412,7 @@
     }
 
     public Association createAssociation() {
-        return UMLFactory.eINSTANCE.createAssociation();
+        return uml.createAssociation();
     }
 
     public AssociationClass createAssociationClass() {
@@ -437,7 +434,7 @@
     }
 
     public org.eclipse.uml2.uml.Class createClass() {
-        return UMLFactory.eINSTANCE.createClass();
+        return uml.createClass();
     }
 
     public Comment createComment() {