Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-01-21 21:43:53 +0000
committerChristian W. Damus2016-01-22 16:14:27 +0000
commit90c9b9830e0d837ce176dd8c673adf75ef262b72 (patch)
tree125bc209896a7d2583d8ea6fe7b2c8e6c11ce6e6 /plugins/uml/decoratormodel
parent02b052a140cd3c0499700afd5b8a1fdd31782a71 (diff)
downloadorg.eclipse.papyrus-90c9b9830e0d837ce176dd8c673adf75ef262b72.tar.gz
org.eclipse.papyrus-90c9b9830e0d837ce176dd8c673adf75ef262b72.tar.xz
org.eclipse.papyrus-90c9b9830e0d837ce176dd8c673adf75ef262b72.zip
Bug 485220: [Architecture] Provide a more modular architecture (& builds) for Papyrus
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Refactor the Properties Model bundles into the Infra Layer. The *.views.properties.model[.edit,.editor] bundles are renamed as *.infra.properties[.edit,.editor]. The packages within are correspondingly renamed. To support upgrade installation, special p2 update metadata tells the p2 engine how these bundles have been renamed, ensuring proper replacement of the old *.views.properties.model* bundles, because otherwise the clash of EMF model registrations would cause run-time errors. The *.views.properties.environment extension point is moved to *.infra.properties.environments. The *.views.properties.context extension point has the <context> element moved to a new *.infra.properties.contexts point. The <preferencePageBinding> element remains. JUnit tests pass, at least inasmuch as they pass in the nightly builds. Change-Id: I6445808f8eb1144b08c0cd5f0a487d1bad229a4c
Diffstat (limited to 'plugins/uml/decoratormodel')
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.xml4
-rw-r--r--plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/elements/PackageModelElementFactory.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
index a718de2e060..3780e3fc197 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.databinding.observable;bundle-version="1.4.1",
org.eclipse.core.databinding;bundle-version="1.4.1",
com.google.guava;bundle-version="11.0.0",
- org.eclipse.papyrus.views.properties.model;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
org.eclipse.emf.edit;bundle-version="2.10.0",
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.xml b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.xml
index c95214422da..7b2c35642a6 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.xml
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/plugin.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<plugin>
-<extension point="org.eclipse.papyrus.views.properties.environment">
+<extension point="org.eclipse.papyrus.infra.properties.environments">
<environment environmentModel="resources/UMLStereotypeApplicationExternalResourceEnvironment.xmi">
</environment>
</extension>
- <extension point="org.eclipse.papyrus.views.properties.context">
+ <extension point="org.eclipse.papyrus.infra.properties.contexts">
<context contextModel="resources/UMLStereotypeApplicationExternalResource.ctx">
</context>
</extension>
diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/elements/PackageModelElementFactory.java b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/elements/PackageModelElementFactory.java
index 08c7845d095..53e235a8224 100644
--- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/elements/PackageModelElementFactory.java
+++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/src/org/eclipse/papyrus/uml/decoratormodel/properties/elements/PackageModelElementFactory.java
@@ -15,10 +15,10 @@ package org.eclipse.papyrus.uml.decoratormodel.properties.elements;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.util.TransactionUtil;
+import org.eclipse.papyrus.infra.properties.contexts.DataContextElement;
import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElement;
import org.eclipse.papyrus.uml.properties.modelelement.UMLModelElementFactory;
import org.eclipse.papyrus.uml.tools.utils.UMLUtil;
-import org.eclipse.papyrus.views.properties.contexts.DataContextElement;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.Package;

Back to the top