diff options
author | Maged Elaasar | 2018-03-17 00:06:14 +0000 |
---|---|---|
committer | ptessier | 2018-04-19 20:55:57 +0000 |
commit | 371756cd59fe03ac08e079a6a98b2b332da6ff92 (patch) | |
tree | c50ab6ebf82acaeaf37f372acba864a49a876a04 /plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz | |
parent | 9795d6a6d23ed40a5fe31b89c6868e9c407a5edb (diff) | |
download | org.eclipse.papyrus-371756cd59fe03ac08e079a6a98b2b332da6ff92.tar.gz org.eclipse.papyrus-371756cd59fe03ac08e079a6a98b2b332da6ff92.tar.xz org.eclipse.papyrus-371756cd59fe03ac08e079a6a98b2b332da6ff92.zip |
Bug 527664 - [AFViewpoints] Architecture Model Editor remove
CreationCommandClass property value
Converted the Creation/ConversionCommandClass properties in the
architecture editor to be of type string instead of Class. They can now
reference class names from the workspace (on their project's class
path). Also added validation rules for that. Finally, I added a
Browse... button in the property sheet to help put values for them.
remove some reexport
increase version to take in account API tool
Change-Id: I6792449fbee70b089f83780c4935242fff72d50b
Signed-off-by: Maged Elaasar <melaasar@gmail.com>
Diffstat (limited to 'plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz')
2 files changed, 12 insertions, 8 deletions
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 f5dbb6900e5..5e7f41dfc26 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 @@ -31,7 +31,7 @@ Bundle-ClassPath: . Bundle-Name: %pluginName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3.6.0,4.0.0)", +Require-Bundle: 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.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)", @@ -41,10 +41,10 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 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="[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)", - org.eclipse.emf.validation;visibility:=reexport;bundle-version="[1.8.0,2.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.validation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, 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)", @@ -69,12 +69,14 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 org.eclipse.gmf.runtime.diagram.ui.properties, org.eclipse.gmf.runtime.diagram.ui.providers, org.eclipse.gmf.runtime.diagram.ui.resources.editor, - org.eclipse.uml2.uml;visibility:=reexport;bundle-version="[5.3.0,6.0.0)", - org.eclipse.uml2.uml.edit;visibility:=reexport;bundle-version="[5.3.0,6.0.0)", + org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:=reexport, + org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport, org.eclipse.gef, org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.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.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java index eb107b08af3..6d4b9b4ea3c 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.clazz/custom-src/org/eclipse/papyrus/uml/diagram/clazz/PackageDiagramEditorFactory.java @@ -15,7 +15,9 @@ package org.eclipse.papyrus.uml.diagram.clazz; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.transaction.TransactionalEditingDomain; +import org.eclipse.gmf.runtime.emf.clipboard.core.internal.MergedEObjectInfo; import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.papyrus.infra.core.architecture.merged.MergedArchitectureContext; import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageModel; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForResourceSet; |