Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-15 10:13:29 -0500
committercletavernie2011-12-15 10:13:29 -0500
commit92870bec3e9aeb414b9ae8ad126429a597a76afd (patch)
tree577d37bc0d1af153bee09321b709e4a700823d05 /plugins/customization
parentf6fc33713572f1346dac7d2deb4bb34b63062c0f (diff)
downloadorg.eclipse.papyrus-92870bec3e9aeb414b9ae8ad126429a597a76afd.tar.gz
org.eclipse.papyrus-92870bec3e9aeb414b9ae8ad126429a597a76afd.tar.xz
org.eclipse.papyrus-92870bec3e9aeb414b9ae8ad126429a597a76afd.zip
366527: [All diagram][refactoring] update papyrus to UML2.4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=366527
Diffstat (limited to 'plugins/customization')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java3
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project10
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java5
4 files changed, 16 insertions, 4 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
index d6c4bf36593..76cfae4e0ee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
@@ -40,6 +40,7 @@ import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Profile;
import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLPackage;
/**
* An IGenerator for building Contexts from a UML Profile
@@ -88,7 +89,7 @@ public class ProfileGenerator extends AbstractQVTGenerator {
umlProfile = (Profile)loadEMFModel(profileURI);
ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(umlProfile));
- EPackage umlPackage = EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/uml2/3.0.0/UML"); //$NON-NLS-1$
+ EPackage umlPackage = UMLPackage.eINSTANCE;
ModelExtent inUml = new BasicModelExtent(Collections.singletonList(umlPackage));
PropertiesRoot root = ConfigurationManager.instance.getPropertiesRoot();
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
index 1ae2d6d7522..864b784a01c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
@@ -1,4 +1,4 @@
-modeltype UML uses "http://www.eclipse.org/uml2/3.0.0/UML";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
modeltype PropertyContext uses "http://www.eclipse.org/papyrus/properties/contexts";
modeltype PropertyEnvironment uses "http://www.eclipse.org/papyrus/properties/environment";
modeltype PRoot uses "http://www.eclipse.org/papyrus/properties/root";
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
index c5803e5dca0..0736b2064bb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
@@ -20,9 +20,19 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>src_container</key>
+ <value>transforms</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
</natures>
</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
index 1cbd9f903e8..ff35aaad9a0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
@@ -47,6 +47,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.format.XMLFormatte
import org.eclipse.papyrus.views.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.ui.CompositeWidget;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
import org.eclipse.papyrus.views.properties.util.Util;
/**
@@ -154,7 +155,7 @@ public class XWTResource extends ResourceImpl {
}
private CompositeWidget xmlToUISection(Root genericXMLRoot) {
- URI transformationURI = URI.createURI("platform:/plugin/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/XMLToUI.qvto"); //$NON-NLS-1$
+ URI transformationURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/Transformation/XMLToUI.qvto", true); //$NON-NLS-1$
TransformationExecutor executor = new TransformationExecutor(transformationURI);
List<Context> contexts = new LinkedList<Context>(findContexts());
@@ -208,7 +209,7 @@ public class XWTResource extends ResourceImpl {
}
private Root uiSectionToXML(CompositeWidget widget) {
- URI transformationURI = URI.createURI("platform:/plugin/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/UIToXML.qvto"); //$NON-NLS-1$
+ URI transformationURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/Transformation/UIToXML.qvto", true); //$NON-NLS-1$
TransformationExecutor executor = new TransformationExecutor(transformationURI);
ModelExtent inWidget = getModelExtent(widget);

Back to the top