final touches to refactoring
diff --git a/org.eclipse.bpmn/plugin.xml b/org.eclipse.bpmn/plugin.xml
index 0bef30b..f903d69 100644
--- a/org.eclipse.bpmn/plugin.xml
+++ b/org.eclipse.bpmn/plugin.xml
@@ -20,7 +20,7 @@
<extension point="org.eclipse.emf.ecore.generated_package">
<package
uri="http://www.omg.org/bpmn20"
- class="org.eclipse.mdt.bpmn.BpmnPackage"
+ class="org.eclipse.bpmn.BpmnPackage"
genModel="model/BPMN.genmodel"/>
</extension>
@@ -30,7 +30,7 @@
base-type="org.eclipse.core.runtime.xml"
default-charset="UTF-8"
file-extensions="bpmn"
- id="org.eclipse.mdt.bpmn.content-type"
+ id="org.eclipse.bpmn.content-type"
name="BPMN 2.0 Content type"
priority="normal">
<describer
@@ -46,8 +46,8 @@
<extension
point="org.eclipse.emf.ecore.content_parser">
<parser
- class="org.eclipse.mdt.bpmn.util.BpmnResourceFactoryImpl"
- contentTypeIdentifier="org.eclipse.mdt.bpmn.content-type">
+ class="org.eclipse.bpmn.util.BpmnResourceFactoryImpl"
+ contentTypeIdentifier="org.eclipse.bpmn.content-type">
</parser>
</extension>
diff --git a/org.eclipse.bpmn/src/org/eclipse/bpmn/Definitions.java b/org.eclipse.bpmn/src/org/eclipse/bpmn/Definitions.java
index 99bb95a..9ebee27 100644
--- a/org.eclipse.bpmn/src/org/eclipse/bpmn/Definitions.java
+++ b/org.eclipse.bpmn/src/org/eclipse/bpmn/Definitions.java
@@ -18,7 +18,6 @@
import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.bpmn.di.Diagram;
/**
* <!-- begin-user-doc -->
diff --git a/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/BpmnPackageImpl.java b/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/BpmnPackageImpl.java
index b381264..d32eda2 100644
--- a/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/BpmnPackageImpl.java
+++ b/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/BpmnPackageImpl.java
@@ -39,9 +39,7 @@
import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.bpmn.di.DIPackage;
-import org.eclipse.bpmn.di.impl.DIPackageImpl;
/**
* <!-- begin-user-doc -->
diff --git a/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/DefinitionsImpl.java b/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/DefinitionsImpl.java
index d7d04dc..ca44f12 100644
--- a/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/DefinitionsImpl.java
+++ b/org.eclipse.bpmn/src/org/eclipse/bpmn/impl/DefinitionsImpl.java
@@ -37,7 +37,6 @@
import org.eclipse.emf.ecore.util.FeatureMap;
import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.bpmn.di.Diagram;
/**
* <!-- begin-user-doc -->
