Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xexamples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project6
-rwxr-xr-xfeatures/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml2
-rwxr-xr-xfeatures/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml2
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml2
-rw-r--r--features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml2
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project6
-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/custom/PapyrusXTextDocumentProvider.java35
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java2
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/nested/editor/PapyrusXTextEditor.java166
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/pom.xml2
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java130
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java135
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md15
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project6
-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/uml/properties/org.eclipse.papyrus.uml.properties/META-INF/MANIFEST.MF2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml2
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java12
-rw-r--r--releng/main/site/category.xml4
-rw-r--r--releng/main/site/pom.xml2
-rwxr-xr-xreleng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target42
-rwxr-xr-xreleng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd20
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product7
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg4
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/splash.bmpbin483054 -> 483054 bytes
-rw-r--r--releng/rcp/pom.xml4
-rwxr-xr-xreleng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target54
-rw-r--r--releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd8
-rw-r--r--releng/rcp/targetPlatform/pom.xml2
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target44
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd2
-rwxr-xr-xreleng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target42
-rwxr-xr-xreleng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target82
-rw-r--r--releng/toolsmiths/site/category.xml4
-rwxr-xr-xreleng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target82
-rw-r--r--releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd4
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml2
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java11
54 files changed, 733 insertions, 280 deletions
diff --git a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project
index 9342ffac1e9..ffd658e3c06 100755
--- a/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project
+++ b/examples/uml/org.eclipse.papyrus.examples.uml.textedit.property.xtext.architecture/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml
index 841fa29f1e7..e06c53c51c3 100755
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.infra.textedit.feature"
label="%featureName"
- version="1.0.0.qualifier"
+ version="1.1.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2">
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml
index e279af9aea0..0c3e33a71b9 100755
--- a/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.infra.textedit.feature/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.textedit.feature</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
index 9e4ac1174c7..ce66841bb22 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.sdk.feature"
label="%featureName"
- version="6.2.0.qualifier"
+ version="6.3.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.papyrus.sdk"
license-feature="org.eclipse.license"
diff --git a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
index 39c124e29c6..33f368dba14 100644
--- a/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
+++ b/features/papyrus-main-features/org.eclipse.papyrus.sdk.feature/pom.xml
@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.sdk.feature</artifactId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project
index fedc1c56b8b..2667d7019b4 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.edit/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project
index fbb6ed37938..f208e0971e1 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.modelexplorer/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project
index 89484cab4dc..c7d5debb6fd 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.properties/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project
index 9405bab1a09..8689400abb7 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.architecture/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project
index ea21b3a5147..f10c3607e79 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation.edit/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project
index 04a0d4a1d50..fc648c70308 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.representation/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project
index bef472e20db..9d6aa71e306 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.types/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project
index 367ae42f8c5..9c9ff0b79ce 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.ui/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project
index 62eae2fe130..eaef2ca8fad 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
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 1665b4aa5f4..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.0.100.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/custom/PapyrusXTextDocumentProvider.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java
index 4648efd3fa3..379598c2fbb 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextDocumentProvider.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2021 CEA LIST and others.
+ * Copyright (c) 2021-2022 CEA LIST and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,7 +10,7 @@
*
* Contributors:
* Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
- *
+ * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 580115
*****************************************************************************/
package org.eclipse.papyrus.infra.textedit.xtext.custom;
@@ -30,6 +30,7 @@ import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.textedit.xtext.Activator;
import org.eclipse.papyrus.infra.textedit.xtext.nested.editor.NestedXTextEditorInput;
+import org.eclipse.xtext.ui.editor.model.IXtextDocument;
import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider;
/**
@@ -38,6 +39,18 @@ import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider;
public class PapyrusXTextDocumentProvider extends XtextDocumentProvider {
/**
+ * @see org.eclipse.ui.texteditor.AbstractDocumentProvider#getDocument(java.lang.Object)
+ *
+ * @param element
+ * @return
+ * @since 1.1
+ */
+ @Override
+ public IXtextDocument getDocument(Object element) {
+ return (IXtextDocument) super.getDocument(element);
+ }
+
+ /**
* @see org.eclipse.xtext.ui.editor.model.XtextDocumentProvider#doSaveDocument(org.eclipse.core.runtime.IProgressMonitor, java.lang.Object, org.eclipse.jface.text.IDocument, boolean)
*
* @param monitor
@@ -72,13 +85,29 @@ public class PapyrusXTextDocumentProvider extends XtextDocumentProvider {
if (newText.equals(initialText)) {
return;
}
-
ICommand cmd = getParseCommand(input.getDirectEditorConfiguration(), semanticElement, newText);
final TransactionalEditingDomain domain = getEditingDomain(semanticElement);
domain.getCommandStack().execute(new GMFtoEMFCommandWrapper(cmd));
}
/**
+ * This method is used to update the editor content when the value has been edited outside of the current editor
+ *
+ * @param editorInput
+ * the editor input
+ * @param document
+ * the edited document
+ * @since 1.1
+ */
+ public void updateTextEditorContent(final NestedXTextEditorInput editorInput, final IDocument document) {
+ final String oldText = document.get();
+ final String newText = editorInput.getTextToEdit();
+ if (!oldText.equals(newText)) {
+ document.set(newText);
+ }
+ }
+
+ /**
*
* @param configuration
* the editor configuration
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java
index 7cdf4ae4fae..bb7e40a132d 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/api/org/eclipse/papyrus/infra/textedit/xtext/custom/PapyrusXTextMarker.java
@@ -21,7 +21,7 @@ import org.eclipse.papyrus.infra.textedit.xtext.nested.editor.PapyrusXTextEditor
/**
* This class allows to get error markers in the {@link PapyrusXTextEditor}.
- * Strangely it seems work find doing nothing
+ * Strangely it seems work fine doing nothing
*/
public class PapyrusXTextMarker extends org.eclipse.ui.texteditor.AbstractMarkerAnnotationModel {
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 0414b874411..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
@@ -10,7 +10,8 @@
*
* Contributors:
* Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
- * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Bug 578648, 579033
+ * 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;
@@ -18,9 +19,13 @@ package org.eclipse.papyrus.infra.textedit.xtext.nested.editor;
import java.io.IOException;
import java.util.EventObject;
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.emf.common.command.CommandStackListener;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
@@ -32,12 +37,16 @@ import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.core.utils.ServiceUtils;
+import org.eclipse.papyrus.infra.emf.gmf.command.NotifyingWorkspaceCommandStack;
import org.eclipse.papyrus.infra.gmfdiag.extensionpoints.editors.configuration.ICustomDirectEditorConfiguration;
import org.eclipse.papyrus.infra.textedit.textdocument.TextDocument;
import org.eclipse.papyrus.infra.textedit.textdocument.TextDocumentPackage;
import org.eclipse.papyrus.infra.textedit.xtext.Activator;
+import org.eclipse.papyrus.infra.textedit.xtext.custom.PapyrusXTextDocumentProvider;
+import org.eclipse.papyrus.infra.textedit.xtext.internal.command.TextUndoRedoCommandWrapper;
import org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.SaveTextOnFocusLostPageLifeCycleEventsListener;
import org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.SaveTextOnFocusLostPartListener;
+import org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.UndoableTextChangeListener;
import org.eclipse.papyrus.infra.ui.lifecycleevents.ISaveAndDirtyService;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
@@ -45,6 +54,9 @@ import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
import org.eclipse.xtext.ui.editor.XtextEditor;
+import org.eclipse.xtext.ui.editor.model.IXtextDocument;
+import org.eclipse.xtext.ui.editor.model.XtextDocument;
+
/**
* This Customization of the {@link XtextEditor} allows us to open an XtextEditor in the Papyrus sash editor
@@ -54,27 +66,12 @@ public class PapyrusXTextEditor extends XtextEditor {
/**
* the listener on the command stack
*/
- private final CommandStackListener listener = new CommandStackListener() {
-
- @Override
- public void commandStackChanged(EventObject event) {
- resetInput();
- }
- };
+ private CommandStackListener commandStackListener;
/**
* a listener on the semanticContext of the {@link TextDocument}
*/
- private final Adapter textDocumentListener = new AdapterImpl() {
-
- @Override
- public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) {
- if (TextDocumentPackage.eINSTANCE.getTextDocument_SemanticContext().equals(msg.getFeature())) {
- resetInput();
- }
- };
-
- };
+ private Adapter textDocumentListener;
/**
* the part listener. This listener is used to be able to save the editor contents on the focus lost
@@ -131,6 +128,11 @@ public class PapyrusXTextEditor extends XtextEditor {
private SaveTextOnFocusLostPageLifeCycleEventsListener sashWindowsContainerListener = null;
/**
+ * listener on the IOperationHistory
+ */
+ private UndoableTextChangeListener historyListener;
+
+ /**
*
* Constructor.
*
@@ -222,27 +224,16 @@ public class PapyrusXTextEditor extends XtextEditor {
/**
* This method is called to re-set the editor input
*/
- private void resetInput() {
- int currentCaretOffset = -1;
- if (getSourceViewer() != null
- && getSourceViewer().getTextWidget() != null
- && !getSourceViewer().getTextWidget().isDisposed()) {
- currentCaretOffset = getSourceViewer().getTextWidget().getCaretOffset();
- }
- try {
- // TODO maybe better to call setInput directly!
- // setInput(null);
- doSetInput(null);
- } catch (CoreException e) {
- Activator.log.error(e);
- }
- if (currentCaretOffset != -1 && getSourceViewer() != null
- && getSourceViewer().getTextWidget() != null
- && !getSourceViewer().getTextWidget().isDisposed()) {
- getSourceViewer().getTextWidget().setCaretOffset(currentCaretOffset);
- }
- }
+ private void updateEditorContent() {
+ final PapyrusXTextDocumentProvider provider = getDocumentProvider();
+ final IXtextDocument document = provider.getDocument(this.input);
+ // we need to disable the listener in order to not add a new command into the commandstack!
+ this.historyListener.disable();
+ provider.updateTextEditorContent(this.input, document);
+
+ this.historyListener.enable();
+ }
/**
* This method allows to save the typed text in the edited model
@@ -255,13 +246,21 @@ public class PapyrusXTextEditor extends XtextEditor {
* this method registers the listeners
*/
protected void registerListeners() {
- this.domain.getCommandStack().addCommandStackListener(this.listener);
- this.textDocument.eAdapters().add(this.textDocumentListener);
+ this.commandStackListener = createCommandStackListener();
+ if (this.commandStackListener != null) {
+ this.domain.getCommandStack().addCommandStackListener(this.commandStackListener);
+ }
+ this.textDocumentListener = createTextDocumentListener();
+ if (this.textDocumentListener != null) {
+ this.textDocument.eAdapters().add(this.textDocumentListener);
+ }
if (this.saveAndDirtyService != null) {
this.saveAndDirtyService.registerIsaveablePart(this);
}
final IWorkbenchPage page = getEditorSite().getPage();
page.addPartListener(this.partListener);
+ this.historyListener = new UndoableTextChangeListener(this.domain, getDocumentProvider().getDocument(this.input));
+ getOperationHistory().addOperationHistoryListener(this.historyListener);
}
@@ -270,10 +269,15 @@ public class PapyrusXTextEditor extends XtextEditor {
*/
protected void unregisterListeners() {
unregisterSashWindowsContainerListener();
+ getOperationHistory().removeOperationHistoryListener(this.historyListener);
final IWorkbenchPage page = getEditorSite().getPage();
page.removePartListener(this.partListener);
- this.domain.getCommandStack().removeCommandStackListener(this.listener);
- this.textDocument.eAdapters().remove(this.textDocumentListener);
+ if (this.commandStackListener != null) {
+ this.domain.getCommandStack().removeCommandStackListener(this.commandStackListener);
+ }
+ if (this.textDocumentListener != null) {
+ this.textDocument.eAdapters().remove(this.textDocumentListener);
+ }
if (this.saveAndDirtyService != null) {
this.saveAndDirtyService.removeIsaveablePart(this);
}
@@ -325,6 +329,9 @@ public class PapyrusXTextEditor extends XtextEditor {
if (this.textDocument != null
&& this.textDocument.eResource() != null) {// resource can be null when we are destroying the TextDocument
super.doSetInput(this.input);
+ if (this.historyListener != null) {
+ this.historyListener.updateXTextDocument(getDocumentProvider().getDocument(this.input));
+ }
}
}
@@ -335,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();
}
@@ -377,6 +393,70 @@ public class PapyrusXTextEditor extends XtextEditor {
*/
@Override
protected void createUndoRedoActions() {
- // do nothing to preserve papyrus Undo/Redo feature/keybinding
+ // do nothing to preserve Papyrus Undo/Redo feature/keybinding
+ }
+
+ /**
+ *
+ * @return
+ * the {@link IOperationHistory}
+ */
+ private IOperationHistory getOperationHistory() {
+ return OperationHistoryFactory.getOperationHistory();
+ }
+
+ /**
+ * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#getDocumentProvider()
+ *
+ * @return
+ * @since 1.1
+ */
+ @Override
+ public PapyrusXTextDocumentProvider getDocumentProvider() {
+ return (PapyrusXTextDocumentProvider) super.getDocumentProvider();
+ }
+
+ /**
+ *
+ * @return
+ * the listener for the {@link CommandStack}, can be <code>null</code>
+ * @since 1.1
+ */
+ protected CommandStackListener createCommandStackListener() {
+ return new CommandStackListener() {
+
+ @Override
+ public void commandStackChanged(EventObject event) {
+ final Object source = event.getSource();
+ if (source instanceof NotifyingWorkspaceCommandStack) {
+ NotifyingWorkspaceCommandStack stack = (NotifyingWorkspaceCommandStack) source;
+ final Command cmd = stack.getMostRecentCommand();
+
+ if (cmd instanceof TextUndoRedoCommandWrapper) {
+ // there is nothing to do in this case, because this notification has been sent by ourself!
+ return;
+ }
+ }
+ updateEditorContent();
+ }
+ };
+ }
+
+ /**
+ *
+ * @return
+ * the listener for {@link TextDocument}, can be <code>null</code>
+ * @since 1.1
+ */
+ protected Adapter createTextDocumentListener() {
+ return new AdapterImpl() {
+
+ @Override
+ public void notifyChanged(org.eclipse.emf.common.notify.Notification msg) {
+ if (TextDocumentPackage.eINSTANCE.getTextDocument_SemanticContext().equals(msg.getFeature())) {
+ updateEditorContent();
+ }
+ };
+ };
}
}
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 be0b2b2a1d9..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.0.100-SNAPSHOT</version>
+ <version>1.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java
new file mode 100755
index 00000000000..ba1a4d995c2
--- /dev/null
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/command/TextUndoRedoCommandWrapper.java
@@ -0,0 +1,130 @@
+/*****************************************************************************
+ * Copyright (c) 2022 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.textedit.xtext.internal.command;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.operations.IOperationHistory;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.commands.operations.OperationHistoryFactory;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.common.command.AbstractCommand;
+import org.eclipse.papyrus.infra.textedit.xtext.Activator;
+import org.eclipse.ui.editors.text.TextEditor;
+
+/**
+ * This command is used to wrap an already executed {@link IUndoableOperation} used in the context of a {@link TextEditor}
+ */
+public class TextUndoRedoCommandWrapper extends AbstractCommand {
+
+ /**
+ * the wrapped operation
+ */
+ private IUndoableOperation operation;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param operation
+ * the wrapped operation
+ */
+ public TextUndoRedoCommandWrapper(final IUndoableOperation operation) {
+ super("Wrapped Papyrus Text Edit Operation"); //$NON-NLS-1$
+ this.operation = operation;
+
+ }
+
+ /**
+ * @see org.eclipse.emf.common.command.Command#execute()
+ *
+ */
+ @Override
+ public void execute() {
+ // do nothing, already executed by XText
+ }
+
+ /**
+ *
+ * @see org.eclipse.emf.common.command.AbstractCommand#canExecute()
+ *
+ * @return
+ */
+ @Override
+ public boolean canExecute() {
+ return true;
+ };
+
+ /**
+ *
+ * @see org.eclipse.emf.common.command.AbstractCommand#prepare()
+ *
+ * @return
+ */
+ @Override
+ protected boolean prepare() {
+ return true;
+ };
+
+ /**
+ * @see org.eclipse.emf.common.command.AbstractCommand#undo()
+ *
+ */
+ @Override
+ public void undo() {
+ try {
+ if (operation != null) {
+ getOperationHistory().undoOperation(this.operation, new NullProgressMonitor(), null);
+ }
+ } catch (ExecutionException e) {
+ Activator.log.error(e);
+ }
+ }
+
+ /**
+ * @see org.eclipse.emf.common.command.AbstractCommand#canUndo()
+ *
+ * @return
+ */
+ @Override
+ public boolean canUndo() {
+ return true;
+ }
+
+
+ /**
+ * @see org.eclipse.emf.common.command.Command#redo()
+ *
+ */
+ @Override
+ public void redo() {
+ try {
+ if (this.operation != null) {
+ getOperationHistory().redoOperation(operation, new NullProgressMonitor(), null);
+ }
+ } catch (ExecutionException e) {
+ Activator.log.error(e);
+ }
+ }
+
+ /**
+ *
+ * @return
+ * the {@link IOperationHistory}
+ */
+ private IOperationHistory getOperationHistory() {
+ return OperationHistoryFactory.getOperationHistory();
+ }
+}
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java
new file mode 100755
index 00000000000..7b1ce8f245d
--- /dev/null
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/listeners/UndoableTextChangeListener.java
@@ -0,0 +1,135 @@
+/*****************************************************************************
+ * Copyright (c) 2022 CEA LIST and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Vincent Lorenzo (CEA LIST) <vincent.lorenzo@cea.fr> - Initial API and implementation
+ *
+ *****************************************************************************/
+
+package org.eclipse.papyrus.infra.textedit.xtext.internal.listeners;
+
+import org.eclipse.core.commands.operations.IOperationHistoryListener;
+import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.commands.operations.ObjectUndoContext;
+import org.eclipse.core.commands.operations.OperationHistoryEvent;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.papyrus.infra.textedit.xtext.internal.command.TextUndoRedoCommandWrapper;
+import org.eclipse.xtext.ui.editor.model.IXtextDocument;
+
+/**
+ * This class is in charge of listening the change of the Eclipse OperationHistory and to propagate the changes concerning a text edition from Papyrus
+ * inside the Papyrus CommandStack
+ */
+public class UndoableTextChangeListener implements IOperationHistoryListener {
+
+ private static final String UNDOABLE_TEXT_CHANGE_CLASS = "org.eclipse.text.undo.DocumentUndoManager.UndoableTextChange"; //$NON-NLS-1$
+
+ private static final String UNDOABLE_COMPOUND_TEXT_CHANGE_CLASS = "org.eclipse.text.undo.DocumentUndoManager.UndoableCompoundTextChange"; //$NON-NLS-1$
+
+ /**
+ * the editing domain to use
+ */
+ private TransactionalEditingDomain domain;
+
+ /**
+ * the edited {@link IXtextDocument}
+ */
+ private IXtextDocument xTextDocument;
+
+ /**
+ * boolean indicating if we must listen or not the changes
+ */
+ private boolean active = true;
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param domain
+ * the editing domain used to by the Papyrus editor
+ * @param xTextDocument
+ * the edited {@link IXtextDocument}
+ */
+ public UndoableTextChangeListener(final TransactionalEditingDomain domain, final IXtextDocument xTextDocument) {
+ this.domain = domain;
+ this.xTextDocument = xTextDocument;
+ }
+
+ /**
+ * This method allows to update the concerned XtextDocument because we create a new one after each new setInput
+ *
+ * @param xTextDocument
+ */
+ public void updateXTextDocument(final IXtextDocument xTextDocument) {
+ this.xTextDocument = xTextDocument;
+ }
+
+ /**
+ * enable the listener
+ */
+ public void enable() {
+ this.active = true;
+ }
+
+ /**
+ * disable the listener
+ */
+ public void disable() {
+ this.active = false;
+ }
+
+ /**
+ * @see org.eclipse.core.commands.operations.IOperationHistoryListener#historyNotification(org.eclipse.core.commands.operations.OperationHistoryEvent)
+ *
+ * @param event
+ */
+ @Override
+ public void historyNotification(final OperationHistoryEvent event) {
+
+ final int eventType = event.getEventType();
+ final IUndoableOperation operation = event.getOperation();
+ final String operationClassName = operation.getClass().getCanonicalName();
+ if (UNDOABLE_TEXT_CHANGE_CLASS.equals(operationClassName)
+ || UNDOABLE_COMPOUND_TEXT_CHANGE_CLASS.equals(operationClassName)) {
+
+ if (eventType == OperationHistoryEvent.OPERATION_ADDED) {
+ if (!active) {
+ return;
+ }
+ // we check the notification concerns the document for which we installed this listener
+ if (this.xTextDocument == extractCurrentXTextDocument(operation)) {
+ // we wrap the action and we add it to the papyrus command stack
+ final TextUndoRedoCommandWrapper lastCreatedWrapper = new TextUndoRedoCommandWrapper(operation);
+ this.domain.getCommandStack().execute(lastCreatedWrapper);
+ }
+ }
+ }
+ }
+
+ /**
+ *
+ * @param operation
+ * an operation
+ * @return
+ * the xtext document or <code>null</code> for the current operation
+ */
+ private IXtextDocument extractCurrentXTextDocument(final IUndoableOperation operation) {
+ for (final IUndoContext ctx : operation.getContexts()) {
+ if (ctx instanceof ObjectUndoContext) {
+ final ObjectUndoContext undoContext = (ObjectUndoContext) ctx;
+ if (undoContext.getObject() instanceof IXtextDocument) {
+ return (IXtextDocument) undoContext.getObject();
+ }
+ }
+ }
+ return null;
+ }
+}
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md
index 986801fa7e3..3e4bb8fa874 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/usecase.md
@@ -11,4 +11,17 @@ For the "focus lost", we must consider several case:
Custom implementation of the dispose method (close method is never called by Papyrus)
5. We have several PapyrusXtextEditor open side by side, we must save the first one each time the user click in another one
- we use the SaveTextOnFocusLostPageLifeCycleEventsListener \ No newline at end of file
+ we use the SaveTextOnFocusLostPageLifeCycleEventsListener
+
+##Undo/Redo
+bug 580115 : the Undo/Redo of the text editor must be accessible to the user.
+Undo/Redo of TextEditor is not compliant with the Papyrus Undo/Redo mechanism which uses an EMF Command Stack. Nevertheless we find a way to propagate Text changes inside the Papyrus Undo/Redo command stack.
+We listen the Eclipse Operation History (class org.eclipse.papyrus.infra.textedit.xtext.internal.listeners.UndoableTextChangeListener) to detect TextEdition action from a Papyrus nested TextEditor,
+then we wrap the UndoableTextChange/UndoableCompoundTextChange (already executed) into an EMF Command (class TextUndoRedoCommandWrapper) and we add this command into the Papyrus CommandStack.
+
+The CommandStack listener is used to update the editor contents when a new command is executed inside the Command Stack:
+- TextUndoRedoCommandWrapper can be ignored, because the editor is already up to date
+- the CommandStackListener calls org.eclipse.papyrus.infra.textedit.xtext.nested.editor.PapyrusXTextEditor.updateEditorContent()
+- updateEditorContent disables the UndoableTextChangeListener before updating the contents. this steps is required. If we don't disable the listener, the update will add a new TextUndoRedoCommandWrapper inside the Papyrus CommandStack and it should not!
+
+ \ No newline at end of file
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project
index ad4bb1562aa..ca6d97a1307 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit/.project
@@ -20,9 +20,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
</projectDescription>
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/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 4dbfec6ec0e..913bcc780f6 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
@@ -62,7 +62,7 @@ Require-Bundle: org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0
org.eclipse.papyrus.infra.gmfdiag.properties;bundle-version="5.0.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy;exclude:=org.eclipse.papyrus.uml.properties.constraints
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.1.100.qualifier
Bundle-ClassPath: .
Bundle-Name: %pluginName
Bundle-Localization: plugin
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
index 9e15e10cd3e..29e55786f50 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.properties</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java
index ced746e8592..f5283b615b1 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/widgets/StereotypeExplorerDialog.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2016 CEA LIST.
+ * Copyright (c) 2016, 2022 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -10,6 +10,7 @@
*
* Contributors:
* Mickael ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and Implementation
+ * Vincent LORENZO (CEA-LIST) vincent.lorenzo@cea.fr - Bug 579917
*****************************************************************************/
package org.eclipse.papyrus.uml.properties.widgets;
@@ -251,14 +252,7 @@ public class StereotypeExplorerDialog extends SelectionStatusDialog {
if (element instanceof String) {
styledString.setStyle(0, text.length(),
StyledString.COUNTER_STYLER);
- } else if (element instanceof IRegisteredProfile) {
- URI uri = resourceSet.getURIConverter().normalize(((IRegisteredProfile) element).getUri()).trimFragment();
- String path = new StringBuilder(" - ")//$NON-NLS-1$
- .append(uri.toPlatformString(true).substring(1))
- .toString();
- styledString.append(path, StyledString.QUALIFIER_STYLER);
-
- } else if (element instanceof Profile) {
+ }else if (element instanceof Profile) {
URI uri = EcoreUtil.getURI((EObject) element).trimFragment();
String path = new StringBuilder(" - ")//$NON-NLS-1$
.append(uri.toPlatformString(true).substring(1)).toString();
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index 0fef2bc4cc0..9bf5fd88b15 100644
--- a/releng/main/site/category.xml
+++ b/releng/main/site/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.papyrus.sdk.feature_6.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="6.2.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature_6.3.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="6.3.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.sdk.feature.source_6.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="6.2.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature.source_6.3.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="6.3.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
<feature url="features/org.eclipse.papyrus.user.examples.feature_0.0.3.qualifier.jar" id="org.eclipse.papyrus.user.examples.feature" version="0.0.3.qualifier">
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index d9fe1bae7ea..d2ad5422254 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.eclipse.papyrus.p2</artifactId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
index 7dfceab368e..22df9585db0 100755
--- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
+++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Main" sequenceNumber="1651648009">
+<target name="Papyrus Main" sequenceNumber="1656604335">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -38,8 +38,8 @@
<repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.7.v20220605-1149"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -51,8 +51,8 @@
<repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
@@ -60,33 +60,33 @@
<repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220530-0508"/>
+ <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/>
+ <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
+ <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.15.0.202206180919"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
<repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -101,8 +101,8 @@
<repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.14.0.202206170857"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.14.0"/>
</location>
</locations>
</target>
diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
index f5ea26b968f..f388ebebba2 100755
--- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
+++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
@@ -43,7 +43,7 @@ location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
}
// updateFrom("QVT Operational for 2022-06",0)
-location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6" {
+location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7" {
org.eclipse.m2m.qvt.oml.sdk.feature.group
}
@@ -59,7 +59,7 @@ location uml "https://download.eclipse.org/modeling/mdt/uml2/updates/5.5" {
}
// updateFrom("Eclipse",0)
-location platform "https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/" {
+location platform "https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/" {
org.eclipse.sdk.feature.group
}
@@ -70,7 +70,7 @@ location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.1
}
// updateFrom("Xtext, Xtend",0)
-location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041" {
+location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0" {
org.eclipse.xtext.sdk.feature.group
org.eclipse.xtend.sdk.feature.group
org.eclipse.xtext.redist.feature.group
@@ -80,27 +80,27 @@ location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/mileston
}
// updateFrom("EMFT MWE for 2022-06",0)
-location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/" {
+location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/" {
org.eclipse.emf.mwe2.language.sdk.feature.group
}
// updateFrom("Web Tools Platform 3.26 for SimRel 2022-06",0)
-location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/" {
+location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/" {
org.eclipse.wst.xml_ui.feature.feature.group lazy
}
-// updateFrom("GMF Runtime 1.14.2 for SimRel 2022-06",0)
-location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739" {
+// updateFrom("GMF Runtime 1.15.0rc3 for SimRel 2022-09",0)
+location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919" {
org.eclipse.gmf.runtime.sdk.feature.group
}
-// updateFrom("GMF Runtime 1.14.2 for SimRel 2022-06",1)
+// updateFrom("GMF Runtime 1.15.0rc3 for SimRel 2022-09",1)
location gmfNotation "https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913" {
org.eclipse.gmf.runtime.notation.sdk.feature.group
}
// updateFrom("EMF (Core)",0)
-location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307" {
+location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.30" {
org.eclipse.emf.sdk.feature.group
}
@@ -120,7 +120,7 @@ location emfTransaction "https://download.eclipse.org/modeling/emf/transaction/u
}
// updateFrom("GEF",0)
-location gef "https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" {
+location gef "https://download.eclipse.org/tools/gef/classic/releases/3.14.0" {
org.eclipse.gef.feature.group
}
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index 670383e2772..b49ee5a1500 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.papyrus.rcp.feature"
label="%featureName"
- version="6.2.0.qualifier"
+ version="6.3.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2">
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 2b9ec2aa9ec..0037f5da45f 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp.feature</artifactId>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index d110ba26608..9df7889fb1a 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="6.2.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Papyrus" uid="org.eclipse.papyrus.rcp.product" id="org.eclipse.papyrus.rcp.product" application="org.eclipse.ui.ide.workbench" version="6.3.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
@@ -200,16 +200,17 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
+ <property name="osgi.bundles.defaultStartLevel" value="4" />
<property name="osgi.instance.area.default" value="@user.home/workspace-papyrus" />
<property name="org.eclipse.update.reconcile" value="false" />
<property name="osgi.requiredJavaVersion" value="11" />
- <property name="osgi.bundles.defaultStartLevel" value="4" />
</configurations>
<repositories>
<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
+ <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" enabled="true" />
<repository location="https://download.eclipse.org/releases/latest/" enabled="true" />
- <repository location="https://download.eclipse.org/eclipse/updates/4.24/" enabled="true" />
+ <repository location="https://download.eclipse.org/eclipse/updates/4.25/" enabled="true" />
</repositories>
<preferencesInfo>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
index 906b064dccd..609d9c1cb00 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
index fd43456c679..e326cbe2672 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
+++ b/releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.e4.ui.css.swt.theme
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
-Bundle-Version: 6.2.0.qualifier
+Bundle-Version: 6.3.0.qualifier
Eclipse-BundleShape: dir
Bundle-Name: %pluginName
Bundle-Localization: plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
index 6a644d3acd9..1cc216f87aa 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
@@ -31,7 +31,7 @@
id="namedview334"
showgrid="false"
inkscape:zoom="1.3485714"
- inkscape:cx="-230.98517"
+ inkscape:cx="-366.31356"
inkscape:cy="102.70127"
inkscape:window-x="4472"
inkscape:window-y="-8"
@@ -1786,5 +1786,5 @@
x="197.48167"
y="240.93285"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66670036px;line-height:1.25;font-family:'Open Sans';-inkscape-font-specification:'Open Sans';fill:#333333;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
- dy="-2.2245762 0 0 0 0 0 0 0 -2.2245762">2022-06N</tspan></text>
+ dy="-2.2245762 0 0 0 0 0 0 0 -2.2245762">2022-09N</tspan></text>
</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 6ad3ef30589..c385b03115c 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp</artifactId>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
index 593eab993f4..07e82cf9c29 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
+++ b/releng/rcp/org.eclipse.papyrus.rcp/splash.bmp
Binary files differ
diff --git a/releng/rcp/pom.xml b/releng/rcp/pom.xml
index 8b69bac19e6..9928cb1ddb1 100644
--- a/releng/rcp/pom.xml
+++ b/releng/rcp/pom.xml
@@ -11,7 +11,7 @@
</parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -26,7 +26,7 @@
<eclipse.simultaneous.release.build>${maven.build.timestamp}</eclipse.simultaneous.release.build>
<!-- Human readable name of the release, e.g. used in the about dialog
(see about.mappings) -->
- <eclipse.simultaneous.release.name>2022-06 (4.24)</eclipse.simultaneous.release.name>
+ <eclipse.simultaneous.release.name>2022-09 (4.25)</eclipse.simultaneous.release.name>
<target.platform>org.eclipse.papyrus.rcp.targetplatform</target.platform>
</properties>
diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
index e36d588e3e9..1abb2f86d72 100755
--- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
+++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus RCP" sequenceNumber="1651648009">
+<target name="Papyrus RCP" sequenceNumber="1656604335">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -38,8 +38,8 @@
<repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.7.v20220605-1149"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -56,25 +56,25 @@
<repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220530-0508"/>
+ <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/>
+ <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
+ <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.15.0.202206180919"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
@@ -93,8 +93,8 @@
<repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.14.0.202206170857"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.14.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
@@ -110,15 +110,15 @@
<repository id="mylyn" location="https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="6.1.0.202203080745-r"/>
- <repository id="egit" location="https://download.eclipse.org/egit/updates-6.1"/>
+ <unit id="org.eclipse.egit.feature.group" version="6.2.0.202206071550-r"/>
+ <repository id="egit" location="https://download.eclipse.org/egit/updates-6.2"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.24.0.v20220420-0901"/>
- <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1700.v20220428-1800"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1700.v20220419-2255"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/>
+ <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1700.v20220607-0700"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1700.v20220509-0833"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
@@ -127,12 +127,12 @@
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xsd.sdk.feature.group" version="2.30.0.v20220317-1532"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.18.0.v20220309-1619"/>
- <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120"/>
+ <unit id="org.eclipse.emf.cdo.epp.feature.group" version="4.19.0.v20220608-1505"/>
+ <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20220608-1105"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.epp.mpc.feature.group" version="1.10.0.v20220502-0731"/>
diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
index fe407a89a24..8fb77341f4b 100644
--- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
+++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
@@ -18,12 +18,12 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"
/*** Updates from the Simrel repository ***/
// updateFrom("EGit",0)
-location egit "https://download.eclipse.org/egit/updates-6.1" {
+location egit "https://download.eclipse.org/egit/updates-6.2" {
org.eclipse.egit.feature.group
}
// updateFrom("Eclipse",0)
-location platform "https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/" {
+location platform "https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/" {
org.eclipse.e4.core.tools.feature.feature.group
org.eclipse.rcp.configuration.feature.group
org.eclipse.equinox.executable.feature.group
@@ -36,12 +36,12 @@ location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/m
}
// updateFrom("EMF (Core)",0)
-location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307" {
+location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.30" {
org.eclipse.xsd.sdk.feature.group
}
// updateFrom("EMF CDO",0)
-location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120" {
+location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220608-1105" {
org.eclipse.emf.cdo.epp.feature.group
}
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index ec9377c2c60..c066dfcfe28 100644
--- a/releng/rcp/targetPlatform/pom.xml
+++ b/releng/rcp/targetPlatform/pom.xml
@@ -7,7 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>6.2.0-SNAPSHOT</version>
+ <version>6.3.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp.targetplatform</artifactId>
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
index f487fec7324..f9e21d0b43b 100755
--- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus CDO Tests" sequenceNumber="1651648009">
+<target name="Papyrus CDO Tests" sequenceNumber="1656604336">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -38,8 +38,8 @@
<repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.7.v20220605-1149"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -51,8 +51,8 @@
<repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
@@ -60,33 +60,33 @@
<repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220530-0508"/>
+ <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/>
+ <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
+ <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.15.0.202206180919"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
<repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -101,8 +101,8 @@
<repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.14.0.202206170857"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.14.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
@@ -118,7 +118,7 @@
<unit id="org.eclipse.emf.cdo.gmf.notation" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.server.ocl" version="0.0.0"/>
<unit id="org.eclipse.emf.cdo.ui.admin" version="0.0.0"/>
- <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120"/>
+ <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20220608-1105"/>
</location>
</locations>
</target>
diff --git a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd
index efc0a926128..2390b1adb70 100755
--- a/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd
+++ b/releng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd
@@ -4,7 +4,7 @@ include "../../main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetpl
/*** Updates from the Simrel repository ***/
// updateFrom("EMF CDO",0)
-location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220309-1120" {
+location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220608-1105" {
org.eclipse.emf.cdo.admin lazy
org.eclipse.emf.cdo.dawn lazy
org.eclipse.emf.cdo.dawn.gmf lazy
diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
index 56929a76009..94e339d59f9 100755
--- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
+++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Tests" sequenceNumber="1651648009">
+<target name="Papyrus Tests" sequenceNumber="1656604335">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -38,8 +38,8 @@
<repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.7.v20220605-1149"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -51,8 +51,8 @@
<repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
@@ -60,33 +60,33 @@
<repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220530-0508"/>
+ <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/>
+ <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
+ <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.15.0.202206180919"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
<repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -101,8 +101,8 @@
<repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.14.0.202206170857"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.14.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
index 7ee45e30b5d..ec88a940fe9 100755
--- a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
+++ b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Releng" sequenceNumber="1651648012">
+<target name="Papyrus Releng" sequenceNumber="1656604338">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -38,8 +38,8 @@
<repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.7.v20220605-1149"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -51,8 +51,8 @@
<repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
@@ -60,33 +60,33 @@
<repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220530-0508"/>
+ <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/>
+ <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
+ <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.15.0.202206180919"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
<repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -101,8 +101,8 @@
<repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.14.0.202206170857"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.14.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cbi.targetplatform-feature.feature.group" version="0.0.0"/>
@@ -115,26 +115,26 @@
<repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.17.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.20.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.19.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.21.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.17.0.v20220413-0631"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.23.0.v20220413-1200"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.25.0.v20220413-1200"/>
- <unit id="org.eclipse.oomph.preferences.feature.group" version="1.15.0.v20220301-0958"/>
- <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20220413-080151-1.25.0-M1a"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository id="egit" location="https://download.eclipse.org/egit/updates-6.1"/>
+ <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.16.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.17.0.v20220601-1043"/>
+ <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.17.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.21.0.v20220601-1149"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.19.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.16.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.21.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.17.0.v20220525-1027"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.23.0.v20220525-1027"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.25.0.v20220607-1104"/>
+ <unit id="org.eclipse.oomph.preferences.feature.group" version="1.15.0.v20220421-1218"/>
+ <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.25.0"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <repository id="egit" location="https://download.eclipse.org/egit/updates-6.2"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1/"/>
diff --git a/releng/toolsmiths/site/category.xml b/releng/toolsmiths/site/category.xml
index 027f54ca33b..7581266383b 100644
--- a/releng/toolsmiths/site/category.xml
+++ b/releng/toolsmiths/site/category.xml
@@ -48,10 +48,10 @@
<feature url="features/org.eclipse.papyrus.toolsmiths.builder.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.toolsmiths.builder.feature" version="1.0.0.qualifier">
<category name="org.eclipse.papyrus.toolsmiths.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.infra.textedit.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.infra.textedit.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature" version="1.1.0.qualifier">
<category name="org.eclipse.papyrus.toolsmiths.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.infra.textedit.feature.source_1.0.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature.source" version="1.0.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.infra.textedit.feature.source_1.1.0.qualifier.jar" id="org.eclipse.papyrus.infra.textedit.feature.source" version="1.1.0.qualifier">
<category name="org.eclipse.papyrus.toolsmiths.category"/>
</feature>
<category-def name="org.eclipse.papyrus.toolsmiths.category" label="Papyrus Toolsmiths">
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
index ace791f7798..30af9db58e9 100755
--- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
+++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde?>
<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Papyrus Toolsmiths" sequenceNumber="1651648012">
+<target name="Papyrus Toolsmiths" sequenceNumber="1656604338">
<locations>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.nebula.widgets.richtext.feature.feature.group" version="1.2.0.201703081533"/>
@@ -38,8 +38,8 @@
<repository id="xwt" location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.6.v20220309-1013"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.6"/>
+ <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.7.v20220605-1149"/>
+ <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xpand.sdk.feature.group" version="2.2.0.v201605260315"/>
@@ -51,8 +51,8 @@
<repository id="uml" location="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220428-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220428-1800/"/>
+ <unit id="org.eclipse.sdk.feature.group" version="4.24.0.v20220607-0700"/>
+ <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
@@ -60,33 +60,33 @@
<repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220501-1041"/>
- <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220501-1041"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/S202205011041"/>
+ <unit id="org.eclipse.xtext.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtend.sdk.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.redist.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.runtime.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.ui.feature.group" version="2.27.0.v20220530-0508"/>
+ <unit id="org.eclipse.xtext.generator.feature.group" version="2.27.0.v20220530-0508"/>
+ <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220429-1234"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/milestones/S202204291234/"/>
+ <unit id="org.eclipse.emf.mwe2.language.sdk.feature.group" version="2.13.0.v20220519-1115"/>
+ <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.13.0/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.wst.xml_ui.feature.feature.group" version="0.0.0"/>
- <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26M1a-20220411232710/repository/"/>
+ <repository id="webtools" location="https://download.eclipse.org/webtools/downloads/drops/R3.26.0/S-3.26RC1-20220526191850/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.14.2.202204130739"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202204130739"/>
+ <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.15.0.202206180919"/>
+ <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones/S202206180919"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
<repository id="gmfNotation" location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220426-0617"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202204260307"/>
+ <unit id="org.eclipse.emf.sdk.feature.group" version="2.30.0.v20220516-1117"/>
+ <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.12.0.201805030653"/>
@@ -101,8 +101,8 @@
<repository id="emfTransaction" location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.gef.feature.group" version="3.11.0.201606061308"/>
- <repository id="gef" location="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952"/>
+ <unit id="org.eclipse.gef.feature.group" version="3.14.0.202206170857"/>
+ <repository id="gef" location="https://download.eclipse.org/tools/gef/classic/releases/3.14.0"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.cbi.targetplatform-feature.feature.group" version="0.0.0"/>
@@ -115,26 +115,26 @@
<repository id="cbiAggregator" location="https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.17.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.15.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.20.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.19.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.16.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.21.0.v20220301-0958"/>
- <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.17.0.v20220413-0631"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.23.0.v20220413-1200"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.25.0.v20220413-1200"/>
- <unit id="org.eclipse.oomph.preferences.feature.group" version="1.15.0.v20220301-0958"/>
- <repository id="oomph" location="https://download.eclipse.org/oomph/drops/milestone/S20220413-080151-1.25.0-M1a"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <repository id="egit" location="https://download.eclipse.org/egit/updates-6.1"/>
+ <unit id="org.eclipse.oomph.version.feature.group" version="1.16.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.16.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.17.0.v20220601-1043"/>
+ <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.17.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.15.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.targlets.feature.group" version="1.21.0.v20220601-1149"/>
+ <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.19.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.16.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.21.0.v20220421-1218"/>
+ <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.17.0.v20220525-1027"/>
+ <unit id="org.eclipse.oomph.p2.feature.group" version="1.23.0.v20220525-1027"/>
+ <unit id="org.eclipse.oomph.setup.feature.group" version="1.25.0.v20220607-1104"/>
+ <unit id="org.eclipse.oomph.preferences.feature.group" version="1.15.0.v20220421-1218"/>
+ <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.25.0"/>
+ </location>
+ <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+ <repository id="egit" location="https://download.eclipse.org/egit/updates-6.2"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1/"/>
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
index e7746b615d6..12fae85f17a 100644
--- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
+++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
@@ -18,7 +18,7 @@ location cbiAggregator "https://download.eclipse.org/cbi/updates/aggregator/ide/
/*** Updates from the Simrel repository ***/
// updateFrom("Oomph",0)
-location oomph "https://download.eclipse.org/oomph/drops/milestone/S20220413-080151-1.25.0-M1a" {
+location oomph "https://download.eclipse.org/oomph/drops/release/1.25.0" {
org.eclipse.oomph.version.feature.group
org.eclipse.oomph.setup.workingsets.feature.group
org.eclipse.oomph.projectconfig.feature.group
@@ -38,7 +38,7 @@ location oomph "https://download.eclipse.org/oomph/drops/milestone/S20220413-080
}
// updateFrom("EGit",0)
-location egit "https://download.eclipse.org/egit/updates-6.1" // oomph
+location egit "https://download.eclipse.org/egit/updates-6.2" // oomph
// updateFrom("m2e",0)
location m2e "https://download.eclipse.org/technology/m2e/releases/1.20.1/" // oomph
diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
index 3a56801134e..b7986e674a3 100644
--- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
+++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/META-INF/MANIFEST.MF
@@ -41,7 +41,7 @@ Export-Package: org.eclipse.papyrus.junit.matchers,
org.eclipse.papyrus.junit.utils.xtext
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.3.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.junit.utils.Activator
diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml b/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml
index 957dd2a1092..ca2fa57e374 100644
--- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml
+++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/pom.xml
@@ -10,6 +10,6 @@
</parent>
<groupId>org.eclipse.papyrus</groupId>
<artifactId>org.eclipse.papyrus.junit.utils</artifactId>
- <version>3.2.0-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java b/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java
index 8f59b899337..9bb2c7a2c99 100644
--- a/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java
+++ b/tests/junit/framework/org.eclipse.papyrus.junit.utils/src/org/eclipse/papyrus/junit/utils/rules/PapyrusEditorFixture.java
@@ -13,7 +13,7 @@
* Christian W. Damus - bugs 433206, 465416, 434983, 483721, 469188, 485220, 491542, 497865, 533673, 533682, 533676, 533679, 536486
* Thanh Liem PHAN (ALL4TEC) thanhliem.phan@all4tec.net - Bug 521550
* EclipseSource - Bug 536631
- * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 549108
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 549108, 580192
*****************************************************************************/
package org.eclipse.papyrus.junit.utils.rules;
@@ -894,6 +894,7 @@ public class PapyrusEditorFixture extends AbstractModelFixture<TransactionalEdit
ServiceUtils.getInstance().getService(IPageManager.class, editor.getServicesRegistry()).closePage(diagram);
flushDisplayEvents();
}
+ activeDiagramEditor = null;
} catch (Exception e) {
throw new IllegalStateException("Cannot close diagram", e);
}
@@ -1591,13 +1592,17 @@ public class PapyrusEditorFixture extends AbstractModelFixture<TransactionalEdit
return getNewEditPart(parent, request.getViewDescriptors());
}
- private IGraphicalEditPart getNewEditPart(EditPart context, Collection<? extends ViewDescriptor> viewDescriptors) {
+
+ /**
+ * @since 3.3
+ */
+ protected IGraphicalEditPart getNewEditPart(EditPart context, Collection<? extends ViewDescriptor> viewDescriptors) {
return viewDescriptors.stream()
.map(desc -> desc.getAdapter(View.class)).map(View.class::cast)
.filter(Objects::nonNull)
.map(view -> DiagramEditPartsUtil.getEditPartFromView(view, context))
.filter(IGraphicalEditPart.class::isInstance).map(IGraphicalEditPart.class::cast)
- .findAny().orElseGet(failOnAbsence("Could not find newly created edit-part"));
+ .findAny().orElseGet(failOnAbsence("Could not find newly created edit-part")); //$NON-NLS-1$
}
/**

Back to the top