[522324] ClassCastException in Bpmn2ModelerFactory.getInstance
Change-Id: I8d2ae838fb28089fdcb12aac605d2f20db25a120
Signed-off-by: Paul Leacu <pleacu@redhat.com>
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java
index 76547d8..09ab7dc 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/merrimac/clad/ListAndDetailCompositeBase.java
@@ -20,7 +20,6 @@
import org.eclipse.bpmn2.modeler.core.merrimac.DefaultBusinessObjectDelegate;
import org.eclipse.bpmn2.modeler.core.merrimac.IBusinessObjectDelegate;
import org.eclipse.bpmn2.modeler.core.merrimac.IConstants;
-import org.eclipse.bpmn2.modeler.core.model.Bpmn2ModelerFactory;
import org.eclipse.bpmn2.modeler.core.model.ModelHandler;
import org.eclipse.bpmn2.modeler.core.preferences.Bpmn2Preferences;
import org.eclipse.bpmn2.modeler.core.preferences.ModelEnablements;
@@ -66,7 +65,7 @@
public final static Bpmn2Package PACKAGE = Bpmn2Package.eINSTANCE;
@Deprecated
// use createModelObject() instead
- public final static Bpmn2ModelerFactory FACTORY = Bpmn2ModelerFactory.getInstance();
+ //public final static Bpmn2Factory FACTORY = Bpmn2ModelerFactory.getInstance();
protected AbstractBpmn2PropertySection propertySection;
protected FormToolkit toolkit;
protected IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
@@ -243,7 +242,6 @@
* @param clazz
* @return
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
protected <T extends EObject> T createModelObject(Class clazz) {
T object = getBusinessObjectDelegate().createObject(clazz);
return object;
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerFactory.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerFactory.java
index 774afe2..92b0dd3 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerFactory.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/model/Bpmn2ModelerFactory.java
@@ -18,6 +18,7 @@
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
+import org.eclipse.bpmn2.Bpmn2Factory;
import org.eclipse.bpmn2.Bpmn2Package;
import org.eclipse.bpmn2.DocumentRoot;
import org.eclipse.bpmn2.di.BpmnDiFactory;
@@ -164,8 +165,8 @@
lock.unlock();
}
- public static Bpmn2ModelerFactory getInstance() {
- return (Bpmn2ModelerFactory) Bpmn2ModelerFactory.eINSTANCE;
+ public static Bpmn2Factory getInstance() {
+ return Bpmn2ModelerFactory.eINSTANCE;
}
@Override
