Issue #12 - Resolved.

- Implemented generic wrapping of non-class classifiers as instances
of Classifier, rather than NamedElement.

Author: seidewitz

org.modeldriven.alf.eclipse/lib/alf-base.jar

@@ -41,10 +41,7 @@ public static Element wrap(org.eclipse.uml2.uml.Element base) {
         if (base == null) {
             return null;
         }
-        Element newInstance = (Element)factory.newInstanceFor(base, 
-        		org.eclipse.uml2.uml.Behavior.class,
-        		org.eclipse.uml2.uml.Class.class, 
-        		org.eclipse.uml2.uml.NamedElement.class);
+        Element newInstance = (Element)factory.newInstanceFor(base);
         if (newInstance != null) {
             newInstance.setBase(base);
         }

org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/Element.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2015 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 
@@ -9,4 +9,13 @@
 package org.modeldriven.alf.eclipse.uml;
 
 public class ElementFactory extends org.modeldriven.alf.uml.ElementFactory {
+
+	public ElementFactory() {
+		super(
+			org.eclipse.uml2.uml.Behavior.class, 
+			org.eclipse.uml2.uml.Class.class, 
+			org.eclipse.uml2.uml.Classifier.class, 
+			org.eclipse.uml2.uml.NamedElement.class);
+	}
+	
 }

org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/uml/ElementFactory.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2015 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 
@@ -9,4 +9,13 @@
 package org.modeldriven.alf.fuml.impl.uml;
 
 public class ElementFactory extends org.modeldriven.alf.uml.ElementFactory {
+
+	public ElementFactory() {
+		super(
+			fUML.Syntax.CommonBehaviors.BasicBehaviors.Behavior.class, 
+			fUML.Syntax.Classes.Kernel.Class_.class, 
+			fUML.Syntax.Classes.Kernel.Classifier.class, 
+			fUML.Syntax.Classes.Kernel.NamedElement.class);
+	}
+	
 }

org.modeldriven.alf.fuml.impl/src/org/modeldriven/alf/fuml/impl/uml/ElementFactory.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2015 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 
@@ -13,6 +13,22 @@
 
 public abstract class ElementFactory {
 
+    private Class<?> behaviorClass = null;
+    private Class<?> classClass = null;
+    private Class<?> classifierClass = null;
+    private Class<?> namedElementClass = null;
+    
+    public ElementFactory(
+            Class<?> behaviorClass, 
+            Class<?> classClass, 
+            Class<?> classifierClass,
+            Class<?> namedElementClass) {
+        this.behaviorClass = behaviorClass;
+        this.classClass = classClass;
+        this.classifierClass = classifierClass;
+        this.namedElementClass = namedElementClass;
+    }
+    
     @SuppressWarnings("unchecked")
     public <T extends org.modeldriven.alf.uml.Element> T newInstance(Class<T> class_) {
         final String className = class_.getSimpleName();
@@ -27,18 +43,15 @@ public <T extends org.modeldriven.alf.uml.Element> T newInstance(Class<T> class_
     }
 
     public Element newInstanceFor(Object base) {
-        return this.newInstanceFor(base.getClass().getSimpleName(), base);
-    }
-    
-    public Element newInstanceFor(Object base, Class<?> behaviorClass, Class<?> classClass, Class<?> namedElementClass) {
         Element newInstance = null;
         try {
             newInstance = (Element)this.createInstanceFor(base.getClass().getSimpleName(), base);
         } catch (Exception e) {
             final String className =
-                    behaviorClass.isInstance(base)? "Behavior":
-                    classClass.isInstance(base)? "Class":
-                    namedElementClass.isInstance(base)? "NamedElement":
+                    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);
         }