diff options
Diffstat (limited to 'plugins/uml/diagram')
25 files changed, 680 insertions, 682 deletions
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF index 45a388a10d9..7fcd1434b38 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/META-INF/MANIFEST.MF @@ -40,9 +40,9 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.validation.ocl;bundle-version="[1.4.0,2.0.0)";visibility:=reexport,
@@ -50,7 +50,7 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
org.eclipse.uml2.uml;bundle-version="[5.2.0,6.0.0)",
org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF index d0afc976fb3..4564485484d 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/META-INF/MANIFEST.MF @@ -35,12 +35,12 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12.0,3.0.0)",
org.eclipse.emf.ecore.edit;visibility:=reexport;bundle-version="[2.9.0,3.0.0)",
@@ -53,7 +53,7 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="3.0.0",
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)",
org.eclipse.core.runtime,
org.eclipse.core.resources,
org.eclipse.core.expressions,
@@ -66,11 +66,11 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 org.eclipse.gmf.runtime.emf.commands.core,
org.eclipse.gmf.runtime.emf.ui.properties,
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.ui,
- org.eclipse.papyrus.infra.core.sashwindows.di,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.properties,
org.eclipse.gmf.runtime.diagram.ui.providers,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
@@ -78,8 +78,8 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 org.eclipse.uml2.uml.edit;visibility:=reexport,
org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
org.eclipse.gef,
- org.eclipse.papyrus.extensionpoints.editors,
- org.eclipse.papyrus.infra.services.edit
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF index 219c58b6c81..995171d291e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/META-INF/MANIFEST.MF @@ -1,22 +1,22 @@ -Manifest-Version: 1.0 -Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands, - org.eclipse.papyrus.uml.diagram.common.groups.core.utils, - org.eclipse.papyrus.uml.diagram.common.groups.edit.policies, - org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment, - org.eclipse.papyrus.uml.diagram.common.groups.preferences, - org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance, - org.eclipse.papyrus.uml.diagram.common.groups.utils -Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)", - org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)" -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %pluginName -Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.common.groups.commands,
+ org.eclipse.papyrus.uml.diagram.common.groups.core.utils,
+ org.eclipse.papyrus.uml.diagram.common.groups.edit.policies,
+ org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment,
+ org.eclipse.papyrus.uml.diagram.common.groups.preferences,
+ org.eclipse.papyrus.uml.diagram.common.groups.tabbedproperties.appearance,
+ org.eclipse.papyrus.uml.diagram.common.groups.utils
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.uml2.uml.edit;bundle-version="[5.1.0,6.0.0)",
+ org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.groups.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common.groups;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF index aa5768a4870..062d008e179 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF @@ -1,96 +1,96 @@ -Manifest-Version: 1.0 -Export-Package: org.eclipse.papyrus.uml.diagram.common, - org.eclipse.papyrus.uml.diagram.common.actions, - org.eclipse.papyrus.uml.diagram.common.actions.handlers, - org.eclipse.papyrus.uml.diagram.common.canonical, - org.eclipse.papyrus.uml.diagram.common.commands, - org.eclipse.papyrus.uml.diagram.common.dialogs, - org.eclipse.papyrus.uml.diagram.common.directedit, - org.eclipse.papyrus.uml.diagram.common.dragtracker, - org.eclipse.papyrus.uml.diagram.common.draw2d, - org.eclipse.papyrus.uml.diagram.common.draw2d.anchors, - org.eclipse.papyrus.uml.diagram.common.editparts, - org.eclipse.papyrus.uml.diagram.common.editpolicies, - org.eclipse.papyrus.uml.diagram.common.figure.edge, - org.eclipse.papyrus.uml.diagram.common.figure.layout, - org.eclipse.papyrus.uml.diagram.common.figure.node, - org.eclipse.papyrus.uml.diagram.common.handlers, - org.eclipse.papyrus.uml.diagram.common.helper, - org.eclipse.papyrus.uml.diagram.common.layout, - org.eclipse.papyrus.uml.diagram.common.listeners, - org.eclipse.papyrus.uml.diagram.common.locator, - org.eclipse.papyrus.uml.diagram.common.parser, - org.eclipse.papyrus.uml.diagram.common.parser.assist, - org.eclipse.papyrus.uml.diagram.common.parser.custom, - org.eclipse.papyrus.uml.diagram.common.parser.lookup, - org.eclipse.papyrus.uml.diagram.common.parser.packageimport, - org.eclipse.papyrus.uml.diagram.common.parser.stereotype, - org.eclipse.papyrus.uml.diagram.common.parser.structural, - org.eclipse.papyrus.uml.diagram.common.part, - org.eclipse.papyrus.uml.diagram.common.preferences, - org.eclipse.papyrus.uml.diagram.common.providers, - org.eclipse.papyrus.uml.diagram.common.providers.assistant, - org.eclipse.papyrus.uml.diagram.common.resourceupdate, - org.eclipse.papyrus.uml.diagram.common.service, - org.eclipse.papyrus.uml.diagram.common.service.palette, - org.eclipse.papyrus.uml.diagram.common.sheet, - org.eclipse.papyrus.uml.diagram.common.stereotype, - org.eclipse.papyrus.uml.diagram.common.stereotype.display.command, - org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper, - org.eclipse.papyrus.uml.diagram.common.stereotype.migration, - org.eclipse.papyrus.uml.diagram.common.stereotype.migration.editpolicies, - org.eclipse.papyrus.uml.diagram.common.strategy.paste, - org.eclipse.papyrus.uml.diagram.common.ui.dialogs, - org.eclipse.papyrus.uml.diagram.common.ui.helper, - org.eclipse.papyrus.uml.diagram.common.util, - org.eclipse.papyrus.uml.diagram.common.util.functions, - org.eclipse.papyrus.uml.diagram.common.util.predicates, - org.eclipse.papyrus.uml.diagram.internal.common.services;x-internal:=true -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: . -Bundle-Name: %pluginName -Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)", - org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)", - org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[2.0.0,3.0.0)", - org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.7.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.emf.appearance;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.services.localizer;bundle-version="[1.2.0,2.0.0)", - org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)", - org.apache.batik.css;bundle-version="[1.6.0,1.7.0)", - org.apache.batik.util;bundle-version="[1.6.0,1.7.0)", - org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)", - org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, - org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", - org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)", - org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport -Bundle-Vendor: %providerName -Bundle-Version: 3.0.0.qualifier -Eclipse-BuddyPolicy: dependent -Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:=true +Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.common,
+ org.eclipse.papyrus.uml.diagram.common.actions,
+ org.eclipse.papyrus.uml.diagram.common.actions.handlers,
+ org.eclipse.papyrus.uml.diagram.common.canonical,
+ org.eclipse.papyrus.uml.diagram.common.commands,
+ org.eclipse.papyrus.uml.diagram.common.dialogs,
+ org.eclipse.papyrus.uml.diagram.common.directedit,
+ org.eclipse.papyrus.uml.diagram.common.dragtracker,
+ org.eclipse.papyrus.uml.diagram.common.draw2d,
+ org.eclipse.papyrus.uml.diagram.common.draw2d.anchors,
+ org.eclipse.papyrus.uml.diagram.common.editparts,
+ org.eclipse.papyrus.uml.diagram.common.editpolicies,
+ org.eclipse.papyrus.uml.diagram.common.figure.edge,
+ org.eclipse.papyrus.uml.diagram.common.figure.layout,
+ org.eclipse.papyrus.uml.diagram.common.figure.node,
+ org.eclipse.papyrus.uml.diagram.common.handlers,
+ org.eclipse.papyrus.uml.diagram.common.helper,
+ org.eclipse.papyrus.uml.diagram.common.layout,
+ org.eclipse.papyrus.uml.diagram.common.listeners,
+ org.eclipse.papyrus.uml.diagram.common.locator,
+ org.eclipse.papyrus.uml.diagram.common.parser,
+ org.eclipse.papyrus.uml.diagram.common.parser.assist,
+ org.eclipse.papyrus.uml.diagram.common.parser.custom,
+ org.eclipse.papyrus.uml.diagram.common.parser.lookup,
+ org.eclipse.papyrus.uml.diagram.common.parser.packageimport,
+ org.eclipse.papyrus.uml.diagram.common.parser.stereotype,
+ org.eclipse.papyrus.uml.diagram.common.parser.structural,
+ org.eclipse.papyrus.uml.diagram.common.part,
+ org.eclipse.papyrus.uml.diagram.common.preferences,
+ org.eclipse.papyrus.uml.diagram.common.providers,
+ org.eclipse.papyrus.uml.diagram.common.providers.assistant,
+ org.eclipse.papyrus.uml.diagram.common.resourceupdate,
+ org.eclipse.papyrus.uml.diagram.common.service,
+ org.eclipse.papyrus.uml.diagram.common.service.palette,
+ org.eclipse.papyrus.uml.diagram.common.sheet,
+ org.eclipse.papyrus.uml.diagram.common.stereotype,
+ org.eclipse.papyrus.uml.diagram.common.stereotype.display.command,
+ org.eclipse.papyrus.uml.diagram.common.stereotype.display.helper,
+ org.eclipse.papyrus.uml.diagram.common.stereotype.migration,
+ org.eclipse.papyrus.uml.diagram.common.stereotype.migration.editpolicies,
+ org.eclipse.papyrus.uml.diagram.common.strategy.paste,
+ org.eclipse.papyrus.uml.diagram.common.ui.dialogs,
+ org.eclipse.papyrus.uml.diagram.common.ui.helper,
+ org.eclipse.papyrus.uml.diagram.common.util,
+ org.eclipse.papyrus.uml.diagram.common.util.functions,
+ org.eclipse.papyrus.uml.diagram.common.util.predicates,
+ org.eclipse.papyrus.uml.diagram.internal.common.services;x-internal:=true
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="[1.7.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.wizards;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.actions;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.printing;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.emf.appearance;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.services.localizer;bundle-version="[2.0.0,3.0.0)",
+ org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.css;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
+ org.eclipse.papyrus.infra.core.pluginexplorer;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.menu;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.canonical;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.nebula.widgets.richtext;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.edit;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)";visibility:=reexport
+Bundle-Vendor: %providerName
+Bundle-Version: 3.0.0.qualifier
+Eclipse-BuddyPolicy: dependent
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.common.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.common;singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF index 630ad0e517b..181616e825c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/META-INF/MANIFEST.MF @@ -40,7 +40,7 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0) org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)",
@@ -52,10 +52,10 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0) org.eclipse.papyrus.uml.diagram.menu;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="3.0.0"
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Activator: org.eclipse.papyrus.uml.diagram.component.part.UMLDiagramEditorPlugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.component; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen index 0389ec896c9..045089401e4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/model/ComponentDiagram.gmfgen @@ -3405,7 +3405,7 @@ iD="org.eclipse.papyrus.uml.diagram.component" name="Papyrus Component Diagram " provider="Eclipse Modeling Project" - version="2.0.0.qualifier"> + version="3.0.0.qualifier"> <requiredPlugins>org.eclipse.draw2d</requiredPlugins> <requiredPlugins>org.eclipse.gmf.runtime.draw2d.ui</requiredPlugins> </plugin> diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml index 7374fb3db6a..de11b0ee291 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.component/pom.xml @@ -1,13 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.uml.diagram.component</artifactId> - <version>2.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> +<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.uml.diagram.component</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
</project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF index abcce8e80af..c0303f9d64b 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/META-INF/MANIFEST.MF @@ -38,7 +38,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version= org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.draw2d;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
@@ -47,7 +47,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version= org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="3.0.0"
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF index d914abb739e..1a9f0c2e0ef 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.css/META-INF/MANIFEST.MF @@ -1,16 +1,16 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", - org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", - org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport -Bundle-Vendor: Eclipse Modeling Project -Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier -Bundle-Name: UML-Specific CSS concepts -Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.css;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Export-Package: org.eclipse.papyrus.uml.diagram.css, - org.eclipse.papyrus.uml.diagram.css.dom, - org.eclipse.papyrus.uml.diagram.css.helper +Manifest-Version: 1.0
+Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Name: UML-Specific CSS concepts
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.css.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.css;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.papyrus.uml.diagram.css,
+ org.eclipse.papyrus.uml.diagram.css.dom,
+ org.eclipse.papyrus.uml.diagram.css.helper
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF index 2fd668b202a..9810322b73f 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.deployment/META-INF/MANIFEST.MF @@ -44,11 +44,11 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v org.eclipse.gmf.runtime.emf.commands.core,
org.eclipse.gmf.runtime.emf.ui.properties,
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.ui,
- org.eclipse.papyrus.infra.core.sashwindows.di,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.properties,
org.eclipse.gmf.runtime.diagram.ui.providers,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
@@ -60,11 +60,11 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v org.eclipse.emf.ecore.edit;visibility:=reexport,
org.eclipse.emf.validation;visibility:=reexport,
org.eclipse.gef,
- org.eclipse.papyrus.extensionpoints.editors,
- org.eclipse.papyrus.infra.services.edit,
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF index 8b4ba5e73c9..124be625d17 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/META-INF/MANIFEST.MF @@ -16,14 +16,14 @@ Export-Package: org.eclipse.papyrus.uml.diagram.interactionoverview, Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.timing;bundle-version="[1.3.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.sequence;bundle-version="[3.0.0,4.0.0)";resolution:=optional,
org.eclipse.papyrus.uml.diagram.stereotype.edition;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.modelexplorer;bundle-version="[1.2.0,2.0.0)",
org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="[2.1.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.hyperlink;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF index b441e7c4fee..c1dec84c380 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/META-INF/MANIFEST.MF @@ -1,23 +1,23 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %pluginName -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.linklf;singleton:=true -Bundle-Version: 1.2.100.qualifier -Bundle-Activator: org.eclipse.papyrus.uml.diagram.linklf.PapyrusLinkLFActivator -Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.component;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 -Bundle-ActivationPolicy: lazy -Bundle-Vendor: %providerName -Bundle-Localization: plugin -Export-Package: org.eclipse.papyrus.uml.diagram.linklf;x-internal:=true, - org.eclipse.papyrus.uml.diagram.linklf.common, - org.eclipse.papyrus.uml.diagram.linklf.policy.graphicalnode, - org.eclipse.papyrus.uml.diagram.linklf.providers +Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.linklf;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.linklf.PapyrusLinkLFActivator
+Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.clazz;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.activity;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.component;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.composite;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.deployment;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.diagram.profile;bundle-version="[3.0.0,4.0.0)"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.eclipse.papyrus.uml.diagram.linklf;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.linklf.common,
+ org.eclipse.papyrus.uml.diagram.linklf.policy.graphicalnode,
+ org.eclipse.papyrus.uml.diagram.linklf.providers
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml index be6a14b5d56..8d04f76218c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/pom.xml @@ -1,13 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.uml.diagram.linklf</artifactId> - <version>1.2.100-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> +<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.uml.diagram.linklf</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/src/org/eclipse/papyrus/uml/diagram/linklf/providers/LinksLFEditPolicyProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/src/org/eclipse/papyrus/uml/diagram/linklf/providers/LinksLFEditPolicyProvider.java index 2acfac27bd6..044a91d63b2 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/src/org/eclipse/papyrus/uml/diagram/linklf/providers/LinksLFEditPolicyProvider.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.linklf/src/org/eclipse/papyrus/uml/diagram/linklf/providers/LinksLFEditPolicyProvider.java @@ -1,159 +1,163 @@ -/***************************************************************************** - * Copyright (c) 2015 CEA LIST, Montages AG 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: - * Svyatoslav Kovalsky - Initial API and implementation - * - *****************************************************************************/ -package org.eclipse.papyrus.uml.diagram.linklf.providers; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.gef.EditPart; -import org.eclipse.gef.EditPolicy; -import org.eclipse.gmf.runtime.common.core.service.AbstractProvider; -import org.eclipse.gmf.runtime.common.core.service.IOperation; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart; -import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart; -import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation; -import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider; -import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.gmf.runtime.notation.View; -import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeNodeAnchorDelegate; -import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.editparts.LinkLFAnchorsDelegatingEditPart; -import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart; -import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies.AdjustBorderItemAnchorsEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies.AdjustImplicitlyMovedLinksEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies.AdjustSyntheticBendpointsEditPolicy; -import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart; -import org.eclipse.papyrus.uml.diagram.linklf.common.LinkLabelPositionEditPolicy; -import org.eclipse.papyrus.uml.diagram.linklf.common.LinksLFConnectionLabelControlEditPolicy; -import org.eclipse.papyrus.uml.diagram.linklf.common.Node2ConnectionLabelControlEditPolicy; -import org.eclipse.papyrus.uml.diagram.linklf.policy.graphicalnode.DefaultLinksLFEditPolicy; - -public class LinksLFEditPolicyProvider extends AbstractProvider implements - IEditPolicyProvider, IExecutableExtension { - - public static final String DIAGRAM_NOTATION_CLASS = "org.eclipse.gmf.runtime.notation.Diagram(org.eclipse.gmf.runtime.notation)"; - - private String myDiagramID; - - @Override - public boolean provides(IOperation op) { - if (false == op instanceof CreateEditPoliciesOperation) { - return false; - } - CreateEditPoliciesOperation operation = (CreateEditPoliciesOperation) op; - EditPart host = operation.getEditPart(); - - if (false == host instanceof IGraphicalEditPart) { - return false; - } - - View notationView = ((IGraphicalEditPart) host).getNotationView(); - if (notationView == null) { - return false; - } - - Diagram diagram = notationView.getDiagram(); - if (!isSupportedDiagram(diagram)) { - return false; - } - return true; - } - - private boolean isSupportedDiagram(Diagram diagram) { - return diagram != null && myDiagramID != null - && myDiagramID.equals(diagram.getType()); - } - - @Override - public void createEditPolicies(EditPart editPart) { - IGraphicalEditPart graphicalEP = (IGraphicalEditPart) editPart; - if (graphicalEP instanceof LinkLFConnectionNodeEditPart) { - installLinkEditPolicies((LinkLFConnectionNodeEditPart) editPart); - } else if (editPart instanceof INodeEditPart) { - installNodeEditPolicies((INodeEditPart) editPart); - } else if (graphicalEP instanceof PapyrusLabelEditPart) { - installPapyrusLabelPolicy((PapyrusLabelEditPart)graphicalEP); - } - } - - protected void installLinkEditPolicies(LinkLFConnectionNodeEditPart linkEP) { - linkEP.setLinkLFEnabled(true); - linkEP.installEditPolicy(LinksLFConnectionLabelControlEditPolicy.KEY, new LinksLFConnectionLabelControlEditPolicy()); - } - - protected void installNodeEditPolicies(INodeEditPart nodeEP) { - if (nodeEP instanceof LinkLFAnchorsDelegatingEditPart) { - LinkLFAnchorsDelegatingEditPart linklfEP = (LinkLFAnchorsDelegatingEditPart) nodeEP; - linklfEP.setAnchorDelegate(new LinkLFShapeNodeAnchorDelegate( - linklfEP.getNodeFigure())); - } - - installGraphicalNodeEditPolicy(nodeEP); - - nodeEP.installEditPolicy(AdjustSyntheticBendpointsEditPolicy.ROLE, - new AdjustSyntheticBendpointsEditPolicy()); - nodeEP.installEditPolicy(AdjustImplicitlyMovedLinksEditPolicy.ROLE, - new AdjustImplicitlyMovedLinksEditPolicy()); - if (nodeEP instanceof IBorderItemEditPart) { - nodeEP.installEditPolicy(AdjustBorderItemAnchorsEditPolicy.ROLE, - new AdjustBorderItemAnchorsEditPolicy()); - } - - nodeEP.installEditPolicy(Node2ConnectionLabelControlEditPolicy.KEY, new Node2ConnectionLabelControlEditPolicy()); - } - - protected void installGraphicalNodeEditPolicy(INodeEditPart nodeEP) { - if (nodeEP.getEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE) != null) { - nodeEP.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultLinksLFEditPolicy()); - } - } - - protected void installPapyrusLabelPolicy(PapyrusLabelEditPart labelEP) { - if (labelEP.getParent() instanceof LinkLFConnectionNodeEditPart) { - labelEP.installEditPolicy(LinkLabelPositionEditPolicy.KEY, new LinkLabelPositionEditPolicy()); - } - } - - @Override - public void setInitializationData(IConfigurationElement config, String propertyName, Object data) - throws CoreException { - initFromIConfig(config); - } - - public void initFromIConfig(IConfigurationElement config) { - String classAttr = config.getAttribute("class"); - if (DIAGRAM_NOTATION_CLASS.equals(classAttr)) { - myDiagramID = getValue(config); - } - IConfigurationElement[] children = config.getChildren(); - if (children != null) { - for (IConfigurationElement child : children) { - initFromIConfig(child); - } - } - } - - private String getValue(IConfigurationElement config) { - IConfigurationElement methods[] = config.getChildren("method"); - if (methods == null || methods.length != 1) { - return ""; - } - IConfigurationElement method = methods[0]; - String value = method.getAttribute("value"); - if (value == null || value.isEmpty()) { - return ""; - } - return value; - } -} +/*****************************************************************************
+ * Copyright (c) 2015 CEA LIST, Montages AG 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:
+ * Svyatoslav Kovalsky - Initial API and implementation
+ *
+ *****************************************************************************/
+package org.eclipse.papyrus.uml.diagram.linklf.providers;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExecutableExtension;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gmf.runtime.common.core.service.AbstractProvider;
+import org.eclipse.gmf.runtime.common.core.service.IOperation;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.INodeEditPart;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.CreateEditPoliciesOperation;
+import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.papyrus.infra.gmfdiag.common.editpart.PapyrusLabelEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.LinkLFShapeNodeAnchorDelegate;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.editparts.LinkLFAnchorsDelegatingEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.editparts.LinkLFConnectionNodeEditPart;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies.AdjustBorderItemAnchorsEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies.AdjustImplicitlyMovedLinksEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.tooling.runtime.linklf.policies.AdjustSyntheticBendpointsEditPolicy;
+import org.eclipse.papyrus.uml.diagram.linklf.common.LinkLabelPositionEditPolicy;
+import org.eclipse.papyrus.uml.diagram.linklf.common.LinksLFConnectionLabelControlEditPolicy;
+import org.eclipse.papyrus.uml.diagram.linklf.common.Node2ConnectionLabelControlEditPolicy;
+import org.eclipse.papyrus.uml.diagram.linklf.policy.graphicalnode.DefaultLinksLFEditPolicy;
+
+public class LinksLFEditPolicyProvider extends AbstractProvider implements
+ IEditPolicyProvider, IExecutableExtension {
+
+ public static final String DIAGRAM_NOTATION_CLASS = "org.eclipse.gmf.runtime.notation.Diagram(org.eclipse.gmf.runtime.notation)";
+
+ private String myDiagramID;
+
+ @Override
+ public boolean provides(IOperation op) {
+ if (false == op instanceof CreateEditPoliciesOperation) {
+ return false;
+ }
+ CreateEditPoliciesOperation operation = (CreateEditPoliciesOperation) op;
+ EditPart host = operation.getEditPart();
+
+ if (false == host instanceof IGraphicalEditPart) {
+ return false;
+ }
+
+ View notationView = ((IGraphicalEditPart) host).getNotationView();
+ if (notationView == null) {
+ return false;
+ }
+
+ Diagram diagram = notationView.getDiagram();
+ if (!isSupportedDiagram(diagram)) {
+ return false;
+ }
+ return true;
+ }
+
+ private boolean isSupportedDiagram(Diagram diagram) {
+ return diagram != null && myDiagramID != null
+ && myDiagramID.equals(diagram.getType());
+ }
+
+ @Override
+ public void createEditPolicies(EditPart editPart) {
+ IGraphicalEditPart graphicalEP = (IGraphicalEditPart) editPart;
+ if (graphicalEP instanceof LinkLFConnectionNodeEditPart) {
+ installLinkEditPolicies((LinkLFConnectionNodeEditPart) editPart);
+ } else if (editPart instanceof INodeEditPart) {
+ installNodeEditPolicies((INodeEditPart) editPart);
+ } else if (graphicalEP instanceof PapyrusLabelEditPart) {
+ installPapyrusLabelPolicy((PapyrusLabelEditPart) graphicalEP);
+ }
+ }
+
+ /**
+ * @since 2.0
+ * @param linkEP
+ */
+ protected void installLinkEditPolicies(LinkLFConnectionNodeEditPart linkEP) {
+ linkEP.setLinkLFEnabled(true);
+ linkEP.installEditPolicy(LinksLFConnectionLabelControlEditPolicy.KEY, new LinksLFConnectionLabelControlEditPolicy());
+ }
+
+ protected void installNodeEditPolicies(INodeEditPart nodeEP) {
+ if (nodeEP instanceof LinkLFAnchorsDelegatingEditPart) {
+ LinkLFAnchorsDelegatingEditPart linklfEP = (LinkLFAnchorsDelegatingEditPart) nodeEP;
+ linklfEP.setAnchorDelegate(new LinkLFShapeNodeAnchorDelegate(
+ linklfEP.getNodeFigure()));
+ }
+
+ installGraphicalNodeEditPolicy(nodeEP);
+
+ nodeEP.installEditPolicy(AdjustSyntheticBendpointsEditPolicy.ROLE,
+ new AdjustSyntheticBendpointsEditPolicy());
+ nodeEP.installEditPolicy(AdjustImplicitlyMovedLinksEditPolicy.ROLE,
+ new AdjustImplicitlyMovedLinksEditPolicy());
+ if (nodeEP instanceof IBorderItemEditPart) {
+ nodeEP.installEditPolicy(AdjustBorderItemAnchorsEditPolicy.ROLE,
+ new AdjustBorderItemAnchorsEditPolicy());
+ }
+
+ nodeEP.installEditPolicy(Node2ConnectionLabelControlEditPolicy.KEY, new Node2ConnectionLabelControlEditPolicy());
+ }
+
+ protected void installGraphicalNodeEditPolicy(INodeEditPart nodeEP) {
+ if (nodeEP.getEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE) != null) {
+ nodeEP.installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new DefaultLinksLFEditPolicy());
+ }
+ }
+
+ protected void installPapyrusLabelPolicy(PapyrusLabelEditPart labelEP) {
+ if (labelEP.getParent() instanceof LinkLFConnectionNodeEditPart) {
+ labelEP.installEditPolicy(LinkLabelPositionEditPolicy.KEY, new LinkLabelPositionEditPolicy());
+ }
+ }
+
+ @Override
+ public void setInitializationData(IConfigurationElement config, String propertyName, Object data)
+ throws CoreException {
+ initFromIConfig(config);
+ }
+
+ public void initFromIConfig(IConfigurationElement config) {
+ String classAttr = config.getAttribute("class");
+ if (DIAGRAM_NOTATION_CLASS.equals(classAttr)) {
+ myDiagramID = getValue(config);
+ }
+ IConfigurationElement[] children = config.getChildren();
+ if (children != null) {
+ for (IConfigurationElement child : children) {
+ initFromIConfig(child);
+ }
+ }
+ }
+
+ private String getValue(IConfigurationElement config) {
+ IConfigurationElement methods[] = config.getChildren("method");
+ if (methods == null || methods.length != 1) {
+ return "";
+ }
+ IConfigurationElement method = methods[0];
+ String value = method.getAttribute("value");
+ if (value == null || value.isEmpty()) {
+ return "";
+ }
+ return value;
+ }
+}
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF index f9559a2d2ff..b1873958aff 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/META-INF/MANIFEST.MF @@ -1,40 +1,40 @@ -Manifest-Version: 1.0 -Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", - org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", - org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)", - org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.core;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.emf;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)", - org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)", - org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", - org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)", - org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", - org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)", - org.eclipse.papyrus.infra.properties;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)" -Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration, - org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor, - org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl, - org.eclipse.papyrus.uml.diagram.paletteconfiguration.modelelement, - org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider, - org.eclipse.papyrus.uml.diagram.paletteconfiguration.util -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-ClassPath: . -Bundle-Version: 3.0.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %pluginName -Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
+ org.eclipse.gmf.runtime.common.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.core;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="[2.1.0,3.0.0)",
+ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.views.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.databinding.observable;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.core.databinding;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.emf.databinding;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.infra.properties;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)"
+Export-Package: org.eclipse.papyrus.uml.diagram.paletteconfiguration,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.descriptor,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.modelelement,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.provider,
+ org.eclipse.papyrus.uml.diagram.paletteconfiguration.util
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Bundle-Version: 3.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.paletteconfiguration.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.paletteconfiguration;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF index 5138d386e0c..0c6ea8ed04c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.profile/META-INF/MANIFEST.MF @@ -28,13 +28,13 @@ Bundle-Name: %pluginName Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.services.validation;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="[2.0.0,3.0.0)",
org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF index 0a7db8505ed..6808c19df58 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF @@ -19,9 +19,9 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.properties.ui;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.stereotype.edition;visibility:=reexport;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.menu;bundle-version="[2.0.0,3.0.0)",
@@ -38,16 +38,16 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", org.eclipse.gmf.runtime.emf.commands.core,
org.eclipse.gmf.runtime.emf.ui.properties,
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.ui,
- org.eclipse.papyrus.infra.core.sashwindows.di,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.properties,
org.eclipse.gmf.runtime.diagram.ui.providers.ide,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
org.eclipse.draw2d;visibility:=reexport,
- org.eclipse.papyrus.uml.diagram.common;visibility:=reexport,
+ org.eclipse.papyrus.uml.diagram.common;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
org.eclipse.uml2.uml;visibility:=reexport,
org.eclipse.uml2.uml.edit;visibility:=reexport,
@@ -56,11 +56,11 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", org.eclipse.emf.validation;visibility:=reexport,
org.eclipse.gmf.runtime.notation;visibility:=reexport,
org.eclipse.gef,
- org.eclipse.papyrus.extensionpoints.editors,
- org.eclipse.papyrus.infra.services.edit,
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Bundle-Version: 3.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF index 2d2bd2482d5..56d7f9008a5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12 org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
org.eclipse.papyrus.editor;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;visibility:=reexport;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.diagram.navigation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0)",
@@ -49,11 +49,11 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12 org.eclipse.gmf.runtime.emf.commands.core,
org.eclipse.gmf.runtime.emf.ui.properties,
org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.diagram.common,
- org.eclipse.papyrus.infra.gmfdiag.common,
- org.eclipse.papyrus.infra.widgets,
- org.eclipse.papyrus.infra.ui,
- org.eclipse.papyrus.infra.core.sashwindows.di,
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.infra.core.sashwindows.di;bundle-version="[1.2.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.properties,
org.eclipse.gmf.runtime.diagram.ui.providers,
org.eclipse.gmf.runtime.diagram.ui.resources.editor,
@@ -61,10 +61,10 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12 org.eclipse.uml2.uml.edit;visibility:=reexport,
org.eclipse.emf.validation;visibility:=reexport,
org.eclipse.gef,
- org.eclipse.papyrus.extensionpoints.editors,
+ org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport
+ org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport;bundle-version="[3.0.0,4.0.0)"
Bundle-Vendor: %providerName
Ant-Version: Apache Ant 1.7.0
Eclipse-LazyStart: true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF index a25ad341f08..66788a2ed8b 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.stereotype.edition/META-INF/MANIFEST.MF @@ -1,20 +1,20 @@ -Manifest-Version: 1.0 -Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart, - org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies, - org.eclipse.papyrus.uml.diagram.stereotype.edition.internal.edithelper.advice;x-internal:=true, - org.eclipse.papyrus.uml.diagram.stereotype.edition.provider -Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)" -Bundle-Vendor: %providerName -Bundle-ActivationPolicy: lazy -Bundle-Version: 2.0.0.qualifier -Bundle-Localization: plugin -Bundle-Name: %pluginName -Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator -Bundle-ManifestVersion: 2 -Bundle-Description: %pluginDescription -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.stereotype.edition.editpart,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition.editpolicies,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition.internal.edithelper.advice;x-internal:=true,
+ org.eclipse.papyrus.uml.diagram.stereotype.edition.provider
+Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 2.0.0.qualifier
+Bundle-Localization: plugin
+Bundle-Name: %pluginName
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.stereotype.edition.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %pluginDescription
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.stereotype.edition;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF index 5c0524bdf15..2f312016584 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.symbols/META-INF/MANIFEST.MF @@ -1,17 +1,17 @@ -Manifest-Version: 1.0 -Export-Package: org.eclipse.papyrus.uml.diagram.symbols, - org.eclipse.papyrus.uml.diagram.symbols.provider -Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)", - org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)", - org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", - org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)" -Bundle-Vendor: %Bundle-Vendor -Bundle-ActivationPolicy: lazy -Bundle-Version: 1.2.0.qualifier -Bundle-Name: %Bundle-Name -Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator -Bundle-ManifestVersion: 2 -Bundle-Description: %Bundle-Description -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.symbols,
+ org.eclipse.papyrus.uml.diagram.symbols.provider
+Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.symbols.Activator
+Bundle-ManifestVersion: 2
+Bundle-Description: %Bundle-Description
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.symbols;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF index 9c7c364d6bb..94470b91b11 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/META-INF/MANIFEST.MF @@ -38,12 +38,12 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.infra.gmfdiag.navigation;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
Bundle-Vendor: %providerName
Eclipse-LazyStart: true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
Bundle-Activator: org.eclipse.papyrus.uml.diagram.timing.part.UMLDiagramEditorPlugin
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.timing; singleton:=true
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml index c025d3ca089..a63620a3fbf 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.timing/pom.xml @@ -1,13 +1,11 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId> - <version>0.0.1-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.papyrus.uml.diagram.timing</artifactId> - <version>1.2.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> -</project> +<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.papyrus</groupId>
+ <artifactId>org.eclipse.papyrus.uml-diagrams</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.eclipse.papyrus.uml.diagram.timing</artifactId>
+ <version>1.3.0-SNAPSHOT</version>
+ <packaging>eclipse-plugin</packaging>
+</project>
\ No newline at end of file diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF index 8f757def142..a0d84533742 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.usecase/META-INF/MANIFEST.MF @@ -26,9 +26,9 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version= org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)",
org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-version="[1.7.0,2.0.0)",
org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.papyrus.uml.appearance;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
org.eclipse.ocl.ecore;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF index ff222ac5588..d409c0db0f6 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/META-INF/MANIFEST.MF @@ -1,31 +1,31 @@ -Manifest-Version: 1.0 -Export-Package: org.eclipse.papyrus.uml.diagram.wizards, - org.eclipse.papyrus.uml.diagram.wizards.command, - org.eclipse.papyrus.uml.diagram.wizards.kind, - org.eclipse.papyrus.uml.diagram.wizards.messages, - org.eclipse.papyrus.uml.diagram.wizards.pages, - org.eclipse.papyrus.uml.diagram.wizards.providers, - org.eclipse.papyrus.uml.diagram.wizards.template, - org.eclipse.papyrus.uml.diagram.wizards.transformation, - org.eclipse.papyrus.uml.diagram.wizards.utils, - org.eclipse.papyrus.uml.diagram.wizards.wizards -Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", - org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)", - org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.help;bundle-version="[3.7.0,4.0.0)", - org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.core.architecture;bundle-version="0.1.0", - org.eclipse.papyrus.infra.ui.architecture;bundle-version="[1.0.0,2.0.0)" -Bundle-Vendor: %pluginProvider -Bundle-ActivationPolicy: lazy -Bundle-Version: 3.0.0.qualifier -Bundle-Name: %pluginName -Bundle-Localization: plugin -Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator -Bundle-ManifestVersion: 2 -Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Manifest-Version: 1.0
+Export-Package: org.eclipse.papyrus.uml.diagram.wizards,
+ org.eclipse.papyrus.uml.diagram.wizards.command,
+ org.eclipse.papyrus.uml.diagram.wizards.kind,
+ org.eclipse.papyrus.uml.diagram.wizards.messages,
+ org.eclipse.papyrus.uml.diagram.wizards.pages,
+ org.eclipse.papyrus.uml.diagram.wizards.providers,
+ org.eclipse.papyrus.uml.diagram.wizards.template,
+ org.eclipse.papyrus.uml.diagram.wizards.transformation,
+ org.eclipse.papyrus.uml.diagram.wizards.utils,
+ org.eclipse.papyrus.uml.diagram.wizards.wizards
+Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)",
+ org.eclipse.ui.intro;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.uml.tools;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.help;bundle-version="[3.7.0,4.0.0)",
+ org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.infra.ui.architecture;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: %pluginProvider
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 3.0.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-Activator: org.eclipse.papyrus.uml.diagram.wizards.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.wizards;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/PapyrusExampleInstallerWizard.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/PapyrusExampleInstallerWizard.java index 24e054a3668..70c21243b10 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/PapyrusExampleInstallerWizard.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.wizards/src/org/eclipse/papyrus/uml/diagram/wizards/wizards/PapyrusExampleInstallerWizard.java @@ -1,165 +1,165 @@ -/***************************************************************************** - * Copyright (c) 2016 CEA LIST 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: - * CEA LIST - Initial API and implementation - * - *****************************************************************************/ - -package org.eclipse.papyrus.uml.diagram.wizards.wizards; - -import java.util.ArrayList; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionPoint; -import org.eclipse.core.runtime.Platform; -import org.eclipse.emf.common.ui.CommonUIPlugin; -import org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard; -import org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard; -import org.eclipse.emf.common.util.URI; -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.List; -import org.eclipse.ui.IEditorRegistry; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.part.FileEditorInput; -import org.osgi.framework.Bundle; - -/** - * This class extends the EMF ExampleInstallerWizard with respect to three aspects - * 1. It supports the definition of example models for the same installers in multiple extension points. This is - * important, if sample models (of the same category) are provided by different plug-ins. - * 2. It only copies the selected model - * 3. It also opens the selected example model, if another editor is already open - * - * @since 2.1 - */ -public class PapyrusExampleInstallerWizard extends ExampleInstallerWizard { - - @SuppressWarnings("nls") - @Override - /** - * @see org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard#loadFromExtensionPoints() - * - * identical copy from superclass with one exception: do not stop after the processing of a single extension point - */ - protected void loadFromExtensionPoints() { - projectDescriptors = new ArrayList<ProjectDescriptor>(); - filesToOpen = new ArrayList<FileToOpen>(); - - String wizardID = wizardConfigurationElement.getAttribute("id"); - - IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CommonUIPlugin.INSTANCE.getSymbolicName(), "examples"); - IConfigurationElement[] exampleElements = extensionPoint.getConfigurationElements(); - for (int i = 0; i < exampleElements.length; i++) { - IConfigurationElement exampleElement = exampleElements[i]; - if ("example".equals(exampleElement.getName()) && wizardID.equals(exampleElement.getAttribute("wizardID"))) { - IConfigurationElement[] projectDescriptorElements = exampleElement.getChildren("projectDescriptor"); - for (int j = 0; j < projectDescriptorElements.length; j++) { - IConfigurationElement projectDescriptorElement = projectDescriptorElements[j]; - String projectName = projectDescriptorElement.getAttribute("name"); - if (projectName != null) { - String contentURI = projectDescriptorElement.getAttribute("contentURI"); - if (contentURI != null) { - AbstractExampleInstallerWizard.ProjectDescriptor projectDescriptor = new AbstractExampleInstallerWizard.ProjectDescriptor(); - projectDescriptor.setName(projectName); - - URI uri = URI.createURI(contentURI); - if (uri.isRelative()) { - uri = URI.createPlatformPluginURI(projectDescriptorElement.getContributor().getName() + "/" + contentURI, true); - } - projectDescriptor.setContentURI(uri); - - projectDescriptor.setDescription(projectDescriptorElement.getAttribute("description")); - - projectDescriptors.add(projectDescriptor); - } - } - } - - if (!projectDescriptors.isEmpty()) { - IConfigurationElement[] openElements = exampleElement.getChildren("fileToOpen"); - for (int j = 0; j < openElements.length; j++) { - IConfigurationElement openElement = openElements[j]; - String location = openElement.getAttribute("location"); - if (location != null) { - AbstractExampleInstallerWizard.FileToOpen fileToOpen = new AbstractExampleInstallerWizard.FileToOpen(); - fileToOpen.setLocation(location); - fileToOpen.setEditorID(openElement.getAttribute("editorID")); - filesToOpen.add(fileToOpen); - } - } - - String imagePath = exampleElement.getAttribute("pageImage"); - if (imagePath != null) { - imagePath = imagePath.replace('\\', '/'); - if (!imagePath.startsWith("/")) { - imagePath = "/" + imagePath; - } - - Bundle pluginBundle = Platform.getBundle(exampleElement.getDeclaringExtension().getContributor().getName()); - try { - ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(pluginBundle.getEntry(imagePath)); - setDefaultPageImageDescriptor(imageDescriptor); - } catch (Exception e) { - // Ignore - } - } - - } - } - } - } - - - @Override - /** - * @see org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard#openEditor(org.eclipse.core.resources.IFile, java.lang.String) - * - * Only change compared to superclass: don't pass IWorkbenchPage.MATCH_ID - */ - protected void openEditor(IFile file, String editorID) throws PartInitException { - IEditorRegistry editorRegistry = getWorkbench().getEditorRegistry(); - if (editorID == null || editorRegistry.findEditor(editorID) == null) { - editorID = getWorkbench().getEditorRegistry().getDefaultEditor(file.getFullPath().toString()).getId(); - } - - IWorkbenchPage page = getWorkbench().getActiveWorkbenchWindow().getActivePage(); - page.openEditor(new FileEditorInput(file), editorID, true); - } - - /** - * @see org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard#performFinish() - * - * Only copy selected files - */ - @Override - public boolean performFinish() { - Control control = projectPage.getControl(); - // get selection index from list. The following code depends on the super class implementation, but this is the only way - // to obtain the selection, since projectPage.projectList and projectPage.getSelectedProjectDescriptor are not accessible - if (control instanceof Composite) { - Control list = ((Composite) control).getChildren()[0]; - if (list instanceof List) { - int index = ((List) list).getSelectionIndex(); - - // remove all but selected projects from list - FileToOpen fileToOpen = filesToOpen.get(index); - ProjectDescriptor projectToCreate = projectDescriptors.get(index); - projectDescriptors.clear(); - filesToOpen.clear(); - projectDescriptors.add(projectToCreate); - filesToOpen.add(fileToOpen); - } - } - return super.performFinish(); - } -} +/*****************************************************************************
+ * Copyright (c) 2016 CEA LIST 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:
+ * CEA LIST - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.uml.diagram.wizards.wizards;
+
+import java.util.ArrayList;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtensionPoint;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.common.ui.CommonUIPlugin;
+import org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard;
+import org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.ui.IEditorRegistry;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.part.FileEditorInput;
+import org.osgi.framework.Bundle;
+
+/**
+ * This class extends the EMF ExampleInstallerWizard with respect to three aspects
+ * 1. It supports the definition of example models for the same installers in multiple extension points. This is
+ * important, if sample models (of the same category) are provided by different plug-ins.
+ * 2. It only copies the selected model
+ * 3. It also opens the selected example model, if another editor is already open
+ *
+ * @since 3.0
+ */
+public class PapyrusExampleInstallerWizard extends ExampleInstallerWizard {
+
+ @SuppressWarnings("nls")
+ @Override
+ /**
+ * @see org.eclipse.emf.common.ui.wizard.ExampleInstallerWizard#loadFromExtensionPoints()
+ *
+ * identical copy from superclass with one exception: do not stop after the processing of a single extension point
+ */
+ protected void loadFromExtensionPoints() {
+ projectDescriptors = new ArrayList<ProjectDescriptor>();
+ filesToOpen = new ArrayList<FileToOpen>();
+
+ String wizardID = wizardConfigurationElement.getAttribute("id");
+
+ IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(CommonUIPlugin.INSTANCE.getSymbolicName(), "examples");
+ IConfigurationElement[] exampleElements = extensionPoint.getConfigurationElements();
+ for (int i = 0; i < exampleElements.length; i++) {
+ IConfigurationElement exampleElement = exampleElements[i];
+ if ("example".equals(exampleElement.getName()) && wizardID.equals(exampleElement.getAttribute("wizardID"))) {
+ IConfigurationElement[] projectDescriptorElements = exampleElement.getChildren("projectDescriptor");
+ for (int j = 0; j < projectDescriptorElements.length; j++) {
+ IConfigurationElement projectDescriptorElement = projectDescriptorElements[j];
+ String projectName = projectDescriptorElement.getAttribute("name");
+ if (projectName != null) {
+ String contentURI = projectDescriptorElement.getAttribute("contentURI");
+ if (contentURI != null) {
+ AbstractExampleInstallerWizard.ProjectDescriptor projectDescriptor = new AbstractExampleInstallerWizard.ProjectDescriptor();
+ projectDescriptor.setName(projectName);
+
+ URI uri = URI.createURI(contentURI);
+ if (uri.isRelative()) {
+ uri = URI.createPlatformPluginURI(projectDescriptorElement.getContributor().getName() + "/" + contentURI, true);
+ }
+ projectDescriptor.setContentURI(uri);
+
+ projectDescriptor.setDescription(projectDescriptorElement.getAttribute("description"));
+
+ projectDescriptors.add(projectDescriptor);
+ }
+ }
+ }
+
+ if (!projectDescriptors.isEmpty()) {
+ IConfigurationElement[] openElements = exampleElement.getChildren("fileToOpen");
+ for (int j = 0; j < openElements.length; j++) {
+ IConfigurationElement openElement = openElements[j];
+ String location = openElement.getAttribute("location");
+ if (location != null) {
+ AbstractExampleInstallerWizard.FileToOpen fileToOpen = new AbstractExampleInstallerWizard.FileToOpen();
+ fileToOpen.setLocation(location);
+ fileToOpen.setEditorID(openElement.getAttribute("editorID"));
+ filesToOpen.add(fileToOpen);
+ }
+ }
+
+ String imagePath = exampleElement.getAttribute("pageImage");
+ if (imagePath != null) {
+ imagePath = imagePath.replace('\\', '/');
+ if (!imagePath.startsWith("/")) {
+ imagePath = "/" + imagePath;
+ }
+
+ Bundle pluginBundle = Platform.getBundle(exampleElement.getDeclaringExtension().getContributor().getName());
+ try {
+ ImageDescriptor imageDescriptor = ImageDescriptor.createFromURL(pluginBundle.getEntry(imagePath));
+ setDefaultPageImageDescriptor(imageDescriptor);
+ } catch (Exception e) {
+ // Ignore
+ }
+ }
+
+ }
+ }
+ }
+ }
+
+
+ @Override
+ /**
+ * @see org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard#openEditor(org.eclipse.core.resources.IFile, java.lang.String)
+ *
+ * Only change compared to superclass: don't pass IWorkbenchPage.MATCH_ID
+ */
+ protected void openEditor(IFile file, String editorID) throws PartInitException {
+ IEditorRegistry editorRegistry = getWorkbench().getEditorRegistry();
+ if (editorID == null || editorRegistry.findEditor(editorID) == null) {
+ editorID = getWorkbench().getEditorRegistry().getDefaultEditor(file.getFullPath().toString()).getId();
+ }
+
+ IWorkbenchPage page = getWorkbench().getActiveWorkbenchWindow().getActivePage();
+ page.openEditor(new FileEditorInput(file), editorID, true);
+ }
+
+ /**
+ * @see org.eclipse.emf.common.ui.wizard.AbstractExampleInstallerWizard#performFinish()
+ *
+ * Only copy selected files
+ */
+ @Override
+ public boolean performFinish() {
+ Control control = projectPage.getControl();
+ // get selection index from list. The following code depends on the super class implementation, but this is the only way
+ // to obtain the selection, since projectPage.projectList and projectPage.getSelectedProjectDescriptor are not accessible
+ if (control instanceof Composite) {
+ Control list = ((Composite) control).getChildren()[0];
+ if (list instanceof List) {
+ int index = ((List) list).getSelectionIndex();
+
+ // remove all but selected projects from list
+ FileToOpen fileToOpen = filesToOpen.get(index);
+ ProjectDescriptor projectToCreate = projectDescriptors.get(index);
+ projectDescriptors.clear();
+ filesToOpen.clear();
+ projectDescriptors.add(projectToCreate);
+ filesToOpen.add(fileToOpen);
+ }
+ }
+ return super.performFinish();
+ }
+}
|