Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2016-02-11 02:48:20 +0000
committerGerrit Code Review @ Eclipse.org2016-02-12 15:31:41 +0000
commitecd4928b327f5561364c5068c9ff5f1668e92d13 (patch)
tree7c34f46cf82a1d65ac753fa92c2a5d55371b8dba /extraplugins/eastadl
parent751a204d74e15eb2db6b41c937691fc56dcc1252 (diff)
downloadorg.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.gz
org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.tar.xz
org.eclipse.papyrus-ecd4928b327f5561364c5068c9ff5f1668e92d13.zip
Bug 485220: [Architecture] Provide a more modular architecture
https://bugs.eclipse.org/bugs/show_bug.cgi?id=485220 Factor UI dependencies out of the UML Element Types bundle. This includes moving some advices that interact with the user into a new org.eclipse.papyrus.uml.service.types.ui bundle. Pull up the PasteCommandService and IPasteCommandProvider API into the Infra Diagram layer where the extension point is defined. Deprecate the old API in the UML layer. Introduce a service for participation of languages in CSS styling: * styling reset actions in the Reset Style command * access to semantic model classes and properties to make available to CSS Factor PapyrusObservableValue and cohorts out of the UML Tools bundle into the Infra Layer for more general reuse and to relieve the Diagram Infrastructure layer of UML dependencies. The old API remains as deprecated. Remove the Infra Diagram Layer dependency on UML Layer for property testers governing deletion in the diagram. Includes introduction of a new IGraphicalDeletionHelper OSGi service for delegation of the determination of whether an element can be deleted from the diagram and replacement of the XML expression properties * org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion * org.eclipse.papyrus.uml.diagram.common.isReadOnly by * org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion * org.eclipse.papyrus.infra.gmfdiag.common.canDelete (where the latter is the negation of the property that it supersedes) Extract UML dependencies from the Diagram Outline and CSS Editor bundles. Remove unused MDTUtil APIs that referenced a UML-specific annotation. Move the Diagram Infrastructure CSS Palette bundle into the UML layer because it serves to provide extensions on the Palette Service, which is an overtly UML-specific capability. All client APIs for the Properties View are moved from org.eclipse.papyrus.views.properties bundle to a new org.eclipse.papyrus.infra.properties.ui bundle. This includes renaming of: * extension points * label-provider contexts * XWT namespaces Add an "all UI tests" suite. Define a componentized hierarchical build layout of the main plug-ins Change-Id: I43f8f3644857a18b69715f5a2f1da9b1cf286d67
Diffstat (limited to 'extraplugins/eastadl')
-rw-r--r--extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF3
-rw-r--r--extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/AbstractEastadlNattableCreateCommandHandler.java140
-rw-r--r--extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/FunctionAllocationHandler.java48
-rw-r--r--extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF59
-rw-r--r--extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/handlers/AbstractEastadlCreateCommandHandler.java32
6 files changed, 144 insertions, 141 deletions
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF
index 9debd329eba..0a50ce03c39 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.allocation.config/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.expressions;bundle-version="3.4.500",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
org.eclipse.papyrus.eastadl.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.eastadl.nattable.menu;bundle-version="1.2.0"
+ org.eclipse.papyrus.eastadl.nattable.menu;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 1.2.0.qualifier
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF
index 327c6111e86..7dd1b408897 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.infra.nattable.common;bundle-version="1.2.0",
org.eclipse.papyrus.eastadl.service.types;bundle-version="1.2.0",
org.eclipse.papyrus.uml.nattable.menu;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.eastadl.nattable.menu.handlers
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/AbstractEastadlNattableCreateCommandHandler.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/AbstractEastadlNattableCreateCommandHandler.java
index 4cfb841c3fa..ed13ef48e56 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/AbstractEastadlNattableCreateCommandHandler.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/AbstractEastadlNattableCreateCommandHandler.java
@@ -1,70 +1,70 @@
-package org.eclipse.papyrus.eastadl.nattable.menu.handlers;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.papyrus.eastadl.service.types.handlers.AbstractEastadlCreateCommandHandler;
-import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
-import org.eclipse.papyrus.infra.nattable.utils.INattableModelManagerUtils;
-import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
-import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;
-import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;
-
-public abstract class AbstractEastadlNattableCreateCommandHandler extends
- AbstractEastadlCreateCommandHandler {
-
- /**
- * <pre>
- *
- * Build the create command for an element creation in the selected container.
- * The create command is given by the {@link IElementEditService} of selected
- * element.
- *
- * @return the composite creation command for current selection
- *
- * </pre>
- */
- @Override
- protected Command buildCommand() {
- Command createCmd = super.buildCommand();
-
- return TableMenuUtils.buildNattableCreationCommand(createCmd,
- this.createRequest);
- }
-
- /**
- * Obtain the context of the active table editor.
- *
- * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCommandHandler#getCommandContext()
- *
- * @return
- */
- @Override
- protected ICommandContext getCommandContext() {
- return TableMenuUtils.getTableCommandContext(INattableModelManagerUtils
- .getTableManagerFromWorkbenchPart(getActiveWorkbenchPart()));
-
- }
-
- /**
- * Verify if this handler is currently active and the command can execute.
- * Additionally, verify if this table can add this type of element.
- *
- * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#setEnabled(java.lang.Object)
- *
- * @param evaluationContext
- */
- @Override
- public void setEnabled(Object evaluationContext) {
- INattableModelManager tableManager = INattableModelManagerUtils
- .getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());
- boolean isEnabled = tableManager
- .canCreateRowElement(getElementTypeToCreate().getId());
- if (isEnabled) {
- // we test the enable of the super implementation
- super.setEnabled(evaluationContext);
- isEnabled = super.isEnabled();
- }
- setBaseEnabled(isEnabled);
-
- }
-
-}
+package org.eclipse.papyrus.eastadl.nattable.menu.handlers;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.papyrus.eastadl.service.types.handlers.AbstractEastadlCreateCommandHandler;
+import org.eclipse.papyrus.infra.nattable.manager.table.INattableModelManager;
+import org.eclipse.papyrus.infra.nattable.utils.INattableModelManagerUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
+import org.eclipse.papyrus.uml.nattable.menu.util.TableMenuUtils;
+import org.eclipse.papyrus.uml.service.types.utils.ICommandContext;
+
+public abstract class AbstractEastadlNattableCreateCommandHandler extends
+ AbstractEastadlCreateCommandHandler {
+
+ /**
+ * <pre>
+ *
+ * Build the create command for an element creation in the selected container.
+ * The create command is given by the {@link IElementEditService} of selected
+ * element.
+ *
+ * @return the composite creation command for current selection
+ *
+ * </pre>
+ */
+ @Override
+ protected Command buildCommand() {
+ Command createCmd = super.buildCommand();
+
+ return TableMenuUtils.buildNattableCreationCommand(createCmd,
+ this.createRequest);
+ }
+
+ /**
+ * Obtain the context of the active table editor.
+ *
+ * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCommandHandler#getCommandContext()
+ *
+ * @return
+ */
+ @Override
+ protected ICommandContext getCommandContext() {
+ return TableMenuUtils.getTableCommandContext(INattableModelManagerUtils
+ .getTableManagerFromWorkbenchPart(getActiveWorkbenchPart()));
+
+ }
+
+ /**
+ * Verify if this handler is currently active and the command can execute.
+ * Additionally, verify if this table can add this type of element.
+ *
+ * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#setEnabled(java.lang.Object)
+ *
+ * @param evaluationContext
+ */
+ @Override
+ public void setEnabled(Object evaluationContext) {
+ INattableModelManager tableManager = INattableModelManagerUtils
+ .getTableManagerFromWorkbenchPart(getActiveWorkbenchPart());
+ boolean isEnabled = tableManager
+ .canCreateRowElement(getElementTypeToCreate().getId());
+ if (isEnabled) {
+ // we test the enable of the super implementation
+ super.setEnabled(evaluationContext);
+ isEnabled = super.isEnabled();
+ }
+ setBaseEnabled(isEnabled);
+
+ }
+
+}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/FunctionAllocationHandler.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/FunctionAllocationHandler.java
index 5c18e05e59c..f716f073173 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/FunctionAllocationHandler.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.nattable.menu/src/org/eclipse/papyrus/eastadl/nattable/menu/handlers/FunctionAllocationHandler.java
@@ -1,24 +1,24 @@
-package org.eclipse.papyrus.eastadl.nattable.menu.handlers;
-
-import org.eclipse.gmf.runtime.emf.type.core.IElementType;
-import org.eclipse.papyrus.eastadl.service.types.elements.EastadlElementTypes;
-
-public class FunctionAllocationHandler extends AbstractEastadlNattableCreateCommandHandler {
-
- /**
- * <pre>
- * @see org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
- *
- * @return the IElementType this handler is supposed to create
- *
- * </pre>
- *
- * @generated
- */
- @Override
- protected IElementType getElementTypeToCreate() {
- return EastadlElementTypes.FUNCTION_ALLOCATE;
- }
-
-
-}
+package org.eclipse.papyrus.eastadl.nattable.menu.handlers;
+
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.eastadl.service.types.elements.EastadlElementTypes;
+
+public class FunctionAllocationHandler extends AbstractEastadlNattableCreateCommandHandler {
+
+ /**
+ * <pre>
+ * @see org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler#getElementTypeToCreate()
+ *
+ * @return the IElementType this handler is supposed to create
+ *
+ * </pre>
+ *
+ * @generated
+ */
+ @Override
+ protected IElementType getElementTypeToCreate() {
+ return EastadlElementTypes.FUNCTION_ALLOCATE;
+ }
+
+
+}
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF
index 370e20f5ffe..319490acb4e 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/META-INF/MANIFEST.MF
@@ -1,29 +1,30 @@
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.uml2.uml;bundle-version="4.1.0",
- org.eclipse.papyrus.eastadl;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
- org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
- org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
- org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.0",
- org.eclipse.core.expressions;bundle-version="3.4.500",
- org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0"
-Export-Package: org.eclipse.papyrus.eastadl.service.types,
- org.eclipse.papyrus.eastadl.service.types.elements,
- org.eclipse.papyrus.eastadl.service.types.filter,
- org.eclipse.papyrus.eastadl.service.types.handlers,
- org.eclipse.papyrus.eastadl.service.types.menu
-Bundle-Vendor: %providerName
-Bundle-ActivationPolicy: lazy
-Bundle-Version: 1.2.0.qualifier
-Bundle-Name: %pluginName
-Bundle-Localization: plugin
-Bundle-ManifestVersion: 2
-Bundle-Activator: org.eclipse.papyrus.eastadl.service.types.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.eastadl.service.types;singleton:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.uml2.uml;bundle-version="4.1.0",
+ org.eclipse.papyrus.eastadl;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.7.0",
+ org.eclipse.papyrus.uml.service.types;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="1.2.0",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.7.0",
+ org.eclipse.uml2.uml.profile.standard;bundle-version="1.0.0",
+ org.eclipse.core.expressions;bundle-version="3.4.500",
+ org.eclipse.papyrus.infra.tools;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",
+ org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.service.types.ui;bundle-version="1.2.0"
+Export-Package: org.eclipse.papyrus.eastadl.service.types,
+ org.eclipse.papyrus.eastadl.service.types.elements,
+ org.eclipse.papyrus.eastadl.service.types.filter,
+ org.eclipse.papyrus.eastadl.service.types.handlers,
+ org.eclipse.papyrus.eastadl.service.types.menu
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.eastadl.service.types.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.eastadl.service.types;singleton:=true
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/handlers/AbstractEastadlCreateCommandHandler.java b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/handlers/AbstractEastadlCreateCommandHandler.java
index a8035cf5eda..9fc25f9c6d1 100644
--- a/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/handlers/AbstractEastadlCreateCommandHandler.java
+++ b/extraplugins/eastadl/org.eclipse.papyrus.eastadl.service.types/src/org/eclipse/papyrus/eastadl/service/types/handlers/AbstractEastadlCreateCommandHandler.java
@@ -1,16 +1,16 @@
-package org.eclipse.papyrus.eastadl.service.types.handlers;
-
-import org.eclipse.papyrus.eastadl.service.types.filter.EastadlCommandFilter;
-import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
-import org.eclipse.papyrus.uml.service.types.handlers.AbstractCreateCommandHandler;
-
-public abstract class AbstractEastadlCreateCommandHandler extends
- AbstractCreateCommandHandler {
-
- private static final ICommandFilter filter = EastadlCommandFilter.INSTANCE;
-
- @Override
- public ICommandFilter getCommandFilter() {
- return filter;
- }
-}
+package org.eclipse.papyrus.eastadl.service.types.handlers;
+
+import org.eclipse.papyrus.eastadl.service.types.filter.EastadlCommandFilter;
+import org.eclipse.papyrus.uml.service.types.filter.ICommandFilter;
+import org.eclipse.papyrus.uml.service.types.ui.handlers.AbstractCreateCommandHandler;
+
+public abstract class AbstractEastadlCreateCommandHandler extends
+ AbstractCreateCommandHandler {
+
+ private static final ICommandFilter filter = EastadlCommandFilter.INSTANCE;
+
+ @Override
+ public ICommandFilter getCommandFilter() {
+ return filter;
+ }
+}

Back to the top