From 371756cd59fe03ac08e079a6a98b2b332da6ff92 Mon Sep 17 00:00:00 2001 From: Maged Elaasar Date: Fri, 16 Mar 2018 17:06:14 -0700 Subject: 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 --- .../META-INF/MANIFEST.MF | 9 +- .../META-INF/MANIFEST.MF | 4 +- .../pom.xml | 2 +- .../representation/RepresentationPackage.java | 1 + .../META-INF/MANIFEST.MF | 7 +- .../org.eclipse.papyrus.infra.architecture/pom.xml | 2 +- .../architecture/ArchitectureDescriptionUtils.java | 7 +- .../merged/MergedArchitectureContext.java | 53 +++- .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 11 +- .../model/Architecture.ecore | 30 +- .../model/Architecture.genmodel | 8 + .../pom.xml | 2 +- .../core/architecture/ArchitectureContext.java | 36 ++- .../core/architecture/ArchitecturePackage.java | 103 ++++++- .../architecture/impl/ArchitectureContextImpl.java | 156 +++++++++-- .../architecture/impl/ArchitecturePackageImpl.java | 57 +++- .../architecture/util/ArchitectureValidator.java | 309 +++++++++++++++++++++ .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../core/DelegatingModelingAssistantProvider.java | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 4 +- .../eclipse/papyrus/commands/ICreationCommand.java | 2 +- .../META-INF/MANIFEST.MF | 6 +- .../common/helper/GMFDiagramViewTypeHelper.java | 40 ++- .../service/palette/PapyrusPaletteService.java | 1 - .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 4 +- .../HyperlinkNavigationMenuEditPolicy.java | 1 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 33 ++- .../META-INF/MANIFEST.MF | 11 +- .../model/GmfDiagRepresentation.ecore | 15 +- .../model/GmfDiagRepresentation.genmodel | 4 + .../pom.xml | 2 +- .../gmfdiag/representation/AssistantRule.java | 1 + .../gmfdiag/representation/PapyrusDiagram.java | 19 +- .../representation/RepresentationPackage.java | 29 +- .../representation/impl/PapyrusDiagramImpl.java | 96 ++++++- .../impl/RepresentationPackageImpl.java | 38 ++- .../util/RepresentationValidator.java | 215 ++++++++++++++ .../META-INF/MANIFEST.MF | 12 +- .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 6 +- .../nattable/common/helper/TableCommandHelper.java | 2 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 28 +- .../META-INF/MANIFEST.MF | 14 +- .../pom.xml | 2 +- .../representation/RepresentationPackage.java | 1 + .../META-INF/MANIFEST.MF | 7 +- ...ixRelationshipOwnerStrategyContentProvider.java | 1 + .../papyrus/infra/nattable/messages/Messages.java | 21 ++ ...trixRelationshipOwnerStrategyLabelProvider.java | 1 + .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 21 +- .../pom.xml | 2 +- .../ui/architecture/editor/ArchitectureEditor.java | 4 +- .../CustomAdapterFactoryContentProvider.java | 154 ++++++++++ .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 14 +- .../pom.xml | 2 +- .../viewpoints/policy/AbstractViewTypeHelper.java | 2 +- .../infra/viewpoints/policy/ViewpointExplorer.java | 6 + .../providers/MergedItemPropertyDescriptor.java | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 9 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 18 +- .../diagram/clazz/PackageDiagramEditorFactory.java | 2 + .../META-INF/MANIFEST.MF | 6 +- .../META-INF/MANIFEST.MF | 5 +- .../pom.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- ...ompositeSideAffixedNodesCreationEditPolicy.java | 1 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 5 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 3 +- ...onnectionPointReferenceInStateHelperAdvice.java | 3 + .../helpers/advice/DeleteRegionHelperAdvice.java | 1 + .../advice/PseudostateKindInitializerAdvice.java | 3 + .../OwnedBehaviorHyperlinkContributor.java | 1 + .../CustomEntryExitPointPositionLocator.java | 1 + ...StateMachineReconcilerForCompartment_1_2_0.java | 1 + .../migration/StateMachineReconciler_1_2_0.java | 1 + .../parts/RegionCompartmentDiagramUpdater.java | 3 + .../custom/preferences/CSSOptionsConstants.java | 1 + .../CustomTransitionPreferenceInitializer.java | 1 + .../CustomTransitionPreferencePage.java | 3 + .../custom/preferences/PreferenceConstants.java | 1 + .../StateSemanticConnectionsStrategy.java | 1 + .../util/FixNestedStateAndRegionOnOpening.java | 1 + .../statemachine/custom/util/TriggerUtil.java | 3 + .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 6 +- .../org.eclipse.papyrus.uml.diagram.timing/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 7 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 3 +- .../META-INF/MANIFEST.MF | 4 +- 123 files changed, 1609 insertions(+), 251 deletions(-) create mode 100644 plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java create mode 100644 plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java create mode 100644 plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/CustomAdapterFactoryContentProvider.java (limited to 'plugins') diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF index 17ca37972d8..f9a16a5a303 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation.edit/META-INF/MANIFEST.MF @@ -11,13 +11,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.architecture.representation.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport + org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF index f85c58963a2..b0b24a2a2b7 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture.representation;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -14,5 +14,5 @@ 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.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml index db883c5ade1..19c6cf37da5 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/pom.xml @@ -8,6 +8,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.architecture.representation - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java index 328d69b9ab2..56f916b9b5d 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture.representation/src-gen/org/eclipse/papyrus/infra/architecture/representation/RepresentationPackage.java @@ -85,6 +85,7 @@ public interface RepresentationPackage extends EPackage { * * @generated * @ordered + * @since 2.0 */ int PAPYRUS_REPRESENTATION_KIND__ID = ArchitecturePackage.REPRESENTATION_KIND__ID; diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF index 67d937f9fff..6933a00f79f 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/META-INF/MANIFEST.MF @@ -2,15 +2,16 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.architecture;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.architecture, org.eclipse.papyrus.infra.architecture.commands, org.eclipse.papyrus.infra.architecture.listeners, org.eclipse.papyrus.infra.core.architecture.merged -Require-Bundle: org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml index 50ab4a4ee64..5dc5094e0fe 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/pom.xml @@ -8,6 +8,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.architecture - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java index d98eb577e6b..4f0221d2e7e 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/architecture/ArchitectureDescriptionUtils.java @@ -22,6 +22,7 @@ import java.util.Set; import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.command.CompoundCommand; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.transaction.RecordingCommand; import org.eclipse.papyrus.infra.architecture.commands.IModelConversionCommand; import org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand; @@ -209,8 +210,8 @@ public class ArchitectureDescriptionUtils { */ protected Command getModelCreationCommand(String contextId) { final MergedArchitectureContext context = manager.getArchitectureContextById(contextId); - if (context.getCreationCommandClass() == null) - return null; + if (context.getCreationCommandClassName() == null) + return UnexecutableCommand.INSTANCE; return new RecordingCommand(modelSet.getTransactionalEditingDomain()) { @Override protected void doExecute() { @@ -232,7 +233,7 @@ public class ArchitectureDescriptionUtils { */ protected Command getModelConversionCommand(String contextId) { MergedArchitectureContext context = manager.getArchitectureContextById(contextId); - if (context.getConversionCommandClass() == null) + if (context.getConversionCommandClassName() == null) return null; return new RecordingCommand(modelSet.getTransactionalEditingDomain()) { @Override diff --git a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java index b5d11710836..75442bdb83c 100644 --- a/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java +++ b/plugins/infra/architecture/org.eclipse.papyrus.infra.architecture/src/org/eclipse/papyrus/infra/core/architecture/merged/MergedArchitectureContext.java @@ -20,10 +20,13 @@ import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.common.util.URI; import org.eclipse.papyrus.infra.core.architecture.ADElement; import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext; import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint; import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration; +import org.osgi.framework.Bundle; /** * An element that represents a merged collection of {@link org.eclipse.papyrus.infra.core. @@ -66,11 +69,17 @@ public abstract class MergedArchitectureContext extends MergedADElement { * * @return a creation command class */ - public Class getCreationCommandClass() { + public Class getCreationCommandClass() throws ClassNotFoundException { for (ADElement element : elements) { ArchitectureContext context = (ArchitectureContext) element; - if (context.getCreationCommandClass() != null) - return context.getCreationCommandClass(); + if (context.getCreationCommandClass() != null) { + URI uri = context.eResource().getURI(); + if (uri.isPlatformPlugin()) { + String bundleName = uri.segment(1); + Bundle bundle = Platform.getBundle(bundleName); + return bundle.loadClass(context.getCreationCommandClass()); + } + } } return null; } @@ -80,7 +89,43 @@ public abstract class MergedArchitectureContext extends MergedADElement { * * @return a conversion command class */ - public Class getConversionCommandClass() { + public Class getConversionCommandClass() throws ClassNotFoundException { + for (ADElement element : elements) { + ArchitectureContext context = (ArchitectureContext) element; + if (context.getConversionCommandClass() != null) { + URI uri = context.eResource().getURI(); + if (uri.isPlatformPlugin()) { + String bundleName = uri.segment(1); + Bundle bundle = Platform.getBundle(bundleName); + return bundle.loadClass(context.getConversionCommandClass()); + } + } + } + return null; + } + + /** + * Gets the context's creation command class name + * + * @return a creation command class name + * @since 1.1 + */ + public String getCreationCommandClassName() { + for (ADElement element : elements) { + ArchitectureContext context = (ArchitectureContext) element; + if (context.getCreationCommandClass() != null) + return context.getCreationCommandClass(); + } + return null; + } + + /** + * Gets the context's conversion command class name + * + * @return a conversion command class name + * @since 1.1 + */ + public String getConversionCommandClassName() { for (ADElement element : elements) { ArchitectureContext context = (ArchitectureContext) element; if (context.getConversionCommandClass() != null) diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF index 003266d15ef..d5dcd896208 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture.edit/META-INF/MANIFEST.MF @@ -10,10 +10,10 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.core.architecture.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.12.0,4.0.0)", - org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF index 700d32b2ea2..f5279da3857 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.core.architecture;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,8 +11,9 @@ Export-Package: org.eclipse.papyrus.infra.core.architecture, org.eclipse.papyrus.infra.core.architecture.impl, org.eclipse.papyrus.infra.core.architecture.util 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.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)", + org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)", + org.eclipse.jdt.core;bundle-version="[3.14.0,4.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore index 6b53c7d9252..13fa2e4a432 100755 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.ecore @@ -186,6 +186,24 @@
+ + + + + + + + + + + + + + + + + + @@ -223,25 +241,21 @@
- +
- - - - +
- - - diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel index 3624d20754d..dff58d12429 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/model/Architecture.genmodel @@ -85,6 +85,14 @@ ecoreFeature="ecore:EAttribute Architecture.ecore#//ArchitectureContext/creationCommandClass"/> + + + + + + + + diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml index 3b10e0906b4..ac4b3aef8cd 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/pom.xml @@ -8,6 +8,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.core.architecture - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java index ab1c176a4db..0fa6e050ed0 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitectureContext.java @@ -13,6 +13,8 @@ */ package org.eclipse.papyrus.infra.core.architecture; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration; @@ -144,13 +146,14 @@ public interface ArchitectureContext extends ADElement { * The fully qualified name of a command that creates models applying this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand inteface * * @return the value of the 'Creation Command Class' attribute. - * @see #setCreationCommandClass(Class) + * @see #setCreationCommandClass(String) * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_CreationCommandClass() * @model required="true" * annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The fully qualified name of a command that creates models applying this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelCreationCommand inteface' propertyCategory='Context'" * @generated + * @since 2.0 */ - Class getCreationCommandClass(); + String getCreationCommandClass(); /** * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getCreationCommandClass Creation Command Class}' attribute. @@ -159,8 +162,9 @@ public interface ArchitectureContext extends ADElement { * @param value the new value of the 'Creation Command Class' attribute. * @see #getCreationCommandClass() * @generated + * @since 2.0 */ - void setCreationCommandClass(Class value); + void setCreationCommandClass(String value); /** * Returns the value of the 'Conversion Command Class' attribute. @@ -174,12 +178,13 @@ public interface ArchitectureContext extends ADElement { * The fully qualified name of a command that refactors models that switched to this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelConversionCommand inteface * * @return the value of the 'Conversion Command Class' attribute. - * @see #setConversionCommandClass(Class) + * @see #setConversionCommandClass(String) * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage#getArchitectureContext_ConversionCommandClass() * @model annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The fully qualified name of a command that refactors models that switched to this context. The command must implement the org.eclipse.papyrus.infra.architecture.commands.IModelConversionCommand inteface' propertyCategory='Context'" * @generated + * @since 2.0 */ - Class getConversionCommandClass(); + String getConversionCommandClass(); /** * Sets the value of the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getConversionCommandClass Conversion Command Class}' attribute. @@ -188,8 +193,27 @@ public interface ArchitectureContext extends ADElement { * @param value the new value of the 'Conversion Command Class' attribute. * @see #getConversionCommandClass() * @generated + * @since 2.0 */ - void setConversionCommandClass(Class value); + void setConversionCommandClass(String value); + + /** + * + * + * @model diagnosticsUnique="false" contextUnique="false" + * @generated + * @since 2.0 + */ + boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map context); + + /** + * + * + * @model diagnosticsUnique="false" contextUnique="false" + * @generated + * @since 2.0 + */ + boolean conversionCommandClassExists(DiagnosticChain diagnostics, Map context); /** * Returns the value of the 'Domain' container reference. diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java index 15710401468..4adbb0691d4 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/ArchitecturePackage.java @@ -15,6 +15,7 @@ package org.eclipse.papyrus.infra.core.architecture; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; @@ -370,6 +371,26 @@ public interface ArchitecturePackage extends EPackage { */ int ARCHITECTURE_CONTEXT_FEATURE_COUNT = AD_ELEMENT_FEATURE_COUNT + 7; + /** + * The operation id for the 'Ceation Command Class Exists' operation. + * + * + * @generated + * @ordered + * @since 2.0 + */ + int ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = AD_ELEMENT_OPERATION_COUNT + 0; + + /** + * The operation id for the 'Conversion Command Class Exists' operation. + * + * + * @generated + * @ordered + * @since 2.0 + */ + int ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = AD_ELEMENT_OPERATION_COUNT + 1; + /** * The number of operations of the 'Context' class. * @@ -377,7 +398,7 @@ public interface ArchitecturePackage extends EPackage { * @generated * @ordered */ - int ARCHITECTURE_CONTEXT_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 0; + int ARCHITECTURE_CONTEXT_OPERATION_COUNT = AD_ELEMENT_OPERATION_COUNT + 2; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureDescriptionLanguageImpl Description Language}' class. @@ -533,6 +554,26 @@ public interface ArchitecturePackage extends EPackage { */ int ARCHITECTURE_DESCRIPTION_LANGUAGE_FEATURE_COUNT = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 3; + /** + * The operation id for the 'Ceation Command Class Exists' operation. + * + * + * @generated + * @ordered + * @since 2.0 + */ + int ARCHITECTURE_DESCRIPTION_LANGUAGE___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the 'Conversion Command Class Exists' operation. + * + * + * @generated + * @ordered + * @since 2.0 + */ + int ARCHITECTURE_DESCRIPTION_LANGUAGE___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP; + /** * The number of operations of the 'Description Language' class. * @@ -1033,6 +1074,26 @@ public interface ArchitecturePackage extends EPackage { */ int ARCHITECTURE_FRAMEWORK_FEATURE_COUNT = ARCHITECTURE_CONTEXT_FEATURE_COUNT + 0; + /** + * The operation id for the 'Ceation Command Class Exists' operation. + * + * + * @generated + * @ordered + * @since 2.0 + */ + int ARCHITECTURE_FRAMEWORK___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP; + + /** + * The operation id for the 'Conversion Command Class Exists' operation. + * + * + * @generated + * @ordered + * @since 2.0 + */ + int ARCHITECTURE_FRAMEWORK___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP; + /** * The number of operations of the 'Framework' class. * @@ -1472,6 +1533,28 @@ public interface ArchitecturePackage extends EPackage { */ EAttribute getArchitectureContext_ConversionCommandClass(); + /** + * Returns the meta object for the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Ceation Command Class Exists}' operation. + * + * + * @return the meta object for the 'Ceation Command Class Exists' operation. + * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * @generated + * @since 2.0 + */ + EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map(); + + /** + * Returns the meta object for the '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#conversionCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Conversion Command Class Exists}' operation. + * + * + * @return the meta object for the 'Conversion Command Class Exists' operation. + * @see org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#conversionCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * @generated + * @since 2.0 + */ + EOperation getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map(); + /** * Returns the meta object for the container reference '{@link org.eclipse.papyrus.infra.core.architecture.ArchitectureContext#getDomain Domain}'. * @@ -1838,6 +1921,24 @@ public interface ArchitecturePackage extends EPackage { */ EAttribute ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS = eINSTANCE.getArchitectureContext_ConversionCommandClass(); + /** + * The meta object literal for the 'Ceation Command Class Exists' operation. + * + * + * @generated + * @since 2.0 + */ + EOperation ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map(); + + /** + * The meta object literal for the 'Conversion Command Class Exists' operation. + * + * + * @generated + * @since 2.0 + */ + EOperation ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map(); + /** * The meta object literal for the 'Domain' container reference feature. * diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java index 7fbdb422e0c..22c68cecdab 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitectureContextImpl.java @@ -13,25 +13,40 @@ */ package org.eclipse.papyrus.infra.core.architecture.impl; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; +import java.util.Map; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - +import org.eclipse.emf.common.util.BasicDiagnostic; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; - +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; - import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; +import org.eclipse.emf.ecore.util.EObjectValidator; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.papyrus.infra.core.architecture.ArchitectureContext; import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain; import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage; import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint; +import org.eclipse.papyrus.infra.core.architecture.util.ArchitectureValidator; import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration; /** @@ -104,6 +119,17 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A */ protected String extensionPrefix = EXTENSION_PREFIX_EDEFAULT; + /** + * The default value of the '{@link #getCreationCommandClass() Creation Command Class}' attribute. + * + * + * @see #getCreationCommandClass() + * @generated + * @ordered + * @since 2.0 + */ + protected static final String CREATION_COMMAND_CLASS_EDEFAULT = null; + /** * The cached value of the '{@link #getCreationCommandClass() Creation Command Class}' attribute. * @@ -112,7 +138,18 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A * @generated * @ordered */ - protected Class creationCommandClass; + protected String creationCommandClass = CREATION_COMMAND_CLASS_EDEFAULT; + + /** + * The default value of the '{@link #getConversionCommandClass() Conversion Command Class}' attribute. + * + * + * @see #getConversionCommandClass() + * @generated + * @ordered + * @since 2.0 + */ + protected static final String CONVERSION_COMMAND_CLASS_EDEFAULT = null; /** * The cached value of the '{@link #getConversionCommandClass() Conversion Command Class}' attribute. @@ -122,7 +159,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A * @generated * @ordered */ - protected Class conversionCommandClass; + protected String conversionCommandClass = CONVERSION_COMMAND_CLASS_EDEFAULT; /** * @@ -205,7 +242,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A * * @generated */ - public Class getCreationCommandClass() { + public String getCreationCommandClass() { return creationCommandClass; } @@ -214,8 +251,8 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A * * @generated */ - public void setCreationCommandClass(Class newCreationCommandClass) { - Class oldCreationCommandClass = creationCommandClass; + public void setCreationCommandClass(String newCreationCommandClass) { + String oldCreationCommandClass = creationCommandClass; creationCommandClass = newCreationCommandClass; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS, oldCreationCommandClass, creationCommandClass)); @@ -226,7 +263,7 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A * * @generated */ - public Class getConversionCommandClass() { + public String getConversionCommandClass() { return conversionCommandClass; } @@ -235,13 +272,81 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A * * @generated */ - public void setConversionCommandClass(Class newConversionCommandClass) { - Class oldConversionCommandClass = conversionCommandClass; + public void setConversionCommandClass(String newConversionCommandClass) { + String oldConversionCommandClass = conversionCommandClass; conversionCommandClass = newConversionCommandClass; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS, oldConversionCommandClass, conversionCommandClass)); } + /** + * + * + * @generated NOT + */ + public boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map context) { + if (creationCommandClass != null) { + URI uri = eResource().getURI(); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IFile file = workspace.getRoot().getFile(new Path(uri.toPlatformString(false))); + IProject project = file.getProject(); + IJavaProject javaProject = JavaCore.create(project); + IType type = null; + try { + type = javaProject.findType(creationCommandClass); + } catch (JavaModelException e) { + /* ignore */ + } + if (type == null) { + if (diagnostics != null) { + diagnostics.add + (new BasicDiagnostic + (Diagnostic.ERROR, + ArchitectureValidator.DIAGNOSTIC_SOURCE, + ArchitectureValidator.ARCHITECTURE_CONTEXT__CEATION_COMMAND_CLASS_EXISTS, + EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "ceationCommandClassExists", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$ + new Object [] { this })); + } + return false; + } + } + return true; + } + + /** + * + * + * @generated NOT + */ + public boolean conversionCommandClassExists(DiagnosticChain diagnostics, Map context) { + if (conversionCommandClass != null) { + URI uri = eResource().getURI(); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IFile file = workspace.getRoot().getFile(new Path(uri.toPlatformString(false))); + IProject project = file.getProject(); + IJavaProject javaProject = JavaCore.create(project); + IType type = null; + try { + type = javaProject.findType(conversionCommandClass); + } catch (JavaModelException e) { + /* ignore */ + } + if (type == null) { + if (diagnostics != null) { + diagnostics.add + (new BasicDiagnostic + (Diagnostic.ERROR, + ArchitectureValidator.DIAGNOSTIC_SOURCE, + ArchitectureValidator.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS_EXISTS, + EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "conversionCommandClassExists", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$ + new Object [] { this })); + } + return false; + } + } + return true; + } + /** * * @@ -386,10 +491,10 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A setExtensionPrefix((String)newValue); return; case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS: - setCreationCommandClass((Class)newValue); + setCreationCommandClass((String)newValue); return; case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS: - setConversionCommandClass((Class)newValue); + setConversionCommandClass((String)newValue); return; } super.eSet(featureID, newValue); @@ -419,10 +524,10 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A setExtensionPrefix(EXTENSION_PREFIX_EDEFAULT); return; case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS: - setCreationCommandClass((Class)null); + setCreationCommandClass(CREATION_COMMAND_CLASS_EDEFAULT); return; case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS: - setConversionCommandClass((Class)null); + setConversionCommandClass(CONVERSION_COMMAND_CLASS_EDEFAULT); return; } super.eUnset(featureID); @@ -447,13 +552,30 @@ public abstract class ArchitectureContextImpl extends ADElementImpl implements A case ArchitecturePackage.ARCHITECTURE_CONTEXT__EXTENSION_PREFIX: return EXTENSION_PREFIX_EDEFAULT == null ? extensionPrefix != null : !EXTENSION_PREFIX_EDEFAULT.equals(extensionPrefix); case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS: - return creationCommandClass != null; + return CREATION_COMMAND_CLASS_EDEFAULT == null ? creationCommandClass != null : !CREATION_COMMAND_CLASS_EDEFAULT.equals(creationCommandClass); case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS: - return conversionCommandClass != null; + return CONVERSION_COMMAND_CLASS_EDEFAULT == null ? conversionCommandClass != null : !CONVERSION_COMMAND_CLASS_EDEFAULT.equals(conversionCommandClass); } return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case ArchitecturePackage.ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP: + return ceationCommandClassExists((DiagnosticChain)arguments.get(0), (Map)arguments.get(1)); + case ArchitecturePackage.ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP: + return conversionCommandClassExists((DiagnosticChain)arguments.get(0), (Map)arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + /** * * diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java index 73737f7b647..ab8cfc5d154 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/impl/ArchitecturePackageImpl.java @@ -16,9 +16,11 @@ package org.eclipse.papyrus.infra.core.architecture.impl; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EGenericType; +import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EValidator; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.papyrus.infra.core.architecture.ADElement; @@ -34,6 +36,7 @@ import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint; import org.eclipse.papyrus.infra.core.architecture.Concern; import org.eclipse.papyrus.infra.core.architecture.RepresentationKind; import org.eclipse.papyrus.infra.core.architecture.Stakeholder; +import org.eclipse.papyrus.infra.core.architecture.util.ArchitectureValidator; import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; /** @@ -177,6 +180,15 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur // Initialize created meta-data theArchitecturePackage.initializePackageContents(); + // Register package validator + EValidator.Registry.INSTANCE.put + (theArchitecturePackage, + new EValidator.Descriptor() { + public EValidator getEValidator() { + return ArchitectureValidator.INSTANCE; + } + }); + // Mark meta-data to indicate it can't be changed theArchitecturePackage.freeze(); @@ -482,6 +494,24 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur return (EAttribute)architectureContextEClass.getEStructuralFeatures().get(6); } + /** + * + * + * @generated + */ + public EOperation getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map() { + return architectureContextEClass.getEOperations().get(0); + } + + /** + * + * + * @generated + */ + public EOperation getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map() { + return architectureContextEClass.getEOperations().get(1); + } + /** * * @@ -605,6 +635,8 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__EXTENSION_PREFIX); createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS); createEAttribute(architectureContextEClass, ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS); + createEOperation(architectureContextEClass, ARCHITECTURE_CONTEXT___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP); + createEOperation(architectureContextEClass, ARCHITECTURE_CONTEXT___CONVERSION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP); architectureFrameworkEClass = createEClass(ARCHITECTURE_FRAMEWORK); @@ -640,6 +672,7 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur // Obtain other dependent packages ElementTypesConfigurationsPackage theElementTypesConfigurationsPackage = (ElementTypesConfigurationsPackage)EPackage.Registry.INSTANCE.getEPackage(ElementTypesConfigurationsPackage.eNS_URI); + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); // Create type parameters @@ -695,14 +728,26 @@ public class ArchitecturePackageImpl extends EPackageImpl implements Architectur initEReference(getArchitectureContext_ElementTypes(), theElementTypesConfigurationsPackage.getElementTypeSetConfiguration(), null, "elementTypes", null, 0, -1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getArchitectureContext_Domain(), this.getArchitectureDomain(), this.getArchitectureDomain_Contexts(), "domain", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEAttribute(getArchitectureContext_ExtensionPrefix(), ecorePackage.getEString(), "extensionPrefix", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass()); - EGenericType g2 = createEGenericType(); + initEAttribute(getArchitectureContext_CreationCommandClass(), ecorePackage.getEString(), "creationCommandClass", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getArchitectureContext_ConversionCommandClass(), ecorePackage.getEString(), "conversionCommandClass", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + + EOperation op = initEOperation(getArchitectureContext__CeationCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "ceationCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + addEParameter(op, theEcorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + EGenericType g1 = createEGenericType(theEcorePackage.getEMap()); + EGenericType g2 = createEGenericType(theEcorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(theEcorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + + op = initEOperation(getArchitectureContext__ConversionCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "conversionCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + addEParameter(op, theEcorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + g1 = createEGenericType(theEcorePackage.getEMap()); + g2 = createEGenericType(theEcorePackage.getEJavaObject()); g1.getETypeArguments().add(g2); - initEAttribute(getArchitectureContext_CreationCommandClass(), g1, "creationCommandClass", null, 1, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - g1 = createEGenericType(ecorePackage.getEJavaClass()); - g2 = createEGenericType(); + g2 = createEGenericType(theEcorePackage.getEJavaObject()); g1.getETypeArguments().add(g2); - initEAttribute(getArchitectureContext_ConversionCommandClass(), g1, "conversionCommandClass", null, 0, 1, ArchitectureContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + addEParameter(op, g1, "context", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ initEClass(architectureFrameworkEClass, ArchitectureFramework.class, "ArchitectureFramework", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java new file mode 100644 index 00000000000..5512f6fcd78 --- /dev/null +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.architecture/src-gen/org/eclipse/papyrus/infra/core/architecture/util/ArchitectureValidator.java @@ -0,0 +1,309 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Maged Elaasar - Initial API and implementation + * + * + */ +package org.eclipse.papyrus.infra.core.architecture.util; + +import java.util.Map; + +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.ResourceLocator; + +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.EObjectValidator; + +import org.eclipse.papyrus.infra.core.architecture.*; + +/** + * + * The Validator for the model. + * + * @see org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage + * @generated + * @since 2.0 + */ +public class ArchitectureValidator extends EObjectValidator { + /** + * The cached model package + * + * + * @generated + */ + public static final ArchitectureValidator INSTANCE = new ArchitectureValidator(); + + /** + * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. + * + * + * @see org.eclipse.emf.common.util.Diagnostic#getSource() + * @see org.eclipse.emf.common.util.Diagnostic#getCode() + * @generated + */ + public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.core.architecture"; //$NON-NLS-1$ + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Ceation Command Class Exists' of 'Context'. + * + * + * @generated + */ + public static final int ARCHITECTURE_CONTEXT__CEATION_COMMAND_CLASS_EXISTS = 1; + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Conversion Command Class Exists' of 'Context'. + * + * + * @generated + */ + public static final int ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS_EXISTS = 2; + + /** + * A constant with a fixed name that can be used as the base value for additional hand written constants. + * + * + * @generated + */ + private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 2; + + /** + * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class. + * + * + * @generated + */ + protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public ArchitectureValidator() { + super(); + } + + /** + * Returns the package of this validator switch. + * + * + * @generated + */ + @Override + protected EPackage getEPackage() { + return ArchitecturePackage.eINSTANCE; + } + + /** + * Calls validateXXX for the corresponding classifier of the model. + * + * + * @generated + */ + @Override + protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) { + switch (classifierID) { + case ArchitecturePackage.AD_ELEMENT: + return validateADElement((ADElement)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_DOMAIN: + return validateArchitectureDomain((ArchitectureDomain)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE: + return validateArchitectureDescriptionLanguage((ArchitectureDescriptionLanguage)value, diagnostics, context); + case ArchitecturePackage.STAKEHOLDER: + return validateStakeholder((Stakeholder)value, diagnostics, context); + case ArchitecturePackage.CONCERN: + return validateConcern((Concern)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_VIEWPOINT: + return validateArchitectureViewpoint((ArchitectureViewpoint)value, diagnostics, context); + case ArchitecturePackage.REPRESENTATION_KIND: + return validateRepresentationKind((RepresentationKind)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_CONTEXT: + return validateArchitectureContext((ArchitectureContext)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_FRAMEWORK: + return validateArchitectureFramework((ArchitectureFramework)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_DESCRIPTION: + return validateArchitectureDescription((ArchitectureDescription)value, diagnostics, context); + case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_PREFERENCES: + return validateArchitectureDescriptionPreferences((ArchitectureDescriptionPreferences)value, diagnostics, context); + default: + return true; + } + } + + /** + * + * + * @generated + */ + public boolean validateADElement(ADElement adElement, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(adElement, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureDomain(ArchitectureDomain architectureDomain, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(architectureDomain, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureDescriptionLanguage(ArchitectureDescriptionLanguage architectureDescriptionLanguage, DiagnosticChain diagnostics, Map context) { + if (!validate_NoCircularContainment(architectureDescriptionLanguage, diagnostics, context)) return false; + boolean result = validate_EveryMultiplicityConforms(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryDataValueConforms(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryProxyResolves(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_UniqueID(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryKeyUnique(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validateArchitectureContext_ceationCommandClassExists(architectureDescriptionLanguage, diagnostics, context); + if (result || diagnostics != null) result &= validateArchitectureContext_conversionCommandClassExists(architectureDescriptionLanguage, diagnostics, context); + return result; + } + + /** + * + * + * @generated + */ + public boolean validateStakeholder(Stakeholder stakeholder, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(stakeholder, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateConcern(Concern concern, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(concern, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureViewpoint(ArchitectureViewpoint architectureViewpoint, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(architectureViewpoint, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateRepresentationKind(RepresentationKind representationKind, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(representationKind, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureContext(ArchitectureContext architectureContext, DiagnosticChain diagnostics, Map context) { + if (!validate_NoCircularContainment(architectureContext, diagnostics, context)) return false; + boolean result = validate_EveryMultiplicityConforms(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryDataValueConforms(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryProxyResolves(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_UniqueID(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryKeyUnique(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validateArchitectureContext_ceationCommandClassExists(architectureContext, diagnostics, context); + if (result || diagnostics != null) result &= validateArchitectureContext_conversionCommandClassExists(architectureContext, diagnostics, context); + return result; + } + + /** + * Validates the ceationCommandClassExists constraint of 'Context'. + * + * + * @generated + */ + public boolean validateArchitectureContext_ceationCommandClassExists(ArchitectureContext architectureContext, DiagnosticChain diagnostics, Map context) { + return architectureContext.ceationCommandClassExists(diagnostics, context); + } + + /** + * Validates the conversionCommandClassExists constraint of 'Context'. + * + * + * @generated + */ + public boolean validateArchitectureContext_conversionCommandClassExists(ArchitectureContext architectureContext, DiagnosticChain diagnostics, Map context) { + return architectureContext.conversionCommandClassExists(diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureFramework(ArchitectureFramework architectureFramework, DiagnosticChain diagnostics, Map context) { + if (!validate_NoCircularContainment(architectureFramework, diagnostics, context)) return false; + boolean result = validate_EveryMultiplicityConforms(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryDataValueConforms(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryProxyResolves(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_UniqueID(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryKeyUnique(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validateArchitectureContext_ceationCommandClassExists(architectureFramework, diagnostics, context); + if (result || diagnostics != null) result &= validateArchitectureContext_conversionCommandClassExists(architectureFramework, diagnostics, context); + return result; + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureDescription(ArchitectureDescription architectureDescription, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(architectureDescription, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateArchitectureDescriptionPreferences(ArchitectureDescriptionPreferences architectureDescriptionPreferences, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(architectureDescriptionPreferences, diagnostics, context); + } + + /** + * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. + * + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + // TODO + // Specialize this to return a resource locator for messages specific to this validator. + // Ensure that you remove @generated or mark it @generated NOT + return super.getResourceLocator(); + } + +} //ArchitectureValidator diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF index 1c870582133..feb8bb261fc 100644 --- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF +++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF @@ -28,7 +28,7 @@ Require-Bundle: org.eclipse.emf.workspace;bundle-version="[1.5.0,2.0.0)", org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.commands;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, org.eclipse.core.resources;bundle-version="[3.11.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 3.0.100.qualifier diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF index 5f189304e0a..89f93a208aa 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/META-INF/MANIFEST.MF @@ -3,7 +3,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibi org.eclipse.papyrus.infra.filters;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - com.ibm.icu;bundle-version="52.1.0" + com.ibm.icu;bundle-version="52.1.0", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.assistant, org.eclipse.papyrus.infra.gmfdiag.assistant.core, org.eclipse.papyrus.infra.gmfdiag.assistant.core.util, diff --git a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java index b4140c3914d..5173a2cf477 100644 --- a/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java +++ b/plugins/infra/gmfdiag/assistant/org.eclipse.papyrus.infra.gmfdiag.assistant/src/org/eclipse/papyrus/infra/gmfdiag/assistant/internal/core/DelegatingModelingAssistantProvider.java @@ -28,7 +28,7 @@ import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.gmf.runtime.notation.View; import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker; - +import org.eclipse.papyrus.infra.core.architecture.merged.MergedADElement; import com.google.common.collect.Lists; /** diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF index 9f717b28b43..a81e0797a37 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css/META-INF/MANIFEST.MF @@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.e4.ui.css.core;bundle-version="[0.11.0,1.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0.0)", org.eclipse.papyrus.infra.properties;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 2.2.1.qualifier diff --git a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF index 7691fb0b552..7c2c44d87a9 100644 --- a/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/expansion/org.eclipse.papyrus.infra.gmfdiag.expansion/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0, org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF index 1641f595d4e..a7d03af9f63 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.emf.transaction.ui;bundle-version="[1.4.0,2.0.0)", org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)", org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="[1.7.0,2.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.commands, org.eclipse.papyrus.commands.util, org.eclipse.papyrus.commands.wrappers diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java index bb43bde6688..18b2d587142 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/ICreationCommand.java @@ -19,7 +19,7 @@ import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype; /** * Define a command use to create new diagram. It use to provide Eclipse - * extension @see {@link PapyrusDiagram#creationCommand} It used by the creation + * extension @see PapyrusDiagram#creationCommand It used by the creation * model wizard. * * @author Jerome Benois diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF index 99bcffbb8c1..7dfd8dac3e0 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF @@ -68,11 +68,13 @@ Require-Bundle: org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", org.eclipse.papyrus.infra.core;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.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.filters;bundle-version="1.2.0", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,3.0.0)"; visibility:=reexport + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,4.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java index 3b34937389d..21abab70070 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/helper/GMFDiagramViewTypeHelper.java @@ -13,6 +13,8 @@ *****************************************************************************/ package org.eclipse.papyrus.infra.gmfdiag.common.helper; +import org.eclipse.core.runtime.Platform; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.gmf.runtime.notation.Diagram; import org.eclipse.papyrus.infra.gmfdiag.common.AbstractPapyrusGmfCreateDiagramCommandHandler; @@ -22,6 +24,7 @@ import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram; import org.eclipse.papyrus.infra.viewpoints.policy.AbstractViewTypeHelper; import org.eclipse.papyrus.infra.viewpoints.policy.PolicyChecker; import org.eclipse.papyrus.infra.viewpoints.policy.ViewPrototype; +import org.osgi.framework.Bundle; /** * Represents the dynamic contribution of a policy to menus @@ -49,16 +52,35 @@ public class GMFDiagramViewTypeHelper extends AbstractViewTypeHelper creationCommandClass = diagramKind.getCreationCommandClass(); - command = (AbstractPapyrusGmfCreateDiagramCommandHandler) creationCommandClass.newInstance(); - } catch (Exception e) { - Activator.log.error(e); - return null; + String commandClassName = diagramKind.getCreationCommandClass(); + if (commandClassName != null) { + Class creationCommandClass = null; + + URI uri = diagramKind.eResource().getURI(); + if (uri.isPlatformPlugin()) { + String bundleName = uri.segment(1); + Bundle bundle = Platform.getBundle(bundleName); + try { + creationCommandClass = bundle.loadClass(diagramKind.getCreationCommandClass()); + } catch (ClassNotFoundException e) { + Activator.log.error(e); + } + } + + if (creationCommandClass != null) { + AbstractPapyrusGmfCreateDiagramCommandHandler command; + try { + command = (AbstractPapyrusGmfCreateDiagramCommandHandler) creationCommandClass.newInstance(); + } catch (Exception e) { + Activator.log.error(e); + return null; + } + + String language = diagramKind.getLanguage().getId(); + return new DiagramPrototype(diagramKind, language, command); + } } - return new DiagramPrototype(diagramKind, language, command); + return null; } /** diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java index 5444bbf2403..f42a5607efe 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/palette/PapyrusPaletteService.java @@ -46,7 +46,6 @@ import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.emf.edit.domain.IEditingDomainProvider; import org.eclipse.emf.transaction.TransactionalEditingDomain; import org.eclipse.gef.palette.PaletteContainer; -import org.eclipse.gef.palette.PaletteDrawer; import org.eclipse.gef.palette.PaletteEntry; import org.eclipse.gef.palette.PaletteRoot; import org.eclipse.gef.palette.PaletteSeparator; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF index 81c3b21742a..133283f607f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.dnd/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.dnd.policy, org.eclipse.papyrus.infra.gmfdiag.dnd.strategy Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.expansion;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 1.3.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF index b2187840139..d939d5138a9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/META-INF/MANIFEST.MF @@ -6,7 +6,9 @@ Require-Bundle: org.eclipse.papyrus.infra.hyperlink;bundle-version="[3.0.0,4.0.0 org.eclipse.papyrus.infra.gmfdiag.dnd;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.infra.gmfdiag.hyperlink, org.eclipse.papyrus.infra.gmfdiag.hyperlink.dnd, org.eclipse.papyrus.infra.gmfdiag.hyperlink.editpolicies, diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java index ce8fd866ff3..76a40809e17 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.hyperlink/src/org/eclipse/papyrus/infra/gmfdiag/hyperlink/editpolicies/HyperlinkNavigationMenuEditPolicy.java @@ -39,6 +39,7 @@ import org.eclipse.jface.viewers.CellLabelProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind; import org.eclipse.papyrus.infra.core.services.ServiceException; import org.eclipse.papyrus.infra.emf.utils.EMFHelper; import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject; diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF index 1ac715fbe1f..ffdf6dfa608 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF @@ -4,7 +4,8 @@ Require-Bundle: org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.views.modelexplorer;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.infra.internationalization.edit;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.internationalization.edit;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF index 245b19d9a0c..5930202aa21 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF @@ -7,7 +7,10 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4 org.eclipse.papyrus.infra.gmfdiag.canonical;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.infra.internationalization;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.gmfdiag.style;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.infra.gmfdiag.properties.constraint" Bundle-Version: 4.0.0.qualifier diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF index 321d0fe59f6..af078ec3000 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation.edit/META-INF/MANIFEST.MF @@ -10,21 +10,20 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.13.0,4.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.filters;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.emf.edit;bundle-version="[2.12.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.13.0,3.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.9.0,3.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.filters;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.filters.edit;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF index 37ef586210d..3408bc58ea0 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.representation;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,11 +12,14 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.representation, org.eclipse.papyrus.infra.gmfdiag.representation.util Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)", org.eclipse.papyrus.infra.filters;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, org.eclipse.uml2.types;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="[3.14.0,4.0.0)", + org.eclipse.core.resources, + org.eclipse.gmf.runtime.emf.type.core Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore index a4a0cc741c7..1589a77e423 100755 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.ecore @@ -6,6 +6,15 @@
+ + + + + + + + +
@@ -37,15 +46,13 @@
- +
- - - diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel index 7163bff92cc..ef50171f9fa 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/model/GmfDiagRepresentation.genmodel @@ -30,6 +30,10 @@ ecoreFeature="ecore:EAttribute GmfDiagRepresentation.ecore#//PapyrusDiagram/creationCommandClass"/> + + + + 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.gmfdiag.representation - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin Papyrus fork of org.eclipse.gmf.tooling.runtime to remain in the release train \ No newline at end of file diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java index 113a26c6e3c..37d42ff5244 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/AssistantRule.java @@ -71,6 +71,7 @@ public interface AssistantRule extends Rule { * * @model required="true" elementTypeDataType="org.eclipse.papyrus.infra.gmfdiag.representation.ElementType" elementTypeRequired="true" * @generated + * @since 2.0 */ boolean matches(IElementType elementType); diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java index a9f704569d8..56431c3de39 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/PapyrusDiagram.java @@ -13,6 +13,8 @@ */ package org.eclipse.papyrus.infra.gmfdiag.representation; +import java.util.Map; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentationKind; @@ -133,13 +135,14 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind { * The fully qualified name of a command that creates the diagram. The command must implement the org.eclipse.papyrus.commands.ICreationCommand inteface * * @return the value of the 'Creation Command Class' attribute. - * @see #setCreationCommandClass(Class) + * @see #setCreationCommandClass(String) * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage#getPapyrusDiagram_CreationCommandClass() * @model required="true" * annotation="http://www.eclipse.org/emf/2002/GenModel propertyDescription='The fully qualified name of a command that creates the diagram. The command must implement the org.eclipse.papyrus.commands.ICreationCommand inteface' propertyCategory='Diagram'" * @generated + * @since 2.0 */ - Class getCreationCommandClass(); + String getCreationCommandClass(); /** * Sets the value of the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#getCreationCommandClass Creation Command Class}' attribute. @@ -148,8 +151,9 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind { * @param value the new value of the 'Creation Command Class' attribute. * @see #getCreationCommandClass() * @generated + * @since 2.0 */ - void setCreationCommandClass(Class value); + void setCreationCommandClass(String value); /** * Returns the value of the 'Palettes' reference list. @@ -170,4 +174,13 @@ public interface PapyrusDiagram extends PapyrusRepresentationKind { */ EList getPalettes(); + /** + * + * + * @model diagnosticsUnique="false" contextUnique="false" + * @generated + * @since 2.0 + */ + boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map context); + } // PapyrusDiagram diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java index 78616d1cdf1..c147e20b49f 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/RepresentationPackage.java @@ -241,6 +241,15 @@ public interface RepresentationPackage extends EPackage { */ int PAPYRUS_DIAGRAM_FEATURE_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_FEATURE_COUNT + 6; + /** + * The operation id for the 'Ceation Command Class Exists' operation. + * + * + * @generated + * @ordered + */ + int PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0; + /** * The number of operations of the 'Papyrus Diagram' class. * @@ -248,7 +257,7 @@ public interface RepresentationPackage extends EPackage { * @generated * @ordered */ - int PAPYRUS_DIAGRAM_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 0; + int PAPYRUS_DIAGRAM_OPERATION_COUNT = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND_OPERATION_COUNT + 1; /** * The meta object id for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl Child Rule}' class. @@ -566,6 +575,16 @@ public interface RepresentationPackage extends EPackage { */ EReference getPapyrusDiagram_Palettes(); + /** + * Returns the meta object for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) Ceation Command Class Exists}' operation. + * + * + * @return the meta object for the 'Ceation Command Class Exists' operation. + * @see org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram#ceationCommandClassExists(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) + * @generated + */ + EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map(); + /** * Returns the meta object for class '{@link org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule Child Rule}'. * @@ -807,6 +826,14 @@ public interface RepresentationPackage extends EPackage { */ EReference PAPYRUS_DIAGRAM__PALETTES = eINSTANCE.getPapyrusDiagram_Palettes(); + /** + * The meta object literal for the 'Ceation Command Class Exists' operation. + * + * + * @generated + */ + EOperation PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map(); + /** * The meta object literal for the '{@link org.eclipse.papyrus.infra.gmfdiag.representation.impl.ChildRuleImpl Child Rule}' class. * diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java index cc02cb7c7f9..5272d4dcddd 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/PapyrusDiagramImpl.java @@ -13,17 +13,35 @@ */ package org.eclipse.papyrus.infra.gmfdiag.representation.impl; +import java.lang.reflect.InvocationTargetException; import java.util.Collection; +import java.util.Map; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; +import org.eclipse.emf.common.util.BasicDiagnostic; +import org.eclipse.emf.common.util.Diagnostic; +import org.eclipse.emf.common.util.DiagnosticChain; import org.eclipse.emf.common.util.EList; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.plugin.EcorePlugin; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; +import org.eclipse.emf.ecore.util.EObjectValidator; import org.eclipse.emf.ecore.util.InternalEList; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.papyrus.infra.architecture.representation.impl.PapyrusRepresentationKindImpl; import org.eclipse.papyrus.infra.gmfdiag.paletteconfiguration.PaletteConfiguration; import org.eclipse.papyrus.infra.gmfdiag.representation.AssistantRule; @@ -31,6 +49,7 @@ import org.eclipse.papyrus.infra.gmfdiag.representation.ChildRule; import org.eclipse.papyrus.infra.gmfdiag.representation.PaletteRule; import org.eclipse.papyrus.infra.gmfdiag.representation.PapyrusDiagram; import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage; +import org.eclipse.papyrus.infra.gmfdiag.representation.util.RepresentationValidator; /** * An implementation of the model object 'Papyrus @@ -97,6 +116,17 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements */ protected EList assistantRules; + /** + * The default value of the '{@link #getCreationCommandClass() Creation Command Class}' attribute. + * + * + * @see #getCreationCommandClass() + * @generated + * @ordered + * @since 2.0 + */ + protected static final String CREATION_COMMAND_CLASS_EDEFAULT = null; + /** * The cached value of the '{@link #getCreationCommandClass() Creation * Command Class}' attribute. * @generated */ - public Class getCreationCommandClass() { + public String getCreationCommandClass() { return creationCommandClass; } /** - * + * + * * @generated */ - public void setCreationCommandClass(Class newCreationCommandClass) { - Class oldCreationCommandClass = creationCommandClass; + public void setCreationCommandClass(String newCreationCommandClass) { + String oldCreationCommandClass = creationCommandClass; creationCommandClass = newCreationCommandClass; if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS, oldCreationCommandClass, creationCommandClass)); @@ -216,6 +247,40 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements return palettes; } + /** + * + * + * @generated NOT + */ + public boolean ceationCommandClassExists(DiagnosticChain diagnostics, Map context) { + if (creationCommandClass != null) { + URI uri = eResource().getURI(); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IFile file = workspace.getRoot().getFile(new Path(uri.toPlatformString(false))); + IProject project = file.getProject(); + IJavaProject javaProject = JavaCore.create(project); + IType type = null; + try { + type = javaProject.findType(creationCommandClass); + } catch (JavaModelException e) { + /* ignore */ + } + if (type == null) { + if (diagnostics != null) { + diagnostics.add + (new BasicDiagnostic + (Diagnostic.ERROR, + RepresentationValidator.DIAGNOSTIC_SOURCE, + RepresentationValidator.PAPYRUS_DIAGRAM__CEATION_COMMAND_CLASS_EXISTS, + EcorePlugin.INSTANCE.getString("_UI_GenericInvariant_diagnostic", new Object[] { "ceationCommandClassExists", EObjectValidator.getObjectLabel(this, context) }), //$NON-NLS-1$ //$NON-NLS-2$ + new Object [] { this })); + } + return false; + } + } + return true; + } + /** * * @generated @@ -280,7 +345,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements getAssistantRules().addAll((Collection)newValue); return; case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS: - setCreationCommandClass((Class)newValue); + setCreationCommandClass((String)newValue); return; case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES: getPalettes().clear(); @@ -310,7 +375,7 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements getAssistantRules().clear(); return; case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS: - setCreationCommandClass((Class)null); + setCreationCommandClass(CREATION_COMMAND_CLASS_EDEFAULT); return; case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES: getPalettes().clear(); @@ -335,13 +400,28 @@ public class PapyrusDiagramImpl extends PapyrusRepresentationKindImpl implements case RepresentationPackage.PAPYRUS_DIAGRAM__ASSISTANT_RULES: return assistantRules != null && !assistantRules.isEmpty(); case RepresentationPackage.PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS: - return creationCommandClass != null; + return CREATION_COMMAND_CLASS_EDEFAULT == null ? creationCommandClass != null : !CREATION_COMMAND_CLASS_EDEFAULT.equals(creationCommandClass); case RepresentationPackage.PAPYRUS_DIAGRAM__PALETTES: return palettes != null && !palettes.isEmpty(); } return super.eIsSet(featureID); } + /** + * + * + * @generated + */ + @Override + @SuppressWarnings("unchecked") + public Object eInvoke(int operationID, EList arguments) throws InvocationTargetException { + switch (operationID) { + case RepresentationPackage.PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP: + return ceationCommandClassExists((DiagnosticChain)arguments.get(0), (Map)arguments.get(1)); + } + return super.eInvoke(operationID, arguments); + } + /** * * @generated diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java index 800b5b9c134..315e0d223c9 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/impl/RepresentationPackageImpl.java @@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.EGenericType; import org.eclipse.emf.ecore.EOperation; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.EValidator; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.impl.EPackageImpl; @@ -41,6 +42,7 @@ import org.eclipse.papyrus.infra.gmfdiag.representation.PathElement; import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationFactory; import org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage; +import org.eclipse.papyrus.infra.gmfdiag.representation.util.RepresentationValidator; import org.eclipse.papyrus.infra.types.ElementTypesConfigurationsPackage; import org.eclipse.uml2.types.TypesPackage; @@ -156,6 +158,15 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent // Initialize created meta-data theRepresentationPackage.initializePackageContents(); + // Register package validator + EValidator.Registry.INSTANCE.put + (theRepresentationPackage, + new EValidator.Descriptor() { + public EValidator getEValidator() { + return RepresentationValidator.INSTANCE; + } + }); + // Mark meta-data to indicate it can't be changed theRepresentationPackage.freeze(); @@ -227,6 +238,15 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent return (EReference)papyrusDiagramEClass.getEStructuralFeatures().get(5); } + /** + * + * + * @generated + */ + public EOperation getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map() { + return papyrusDiagramEClass.getEOperations().get(0); + } + /** * * @@ -397,6 +417,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__ASSISTANT_RULES); createEAttribute(papyrusDiagramEClass, PAPYRUS_DIAGRAM__CREATION_COMMAND_CLASS); createEReference(papyrusDiagramEClass, PAPYRUS_DIAGRAM__PALETTES); + createEOperation(papyrusDiagramEClass, PAPYRUS_DIAGRAM___CEATION_COMMAND_CLASS_EXISTS__DIAGNOSTICCHAIN_MAP); childRuleEClass = createEClass(CHILD_RULE); createEReference(childRuleEClass, CHILD_RULE__ELEMENT); @@ -446,6 +467,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent // Obtain other dependent packages org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage theRepresentationPackage_1 = (org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage)EPackage.Registry.INSTANCE.getEPackage(org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.eNS_URI); PaletteconfigurationPackage thePaletteconfigurationPackage = (PaletteconfigurationPackage)EPackage.Registry.INSTANCE.getEPackage(PaletteconfigurationPackage.eNS_URI); + EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI); // Create type parameters @@ -463,12 +485,18 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent initEReference(getPapyrusDiagram_ChildRules(), this.getChildRule(), null, "childRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getPapyrusDiagram_PaletteRules(), this.getPaletteRule(), null, "paletteRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getPapyrusDiagram_AssistantRules(), this.getAssistantRule(), null, "assistantRules", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass()); - EGenericType g2 = createEGenericType(); - g1.getETypeArguments().add(g2); - initEAttribute(getPapyrusDiagram_CreationCommandClass(), g1, "creationCommandClass", null, 1, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + initEAttribute(getPapyrusDiagram_CreationCommandClass(), ecorePackage.getEString(), "creationCommandClass", null, 1, 1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getPapyrusDiagram_Palettes(), thePaletteconfigurationPackage.getPaletteConfiguration(), null, "palettes", null, 0, -1, PapyrusDiagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ + EOperation op = initEOperation(getPapyrusDiagram__CeationCommandClassExists__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "ceationCommandClassExists", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + addEParameter(op, theEcorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + EGenericType g1 = createEGenericType(theEcorePackage.getEMap()); + EGenericType g2 = createEGenericType(theEcorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + g2 = createEGenericType(theEcorePackage.getEJavaObject()); + g1.getETypeArguments().add(g2); + addEParameter(op, g1, "context", 0, 1, !IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + initEClass(childRuleEClass, ChildRule.class, "ChildRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEReference(getChildRule_Element(), ecorePackage.getEClass(), null, "element", null, 0, 1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ initEReference(getChildRule_Stereotypes(), ecorePackage.getEClass(), null, "stereotypes", null, 0, -1, ChildRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ @@ -486,7 +514,7 @@ public class RepresentationPackageImpl extends EPackageImpl implements Represent initEClass(assistantRuleEClass, AssistantRule.class, "AssistantRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$ initEAttribute(getAssistantRule_ElementTypeID(), ecorePackage.getEString(), "elementTypeID", null, 0, 1, AssistantRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ - EOperation op = initEOperation(getAssistantRule__Matches__IElementType(), ecorePackage.getEBoolean(), "matches", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ + op = initEOperation(getAssistantRule__Matches__IElementType(), ecorePackage.getEBoolean(), "matches", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ addEParameter(op, this.getElementType(), "elementType", 1, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$ // Initialize data types diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java new file mode 100644 index 00000000000..a971c2db38f --- /dev/null +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.representation/src-gen/org/eclipse/papyrus/infra/gmfdiag/representation/util/RepresentationValidator.java @@ -0,0 +1,215 @@ +/** + * Copyright (c) 2017 CEA LIST. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Maged Elaasar - Initial API and implementation + * + * + */ +package org.eclipse.papyrus.infra.gmfdiag.representation.util; + +import java.util.Map; + +import org.eclipse.emf.common.util.DiagnosticChain; +import org.eclipse.emf.common.util.ResourceLocator; + +import org.eclipse.emf.ecore.EPackage; + +import org.eclipse.emf.ecore.util.EObjectValidator; + +import org.eclipse.gmf.runtime.emf.type.core.IElementType; + +import org.eclipse.papyrus.infra.gmfdiag.representation.*; + +/** + * + * The Validator for the model. + * + * @see org.eclipse.papyrus.infra.gmfdiag.representation.RepresentationPackage + * @generated + * @since 2.0 + */ +public class RepresentationValidator extends EObjectValidator { + /** + * The cached model package + * + * + * @generated + */ + public static final RepresentationValidator INSTANCE = new RepresentationValidator(); + + /** + * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package. + * + * + * @see org.eclipse.emf.common.util.Diagnostic#getSource() + * @see org.eclipse.emf.common.util.Diagnostic#getCode() + * @generated + */ + public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.infra.gmfdiag.representation"; //$NON-NLS-1$ + + /** + * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Ceation Command Class Exists' of 'Papyrus Diagram'. + * + * + * @generated + */ + public static final int PAPYRUS_DIAGRAM__CEATION_COMMAND_CLASS_EXISTS = 1; + + /** + * A constant with a fixed name that can be used as the base value for additional hand written constants. + * + * + * @generated + */ + private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 1; + + /** + * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class. + * + * + * @generated + */ + protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT; + + /** + * Creates an instance of the switch. + * + * + * @generated + */ + public RepresentationValidator() { + super(); + } + + /** + * Returns the package of this validator switch. + * + * + * @generated + */ + @Override + protected EPackage getEPackage() { + return RepresentationPackage.eINSTANCE; + } + + /** + * Calls validateXXX for the corresponding classifier of the model. + * + * + * @generated + */ + @Override + protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map context) { + switch (classifierID) { + case RepresentationPackage.PAPYRUS_DIAGRAM: + return validatePapyrusDiagram((PapyrusDiagram)value, diagnostics, context); + case RepresentationPackage.CHILD_RULE: + return validateChildRule((ChildRule)value, diagnostics, context); + case RepresentationPackage.PALETTE_RULE: + return validatePaletteRule((PaletteRule)value, diagnostics, context); + case RepresentationPackage.PATH_ELEMENT: + return validatePathElement((PathElement)value, diagnostics, context); + case RepresentationPackage.ASSISTANT_RULE: + return validateAssistantRule((AssistantRule)value, diagnostics, context); + case RepresentationPackage.ELEMENT_TYPE: + return validateElementType((IElementType)value, diagnostics, context); + default: + return true; + } + } + + /** + * + * + * @generated + */ + public boolean validatePapyrusDiagram(PapyrusDiagram papyrusDiagram, DiagnosticChain diagnostics, Map context) { + if (!validate_NoCircularContainment(papyrusDiagram, diagnostics, context)) return false; + boolean result = validate_EveryMultiplicityConforms(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryDataValueConforms(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryProxyResolves(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_UniqueID(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryKeyUnique(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(papyrusDiagram, diagnostics, context); + if (result || diagnostics != null) result &= validatePapyrusDiagram_ceationCommandClassExists(papyrusDiagram, diagnostics, context); + return result; + } + + /** + * Validates the ceationCommandClassExists constraint of 'Papyrus Diagram'. + * + * + * @generated + */ + public boolean validatePapyrusDiagram_ceationCommandClassExists(PapyrusDiagram papyrusDiagram, DiagnosticChain diagnostics, Map context) { + return papyrusDiagram.ceationCommandClassExists(diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateChildRule(ChildRule childRule, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(childRule, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validatePaletteRule(PaletteRule paletteRule, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(paletteRule, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validatePathElement(PathElement pathElement, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(pathElement, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateAssistantRule(AssistantRule assistantRule, DiagnosticChain diagnostics, Map context) { + return validate_EveryDefaultConstraint(assistantRule, diagnostics, context); + } + + /** + * + * + * @generated + */ + public boolean validateElementType(IElementType elementType, DiagnosticChain diagnostics, Map context) { + return true; + } + + /** + * Returns the resource locator that will be used to fetch messages for this validator's diagnostics. + * + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + // TODO + // Specialize this to return a resource locator for messages specific to this validator. + // Ensure that you remove @generated or mark it @generated NOT + return super.getResourceLocator(); + } + +} //RepresentationValidator diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF index f2fad1c545c..2ce05614b57 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style.edit/META-INF/MANIFEST.MF @@ -12,8 +12,8 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.style.provider Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.gmfdiag.style;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.constraints.edit;visibility:=reexport;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.ecore;visibility:=reexport, @@ -22,8 +22,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)", org.eclipse.gmf.runtime.notation;visibility:=reexport, org.eclipse.gmf.runtime.notation.edit;visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.architecture.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.representation.edit;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF index 106551ae97c..650cb1fa5a6 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.style/META-INF/MANIFEST.MF @@ -13,10 +13,10 @@ Export-Package: org.eclipse.papyrus.infra.gmfdiag.style, Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.constraints;visibility:=reexport;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.types;visibility:=reexport;bundle-version="[3.0.0,4.0.0)", org.eclipse.gmf.runtime.notation;visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.gmfdiag.representation;visibility:=reexport;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF index a7b67580b80..6d7e38dbe47 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.welcome/META-INF/MANIFEST.MF @@ -7,7 +7,9 @@ Require-Bundle: org.eclipse.papyrus.infra.editor.welcome;bundle-version="[2.0.0, org.eclipse.papyrus.infra.services.navigation;bundle-version="[3.0.0,4.0.0)", org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", org.eclipse.papyrus.infra.editor.welcome.nattable;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)" + org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.100.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF index c7158d8af71..cb84aacaf95 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/META-INF/MANIFEST.MF @@ -14,14 +14,16 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0) org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.100.0,4.0.0)", org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.services.edit;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.types.core;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.infra.internationalization.common;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 5.0.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java index a3418936b6b..f8683afa586 100755 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.common/src/org/eclipse/papyrus/infra/nattable/common/helper/TableCommandHelper.java @@ -56,7 +56,7 @@ public class TableCommandHelper extends AbstractViewTypeHelper { /** * {@inheritDoc} * - * @since 4.1 + * @since 5.0 */ @Override protected ViewPrototype doGetPrototypeFor(PapyrusTable papyrusTable) { diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF index 29174d98032..b4922e93ffd 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.modelexplorer/META-INF/MANIFEST.MF @@ -10,7 +10,7 @@ Bundle-Name: %Bundle-Name Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)", org.eclipse.papyrus.emf.facet.query.java.core;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.emf.facet.custom.metamodel;bundle-version="[1.3.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="[3.0.0,4.0.0)", @@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0, org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.views.modelexplorer;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.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)" + org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.papyrus.infra.nattable.modelexplorer.Activator diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF index 29a680f2517..4b7ecbc9726 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.properties/META-INF/MANIFEST.MF @@ -5,12 +5,13 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4 org.eclipse.papyrus.infra.emf.gmf;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, 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,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.emf.nattable;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.internationalization;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)" + org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 2.2.100.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF index 99586ef8201..2ddf400ec62 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation.edit/META-INF/MANIFEST.MF @@ -10,19 +10,19 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.nattable.representation.provider Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.emf.edit;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.constraints.edit;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.ecore.edit;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.infra.nattable.model.edit;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.emf.expressions.edit;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF index bd10268ef08..859f66f88fe 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.nattable.representation;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,11 +11,11 @@ Export-Package: org.eclipse.papyrus.infra.nattable.representation, org.eclipse.papyrus.infra.nattable.representation.impl, org.eclipse.papyrus.infra.nattable.representation.util Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", - org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.emf.ecore;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.nattable.model;bundle-version="[4.0.0,5.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)", org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml index 869890f5a06..f947bf42a56 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/pom.xml @@ -7,6 +7,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.nattable.representation - 1.0.100-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin \ No newline at end of file diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java index cb0827d1313..82c2adf90cf 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable.representation/src-gen/org/eclipse/papyrus/infra/nattable/representation/RepresentationPackage.java @@ -82,6 +82,7 @@ public interface RepresentationPackage extends EPackage { * * @generated * @ordered + * @since 2.0 */ int PAPYRUS_TABLE__ID = org.eclipse.papyrus.infra.architecture.representation.RepresentationPackage.PAPYRUS_REPRESENTATION_KIND__ID; diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF index 6d4238ab17a..5cd038c81cc 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF @@ -65,10 +65,13 @@ Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0 org.eclipse.papyrus.infra.services.decoration;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.ui.emf;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.types.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.editor;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.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 6.0.0.qualifier diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java index 9998ebd6476..7cab2bc12fe 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/contentprovider/MatrixRelationshipOwnerStrategyContentProvider.java @@ -23,6 +23,7 @@ import org.eclipse.papyrus.infra.widgets.providers.IStaticContentProvider; /** * * This class provides the available relationship direction required to edit relationship in case of matrix table + * @since 6.0 * */ public class MatrixRelationshipOwnerStrategyContentProvider implements IStaticContentProvider { diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java index eaa2d9ea929..cbdb960bc6e 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/messages/Messages.java @@ -497,18 +497,39 @@ public class Messages extends NLS { public static String MatrixRelationshipDirectionLabelProvider_ColumnToRow; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_ColumAsOwner; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_ColumnsOwnerAsOwner; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_Default; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_Other; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_RowAsOwner; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_RowsOwnerAsOwner; + /** + * @since 6.0 + */ public static String MatrixRelationshipOwnerStrategyLabelProvider_TableRootElement; /** diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java index 1cee9192244..1a0db0ae5d2 100644 --- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java +++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/provider/MatrixRelationshipOwnerStrategyLabelProvider.java @@ -21,6 +21,7 @@ import org.eclipse.swt.graphics.Image; /** * The label provider to use for the enumeration used to define the relationship direction + * @since 6.0 * */ public class MatrixRelationshipOwnerStrategyLabelProvider implements ILabelProvider { diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF index 454615e1a1b..bcba880dd15 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.architecture/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.services.architecture -Require-Bundle: org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, +Require-Bundle: org.eclipse.papyrus.infra.core.architecture;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.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)" diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF index f984b5c75ca..f10cd73952c 100644 --- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF +++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF @@ -10,7 +10,8 @@ Export-Package: org.eclipse.papyrus.infra.services.edit, org.eclipse.papyrus.infra.services.edit.utils Require-Bundle: org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.infra.services.markerlistener;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 3.0.0.qualifier diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF index 75850bc24c6..4d552874ae8 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.architecture;singleton:=true -Bundle-Version: 1.0.100.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin$Implementation Bundle-Vendor: %providerName @@ -10,17 +10,20 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.papyrus.infra.ui.architecture, org.eclipse.papyrus.infra.ui.architecture.widgets -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.emf.edit.ui;visibility:=reexport, - org.eclipse.ui.ide;visibility:=reexport, - org.eclipse.papyrus.infra.types.edit;visibility:=reexport;bundle-version="[3.0.0,4.0.0)", +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.0.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.0.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.edit.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.ui.ide;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.types.edit;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.core.architecture.edit;visibility:=reexport;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)", org.eclipse.papyrus.infra.architecture.representation.edit;bundle-version="[1.0.0,2.0.0)", org.eclipse.papyrus.infra.emf;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.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)" + org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)", + org.eclipse.jdt.core;bundle-version="[3.0.0,4.0.0)", + org.eclipse.jdt.ui;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)" Bundle-ActivationPolicy: lazy diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml index 32eacb4deec..41a3a0ce2ea 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/pom.xml @@ -8,6 +8,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.ui.architecture - 1.0.100-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureEditor.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureEditor.java index 48bbd71b8b7..5619788896a 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureEditor.java +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/ArchitectureEditor.java @@ -95,8 +95,8 @@ import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureItemProviderAdapterFactory; import org.eclipse.papyrus.infra.architecture.representation.provider.RepresentationItemProviderAdapterFactory; +import org.eclipse.papyrus.infra.core.architecture.provider.ArchitectureItemProviderAdapterFactory; import org.eclipse.papyrus.infra.types.provider.ElementTypesConfigurationsItemProviderAdapterFactory; import org.eclipse.papyrus.infra.ui.architecture.ArchitectureUIPlugin; import org.eclipse.swt.SWT; @@ -1210,7 +1210,7 @@ public class ArchitectureEditor getActionBarContributor().shareGlobalActions(this, actionBars); } }; - propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory)); + propertySheetPage.setPropertySourceProvider(new CustomAdapterFactoryContentProvider(adapterFactory)); propertySheetPages.add(propertySheetPage); return propertySheetPage; diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/CustomAdapterFactoryContentProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/CustomAdapterFactoryContentProvider.java new file mode 100644 index 00000000000..380d9268f5d --- /dev/null +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui.architecture/src/org/eclipse/papyrus/infra/ui/architecture/editor/CustomAdapterFactoryContentProvider.java @@ -0,0 +1,154 @@ +/***************************************************************************** + * Copyright (c) 2018 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.infra.ui.architecture.editor; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.util.URI; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.emf.edit.ui.provider.PropertyDescriptor; +import org.eclipse.emf.edit.ui.provider.PropertySource; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.search.IJavaSearchScope; +import org.eclipse.jdt.core.search.SearchEngine; +import org.eclipse.jdt.ui.IJavaElementSearchConstants; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.viewers.CellEditor; +import org.eclipse.jface.viewers.DialogCellEditor; +import org.eclipse.jface.window.Window; +import org.eclipse.papyrus.infra.gmfdiag.common.Activator; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.dialogs.SelectionDialog; +import org.eclipse.ui.views.properties.IPropertyDescriptor; +import org.eclipse.ui.views.properties.IPropertySource; + +/** + * @author melaasar + * + */ +public class CustomAdapterFactoryContentProvider extends AdapterFactoryContentProvider { + + /** + * @param adapterFactory + */ + public CustomAdapterFactoryContentProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * @see org.eclipse.ui.views.properties.IPropertySourceProvider#getPropertySource(java.lang.Object) + * + * @param object + * @return + */ + @Override + protected IPropertySource createPropertySource(Object object, + IItemPropertySource itemPropertySource) { + return new CustomPropertySource(object, itemPropertySource); + } + + /** + * A custom property source + */ + private class CustomPropertySource extends PropertySource { + /** + * Constructor. + * + * @param object + * @param itemPropertySource + */ + public CustomPropertySource(Object object, IItemPropertySource itemPropertySource) { + super(object, itemPropertySource); + } + + /* + * @see + * PropertySource#createPropertyDescriptor(org.eclipse.emf.edit .provider.IItemPropertyDescriptor) + */ + protected IPropertyDescriptor createPropertyDescriptor(IItemPropertyDescriptor itemPropertyDescriptor) { + return new CustomPropertyDescriptor(object, itemPropertyDescriptor); + } + } + + private class CustomPropertyDescriptor extends PropertyDescriptor { + + /** + * @param object + * @param itemPropertyDescriptor + */ + public CustomPropertyDescriptor(Object object, IItemPropertyDescriptor itemPropertyDescriptor) { + super(object, itemPropertyDescriptor); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.views.properties.IPropertyDescriptor#createPr opertyEditor(org.eclipse.swt.widgets.Composite) + */ + public CellEditor createPropertyEditor(Composite composite) { + final EObject eObject = (EObject) object; + final EStructuralFeature feature = (EStructuralFeature) itemPropertyDescriptor.getFeature(eObject); + if (feature.getName().endsWith("Class") || feature.getName().endsWith("class")) { + CellEditor cellEditor = new DialogCellEditor(composite) { + @Override + protected Object openDialogBox(Control cellEditorWindow) { + return selectTypeDialog(cellEditorWindow, eObject, feature); + } + }; + return cellEditor; + } + return super.createPropertyEditor(composite); + } + } + + public String selectTypeDialog(Control cellEditorWindow, EObject eObject, EStructuralFeature feature) { + URI uri = eObject.eResource().getURI(); + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + IFile file = workspace.getRoot().getFile(new Path(uri.toPlatformString(false))); + IProject project = file.getProject(); + IJavaProject[] javaProject = new IJavaProject[] {JavaCore.create(project)}; + IJavaSearchScope searchScope = SearchEngine.createJavaSearchScope(javaProject); + + int scope = IJavaElementSearchConstants.CONSIDER_CLASSES; + String filter = (String) eObject.eGet(feature); + if (filter == null || filter.length() == 0) + filter = "**"; //$NON-NLS-1$ + + try { + SelectionDialog dialog = JavaUI.createTypeDialog(cellEditorWindow.getShell(), PlatformUI.getWorkbench().getProgressService(), searchScope, scope, false, filter); + dialog.setTitle("Select Class"); + if (dialog.open() == Window.OK) { + IType type = (IType) dialog.getResult()[0]; + return type.getFullyQualifiedName('$'); + } + } catch (JavaModelException e) { + Activator.log.error(e); + } + return null; + } +} diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF index 98931c2c119..cb7dc37fa01 100644 --- a/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF +++ b/plugins/infra/ui/org.eclipse.papyrus.infra.ui/META-INF/MANIFEST.MF @@ -34,7 +34,8 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)";vi org.eclipse.ui.views;bundle-version="[3.8.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.emf;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.tools;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.tools;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.core.architecture;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-Version: 2.0.0.qualifier Eclipse-BuddyPolicy: dependent diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF index dc943fa4820..7e6bd54844a 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reex org.eclipse.core.runtime, org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="[2.12.0,3.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", org.eclipse.gmf.runtime.notation;bundle-version="[1.8.0,2.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)";visibility:=reexport, org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.8.0,2.0.0)", @@ -21,15 +21,15 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.107.0,4.0.0)";visibility:=reex org.eclipse.papyrus.infra.widgets;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.ui.emf;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.infra.architecture;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.gmfdiag.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.nattable.representation;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.core.architecture.edit;bundle-version="[1.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-ClassPath: . -Bundle-Version: 2.100.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Localization: plugin Bundle-Name: %pluginName Bundle-ManifestVersion: 2 diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml index e1271ec674f..d3cb2cc77fa 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/pom.xml @@ -6,6 +6,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.infra.viewpoints.policy - 2.100.0-SNAPSHOT + 3.0.0-SNAPSHOT eclipse-plugin \ No newline at end of file diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/AbstractViewTypeHelper.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/AbstractViewTypeHelper.java index 7e6ae4c8079..043e98f5282 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/AbstractViewTypeHelper.java +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/AbstractViewTypeHelper.java @@ -25,7 +25,7 @@ import org.eclipse.papyrus.infra.architecture.representation.PapyrusRepresentati * * @author Laurent Wouters * - * @since 2.1 + * @since 3.0 */ public abstract class AbstractViewTypeHelper implements IViewTypeHelper { diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java index d33652dc773..06d9951d47d 100755 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/ViewpointExplorer.java @@ -281,6 +281,9 @@ public class ViewpointExplorer extends ViewPart { }; } + /** + * @since 3.0 + */ public Object[] getPropertySources(Object[] objects) { ArrayList propertySources = new ArrayList(); for (Object object : objects) { @@ -289,6 +292,9 @@ public class ViewpointExplorer extends ViewPart { return propertySources.toArray(); } + /** + * @since 3.0 + */ public Object getPropertySource(Object object) { if (object instanceof EObject) return contentProvider.getPropertySource(object); diff --git a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/providers/MergedItemPropertyDescriptor.java b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/providers/MergedItemPropertyDescriptor.java index 49b91d08dc5..b26d839716e 100644 --- a/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/providers/MergedItemPropertyDescriptor.java +++ b/plugins/infra/viewpoints/org.eclipse.papyrus.infra.viewpoints.policy/src/org/eclipse/papyrus/infra/viewpoints/policy/providers/MergedItemPropertyDescriptor.java @@ -48,9 +48,9 @@ public class MergedItemPropertyDescriptor extends ItemPropertyDescriptor { if (object instanceof MergedArchitectureContext) { switch (feature.getFeatureID()) { case ArchitecturePackage.ARCHITECTURE_CONTEXT__CONVERSION_COMMAND_CLASS: - return ((MergedArchitectureContext)object).getConversionCommandClass(); + return ((MergedArchitectureContext)object).getConversionCommandClassName(); case ArchitecturePackage.ARCHITECTURE_CONTEXT__CREATION_COMMAND_CLASS: - return ((MergedArchitectureContext)object).getCreationCommandClass(); + return ((MergedArchitectureContext)object).getCreationCommandClassName(); case ArchitecturePackage.ARCHITECTURE_CONTEXT__DEFAULT_VIEWPOINTS: return ((MergedArchitectureContext)object).getDefaultViewpoints(); case ArchitecturePackage.ARCHITECTURE_CONTEXT__ELEMENT_TYPES: diff --git a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF index 5071a4d2acf..fef03f31dee 100644 --- a/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF +++ b/plugins/toolsmiths/org.eclipse.papyrus.uml.m2m.qvto.tests.tools/META-INF/MANIFEST.MF @@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.papyrus.infra.core.log;bundle-version="[1.2.0,2.0.0) org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", org.eclipse.papyrus.junit.utils;bundle-version="[2.0.0,3.0.0)", org.eclipse.emf.compare;bundle-version="[3.3.0,4.0.0)", - com.google.guava;bundle-version="21.0.0" + com.google.guava;bundle-version="21.0.0", + org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.constraints;bundle-version="[2.0.0,3.0.0)" Bundle-Activator: org.eclipse.papyrus.uml.m2m.qvto.tests.tools.Activator Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.uml.m2m.qvto.tests.tools, diff --git a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF index f938282829a..255e64caf38 100755 --- a/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF +++ b/plugins/uml/architecture/org.eclipse.papyrus.uml.architecture/META-INF/MANIFEST.MF @@ -15,10 +15,10 @@ Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0 org.eclipse.papyrus.infra.services.controlmode;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.types.rulebased;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)", org.eclipse.papyrus.uml.diagram.activity;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.communication;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.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)", @@ -31,6 +31,9 @@ Require-Bundle: org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0 org.eclipse.papyrus.uml.diagram.usecase;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.uml.nattable.generic.config;bundle-version="[1.2.0,2.0.0)", org.eclipse.papyrus.uml.service.types;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.uml.service.types.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.nattable.representation;bundle-version="[2.0.0,3.0.0)" Export-Package: org.eclipse.papyrus.uml.architecture Bundle-Vendor: %providerName diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF index 765a0c1906b..312fcb9cb91 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.properties/META-INF/MANIFEST.MF @@ -3,7 +3,8 @@ Require-Bundle: org.eclipse.papyrus.infra.properties.ui;bundle-version="[3.0.0,4 org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.properties;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.uml.decoratormodel.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.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.uml.tools;bundle-version="[4.0.0,5.0.0)" Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.properties.constraints;x-internal:=true, org.eclipse.papyrus.uml.decoratormodel.properties, org.eclipse.papyrus.uml.decoratormodel.properties.elements, diff --git a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF index 5de063baa22..2f75cfb7ac3 100644 --- a/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/decoratormodel/org.eclipse.papyrus.uml.decoratormodel.ui/META-INF/MANIFEST.MF @@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)";visibility org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)", org.eclipse.papyrus.infra.onefile;bundle-version="[2.1.0,3.0.0)", org.eclipse.papyrus.uml.profile;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.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)" Export-Package: org.eclipse.papyrus.uml.decoratormodel.internal.ui, org.eclipse.papyrus.uml.decoratormodel.internal.ui.commands;x-friends:="org.eclipse.papyrus.uml.decoratormodel.properties", org.eclipse.papyrus.uml.decoratormodel.internal.ui.expressions;x-internal:=true, 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 5cc9c890bd6..98e2af46381 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 @@ -84,7 +84,8 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";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)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 3.1.0.qualifier 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; 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 4131800e1c1..561f4cbfc3d 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 @@ -84,7 +84,11 @@ Require-Bundle: org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.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, - org.eclipse.papyrus.infra.gmfdiag.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.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %providerName Bundle-Version: 3.1.0.qualifier Eclipse-BuddyPolicy: dependent diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF index 5ecfc89f2e9..2709fd5e861 100755 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/META-INF/MANIFEST.MF @@ -68,10 +68,11 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)", org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)", org.eclipse.gef;bundle-version="[3.11.0,4.0.0)", - org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 3.0.0.qualifier +Bundle-Version: 4.0.0.qualifier Bundle-Activator: org.eclipse.papyrus.uml.diagram.communication.part.UMLDiagramEditorPlugin Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.communication; singleton:=true diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml index ea46e7f3cc6..b6af82888f1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.communication/pom.xml @@ -7,6 +7,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.uml.diagram.communication - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT eclipse-plugin \ No newline at end of file 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 c3f1014c0e9..5291fc52de3 100644 --- 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 @@ -77,7 +77,8 @@ Require-Bundle: org.eclipse.ui.navigator.resources;bundle-version="[3.5.0,4.0.0) org.eclipse.uml2.uml.edit;bundle-version="[5.3.0,6.0.0)";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)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 3.1.0.qualifier 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 e8a2ce8148a..1e81f7764a1 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 @@ -74,7 +74,8 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version= org.eclipse.emf.ecore;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)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 3.1.0.qualifier diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CompositeSideAffixedNodesCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CompositeSideAffixedNodesCreationEditPolicy.java index 4e02f9c39e7..6d146f50946 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CompositeSideAffixedNodesCreationEditPolicy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.composite/custom-src/org/eclipse/papyrus/uml/diagram/composite/custom/edit/policies/CompositeSideAffixedNodesCreationEditPolicy.java @@ -30,6 +30,7 @@ import org.eclipse.uml2.uml.Port; /** * This EditPolicy takes care of the correct placement of ports, see bug 527181 + * @since 3.1 */ public class CompositeSideAffixedNodesCreationEditPolicy extends SideAffixedNodesCreationEditPolicy { 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 aa1b7ceee4e..83cea173add 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 @@ -64,7 +64,8 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide;bundle-v 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;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 3.1.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 f8b04b3e47b..a8c5244a9c1 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 @@ -19,12 +19,13 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers;bundle-version="[1. org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.0,2.0.0)", 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.uml.diagram.communication;bundle-version="[4.0.0,5.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.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)" + org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 3.0.100.qualifier 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 109a50b1c88..119fd620a73 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 @@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="[1.7.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.communication;bundle-version="[4.0.0,5.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)", 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 cb3d748188a..77202b0f363 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 @@ -73,7 +73,9 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)", org.eclipse.emf.validation;visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.gef, - org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.extensionpoints.editors;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.sequence/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/META-INF/MANIFEST.MF index 47186ee968a..6b08da9f428 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 @@ -63,7 +63,8 @@ Require-Bundle: org.eclipse.ui.navigator;visibility:=reexport;bundle-version="[3 org.eclipse.papyrus.infra.properties.ui, org.eclipse.papyrus.uml.diagram.menu, org.eclipse.draw2d;visibility:=reexport, - org.eclipse.gmf.runtime.notation;visibility:=reexport + org.eclipse.gmf.runtime.notation;visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)" Bundle-Vendor: %providerName Bundle-Version: 5.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 e2a2b05fe1f..ae403975871 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 @@ -72,7 +72,8 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.12 org.eclipse.papyrus.extensionpoints.editors;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;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.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.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/ConnectionPointReferenceInStateHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/ConnectionPointReferenceInStateHelperAdvice.java index c3c70b466fc..b08ef50dbfb 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/ConnectionPointReferenceInStateHelperAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/ConnectionPointReferenceInStateHelperAdvice.java @@ -21,6 +21,9 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest; import org.eclipse.papyrus.uml.diagram.statemachine.providers.UMLElementTypes; import org.eclipse.uml2.uml.State; +/** + * @since 3.1 + */ public class ConnectionPointReferenceInStateHelperAdvice extends AbstractEditHelperAdvice { @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/DeleteRegionHelperAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/DeleteRegionHelperAdvice.java index bafacacf58f..b2387311f7e 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/DeleteRegionHelperAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/DeleteRegionHelperAdvice.java @@ -29,6 +29,7 @@ import org.eclipse.uml2.uml.Region; * 
  * This HelperAdvice resizes other regions of a state-machine or composite state, if a region gets deleted
  *
+ * @since 3.1 */ public class DeleteRegionHelperAdvice extends AbstractEditHelperAdvice { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/PseudostateKindInitializerAdvice.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/PseudostateKindInitializerAdvice.java index 85698caeb1c..aadfcef38d4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/PseudostateKindInitializerAdvice.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/helpers/advice/PseudostateKindInitializerAdvice.java @@ -32,6 +32,9 @@ import org.eclipse.uml2.uml.Pseudostate; import org.eclipse.uml2.uml.PseudostateKind; +/** + * @since 3.1 + */ public class PseudostateKindInitializerAdvice extends AbstractEditHelperAdvice { @Override diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/hyperlink/OwnedBehaviorHyperlinkContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/hyperlink/OwnedBehaviorHyperlinkContributor.java index 9c64d82643a..a40cf626fe1 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/hyperlink/OwnedBehaviorHyperlinkContributor.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/hyperlink/OwnedBehaviorHyperlinkContributor.java @@ -36,6 +36,7 @@ import org.eclipse.uml2.uml.BehavioredClassifier; * owned behaviors of a BehaviorClassifier * * @author Shuai Li + * @since 3.1 * */ public class OwnedBehaviorHyperlinkContributor implements HyperlinkContributor { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java index 46bc4d8816a..434aa72ce83 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/locators/CustomEntryExitPointPositionLocator.java @@ -21,6 +21,7 @@ import org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator; /** * This class is used to constrain the position of Entry/Exit points when they are added on a StateMachine + * @since 3.1 * */ public class CustomEntryExitPointPositionLocator implements IBorderItemLocator { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment_1_2_0.java index eccfa0c3846..1977d5ab189 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment_1_2_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconcilerForCompartment_1_2_0.java @@ -20,6 +20,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.ReconcilerForCompartm /** * Diagram Reconciler for compartment from 1.1.0 to 1.2.0 + * @since 3.1 */ public class StateMachineReconcilerForCompartment_1_2_0 extends ReconcilerForCompartment { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconciler_1_2_0.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconciler_1_2_0.java index 80d0fe6936a..1a641c9519d 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconciler_1_2_0.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/migration/StateMachineReconciler_1_2_0.java @@ -28,6 +28,7 @@ import org.eclipse.papyrus.infra.gmfdiag.common.reconciler.DiagramReconciler; /** * State Machine Diagram Reconciler from 1.1.0 to 1.2.0 + * @since 3.1 */ public class StateMachineReconciler_1_2_0 extends DiagramReconciler { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java index 8159457a54a..e82172e2e9a 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/parts/RegionCompartmentDiagramUpdater.java @@ -35,6 +35,9 @@ import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLVisualIDRegistry; import org.eclipse.uml2.uml.Region; import org.eclipse.uml2.uml.Vertex; +/** + * @since 3.1 + */ public class RegionCompartmentDiagramUpdater implements ICustomDiagramUpdater { @Override public List getSemanticChildren(View view) { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CSSOptionsConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CSSOptionsConstants.java index 48642b658a5..0c735cd55c4 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CSSOptionsConstants.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CSSOptionsConstants.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences; /** * Values to use in CSS styles for transition options (how to show code attached to a transition) + * @since 3.1 */ public class CSSOptionsConstants { /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferenceInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferenceInitializer.java index bda52f4c19d..5efb2f11fc5 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferenceInitializer.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferenceInitializer.java @@ -19,6 +19,7 @@ import org.eclipse.papyrus.uml.diagram.statemachine.part.UMLDiagramEditorPlugin; /** * Class used to initialize default preference values. + * @since 3.1 */ public class CustomTransitionPreferenceInitializer extends AbstractPreferenceInitializer { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java index cd37466c6e5..e8fe0552026 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/CustomTransitionPreferencePage.java @@ -22,6 +22,9 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; +/** + * @since 3.1 + */ public class CustomTransitionPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/PreferenceConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/PreferenceConstants.java index 300171b725c..2dc1b7e5051 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/PreferenceConstants.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/preferences/PreferenceConstants.java @@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.diagram.statemachine.custom.preferences; /** * Constants for Transition preferences (use same constants as for CSS options) + * @since 3.1 */ public class PreferenceConstants { /** diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/strategies/StateSemanticConnectionsStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/strategies/StateSemanticConnectionsStrategy.java index 3020a8b67d2..03a0d846ed7 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/strategies/StateSemanticConnectionsStrategy.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/strategies/StateSemanticConnectionsStrategy.java @@ -24,6 +24,7 @@ import org.eclipse.uml2.uml.Transition; import org.eclipse.uml2.uml.TransitionKind; /** + * @since 3.1 * */ public class StateSemanticConnectionsStrategy extends DefaultUMLSemanticChildrenStrategy { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/FixNestedStateAndRegionOnOpening.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/FixNestedStateAndRegionOnOpening.java index 48056e23a74..0a4a51fd76c 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/FixNestedStateAndRegionOnOpening.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/FixNestedStateAndRegionOnOpening.java @@ -35,6 +35,7 @@ import org.eclipse.papyrus.uml.diagram.statemachine.edit.parts.StateEditPart; * * - bug 401059, i.e. it removes obsolete compartments from states * - bug 397730, contents of region is not visible caused by invalid region position + * @since 3.1 */ public class FixNestedStateAndRegionOnOpening { diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/TriggerUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/TriggerUtil.java index b606a674723..a44defb9806 100644 --- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/TriggerUtil.java +++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.statemachine/custom-src/org/eclipse/papyrus/uml/diagram/statemachine/custom/util/TriggerUtil.java @@ -28,6 +28,9 @@ import org.eclipse.uml2.uml.TimeExpression; import org.eclipse.uml2.uml.Trigger; import org.eclipse.uml2.uml.ValueSpecification; +/** + * @since 3.1 + */ public class TriggerUtil { /** 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 bbae63b7643..03a58935043 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 @@ -5,7 +5,8 @@ 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)" + org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier 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 3f7f612edc5..6803693fe92 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 @@ -40,10 +40,12 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.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="[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.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,4.0.0)", + org.eclipse.papyrus.extensionpoints.editors;bundle-version="[2.0.0,4.0.0)" Bundle-Vendor: %providerName Eclipse-LazyStart: true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.4.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 c9376a6bb2a..b6d724fe258 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 @@ -6,6 +6,6 @@ 0.0.1-SNAPSHOT org.eclipse.papyrus.uml.diagram.timing - 1.3.0-SNAPSHOT + 1.4.0-SNAPSHOT eclipse-plugin \ 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 6213c40d357..fe4ccbd93e4 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 @@ -68,7 +68,8 @@ Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.providers.ide;bundle-version= org.eclipse.papyrus.infra.gmfdiag.tooling.runtime;visibility:=reexport;bundle-version="[3.0.0,4.0.0)", 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)" Bundle-Vendor: %providerName Eclipse-LazyStart: true Bundle-Version: 4.0.0.qualifier 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 0fcc57b9c88..277f36b1e0f 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 @@ -18,8 +18,11 @@ Require-Bundle: org.eclipse.m2m.qvt.oml;bundle-version="[3.6.0,4.0.0)";visibilit 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)" + org.eclipse.papyrus.infra.core.architecture;bundle-version="[1.0.0,3.0.0)", + org.eclipse.papyrus.infra.ui.architecture;bundle-version="[1.0.0,3.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)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[1.0.0,3.0.0)" Bundle-Vendor: %pluginProvider Bundle-ActivationPolicy: lazy Bundle-Version: 3.0.200.qualifier diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF index 57a2715cd7f..44fe71a39d8 100644 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.papyrus.uml.nattable;bundle-version="[5.0.0,6.0.0)";visibility:=reexport, org.eclipse.nebula.widgets.nattable.extension.glazedlists;bundle-version="[1.5.0,2.0.0)", - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)" Export-Package: org.eclipse.papyrus.uml.nattable.clazz.config, org.eclipse.papyrus.uml.nattable.clazz.config.manager.axis Bundle-Vendor: %Bundle-Vendor diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF index 3ace5510a24..a8fa0c98b83 100755 --- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.properties/META-INF/MANIFEST.MF @@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.papyrus.infra.nattable;bundle-version="[6.0.0,7.0.0] org.eclipse.papyrus.infra.nattable.common;bundle-version="[5.0.0,6.0.0)", org.eclipse.papyrus.uml.expressions;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.emf.expressions.properties;bundle-version="[1.0.0,2.0.0)", - org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)" + org.eclipse.papyrus.infra.emf.expressions;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)" Bundle-Activator: org.eclipse.papyrus.uml.nattable.properties.Activator Bundle-Description: %Bundle-Description Bundle-ActivationPolicy: lazy diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF index 5d8cbb985ea..b62b9dafd52 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF @@ -13,7 +13,9 @@ Require-Bundle: org.eclipse.jdt.ui;bundle-version="[3.13.50,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.gmfdiag.export;bundle-version="[2.0.0,3.0.0)", org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.infra.onefile;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.architecture;bundle-version="[1.0.0,2.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Activator: org.eclipse.papyrus.uml.export.Activator Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName diff --git a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF index 343eee99bd6..db0370189ec 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.import/META-INF/MANIFEST.MF @@ -2,7 +2,9 @@ Manifest-Version: 1.0 Require-Bundle: org.eclipse.papyrus.views.modelexplorer;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.tools.utils;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.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)" + org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.2.0.qualifier diff --git a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF index 907d733277a..17ded49a891 100644 --- a/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF +++ b/plugins/uml/org.eclipse.papyrus.uml.profile/META-INF/MANIFEST.MF @@ -16,12 +16,12 @@ Export-Package: org.eclipse.papyrus.uml.profile, org.eclipse.papyrus.uml.profile.validation, org.eclipse.papyrus.uml.profile.wizard Require-Bundle: org.eclipse.papyrus.uml.tools.utils;bundle-version="[3.0.0,4.0.0)", - org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)";visibility:=reexport, + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.emf.readonly;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.services.validation;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.extensionpoints;bundle-version="[1.2.0,2.0.0)";visibility:=reexport, org.eclipse.uml2.uml.editor;bundle-version="[5.2.0,6.0.0)";visibility:=reexport, - org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.modelrepair;bundle-version="[2.0.0,3.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)" diff --git a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF index 314380f83d2..dbdbe29d7dd 100644 --- a/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF +++ b/plugins/uml/profile/org.eclipse.papyrus.uml.profile.drafter/META-INF/MANIFEST.MF @@ -7,7 +7,9 @@ Require-Bundle: org.eclipse.gmf.runtime.notation.edit;bundle-version="[1.7.0,2.0 org.eclipse.core.databinding.beans;bundle-version="[1.3.0,2.0.0)", org.eclipse.jface.databinding;bundle-version="[1.8.0,2.0.0)", com.ibm.icu, - org.eclipse.papyrus.uml.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.emf;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)" Export-Package: org.eclipse.papyrus.uml.profile.drafter, org.eclipse.papyrus.uml.profile.drafter.exceptions, org.eclipse.papyrus.uml.profile.drafter.ui.handler, diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF index 0119f99ffa6..f77ea66e908 100644 --- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF +++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF @@ -35,7 +35,8 @@ Require-Bundle: org.eclipse.papyrus.uml.profile;bundle-version="[3.0.0,4.0.0)";v org.eclipse.papyrus.infra.widgets;bundle-version="[3.1.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.internationalization;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.tools;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.papyrus.uml.properties.constraints" Bundle-Version: 3.1.100.qualifier diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF index a9ba2e18406..f33f687230f 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.message.xtext.ui/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.message.xtext;bundle-version="[ org.eclipse.papyrus.infra.emf;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.uml.alf.common.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.uml.diagram.communication;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.uml.diagram.communication;bundle-version="[4.0.0,5.0.0)", org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.internationalization.common;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/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF index 1b5659268a2..f8ee1ffca0e 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext.ui/META-INF/MANIFEST.MF @@ -22,7 +22,9 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext;bundle org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.xtext.ui;bundle-version="[2.10.0,3.0.0)", org.eclipse.ui.editors;bundle-version="[3.10.0,4.0.0)", - org.eclipse.ui;bundle-version="[3.107.0,4.0.0)" + org.eclipse.ui;bundle-version="[3.107.0,4.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)", + org.eclipse.gmf.runtime.common.ui.services;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: %providerName Bundle-Version: 3.0.0.qualifier Bundle-ManifestVersion: 2 diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF index e2b5afabd4d..42df9277980 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.stereotypeproperty.xtext/META-INF/MANIFEST.MF @@ -28,7 +28,8 @@ Require-Bundle: org.eclipse.xtext;bundle-version="[2.10.0,3.0.0)";visibility:=re org.eclipse.xtext.util;bundle-version="[2.10.0,3.0.0)", org.eclipse.emf.ecore;bundle-version="[2.12.0,3.0.0)", org.eclipse.emf.common;bundle-version="[2.12.0,3.0.0)", - org.antlr.runtime;bundle-version="[3.2.0,4.0.0)" + org.antlr.runtime;bundle-version="[3.2.0,4.0.0)", + org.eclipse.papyrus.uml.tools;bundle-version="[4.0.0,5.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 3.0.0.qualifier diff --git a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF index 80918764752..b57c9c6a4c0 100644 --- a/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF +++ b/plugins/uml/tools/org.eclipse.papyrus.uml.tools/META-INF/MANIFEST.MF @@ -25,7 +25,9 @@ Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)";visibility:= org.eclipse.papyrus.infra.core;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.infra.widgets;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.uml.internationalization.edit;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.infra.constraints;bundle-version="[2.0.0,3.0.0)", + org.eclipse.papyrus.infra.types;bundle-version="[3.0.0,4.0.0)" Bundle-Vendor: %Bundle-Vendor Bundle-ActivationPolicy: lazy Bundle-Version: 4.0.0.qualifier diff --git a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF index fb480315ba9..08ce7fbc364 100644 --- a/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF +++ b/plugins/uml/xtext/org.eclipse.papyrus.uml.xtext.integration.validation/META-INF/MANIFEST.MF @@ -1,7 +1,8 @@ Manifest-Version: 1.0 Export-Package: org.eclipse.papyrus.uml.xtext.integration.validation Require-Bundle: org.eclipse.uml2.uml;bundle-version="[5.3.0,6.0.0)", - org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)" + org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="[2.0.0,3.0.0)", + org.eclipse.emf.validation;bundle-version="[1.0.0,2.0.0)" Bundle-Vendor: Eclipse Modeling Project Bundle-ActivationPolicy: lazy Bundle-Version: 2.0.0.qualifier diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF index 6dacc041c5a..25e433caed6 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF @@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.ui.navigator;bundle-version="[3.6.0,4.0.0)";visibili org.eclipse.papyrus.extensionpoints.editors;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)", org.eclipse.papyrus.emf.facet.util.emf.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport + org.eclipse.papyrus.infra.ui;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, + org.eclipse.papyrus.infra.viewpoints.policy;bundle-version="[3.0.0,4.0.0)", + org.eclipse.papyrus.infra.architecture.representation;bundle-version="[2.0.0,3.0.0)" Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 3.0.0.qualifier -- cgit v1.2.3