Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java26
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml2
-rw-r--r--plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/pom.xml2
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml4
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml2
-rw-r--r--plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml8
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml6
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml10
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml2
-rwxr-xr-xplugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF2
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml33
-rw-r--r--plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java17
22 files changed, 90 insertions, 44 deletions
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF
index e8c19ec5089..fecbb0e0435 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.papyrus.infra.textedit.xtext;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
Bundle-Activator: org.eclipse.papyrus.infra.textedit.xtext.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui;bundle-version="[3.119.0,4.0.0)",
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java
index 2775269b9b0..220c1299274 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java
@@ -11,6 +11,7 @@
* Contributors:
* Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
* Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 578648, 579033, 580115, 580042
+ * Jeremie Tatibouet (CEA LIST) <jeremie.tatibouet@cea.fr> - Bug 580336
*****************************************************************************/
package org.eclipse.papyrus.infra.textedit.xtext.nested.editor;
@@ -30,7 +31,6 @@ import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
-import org.eclipse.jface.text.IDocument;
import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
@@ -53,11 +53,9 @@ import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.xtext.ui.editor.XtextEditor;
import org.eclipse.xtext.ui.editor.model.IXtextDocument;
import org.eclipse.xtext.ui.editor.model.XtextDocument;
-import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider;
/**
@@ -334,19 +332,6 @@ public class PapyrusXTextEditor extends XtextEditor {
if (this.historyListener != null) {
this.historyListener.updateXTextDocument(getDocumentProvider().getDocument(this.input));
}
-
- final IDocumentProvider provider = getDocumentProvider();
- if (provider instanceof XtextDocumentProvider) {
- final XtextDocumentProvider xtextDocumentProvider = (XtextDocumentProvider) provider;
- final IDocument tmp = xtextDocumentProvider.getDocument(this.input);
-
- if (tmp instanceof XtextDocument) {
- final XtextDocument xtextDoc = (XtextDocument) tmp;
- // here to create and display validation marker just after the opening of the editor
- // bug 580042
- xtextDoc.checkAndUpdateAnnotations();
- }
- }
}
}
@@ -357,6 +342,15 @@ public class PapyrusXTextEditor extends XtextEditor {
*/
@Override
public void setFocus() {
+ final PapyrusXTextDocumentProvider provider = getDocumentProvider();
+ if (provider != null) {
+ final IXtextDocument document = provider.getDocument(getEditorInput());
+ if (document instanceof XtextDocument) {
+ // here to create and display validation markers after getting the focus
+ // bugs 580042 and 580336
+ ((XtextDocument) document).checkAndUpdateAnnotations();
+ }
+ }
registerSashWindowsContainerListener();
super.setFocus();
}
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml
index 49e3b773d1b..e825ece7693 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.textedit.xtext</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
index fa1d4c578bb..3008991046e 100644
--- a/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
+++ b/plugins/infra/types/org.eclipse.papyrus.infra.types.ui/plugin.xml
@@ -20,7 +20,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+ locationURI="popup:org.eclipse.papyrus.dev.ui.framework">
<command
commandId="org.eclipse.papyrus.infra.types.ui.deploy"
icon="icons/configuration.gif"
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
index 51b1fda3d04..1d9e881c354 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
index 48013784f50..381e945e51c 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk</artifactId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
index 958c626bc31..c49f0460e69 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.assistants.generator.ui/plugin.xml
@@ -5,11 +5,11 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu?after=additions">
+ locationURI="popup:org.eclipse.papyrus.custo.editors">
<command
commandId="org.eclipse.papyrus.uml.profile.assistants.generator.ui.generateModelAssistants"
id="org.eclipse.papyrus.uml.profile.assistants.generator.ui.generateModelAssistants"
- label="Diagram Assistants..."
+ label="Generate Diagram Assistants..."
style="push">
<visibleWhen
checkEnabled="false">
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml
index b996bf535e8..c22ac3f18ce 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+ locationURI="popup:org.eclipse.papyrus.custo.modelexplorer">
<command
commandId="org.eclipse.papyrus.uml.profile.newchildmenu.generator.ui.command"
style="push">
diff --git a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
index 9953366b8ba..4abea148e06 100644
--- a/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
+++ b/plugins/toolsmiths/assistants/org.eclipse.papyrus.uml.profile.types.generator.ui/plugin.xml
@@ -5,14 +5,11 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup?after=tools">
- <menu
- label="Generate Tooling Model"
- id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu">
+ locationURI="popup:org.eclipse.papyrus.custo.framework">
<command
commandId="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes"
id="org.eclipse.papyrus.uml.profile.types.generator.ui.generateElementTypes"
- label="Element Types..."
+ label="Generate Element Types..."
style="push">
<visibleWhen
checkEnabled="false">
@@ -36,7 +33,6 @@
name="additions"
visible="false">
</separator>
- </menu>
</menuContribution>
</extension>
<extension
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml
index 6a31924d162..c3cf33144da 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/plugin.xml
@@ -20,7 +20,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any">
+ locationURI="popup:org.eclipse.papyrus.custo.editors">
<command
commandId="org.eclipse.papyrus.dev.assistants.codegen.generateAssistantsFromElementTypes"
id="org.eclipse.papyrus.dev.assistants.codegen.menus.generateAssistantsFromElementTypes"
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
index 3969868ada7..be9ce2ee899 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
org.eclipse.xtend.lib;bundle-version="[2.22.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 4.0.0.qualifier
+Bundle-Version: 4.1.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml
index 9d0f7c94998..ace6e97d911 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.dev.ui.menu">
+ locationURI="popup:org.eclipse.papyrus.custo.framework">
<command
commandId="org.eclipse.papyrus.infra.dev.types.commands.migrateTypesConfigurations"
id="org.eclipse.papyrus.infra.dev.types.menus.migrateTypesConfigurations"
@@ -29,7 +29,7 @@
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.dev.ui.menu">
+ locationURI="popup:org.eclipse.papyrus.custo.framework">
<command
commandId="org.eclipse.papyrus.infra.dev.types.commands.generateElementTypesRegistry"
id="org.eclipse.papyrus.infra.dev.types.menus.generateElementTypesRegistry"
@@ -53,7 +53,7 @@
</menuContribution>
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.dev.ui.menu">
+ locationURI="popup:org.eclipse.papyrus.custo.framework">
<command
commandId="org.eclipse.papyrus.infra.dev.types.commands.migrateSpecializations"
id="org.eclipse.papyrus.infra.dev.types.menus.migrateSpecializations"
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml
index c8d06a6380d..31aca283712 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.types/pom.xml
@@ -8,7 +8,7 @@
</parent>
<artifactId>org.eclipse.papyrus.dev.types</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>
<plugins>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF
index 1d3f9ba399d..d48e3aed130 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.ui;bundle-version="[3.117.0,4.0.0)"
Bundle-Vendor: %providerName
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.1.0.qualifier
Eclipse-BuddyPolicy: dependent
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.dev.ui.Activator
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml
index 3f9ff2ba32a..8da0a3561b2 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/plugin.xml
@@ -27,6 +27,16 @@
visible="true"
id="org.eclipse.papyrus.dev.ui.menu.separator.after">
</separator>
+ <menu
+ id="org.eclipse.papyrus.dev.ui.framework"
+ label="Framework"
+ tooltip="Papyrus framework developer menu">
+ </menu>
+ <menu
+ id="org.eclipse.papyrus.dev.ui.editors"
+ label="Editors"
+ tooltip="Papyrus editors developer menu">
+ </menu>
</menu>
</menuContribution>
</extension>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml
index bd1a9957d79..470e35a5b3e 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.ui/pom.xml
@@ -12,7 +12,7 @@
<artifactId>org.eclipse.papyrus.dev.ui</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<description>A plugin to hold the menu for developer tools.</description>
</project>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml
index e187ce1859b..4d77c81235e 100755
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.expressions/plugin.xml
@@ -14,7 +14,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.papyrus.uml.profile.types.generator.ui.generateMenu?after=additions">
+ locationURI="popup:org.eclipse.papyrus.dev.ui.framework">
<command
commandId="org.eclipse.papyrus.toolsmiths.expressions.createExpressionsForUMLProfile"
icon="icons/ExpressionCatalog.gif"
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml
index a35158c6b63..2a8d36ddbad 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths.palette/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.ui.menus">
<menuContribution
allPopups="false"
- locationURI="popup:org.eclipse.ui.popup.any?after=additions">
+ locationURI="popup:org.eclipse.papyrus.custo.editors">
<command
commandId="org.eclipse.papyrus.customization.palette.extended.undeploy"
icon="icons/configuration.gif"
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF
index bf770bee2ee..870b2b16cf3 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Export-Package: org.eclipse.papyrus.toolsmiths.factory,
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.toolsmiths.Activator
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml
index 6e4ac61cfb7..6654bf6fa0d 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/plugin.xml
@@ -71,6 +71,39 @@
factory="org.eclipse.papyrus.toolsmiths.factory.PropertyViewEnvironmentExtensionFactory">
</factory>
</extension>
+ <extension
+ point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="popup:org.eclipse.ui.popup.any">
+ <menu
+ id="org.eclipse.papyrus.custo.menu"
+ label="Papyrus Customization"
+ icon="platform:/plugin/org.eclipse.papyrus.dev.ui/icons/papyrus/Papyrus_16x16.gif"
+ tooltip="Papyrus Customization Menu">
+ <menu
+ id="org.eclipse.papyrus.custo.framework"
+ label="Framework"
+ tooltip="Papyrus framework customization menu">
+ </menu>
+ <menu
+ id="org.eclipse.papyrus.custo.editors"
+ label="Editors"
+ tooltip="Papyrus editors customization menu">
+ </menu>
+ <menu
+ id="org.eclipse.papyrus.custo.modelexplorer"
+ label="Model Explorer"
+ tooltip="Papyrus model explorer customization menu">
+ </menu>
+ <menu
+ id="org.eclipse.papyrus.custo.propertiesview"
+ label="Properties view"
+ tooltip="Papyrus properties view customization menu">
+ </menu>
+ </menu>
+ </menuContribution>
+ </extension>
</plugin>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml
index e9ba325349d..5a44668f17e 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.toolsmiths/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.toolsmiths</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java
index 3925902b504..085aca004af 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.service.types/src/org/eclipse/papyrus/uml/service/types/command/InterfaceRealizationReorientCommand.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2011, 2017 CEA LIST.
+ * Copyright (c) 2011, 2017, 2022 CEA LIST.
*
*
* All rights reserved. This program and the accompanying materials
@@ -11,8 +11,9 @@
*
* Contributors:
*
- * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
+ * Yann Tanguy (CEA LIST) yann.tanguy@cea.fr - Initial API and implementation
* Fanch Bonnabesse (ALL4TEC) fanch.bonnabesse@alltec.net - Bug 515122
+ * Ansgar Radermacher (CEA) - Bug 580557, InterfaceRealization element disappears
*
*****************************************************************************/
package org.eclipse.papyrus.uml.service.types.command;
@@ -78,6 +79,18 @@ public class InterfaceRealizationReorientCommand extends DependencyReorientComma
return (InterfaceRealization) getElementToEdit();
}
+ @Override
+ protected CommandResult reorientSource() throws ExecutionException {
+ if (getNewSource() instanceof BehavioredClassifier) {
+ // add interface-realization to new container (behaviored-classifier). If
+ // the old source is removed from the "client" list of the relationship, the
+ // interface realization is detached from its container otherwise (bug 580557).
+ BehavioredClassifier bClassifier = (BehavioredClassifier) getNewSource();
+ bClassifier.getInterfaceRealizations().add(getLink());
+ }
+ return super.reorientSource();
+ }
+
/**
* {@inheritDoc}
*/

Back to the top