Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2007-05-18 17:17:29 -0400
committeratikhomirov2007-05-18 17:17:29 -0400
commitffdeeaa755fdc6a13626bf91b132db3f9e22fb8c (patch)
tree30f64443baef1108e15fcd93635347fbe7649bc7
parentcaf7025ed637fae4ceecfeca5a6b85b41c63d985 (diff)
downloadorg.eclipse.gmf-tooling-ffdeeaa755fdc6a13626bf91b132db3f9e22fb8c.tar.gz
org.eclipse.gmf-tooling-ffdeeaa755fdc6a13626bf91b132db3f9e22fb8c.tar.xz
org.eclipse.gmf-tooling-ffdeeaa755fdc6a13626bf91b132db3f9e22fb8c.zip
switching to nsURI format which uses year to denote model version (same way EMF does)
-rw-r--r--plugins/org.eclipse.gmf.map/models/gmfmap.ecore2
-rw-r--r--plugins/org.eclipse.gmf.map/plugin.xml4
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/internal/map/util/GMFMapResource.java1
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java2
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapFactoryImpl.java2
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java2
6 files changed, 8 insertions, 5 deletions
diff --git a/plugins/org.eclipse.gmf.map/models/gmfmap.ecore b/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
index 08514a17e..7ba74c4c6 100644
--- a/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
+++ b/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
@@ -2,7 +2,7 @@
<ecore:EPackage xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="mappings"
- nsURI="http://www.eclipse.org/gmf/2005/mappings/2.0" nsPrefix="gmfmap">
+ nsURI="http://www.eclipse.org/gmf/2006/mappings" nsPrefix="gmfmap">
<eAnnotations source="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap">
<details key="constraints" value="http://www.eclipse.org/gmf/2005/constraints"/>
<details key="constraintsMeta" value="http://www.eclipse.org/gmf/2005/constraints/meta"/>
diff --git a/plugins/org.eclipse.gmf.map/plugin.xml b/plugins/org.eclipse.gmf.map/plugin.xml
index dbb375156..c460cea8d 100644
--- a/plugins/org.eclipse.gmf.map/plugin.xml
+++ b/plugins/org.eclipse.gmf.map/plugin.xml
@@ -2,13 +2,13 @@
<?eclipse version="3.0"?>
<plugin>
- <extension point="org.eclipse.emf.ecore.generated_package">
+ <extension point="org.eclipse.emf.ecore.generated_package">
<package
uri = "http://www.eclipse.org/gmf/2005/mappings"
class = "org.eclipse.gmf.mappings.GMFMapPackage"
genModel = "models/gmfmap.genmodel" />
<package
- uri = "http://www.eclipse.org/gmf/2005/mappings/2.0"
+ uri = "http://www.eclipse.org/gmf/2006/mappings"
class = "org.eclipse.gmf.mappings.GMFMapPackage"
genModel = "models/gmfmap.genmodel" />
</extension>
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/internal/map/util/GMFMapResource.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/internal/map/util/GMFMapResource.java
index 20c16b695..d9a6c8cfe 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/internal/map/util/GMFMapResource.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/internal/map/util/GMFMapResource.java
@@ -46,6 +46,7 @@ public class GMFMapResource extends MigrationResource {
if (myBackwardSupportedURIs == null) {
myBackwardSupportedURIs = Arrays.asList(new String[] {
"http://www.eclipse.org/gmf/2005/mappings", //$NON-NLS-1$
+ "http://www.eclipse.org/gmf/2005/mappings/2.0" //$NON-NLS-1$
});
}
return myBackwardSupportedURIs;
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
index cdca09b6a..959feace3 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
@@ -44,7 +44,7 @@ public interface GMFMapPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- String eNS_URI = "http://www.eclipse.org/gmf/2005/mappings/2.0";
+ String eNS_URI = "http://www.eclipse.org/gmf/2006/mappings";
/**
* The package namespace name.
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapFactoryImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapFactoryImpl.java
index 3f616129d..7d0396571 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapFactoryImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapFactoryImpl.java
@@ -48,7 +48,7 @@ public class GMFMapFactoryImpl extends EFactoryImpl implements GMFMapFactory {
*/
public static GMFMapFactory init() {
try {
- GMFMapFactory theGMFMapFactory = (GMFMapFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/2005/mappings/2.0");
+ GMFMapFactory theGMFMapFactory = (GMFMapFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/gmf/2006/mappings");
if (theGMFMapFactory != null) {
return theGMFMapFactory;
}
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
index 57126e26c..0a418b8e0 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
@@ -11,6 +11,7 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EEnum;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
@@ -357,6 +358,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
// Initialize simple dependencies
GMFGraphPackage.eINSTANCE.eClass();
GMFToolPackage.eINSTANCE.eClass();
+ EcorePackage.eINSTANCE.eClass();
// Create package meta-data objects
theGMFMapPackage.createPackageContents();

Back to the top