Viewpoints improvments:

- configuration resources shall use UUIDs instead of positions

Change-Id: Ie405458f80d0774b7a98195a6a920c009d424dfc
Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>


Change-Id: Ie405458f80d0774b7a98195a6a920c009d424dfc
Signed-off-by: Remi Schnekenburger <remi.schnekenburger@cea.fr>

5 files changed, 145 insertions, 38 deletions

diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
index 668b90b3323..6b805d4520d 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/META-INF/MANIFEST.MF
@@ -1,25 +1,26 @@
-Manifest-Version: 1.0

-Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,

- org.eclipse.papyrus.infra.viewpoints.configuration.impl,

- org.eclipse.papyrus.infra.viewpoints.configuration.ui,

- org.eclipse.papyrus.infra.viewpoints.configuration.util

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.jface,

- org.eclipse.emf.ecore,

- org.eclipse.emf.edit,

- org.eclipse.gmf.runtime.emf.type.core,

- org.eclipse.papyrus.infra.core;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.0",

- org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0"

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-ClassPath: .

-Bundle-Version: 1.0.0.qualifier

-Bundle-Localization: plugin

-Bundle-Name: %pluginName

-Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-

+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.viewpoints.configuration,
+ org.eclipse.papyrus.infra.viewpoints.configuration.impl,
+ org.eclipse.papyrus.infra.viewpoints.configuration.ui,
+ org.eclipse.papyrus.infra.viewpoints.configuration.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.jface,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit,
+ org.eclipse.gmf.runtime.emf.type.core,
+ org.eclipse.papyrus.infra.core;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.viewpoints.iso42010;bundle-version="1.0.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.0.0"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.infra.viewpoints.configuration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.infra.viewpoints.configuration;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel
index fa94dc7038d..0e84d0e5c72 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/model/configuration.genmodel
@@ -8,8 +8,8 @@
     operationReflection="true" importOrganizing="true">
   <foreignModel>configuration.ecore</foreignModel>
   <genPackages prefix="Configuration" basePackage="org.eclipse.papyrus.infra.viewpoints"
-      disposableProviderFactory="true" extensibleProviderFactory="true" childCreationExtenders="true"
-      ecorePackage="configuration.ecore#/">
+      resource="XMI" disposableProviderFactory="true" extensibleProviderFactory="true"
+      childCreationExtenders="true" ecorePackage="configuration.ecore#/">
     <genClasses ecoreClass="configuration.ecore#//PapyrusConfiguration">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusConfiguration/defaultStakeholder"/>
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference configuration.ecore#//PapyrusConfiguration/metamodel"/>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml
index 9debbf64776..c14554d966b 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/plugin.xml
@@ -1,11 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<?eclipse version="3.0"?>

-<plugin>

-   <extension point="org.eclipse.emf.ecore.generated_package">

-      <!-- @generated configuration -->

-      <package

-            uri="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"

-            class="org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage"

-            genModel="model/configuration.genmodel"/>

-   </extension>

-</plugin>

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated configuration -->
+      <package
+            uri="http://www.eclipse.org/papyrus/infra/viewpoints/configuration"
+            class="org.eclipse.papyrus.infra.viewpoints.configuration.ConfigurationPackage"
+            genModel="model/configuration.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated configuration -->
+      <parser
+            type="configuration"
+            class="org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceFactoryImpl"/>
+   </extension>
+</plugin>
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryImpl.java
new file mode 100644
index 00000000000..e5961c5c142
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryImpl.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceImpl
+ * @generated
+ */
+public class ConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ConfigurationResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		Resource result = new ConfigurationResourceImpl(uri);
+		return result;
+	}
+
+} //ConfigurationResourceFactoryImpl
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceImpl.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceImpl.java
new file mode 100644
index 00000000000..5890319457d
--- /dev/null
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceImpl.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2013 CEA LIST.
+ * 
+ *  All rights reserved. This program and the accompanying materials
+ *  are made available under the terms of the Eclipse Public License v1.0
+ *  which accompanies this distribution, and is available at
+ *  http://www.eclipse.org/legal/epl-v10.html
+ *  
+ *  Contributors:
+ *  Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+ *  
+ * 
+ */
+package org.eclipse.papyrus.infra.viewpoints.configuration.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.infra.viewpoints.configuration.util.ConfigurationResourceFactoryImpl
+ * @generated
+ */
+public class ConfigurationResourceImpl extends XMIResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public ConfigurationResourceImpl(URI uri) {
+		super(uri);
+	}
+	
+	/**
+	 * @generated NOT - use UUIDs instead of positions
+	 */
+	@Override
+	protected boolean useUUIDs() {
+		return true;
+	}
+
+} //ConfigurationResourceImpl