Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2014-12-08 13:58:48 +0000
committerCamille Letavernier2014-12-08 13:58:48 +0000
commit9ab03b6050ec9ce025960c594ba94d15138e8c6e (patch)
tree0d911e14c8a6ad328159fb2dcc46f44eadd4001f /plugins/infra/viewpoints
parentf872162d442e00f800f02903c9119767006bc426 (diff)
downloadorg.eclipse.papyrus-9ab03b6050ec9ce025960c594ba94d15138e8c6e.tar.gz
org.eclipse.papyrus-9ab03b6050ec9ce025960c594ba94d15138e8c6e.tar.xz
org.eclipse.papyrus-9ab03b6050ec9ce025960c594ba94d15138e8c6e.zip
[Viewpoints] Use Absolute URIs instead of relative in the builtin
viewpoint. Fix the Viewpoint Resource to always use absolute URIs
Diffstat (limited to 'plugins/infra/viewpoints')
-rw-r--r--plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.configuration/src/org/eclipse/papyrus/infra/viewpoints/configuration/util/ConfigurationResourceFactoryImpl.java10
-rwxr-xr-xplugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration4
2 files changed, 10 insertions, 4 deletions
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
index aa713048ddb..b9a3fb6f7e2 100644
--- 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
@@ -16,11 +16,14 @@ 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;
+import org.eclipse.emf.ecore.xmi.XMIResource;
+import org.eclipse.emf.ecore.xmi.impl.URIHandlerImpl;
/**
* <!-- 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
*/
@@ -29,6 +32,7 @@ public class ConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
* Creates an instance of the resource factory.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public ConfigurationResourceFactoryImpl() {
@@ -39,11 +43,13 @@ public class ConfigurationResourceFactoryImpl extends ResourceFactoryImpl {
* Creates an instance of the resource.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ *
+ * @generated NOT
*/
@Override
public Resource createResource(URI uri) {
- Resource result = new ConfigurationResourceImpl(uri);
+ XMIResource result = new ConfigurationResourceImpl(uri);
+ result.getDefaultSaveOptions().put(XMIResource.OPTION_URI_HANDLER, new URIHandlerImpl.PlatformSchemeAware());
return result;
}
diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration
index 018ef3e53b7..5e7bda30173 100755
--- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration
+++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/builtin/default.configuration
@@ -212,8 +212,8 @@
</modelKinds>
<modelKinds xsi:type="configuration:PapyrusDiagram" xmi:id="_7wM0stxhEeOqHvRyiN87hA" implementationID="PapyrusUMLProfileDiagram" categories="_7wNb5NxhEeOqHvRyiN87hA">
<modelRules xmi:id="_7wM0s9xhEeOqHvRyiN87hA">
- <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_rd91gN9EEeOOpcSm0dG8Kg" name="">
- <constraintType href="../../../plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
+ <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_rd91gN9EEeOOpcSm0dG8Kg" name="IsContainedByProfile">
+ <constraintType href="platform:/plugin/org.eclipse.papyrus.infra.constraints/Model/ConstraintEnvironment.xmi#//@constraintTypes.4"/>
<properties xsi:type="constraints:ValueProperty" xmi:id="_iic2kN9FEeOOpcSm0dG8Kg" name="className" value="org.eclipse.papyrus.infra.viewpoints.policy.query.IsContainedByProfileQuery"/>
</constraints>
<element href="http://www.eclipse.org/uml2/5.0.0/UML#//Package"/>

Back to the top