Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-11 21:38:52 +0000
committerChristian W. Damus2016-02-24 22:26:27 +0000
commit09fde7a4087685b065b7f1e40375686fb9f19f2a (patch)
tree36668c0515a08586179a74cefcf1dc6197311d70 /plugins/customization
parent2f0dd86c51f8543f56a99cd4371965a01287fcaa (diff)
downloadorg.eclipse.papyrus-09fde7a4087685b065b7f1e40375686fb9f19f2a.tar.gz
org.eclipse.papyrus-09fde7a4087685b065b7f1e40375686fb9f19f2a.tar.xz
org.eclipse.papyrus-09fde7a4087685b065b7f1e40375686fb9f19f2a.zip
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Implement version management: PDE API Tooling and Oomph Version Management. Introduce two new plug-in projects to manage versioning using Oomph: * org.eclipse.papyrus.releng.main.release for the Main bundles and features * org.eclipse.papyrus.releng.dev.release for the Dev Tools Add new menu actions to the Dev Tools: * main menu bar: * synchronize POM and manifest versions * "Configure" context menu on bundle projects and MANIFEST.MF * optimize bundle dependencies and re-exports * update dependency version ranges to match current workspace and PDE target Remove obsolete menu actions from the Dev Tools: * main menu bar: * Set all Papyrus feature versions * Set all Papyrus plug-in versions * Set versions of all Papyrus dependencies in Papyrus plug-ins Fix versioning errors reported by PDE and Oomph. Ensure proper version ranges consistent with latest build target. Optimize the dependencies of all Papyrus Main bundles and Dev Tools. Remove version- and reexport-checking tests in the BundlesTests that are now not needed because, on the one hand, we now implement discrete bundle versioning (managed by PDE/Oomph) and on the other, we now use re-exports properly to ensure classpath consistency in clients of a bundle's API. Thorough overhaul of the "project editors" API, including: * rationalize the API interfaces * refactor the all-in-one PluginEditor class from the customization bundle to the project-editors bundle * update clients in the Customization and DSML Validation components * fix a bunch of operations that didn't work * add missing operations required by the new Dev Tools actions * complete some unimplemented APIs * add a comprehensive JUnit test suite covering all of the project-editors API Change-Id: I6a699d93909f61099226ceb994140f03ea99a70f
Diffstat (limited to 'plugins/customization')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project74
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF6
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project74
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF6
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project74
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF4
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.palette/.project74
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF43
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project76
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF36
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project94
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF71
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project98
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF46
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/.project78
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF58
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF23
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java86
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java60
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java292
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java134
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java216
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java6
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java12
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java108
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java138
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java192
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java257
-rw-r--r--plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project74
-rw-r--r--plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF32
-rw-r--r--plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project74
-rw-r--r--plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF34
32 files changed, 1290 insertions, 1360 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project
index c1c9b5ec9f9..7679c02f662 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes.emf</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.extendedtypes.emf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF
index fa5476b9585..1d587c3cd42 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -1,8 +1,6 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.customization.extendedtypes;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project
index 04c2b52c2c3..7d9bff6670c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes.uml</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.extendedtypes.uml</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF
index 60932311477..3ebe24c5f4e 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes.uml/META-INF/MANIFEST.MF
@@ -1,8 +1,6 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.customization.extendedtypes;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.customization.extendedtypes;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project
index f75d3c9557e..9b0f9d6d912 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.extendedtypes</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.extendedtypes</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF
index 0dbaaf4c19c..f6b37ead789 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.extendedtypes/META-INF/MANIFEST.MF
@@ -1,7 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)"
Bundle-Vendor: Eclipse Modeling Project
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/.project b/plugins/customization/org.eclipse.papyrus.customization.palette/.project
index cdc3f107099..31cb9051c27 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.palette</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.palette</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
index ce0a4749a96..db16d3489c6 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.palette/META-INF/MANIFEST.MF
@@ -1,27 +1,16 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.palette,
- org.eclipse.papyrus.customization.palette.dialog,
- org.eclipse.papyrus.customization.palette.proxies
-Require-Bundle: org.eclipse.pde;bundle-version="3.6.0",
- org.eclipse.pde.ui;bundle-version="3.6.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.core.runtime;bundle-version="3.8.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="4.0.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0"
-Bundle-Vendor: %providerName
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %pluginName
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.customization.palette,
+ org.eclipse.papyrus.customization.palette.dialog,
+ org.eclipse.papyrus.customization.palette.proxies
+Require-Bundle: org.eclipse.pde;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.customization.palette;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
index e6fc7832d9a..955406ef912 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/.project
@@ -1,29 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.paletteconfiguration</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.paletteconfiguration</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.papyrus.emf.facet.common.ProjectNature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
index 6e7d1118c33..ea75d018a7c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/META-INF/MANIFEST.MF
@@ -1,20 +1,16 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
- org.eclipse.papyrus.customization.paletteconfiguration.queries
-Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.core.runtime;bundle-version="3.7.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="1.2.0",
- org.eclipse.uml2.uml;bundle-version="3.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
- org.eclipse.papyrus.infra.extendedtypes;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.customization.paletteconfiguration,
+ org.eclipse.papyrus.customization.paletteconfiguration.queries
+Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.customization.paletteconfiguration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.customization.paletteconfiguration;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project
index e94613a0d4e..6bd7d558acb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/.project
@@ -1,38 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties.generation</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <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>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.properties.generation</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <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>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
index c0d8e21fed1..28272f0cbd3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
@@ -1,45 +1,26 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.generation,
- org.eclipse.papyrus.customization.properties.generation.generators,
- org.eclipse.papyrus.customization.properties.generation.layout,
- org.eclipse.papyrus.customization.properties.generation.wizard,
- org.eclipse.papyrus.customization.properties.generation.wizard.widget
-Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
- org.eclipse.osgi;bundle-version="3.6.1",
- org.eclipse.core.runtime;bundle-version="3.6.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml;bundle-version="3.0.1",
- org.eclipse.m2m.qvt.oml.common;bundle-version="2.1.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.edit;bundle-version="1.2.0",
- org.eclipse.emf.common.ui;bundle-version="2.6.0",
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.uml2.uml;bundle-version="3.1.1",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.core.databinding.property;bundle-version="1.3.0",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
- org.eclipse.papyrus.customization.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.jface.databinding;bundle-version="1.6.200",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Eclipse-BuddyPolicy: dependent
-Bundle-Name: %Bundle-Name
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.customization.properties.generation,
+ org.eclipse.papyrus.customization.properties.generation.generators,
+ org.eclipse.papyrus.customization.properties.generation.layout,
+ org.eclipse.papyrus.customization.properties.generation.wizard,
+ org.eclipse.papyrus.customization.properties.generation.wizard.widget
+Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.properties.edit;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.customization.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .,
+ bin
+Bundle-Version: 1.2.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.customization.properties.generation.Activator
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.generation;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 c206f4a22bc..ada41a4b484 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
@@ -1,38 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties.model.xwt</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
- <arguments>
- <dictionary>
- <key>src_container</key>
- <value>Transformation</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>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.properties.model.xwt</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>src_container</key>
+ <value>Transformation</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.missing.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</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>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
index 1299b08a90f..e991aa76ae3 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/META-INF/MANIFEST.MF
@@ -1,26 +1,20 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl,
- org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.emf.ecore,
- org.eclipse.m2m.qvt.oml;bundle-version="3.1.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.wst.xml.core;bundle-version="1.1.0",
- org.eclipse.core.resources;bundle-version="3.7.0",
- org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
- com.ibm.icu
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.customization.properties.model.xwt.resource,
+ org.eclipse.papyrus.customization.properties.model.xwt.xwtxml,
+ org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.impl,
+ org.eclipse.papyrus.customization.properties.model.xwt.xwtxml.util
+Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.m2m.qvt.oml.project;bundle-version="[3.6.0,4.0.0)",
+ com.ibm.icu
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.customization.properties.model.xwt.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.customization.properties.model.xwt;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/.project b/plugins/customization/org.eclipse.papyrus.customization.properties/.project
index 8e74255f24f..8a52bef694f 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/.project
@@ -1,30 +1,48 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.customization.properties</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.emf.facet.common.ProjectNature</nature>
- <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.customization.properties</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.emf.facet.common.ProjectNature</nature>
+ <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
index 357df2e8e0e..991b43e4216 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties/META-INF/MANIFEST.MF
@@ -1,37 +1,21 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.customization.properties.editor,
- org.eclipse.papyrus.customization.properties.modelelement,
- org.eclipse.papyrus.customization.properties.providers,
- org.eclipse.papyrus.customization.properties.storage.actions
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;bundle-version="3.6.0",
- org.eclipse.core.databinding.observable;bundle-version="1.3.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties;bundle-version="1.2.0",
- org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="1.2.0",
- org.eclipse.emf.ecore.editor;bundle-version="2.6.0",
- org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.custom.core;bundle-version="1.2.0",
- org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui.emf;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.constraints.ui;bundle-version="1.2.0"
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .,
- bin
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %Bundle-Name
-Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator
-Bundle-ManifestVersion: 2
-Bundle-Description: %pluginDescription
-Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.customization.properties.editor,
+ org.eclipse.papyrus.customization.properties.modelelement,
+ org.eclipse.papyrus.customization.properties.providers,
+ org.eclipse.papyrus.customization.properties.storage.actions
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.customization.properties.model.xwt;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.emf.ecore.editor;bundle-version="[2.11.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.constraints.ui;bundle-version="[1.2.0,2.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .,
+ bin
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.customization.properties.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.customization.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
index a70b7b15fc8..fdde98c5b9d 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization/META-INF/MANIFEST.MF
@@ -1,23 +1,8 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.emf.ecore,
- org.eclipse.pde;bundle-version="3.6.100",
- org.eclipse.core.resources;bundle-version="3.7.100",
- org.eclipse.pde.core;bundle-version="3.7.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
- org.eclipse.pde.ui;bundle-version="3.6.100",
- org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.papyrus.infra.widgets;bundle-version="1.2.0",
- org.eclipse.papyrus.eclipse.project.editors;bundle-version="1.2.0",
- org.eclipse.core.databinding;bundle-version="1.4.0",
- org.eclipse.emf.edit;bundle-version="2.7.0",
- org.eclipse.emf.databinding;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.constraints;bundle-version="1.2.0"
+Require-Bundle: org.eclipse.pde;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.pde.ui;bundle-version="[3.9.0,4.0.0)",
+ org.eclipse.papyrus.eclipse.project.editors;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
Export-Package: org.eclipse.papyrus.customization.factory,
org.eclipse.papyrus.customization.generator,
org.eclipse.papyrus.customization.model.customizationplugin,
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java
index 085556890f3..21524cedd5b 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ConstraintEnvironmentExtensionFactory.java
@@ -1,43 +1,43 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-
-
-public class ConstraintEnvironmentExtensionFactory extends FileBasedExtensionFactory {
-
- public ConstraintEnvironmentExtensionFactory() {
- super("Constraint environment", "org.eclipse.papyrus.infra.constraints.ConstraintEnvironment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.constraints"); //$NON-NLS-1$
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/constraintEnvironment/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getConstraintsEnvironment();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
+import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+
+
+public class ConstraintEnvironmentExtensionFactory extends FileBasedExtensionFactory {
+
+ public ConstraintEnvironmentExtensionFactory() {
+ super("Constraint environment", "org.eclipse.papyrus.infra.constraints.ConstraintEnvironment", "environmentModel", "environment", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ }
+
+ @Override
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
+ super.addElement(element, editor);
+
+ editor.addDependency("org.eclipse.papyrus.infra.constraints"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected String getTargetPath(FileBasedCustomizableElement element) {
+ return "/constraintEnvironment/" + getFileName(element); //$NON-NLS-1$
+ }
+
+ public EClass getCustomizableElementClass() {
+ return CustomizationPluginPackage.eINSTANCE.getConstraintsEnvironment();
+ }
+
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java
index 79fe0e89fa2..9f906d6f0fc 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ExtensionFactory.java
@@ -1,29 +1,31 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-
-
-public interface ExtensionFactory {
-
- public static ExtensionFactoryRegistry registry = ExtensionFactoryRegistry.instance;
-
- public void addElement(CustomizableElement element, PluginEditor editor);
-
- public EClass getCustomizableElementClass();
-
- public String getName();
-}
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+
+
+public interface ExtensionFactory {
+
+ public static ExtensionFactoryRegistry registry = ExtensionFactoryRegistry.instance;
+
+ public void addElement(CustomizableElement element, IPluginEditor editor);
+
+ public EClass getCustomizableElementClass();
+
+ public String getName();
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java
index c230b88c1a1..da15790cf49 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/FileBasedExtensionFactory.java
@@ -1,145 +1,147 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.papyrus.customization.Activator;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.infra.widgets.util.FileUtil;
-import org.w3c.dom.Element;
-
-
-public abstract class FileBasedExtensionFactory implements ExtensionFactory {
-
- protected final String extensionPoint;
-
- protected final String fileAttributeName;
-
- protected final String fileElementName;
-
- protected final boolean allowMultiple;
-
- protected final String name;
-
- public FileBasedExtensionFactory(String name, String extensionPoint, String fileAttributeName, String fileElementName, boolean allowMultiple) {
- this.extensionPoint = extensionPoint;
- this.fileAttributeName = fileAttributeName;
- this.fileElementName = fileElementName;
- this.allowMultiple = allowMultiple;
- this.name = name;
- }
-
- public void addElement(CustomizableElement element, PluginEditor editor) {
- createExtension((FileBasedCustomizableElement) element, editor);
- try {
- copyFile((FileBasedCustomizableElement) element, editor);
- } catch (IOException ex) {
- Activator.log.error(ex);
- }
- }
-
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extensionElement = null;
- if (element instanceof FileBasedCustomizableElement) {
- Element extension = editor.getPluginEditor().addExtension(extensionPoint);
- extensionElement = editor.getPluginEditor().addChild(extension, fileElementName);
- editor.getPluginEditor().setAttribute(extensionElement, fileAttributeName, getTargetPath(element));
- }
- return extensionElement;
- }
-
- protected void copyFile(FileBasedCustomizableElement element, PluginEditor editor) throws FileNotFoundException, IOException {
- copyFile(element.getFile(), getTargetPath(element), editor);
- }
-
- protected void copyFile(String sourcePath, String targetPath, PluginEditor editor) throws FileNotFoundException, IOException {
- File sourceFile = FileUtil.getFile(sourcePath);
- File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + targetPath); //$NON-NLS-1$ //$NON-NLS-2$
-
- if (sourceFile == null) {
- throw new IllegalArgumentException("The source path " + sourcePath + " is not valid");
- }
-
- if (targetFile == null) {
- throw new IllegalArgumentException("The target path " + targetPath + " is not valid");
- }
-
- if (!targetFile.getParentFile().exists()) {
- targetFile.getParentFile().mkdirs();
- }
-
- copy(new FileInputStream(sourceFile), targetFile);
-
- editor.getBuildEditor().addToBuild(targetPath);
- }
-
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/" + getFileName(element); //$NON-NLS-1$
- }
-
- protected String getFileName(FileBasedCustomizableElement element) {
- return getFileName(element.getFile());
- }
-
- protected String getFileName(String path) {
- if (path == null) {
- throw new IllegalArgumentException("File path should not be null");
- }
- String fileName;
- path = path.replace("\\", "/");
- if (path.indexOf("/") < 0) { //$NON-NLS-1$
- fileName = path;
- } else {
- fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$
- }
- return fileName;
- }
-
- protected void copy(InputStream source, File target) throws IOException {
- if (!target.getParentFile().exists()) {
- target.getParentFile().mkdirs();
- }
-
- OutputStream out = new FileOutputStream(target);
- try {
- int c;
-
- while ((c = source.read()) != -1) {
- out.write(c);
- }
-
- } catch (IOException ex) {
- throw ex;
- } finally {
- source.close();
- out.close();
- }
- }
-
- public boolean isValidElement(CustomizableElement element) {
- return element instanceof FileBasedCustomizableElement;
- }
-
- public String getName() {
- return name;
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.eclipse.papyrus.customization.Activator;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+import org.eclipse.papyrus.infra.widgets.util.FileUtil;
+import org.w3c.dom.Element;
+
+
+public abstract class FileBasedExtensionFactory implements ExtensionFactory {
+
+ protected final String extensionPoint;
+
+ protected final String fileAttributeName;
+
+ protected final String fileElementName;
+
+ protected final boolean allowMultiple;
+
+ protected final String name;
+
+ public FileBasedExtensionFactory(String name, String extensionPoint, String fileAttributeName, String fileElementName, boolean allowMultiple) {
+ this.extensionPoint = extensionPoint;
+ this.fileAttributeName = fileAttributeName;
+ this.fileElementName = fileElementName;
+ this.allowMultiple = allowMultiple;
+ this.name = name;
+ }
+
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
+ createExtension((FileBasedCustomizableElement) element, editor);
+ try {
+ copyFile((FileBasedCustomizableElement) element, editor);
+ } catch (IOException ex) {
+ Activator.log.error(ex);
+ }
+ }
+
+ protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) {
+ Element extensionElement = null;
+ if (element instanceof FileBasedCustomizableElement) {
+ Element extension = editor.addExtension(extensionPoint);
+ extensionElement = editor.addChild(extension, fileElementName);
+ editor.setAttribute(extensionElement, fileAttributeName, getTargetPath(element));
+ }
+ return extensionElement;
+ }
+
+ protected void copyFile(FileBasedCustomizableElement element, IPluginEditor editor) throws FileNotFoundException, IOException {
+ copyFile(element.getFile(), getTargetPath(element), editor);
+ }
+
+ protected void copyFile(String sourcePath, String targetPath, IPluginEditor editor) throws FileNotFoundException, IOException {
+ File sourceFile = FileUtil.getFile(sourcePath);
+ File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + targetPath); //$NON-NLS-1$ //$NON-NLS-2$
+
+ if (sourceFile == null) {
+ throw new IllegalArgumentException("The source path " + sourcePath + " is not valid");
+ }
+
+ if (targetFile == null) {
+ throw new IllegalArgumentException("The target path " + targetPath + " is not valid");
+ }
+
+ if (!targetFile.getParentFile().exists()) {
+ targetFile.getParentFile().mkdirs();
+ }
+
+ copy(new FileInputStream(sourceFile), targetFile);
+
+ editor.addToBuild(targetPath);
+ }
+
+ protected String getTargetPath(FileBasedCustomizableElement element) {
+ return "/" + getFileName(element); //$NON-NLS-1$
+ }
+
+ protected String getFileName(FileBasedCustomizableElement element) {
+ return getFileName(element.getFile());
+ }
+
+ protected String getFileName(String path) {
+ if (path == null) {
+ throw new IllegalArgumentException("File path should not be null");
+ }
+ String fileName;
+ path = path.replace("\\", "/");
+ if (path.indexOf("/") < 0) { //$NON-NLS-1$
+ fileName = path;
+ } else {
+ fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$
+ }
+ return fileName;
+ }
+
+ protected void copy(InputStream source, File target) throws IOException {
+ if (!target.getParentFile().exists()) {
+ target.getParentFile().mkdirs();
+ }
+
+ OutputStream out = new FileOutputStream(target);
+ try {
+ int c;
+
+ while ((c = source.read()) != -1) {
+ out.write(c);
+ }
+
+ } catch (IOException ex) {
+ throw ex;
+ } finally {
+ source.close();
+ out.close();
+ }
+ }
+
+ public boolean isValidElement(CustomizableElement element) {
+ return element instanceof FileBasedCustomizableElement;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java
index 6394ddc451d..38ff8e1f3fb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ModelTemplateExtensionFactory.java
@@ -1,67 +1,67 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.ModelTemplate;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.w3c.dom.Element;
-
-
-public class ModelTemplateExtensionFactory extends FileBasedExtensionFactory {
-
- public ModelTemplateExtensionFactory() {
- super(Messages.ModelTemplateExtensionFactory_ModelTemplate, "org.eclipse.papyrus.uml.diagram.wizards.templates", "file", "template", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.uml.diagram.wizards"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement customizableElement, PluginEditor editor) {
- Element extension = super.createExtension(customizableElement, editor);
- if (customizableElement instanceof ModelTemplate) {
- ModelTemplate element = (ModelTemplate) customizableElement;
-
- extension.setAttribute("id", element.getId()); //$NON-NLS-1$
-
- if (element.getName() != null) {
- extension.setAttribute("name", element.getName()); //$NON-NLS-1$
- }
-
- if (element.getLanguage() != null) {
- extension.setAttribute("language", element.getLanguage()); //$NON-NLS-1$
- }
-
- // TODO: Papyrus now handles *.di and *.notation files
- }
-
- return extension;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/modelTemplate/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getModelTemplate();
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.customization.messages.Messages;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
+import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.ModelTemplate;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+import org.w3c.dom.Element;
+
+
+public class ModelTemplateExtensionFactory extends FileBasedExtensionFactory {
+
+ public ModelTemplateExtensionFactory() {
+ super(Messages.ModelTemplateExtensionFactory_ModelTemplate, "org.eclipse.papyrus.uml.diagram.wizards.templates", "file", "template", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ @Override
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
+ super.addElement(element, editor);
+
+ editor.addDependency("org.eclipse.papyrus.uml.diagram.wizards"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected Element createExtension(FileBasedCustomizableElement customizableElement, IPluginEditor editor) {
+ Element extension = super.createExtension(customizableElement, editor);
+ if (customizableElement instanceof ModelTemplate) {
+ ModelTemplate element = (ModelTemplate) customizableElement;
+
+ extension.setAttribute("id", element.getId()); //$NON-NLS-1$
+
+ if (element.getName() != null) {
+ extension.setAttribute("name", element.getName()); //$NON-NLS-1$
+ }
+
+ if (element.getLanguage() != null) {
+ extension.setAttribute("language", element.getLanguage()); //$NON-NLS-1$
+ }
+
+ // TODO: Papyrus now handles *.di and *.notation files
+ }
+
+ return extension;
+ }
+
+ @Override
+ protected String getTargetPath(FileBasedCustomizableElement element) {
+ return "/modelTemplate/" + getFileName(element); //$NON-NLS-1$
+ }
+
+ public EClass getCustomizableElementClass() {
+ return CustomizationPluginPackage.eINSTANCE.getModelTemplate();
+ }
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java
index 1b0dec3ae1b..1c31b0e4249 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/ProfileExtensionFactory.java
@@ -1,108 +1,108 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.Activator;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.Profile;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.infra.widgets.util.FileUtil;
-import org.w3c.dom.Element;
-
-
-public class ProfileExtensionFactory extends FileBasedExtensionFactory {
-
- public ProfileExtensionFactory() {
- super(Messages.ProfileExtensionFactory_Profile, "org.eclipse.papyrus.uml.extensionpoints.UMLProfile", "path", "profile", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extension = super.createExtension(element, editor);
- Profile profile = (Profile) element;
-
- extension.setAttribute("name", profile.getName()); //$NON-NLS-1$
-
- if (profile.getDescription() != null) {
- extension.setAttribute("description", profile.getDescription()); //$NON-NLS-1$
- }
-
- if (profile.getIconpath() != null && !profile.getIconpath().trim().equals("")) {
- //extension.setAttribute("iconpath", profile.getIconpath()); //$NON-NLS-1$
- copyIcon(profile.getIconpath(), editor);
- extension.setAttribute("iconpath", getIconPath(profile.getIconpath())); //$NON-NLS-1$
- }
-
- if (profile.getProvider() != null) {
- extension.setAttribute("provider", profile.getProvider()); //$NON-NLS-1$
- }
-
- return extension;
- }
-
- protected void copyIcon(String path, PluginEditor editor) {
- File sourceFile = FileUtil.getFile(path);
- File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + getIconPath(path)); //$NON-NLS-1$ //$NON-NLS-2$
- if (!targetFile.getParentFile().exists()) {
- targetFile.getParentFile().mkdirs();
- }
-
- try {
- copy(new FileInputStream(sourceFile), targetFile);
- } catch (IOException ex) {
- Activator.log.error(ex);
- }
-
- editor.getBuildEditor().addToBuild("icons/"); //$NON-NLS-1$
- }
-
- protected String getIconPath(String path) {
- return "icons/" + getFileName(path); //$NON-NLS-1$
- }
-
- @Override
- protected String getFileName(String path) {
- String fileName;
- path = path.replace("\\", "/");
- if (path.indexOf("/") < 0) { //$NON-NLS-1$
- fileName = path;
- } else {
- fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$
- }
- return fileName;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/umlProfile/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getProfile();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.customization.Activator;
+import org.eclipse.papyrus.customization.messages.Messages;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
+import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.Profile;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+import org.eclipse.papyrus.infra.widgets.util.FileUtil;
+import org.w3c.dom.Element;
+
+
+public class ProfileExtensionFactory extends FileBasedExtensionFactory {
+
+ public ProfileExtensionFactory() {
+ super(Messages.ProfileExtensionFactory_Profile, "org.eclipse.papyrus.uml.extensionpoints.UMLProfile", "path", "profile", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ @Override
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
+ super.addElement(element, editor);
+
+ editor.addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) {
+ Element extension = super.createExtension(element, editor);
+ Profile profile = (Profile) element;
+
+ extension.setAttribute("name", profile.getName()); //$NON-NLS-1$
+
+ if (profile.getDescription() != null) {
+ extension.setAttribute("description", profile.getDescription()); //$NON-NLS-1$
+ }
+
+ if (profile.getIconpath() != null && !profile.getIconpath().trim().equals("")) {
+ // extension.setAttribute("iconpath", profile.getIconpath()); //$NON-NLS-1$
+ copyIcon(profile.getIconpath(), editor);
+ extension.setAttribute("iconpath", getIconPath(profile.getIconpath())); //$NON-NLS-1$
+ }
+
+ if (profile.getProvider() != null) {
+ extension.setAttribute("provider", profile.getProvider()); //$NON-NLS-1$
+ }
+
+ return extension;
+ }
+
+ protected void copyIcon(String path, IPluginEditor editor) {
+ File sourceFile = FileUtil.getFile(path);
+ File targetFile = FileUtil.getWorkspaceFile("/" + editor.getProject().getName() + "/" + getIconPath(path)); //$NON-NLS-1$ //$NON-NLS-2$
+ if (!targetFile.getParentFile().exists()) {
+ targetFile.getParentFile().mkdirs();
+ }
+
+ try {
+ copy(new FileInputStream(sourceFile), targetFile);
+ } catch (IOException ex) {
+ Activator.log.error(ex);
+ }
+
+ editor.addToBuild("icons/"); //$NON-NLS-1$
+ }
+
+ protected String getIconPath(String path) {
+ return "icons/" + getFileName(path); //$NON-NLS-1$
+ }
+
+ @Override
+ protected String getFileName(String path) {
+ String fileName;
+ path = path.replace("\\", "/");
+ if (path.indexOf("/") < 0) { //$NON-NLS-1$
+ fileName = path;
+ } else {
+ fileName = path.substring(path.lastIndexOf("/") + 1, path.length()); //$NON-NLS-1$
+ }
+ return fileName;
+ }
+
+ @Override
+ protected String getTargetPath(FileBasedCustomizableElement element) {
+ return "/umlProfile/" + getFileName(element); //$NON-NLS-1$
+ }
+
+ public EClass getCustomizableElementClass() {
+ return CustomizationPluginPackage.eINSTANCE.getProfile();
+ }
+
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java
index 0556f997b09..87925310204 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewEnvironmentExtensionFactory.java
@@ -16,7 +16,7 @@ import org.eclipse.papyrus.customization.messages.Messages;
import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
public class PropertyViewEnvironmentExtensionFactory extends FileBasedExtensionFactory {
@@ -26,10 +26,10 @@ public class PropertyViewEnvironmentExtensionFactory extends FileBasedExtensionF
}
@Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
super.addElement(element, editor);
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$
+ editor.addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$
}
@Override
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java
index f8cb820e7d0..0d63ba62360 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/PropertyViewExtensionFactory.java
@@ -36,7 +36,7 @@ import org.eclipse.papyrus.customization.messages.Messages;
import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.properties.contexts.Context;
import org.eclipse.papyrus.infra.widgets.util.FileUtil;
@@ -53,21 +53,21 @@ public class PropertyViewExtensionFactory extends FileBasedExtensionFactory {
}
@Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
super.addElement(element, editor);
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$
+ editor.addDependency("org.eclipse.papyrus.infra.properties.ui"); //$NON-NLS-1$
}
@Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
+ protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) {
Element extension = super.createExtension(element, editor);
// extension.setAttribute("loadDefault", ((PropertyView)element).isLoadDefault() ? "true" : "false");
return extension;
}
@Override
- protected void copyFile(FileBasedCustomizableElement element, PluginEditor editor) {
+ protected void copyFile(FileBasedCustomizableElement element, IPluginEditor editor) {
String path = element.getFile();
File sourceFile = FileUtil.getFile(path);
URI uri = URI.createFileURI(sourceFile.getAbsolutePath());
@@ -93,7 +93,7 @@ public class PropertyViewExtensionFactory extends FileBasedExtensionFactory {
// Activator.log.error(ex);
// }
//
- editor.getBuildEditor().addToBuild("propertyView/");
+ editor.addToBuild("propertyView/");
}
private void copyAll(final Context source, final File target) {
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java
index 7b2fa90e872..ee17c2018cb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UICustomExtensionFactory.java
@@ -1,54 +1,54 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.UICustom;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.w3c.dom.Element;
-
-
-
-public class UICustomExtensionFactory extends FileBasedExtensionFactory {
-
- public UICustomExtensionFactory() {
- super(Messages.UICustomExtensionFactory_UICustom, "org.eclipse.emf.facet.infra.browser.custom.core.registration", "file", "browserCustomization", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.emf.facet.infra.browser.custom"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extension = super.createExtension(element, editor);
- extension.setAttribute("loadByDefault", ((UICustom) element).isLoadByDefault() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return extension;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/uiCustom/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getUICustom();
- }
-
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.customization.messages.Messages;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
+import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.UICustom;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+import org.w3c.dom.Element;
+
+
+
+public class UICustomExtensionFactory extends FileBasedExtensionFactory {
+
+ public UICustomExtensionFactory() {
+ super(Messages.UICustomExtensionFactory_UICustom, "org.eclipse.emf.facet.infra.browser.custom.core.registration", "file", "browserCustomization", true); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ @Override
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
+ super.addElement(element, editor);
+
+ editor.addDependency("org.eclipse.emf.facet.infra.browser.custom"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) {
+ Element extension = super.createExtension(element, editor);
+ extension.setAttribute("loadByDefault", ((UICustom) element).isLoadByDefault() ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ return extension;
+ }
+
+ @Override
+ protected String getTargetPath(FileBasedCustomizableElement element) {
+ return "/uiCustom/" + getFileName(element); //$NON-NLS-1$
+ }
+
+ public EClass getCustomizableElementClass() {
+ return CustomizationPluginPackage.eINSTANCE.getUICustom();
+ }
+
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java
index 3e9015b40ee..df7b3359ee5 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/factory/UMLModelExtensionFactory.java
@@ -1,69 +1,69 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.factory;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
-import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.UMLModel;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.w3c.dom.Element;
-
-
-public class UMLModelExtensionFactory extends FileBasedExtensionFactory {
-
- public UMLModelExtensionFactory() {
- super(Messages.UMLModelExtensionFactory_UMLModel, "org.eclipse.papyrus.uml.extensionpoints.UMLLibrary", "path", "library", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- }
-
- @Override
- public void addElement(CustomizableElement element, PluginEditor editor) {
- super.addElement(element, editor);
-
- editor.getManifestEditor().addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$
- }
-
- @Override
- protected Element createExtension(FileBasedCustomizableElement element, PluginEditor editor) {
- Element extension = super.createExtension(element, editor);
- UMLModel model = (UMLModel) element;
-
- if (model.getDescription() != null) {
- extension.setAttribute("description", model.getDescription()); //$NON-NLS-1$
- }
-
- if (model.getIconpath() != null) {
- extension.setAttribute("iconpath", model.getIconpath()); //$NON-NLS-1$
- }
-
- if (model.getName() != null) {
- extension.setAttribute("name", model.getName()); //$NON-NLS-1$
- }
-
- if (model.getProvider() != null) {
- extension.setAttribute("provider", model.getProvider()); //$NON-NLS-1$
- }
-
- return extension;
- }
-
- @Override
- protected String getTargetPath(FileBasedCustomizableElement element) {
- return "/umlLibrary/" + getFileName(element); //$NON-NLS-1$
- }
-
- public EClass getCustomizableElementClass() {
- return CustomizationPluginPackage.eINSTANCE.getUMLModel();
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.factory;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.papyrus.customization.messages.Messages;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationPluginPackage;
+import org.eclipse.papyrus.customization.model.customizationplugin.FileBasedCustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.UMLModel;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+import org.w3c.dom.Element;
+
+
+public class UMLModelExtensionFactory extends FileBasedExtensionFactory {
+
+ public UMLModelExtensionFactory() {
+ super(Messages.UMLModelExtensionFactory_UMLModel, "org.eclipse.papyrus.uml.extensionpoints.UMLLibrary", "path", "library", false); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ }
+
+ @Override
+ public void addElement(CustomizableElement element, IPluginEditor editor) {
+ super.addElement(element, editor);
+
+ editor.addDependency("org.eclipse.papyrus.uml.extensionpoints"); //$NON-NLS-1$
+ }
+
+ @Override
+ protected Element createExtension(FileBasedCustomizableElement element, IPluginEditor editor) {
+ Element extension = super.createExtension(element, editor);
+ UMLModel model = (UMLModel) element;
+
+ if (model.getDescription() != null) {
+ extension.setAttribute("description", model.getDescription()); //$NON-NLS-1$
+ }
+
+ if (model.getIconpath() != null) {
+ extension.setAttribute("iconpath", model.getIconpath()); //$NON-NLS-1$
+ }
+
+ if (model.getName() != null) {
+ extension.setAttribute("name", model.getName()); //$NON-NLS-1$
+ }
+
+ if (model.getProvider() != null) {
+ extension.setAttribute("provider", model.getProvider()); //$NON-NLS-1$
+ }
+
+ return extension;
+ }
+
+ @Override
+ protected String getTargetPath(FileBasedCustomizableElement element) {
+ return "/umlLibrary/" + getFileName(element); //$NON-NLS-1$
+ }
+
+ public EClass getCustomizableElementClass() {
+ return CustomizationPluginPackage.eINSTANCE.getUMLModel();
+ }
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java
index d8976a7ad97..62dd9141f0c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/generator/PluginGenerator.java
@@ -1,94 +1,98 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.generator;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.customization.Activator;
-import org.eclipse.papyrus.customization.factory.ExtensionFactory;
-import org.eclipse.papyrus.customization.messages.Messages;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
-import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationConfiguration;
-import org.eclipse.papyrus.customization.plugin.PluginEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.xml.sax.SAXException;
-
-public class PluginGenerator {
-
- public static PluginGenerator instance = new PluginGenerator();
-
- private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
-
- public void generate(IProject project, CustomizationConfiguration configuration) throws CoreException, IOException, SAXException, ParserConfigurationException {
- PluginEditor editor;
-
- editor = new PluginEditor(project);
-
- // editor.addNature("org.eclipse.jdt.core.javanature");
-
- Set<String> natures = new HashSet<String>();
- natures.add(PLUGIN_NATURE_ID);
- editor.addNatures(natures);
- editor.setSingleton(true);
-
- for (CustomizableElement element : configuration.getElements()) {
- ExtensionFactory factory = getFactory(element);
- if (factory != null) {
- factory.addElement(element, editor);
- } else {
- Activator.log.warn(Messages.PluginGenerator_factoryNotFound + element.eClass());
- }
- }
-
- editor.save();
-
-
- if (editor.getPluginEditor().exists()) {
- editor.getBuildEditor().addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE);
- editor.getBuildEditor().save();
- }
-
- String pluginId = configuration.getPlugin();
- Resource resource = configuration.eResource();
- URI uri = URI.createPlatformResourceURI(pluginId + "/customizationConfiguration.xmi", true); //$NON-NLS-1$
- if (resource == null) {
- ResourceSet resourceSet = new ResourceSetImpl();
- resource = resourceSet.createResource(uri);
- resource.getContents().add(configuration);
- } else {
- configuration.eResource().setURI(uri);
- }
-
- configuration.eResource().save(Collections.EMPTY_MAP);
-
- editor.getProject().refreshLocal(0, null);
- }
-
- private ExtensionFactory getFactory(CustomizableElement element) {
- ExtensionFactory factory = ExtensionFactory.registry.getFactory(element.eClass());
- return factory;
- }
-
- private PluginGenerator() {
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2011 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.generator;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.papyrus.customization.Activator;
+import org.eclipse.papyrus.customization.factory.ExtensionFactory;
+import org.eclipse.papyrus.customization.messages.Messages;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizableElement;
+import org.eclipse.papyrus.customization.model.customizationplugin.CustomizationConfiguration;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginEditor;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors;
+import org.xml.sax.SAXException;
+
+public class PluginGenerator {
+
+ public static PluginGenerator instance = new PluginGenerator();
+
+ private final static String PLUGIN_NATURE_ID = "org.eclipse.pde.PluginNature"; //$NON-NLS-1$
+
+ public void generate(IProject project, CustomizationConfiguration configuration) throws CoreException, IOException, SAXException, ParserConfigurationException {
+ IPluginEditor editor;
+
+ editor = ProjectEditors.getPluginEditor(project);
+ if (!editor.exists()) {
+ editor.create();
+ }
+ editor.init();
+
+ // editor.addNature("org.eclipse.jdt.core.javanature");
+
+ Set<String> natures = new HashSet<String>();
+ natures.add(PLUGIN_NATURE_ID);
+ editor.addNatures(natures);
+ editor.setSingleton(true);
+
+ for (CustomizableElement element : configuration.getElements()) {
+ ExtensionFactory factory = getFactory(element);
+ if (factory != null) {
+ factory.addElement(element, editor);
+ } else {
+ Activator.log.warn(Messages.PluginGenerator_factoryNotFound + element.eClass());
+ }
+ }
+
+ editor.save();
+
+ if (editor.pluginManifestExists()) {
+ editor.addToBuild(IPluginProjectEditor.PLUGIN_XML_FILE);
+ editor.save();
+ }
+
+ String pluginId = configuration.getPlugin();
+ Resource resource = configuration.eResource();
+ URI uri = URI.createPlatformResourceURI(pluginId + "/customizationConfiguration.xmi", true); //$NON-NLS-1$
+ if (resource == null) {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ resource = resourceSet.createResource(uri);
+ resource.getContents().add(configuration);
+ } else {
+ configuration.eResource().setURI(uri);
+ }
+
+ configuration.eResource().save(Collections.EMPTY_MAP);
+
+ editor.getProject().refreshLocal(0, null);
+ }
+
+ private ExtensionFactory getFactory(CustomizableElement element) {
+ ExtensionFactory factory = ExtensionFactory.registry.getFactory(element.eClass());
+ return factory;
+ }
+
+ private PluginGenerator() {
+ }
+}
diff --git a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java
index eb61d0b73e5..8c6abf404a4 100644
--- a/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java
+++ b/plugins/customization/org.eclipse.papyrus.customization/src/org/eclipse/papyrus/customization/plugin/PluginEditor.java
@@ -1,217 +1,40 @@
-/*****************************************************************************
- * Copyright (c) 2011 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:
- * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
- *****************************************************************************/
-package org.eclipse.papyrus.customization.plugin;
-
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.papyrus.eclipse.project.editors.file.BuildEditor;
-import org.eclipse.papyrus.eclipse.project.editors.file.ManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IBuildEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor;
-import org.eclipse.papyrus.eclipse.project.editors.interfaces.IPluginProjectEditor;
-import org.eclipse.papyrus.eclipse.project.editors.project.PluginProjectEditor;
-import org.xml.sax.SAXException;
-
-public class PluginEditor extends PluginProjectEditor implements IPluginProjectEditor, IManifestEditor, IBuildEditor {
-
- protected IManifestEditor manifest;
-
- protected IBuildEditor build;
-
- public PluginEditor(IProject project) throws CoreException, IOException, SAXException, ParserConfigurationException {
- super(project);
- manifest = new ManifestEditor(project);
- build = new BuildEditor(project);
-
- manifest.init();
- build.init();
- if (!exists()) {
- create();
- }
- init();
- }
-
- public PluginProjectEditor getPluginEditor() {
- return this;
- }
-
- public IManifestEditor getManifestEditor() {
- return manifest;
- }
-
- public IBuildEditor getBuildEditor() {
- return build;
- }
-
- public void registerSourceFolder(String source) {
- build.registerSourceFolder(source);
- }
-
- public void addToBuild(String path) {
- build.addToBuild(path);
- }
-
- public String[] getSourceFolders() {
- return build.getSourceFolders();
- }
-
- public void addDependency(String dependency) {
- manifest.addDependency(dependency);
- }
-
- public void addDependency(String dependency, String version) {
- manifest.addDependency(dependency, version);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#hasDependency(java.lang.String)
- *
- * @param dependency
- * @return
- */
- public boolean hasDependency(String dependency) {
- return manifest.hasDependency(dependency);
- }
-
- public void setValue(String key, String value) {
- manifest.setValue(key, value);
- }
-
- public void setValue(String key, String name, String value) {
- manifest.setValue(key, name, value);
- }
-
- public void removeValue(String key, String value) {
- manifest.removeValue(key, value);
- }
-
- public void removeValue(String key) {
- manifest.removeValue(key);
- }
-
- public void setBundleName(String name) {
- manifest.setBundleName(name);
- }
-
- public String getSymbolicBundleName() {
- return manifest.getSymbolicBundleName();
- }
-
- public String getBundleVersion() {
- return manifest.getBundleVersion();
- }
-
- public void setBundleVersion(String version) {
- manifest.setBundleVersion(version);
- }
-
- @Override
- public void save() {
- super.save();
- manifest.save();
- build.save();
- }
-
- public void registerBinFolder(String binFolder) {
- build.registerBinFolder(binFolder);
- }
-
- public void removeFromBuild(String path) {
- build.removeFromBuild(path);
- }
-
- public boolean isRegisteredSourceFolder(String path) {
- return build.isRegisteredSourceFolder(path);
- }
-
- public boolean isRegisteredBinFolder(String binFolder) {
- return build.isRegisteredBinFolder(binFolder);
- }
-
- public String[] getElementsInBuild() {
- return build.getElementsInBuild();
- }
-
- public String getBundleVendor() {
- return manifest.getBundleVendor();
- }
-
- public void setBundleVendor(String vendor) {
- manifest.setBundleVendor(vendor);
- }
-
- public String getValue(String key) {
- return manifest.getValue(key);
- }
-
- public void setSymbolicBundleName(String name) {
- manifest.setSymbolicBundleName(name);
- }
-
- public String getBundleName() {
- return manifest.getBundleName();
- }
-
- public String getBundleLocalization() {
- return manifest.getBundleLocalization();
- }
-
- public void setSingleton(boolean singleton) {
- manifest.setSingleton(singleton);
- }
-
- public void setDependenciesVersion(String dependencyPattern, String newVersion) {
- manifest.setDependenciesVersion(dependencyPattern, newVersion);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String)
- *
- * @param packageName
- */
- public void addImportPackage(String packageName) {
- manifest.addImportPackage(packageName);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addImportPackage(java.lang.String, java.lang.String)
- *
- * @param packageName
- * @param version
- */
- public void addImportPackage(String packageName, String version) {
- manifest.addImportPackage(packageName, version);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String)
- *
- * @param packageName
- */
- public void addExportPackage(String packageName) {
- manifest.addExportPackage(packageName);
- }
-
- /**
- * @see org.eclipse.papyrus.eclipse.project.editors.interfaces.IManifestEditor#addExportPackage(java.lang.String, java.lang.String)
- *
- * @param packageName
- * @param version
- */
- public void addExportPackage(String packageName, String version) {
- manifest.addExportPackage(packageName, version);
- }
-}
+/*****************************************************************************
+ * Copyright (c) 2011, 2016 CEA LIST, Christian W. Damus, and others.
+ *
+ * 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ * Christian W. Damus - bug 485220
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.customization.plugin;
+
+import java.io.IOException;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.papyrus.eclipse.project.editors.interfaces.ProjectEditors;
+import org.xml.sax.SAXException;
+
+/**
+ * @deprecated Use the {@link ProjectEditors#getPluginEditor(IProject)} API, instead.
+ */
+@Deprecated
+public class PluginEditor extends org.eclipse.papyrus.eclipse.project.editors.project.PluginEditor {
+
+ public PluginEditor(IProject project) throws CoreException, IOException, SAXException, ParserConfigurationException {
+ super(project);
+
+ if (!exists()) {
+ create();
+ }
+
+ init();
+ }
+}
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project
index f3f5d526a87..6c9a959a7fb 100644
--- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project
+++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.gmfdiag.expansion.edit</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF
index edde45f37f3..188997cd46a 100644
--- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/META-INF/MANIFEST.MF
@@ -1,17 +1,15 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider,
- org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.common;visibility:=reexport,
- org.eclipse.emf.edit;visibility:=reexport,
- org.eclipse.uml2.common.edit;visibility:=reexport
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.provider,
+ org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.uml2.common.edit;bundle-version="[2.1.0,3.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.provider.ExpandModelEditPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project
index 28ffbba4a5a..9224a1d644d 100644
--- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project
+++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.project
@@ -1,28 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.gmfdiag.expansion.editor</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>check.maven.pom</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.papyrus.releng.main.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF
index 79d57e3029e..c59799a1b5f 100644
--- a/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/META-INF/MANIFEST.MF
@@ -1,20 +1,14 @@
-Manifest-Version: 1.0
-Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation,
- org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.expansion.edit;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.edit.ui;visibility:=reexport,
- org.eclipse.ui.ide;visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.common
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.editor;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.infra.gmfdiag.common.expansionmodel.presentation,
+ org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.expansion.edit;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.expansion.expansionmodel.presentation.ExpandModelEditorPlugin$Implementation
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.expansion.editor;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

Back to the top