Issue #13 - Resolved.

seidewitz · seidewitz · commit 670a0fbc590e · 2016-03-07T16:15:36.000-05:00
diff --git a/org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/execution/Alf.java b/org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/execution/Alf.java
@@ -55,7 +55,7 @@ protected Locus createLocus() {
     
     @Override
     protected ElementFactory createElementFactory() {
-        return new org.modeldriven.alf.eclipse.uml.ElementFactory();
+        return org.modeldriven.alf.eclipse.uml.Element.FACTORY;
     }
     
     @Override
diff --git a/org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/execution/Fuml.java b/org.modeldriven.alf.eclipse.papyrus/src/org/modeldriven/alf/eclipse/papyrus/execution/Fuml.java
@@ -533,7 +533,6 @@ protected void println(String message) {
 
    public Fuml() {
 	   this.setUmlLibraryDirectory("Libraries");
-	   new org.modeldriven.alf.eclipse.uml.ElementFactory();
 	   
 	   try {
 		   FUMLExecutionEngine.eInstance = new DummyFUMLExecutionEngine();
diff --git a/org.modeldriven.alf.eclipse/UML/_RunTests.uml b/org.modeldriven.alf.eclipse/UML/_RunTests.uml
diff --git a/org.modeldriven.alf.eclipse/lib/alf-base.jar b/org.modeldriven.alf.eclipse/lib/alf-base.jar
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/AlfCompiler.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/AlfCompiler.java
@@ -27,7 +27,7 @@ protected void setUmlDirectory(String umlDirectory) {
     
     @Override
     protected ElementFactory createElementFactory() {
-        return new org.modeldriven.alf.eclipse.uml.ElementFactory();
+        return org.modeldriven.alf.eclipse.uml.Element.FACTORY;
     }
     
     @Override
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/mapping/FumlMapper.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/mapping/FumlMapper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2013 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.modeldriven.alf.eclipse.fuml.mapping;
 
-import org.modeldriven.alf.eclipse.uml.ElementFactory;
+import org.modeldriven.alf.eclipse.uml.Element;
 import org.modeldriven.alf.fuml.mapping.FumlMapping;
 import org.modeldriven.alf.fuml.mapping.FumlMappingFactory;
 import org.modeldriven.alf.mapping.Mapping;
@@ -25,7 +25,7 @@ public static void main(String[] args) {
         }
         
         FumlMapping.setFumlFactory(new FumlMappingFactory());
-        FumlMapping.setElementFactory(new ElementFactory());
+        FumlMapping.setElementFactory(Element.FACTORY);
         FumlMapping mapping = null;
         try {
             mapping = FumlMapping.parseAndMap(fileName);
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/Element.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/Element.java
@@ -18,10 +18,18 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.uml2.uml.UMLFactory;
+import org.modeldriven.alf.uml.ElementFactory;
 import org.modeldriven.alf.uml.StereotypeApplication;
 
 public class Element implements org.modeldriven.alf.uml.Element {
 	
+	public static final ElementFactory FACTORY = new ElementFactory(
+			Element.class,
+			org.eclipse.uml2.uml.Behavior.class, 
+			org.eclipse.uml2.uml.Class.class, 
+			org.eclipse.uml2.uml.Classifier.class, 
+			org.eclipse.uml2.uml.NamedElement.class);
+	
 	protected org.eclipse.uml2.uml.Element base;
 
 	public Element(org.eclipse.uml2.uml.Element base) {
@@ -33,7 +41,7 @@ public org.eclipse.uml2.uml.Element getBase() {
 	}
 
     public static Element wrap(org.eclipse.uml2.uml.Element base) {
-        return (Element)ElementFactory.wrap(base);
+        return (Element)FACTORY.newInstanceFor(base);
     }
     
     @Override
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/ElementFactory.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/ElementFactory.java
diff --git a/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/Stereotype.java b/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/Stereotype.java
@@ -12,6 +12,7 @@
 import java.util.Collection;
 
 import org.eclipse.uml2.uml.UMLFactory;
+import org.modeldriven.alf.uml.ElementFactory;
 
 public class Stereotype extends Class_ implements org.modeldriven.alf.uml.Stereotype {
 
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/environment/AlfOpaqueBehaviorExecution.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/environment/AlfOpaqueBehaviorExecution.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2013 Ivar Jacobson International SA
+ * Copyright 2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License
  * (GPL) version 3 that accompanies this distribution and is available at     
@@ -12,7 +12,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.modeldriven.alf.fuml.impl.uml.ElementFactory;
 import org.modeldriven.alf.fuml.impl.units.RootNamespaceImpl;
 import org.modeldriven.alf.fuml.mapping.FumlMapping;
 import org.modeldriven.alf.fuml.mapping.FumlMappingFactory;
@@ -52,7 +51,7 @@ private static RootNamespaceImpl getRootScopeImpl() {
 		if (rootScopeImpl == null) {
 			rootScopeImpl = new RootNamespaceImpl();
 			FumlMapping.setFumlFactory(new FumlMappingFactory());
-			FumlMapping.setElementFactory(new ElementFactory());
+			FumlMapping.setElementFactory(org.modeldriven.alf.fuml.impl.uml.Element.FACTORY);
 		}
 		return rootScopeImpl;
 	}
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/execution/Alf.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/execution/Alf.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2013 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -50,7 +50,7 @@ protected org.modeldriven.alf.fuml.execution.Locus createLocus() {
     
     @Override
     protected ElementFactory createElementFactory() {
-        return new org.modeldriven.alf.fuml.impl.uml.ElementFactory();
+        return org.modeldriven.alf.fuml.impl.uml.Element.FACTORY;
     }
     
     @Override
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/mapping/FumlMapper.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/mapping/FumlMapper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2013 Data Access Technologies, Inc. (Model Driven Solutions)
+ * Copyright 2011-2016 Data Access Technologies, Inc. (Model Driven Solutions)
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -8,7 +8,7 @@
  *******************************************************************************/
 package org.modeldriven.alf.fuml.impl.mapping;
 
-import org.modeldriven.alf.fuml.impl.uml.ElementFactory;
+import org.modeldriven.alf.fuml.impl.uml.Element;
 import org.modeldriven.alf.fuml.mapping.FumlMapping;
 import org.modeldriven.alf.fuml.mapping.FumlMappingFactory;
 import org.modeldriven.alf.mapping.Mapping;
@@ -25,7 +25,7 @@ public static void main(String[] args) {
         }
         
         FumlMapping.setFumlFactory(new FumlMappingFactory());
-        FumlMapping.setElementFactory(new ElementFactory());
+        FumlMapping.setElementFactory(Element.FACTORY);
         FumlMapping mapping = null;
         try {
             mapping = FumlMapping.parseAndMap(fileName);
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/uml/Element.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/uml/Element.java
@@ -12,9 +12,17 @@
 import java.util.Collection;
 import java.util.List;
 
+import org.modeldriven.alf.uml.ElementFactory;
 import org.modeldriven.alf.uml.StereotypeApplication;
 
 public abstract class Element implements org.modeldriven.alf.uml.Element {
+	
+	public static final ElementFactory FACTORY = new ElementFactory(
+			Element.class,
+			fUML.Syntax.CommonBehaviors.BasicBehaviors.Behavior.class, 
+			fUML.Syntax.Classes.Kernel.Class_.class, 
+			fUML.Syntax.Classes.Kernel.Classifier.class, 
+			fUML.Syntax.Classes.Kernel.NamedElement.class);
     
 	protected Object base;
 
@@ -50,7 +58,7 @@ public boolean isStereotypeApplied(org.modeldriven.alf.uml.Stereotype stereotype
     }
 
     public static Element wrap(Object base) {
-        return (Element)ElementFactory.wrap(base);
+        return (Element)FACTORY.newInstanceFor(base);
     }
     
    @Override
diff --git a/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/uml/ElementFactory.java b/org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/uml/ElementFactory.java
diff --git a/org.modeldriven.alf/dist/alf-base.jar b/org.modeldriven.alf/dist/alf-base.jar
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java b/org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java
@@ -24,7 +24,7 @@
 
 public abstract class AlfBase {
     
-    public static final String ALF_VERSION = "0.6.0g";
+    public static final String ALF_VERSION = "0.6.0h";
     
     protected boolean isVerbose = false;
 
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/uml/ElementFactory.java b/org.modeldriven.alf/src/org/modeldriven/alf/uml/ElementFactory.java
@@ -11,7 +11,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 
-public abstract class ElementFactory {
+public class ElementFactory {
     
     public static final String INTERFACE_PACKAGE_NAME = 
             org.modeldriven.alf.uml.Element.class.getPackage().getName();
@@ -30,29 +30,25 @@ public static Class<?> interfaceForName(String name) {
             }
         }
     }
-    
-    private static ElementFactory elementFactory = null;
-    
-    public static Element wrap(Object base) {
-        return base == null? null: elementFactory.newInstanceFor(base);
-    }
 
+    private String packageName = "";
+    
     private Class<?> behaviorClass = null;
     private Class<?> classClass = null;
     private Class<?> classifierClass = null;
     private Class<?> namedElementClass = null;
     
     public ElementFactory(
+            Class<?> elementClass,
             Class<?> behaviorClass, 
             Class<?> classClass, 
             Class<?> classifierClass,
             Class<?> namedElementClass) {
+        this.packageName = elementClass.getPackage().getName();
         this.behaviorClass = behaviorClass;
         this.classClass = classClass;
         this.classifierClass = classifierClass;
-        this.namedElementClass = namedElementClass;
-        
-        elementFactory = this;
+        this.namedElementClass = namedElementClass;        
     }
     
     @SuppressWarnings("unchecked")
@@ -70,16 +66,18 @@ public <T extends org.modeldriven.alf.uml.Element> T newInstance(Class<T> class_
     
     public Element newInstanceFor(Object base) {
         Element newInstance = null;
-        try {
-            newInstance = (Element)this.createInstanceFor(base.getClass().getSimpleName(), base);
-        } catch (Exception e) {
-            final String className =
-                    this.behaviorClass.isInstance(base)? "Behavior":
-                    this.classClass.isInstance(base)? "Class":
-                    this.classifierClass.isInstance(base)? "Classifier":
-                    this.namedElementClass.isInstance(base)? "NamedElement":
-                    "Element";
-            newInstance = (Element)this.newInstanceFor(className, base);
+        if (base != null) {
+            try {
+                newInstance = (Element)this.createInstanceFor(base.getClass().getSimpleName(), base);
+            } catch (Exception e) {
+                final String className =
+                        this.behaviorClass.isInstance(base)? "Behavior":
+                        this.classClass.isInstance(base)? "Class":
+                        this.classifierClass.isInstance(base)? "Classifier":
+                        this.namedElementClass.isInstance(base)? "NamedElement":
+                        "Element";
+                newInstance = (Element)this.newInstanceFor(className, base);
+            }
         }
         return newInstance;
     }
@@ -131,7 +129,7 @@ public String getWrapperClassName(String className) {
     }
     
     public String getPackageName() {
-        return this.getClass().getPackage().getName();
+        return this.packageName;
     }
     
 }

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ protected Locus createLocus() {`
`55`	`55`
`56`	`56`	`@Override`
`57`	`57`	`protected ElementFactory createElementFactory() {`
`58`		`- return new org.modeldriven.alf.eclipse.uml.ElementFactory();`
	`58`	`+ return org.modeldriven.alf.eclipse.uml.Element.FACTORY;`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ protected void setUmlDirectory(String umlDirectory) {`
`27`	`27`
`28`	`28`	`@Override`
`29`	`29`	`protected ElementFactory createElementFactory() {`
`30`		`- return new org.modeldriven.alf.eclipse.uml.ElementFactory();`
	`30`	`+ return org.modeldriven.alf.eclipse.uml.Element.FACTORY;`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`