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/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF15
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml26
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java52
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java66
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml20
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java10
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java8
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml2
-rwxr-xr-xplugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java8
-rw-r--r--plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml2
-rw-r--r--plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java29
-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.java186
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml2
-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/Activator.java6
-rwxr-xr-xplugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java61
-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/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml2
-rw-r--r--plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java26
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/META-INF/MANIFEST.MF2
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties6
-rw-r--r--plugins/sdk/org.eclipse.papyrus.sdk/pom.xml2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF2
-rwxr-xr-xplugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml195
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml2
-rw-r--r--plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration1
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration1
-rwxr-xr-xplugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration1
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF5
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.export/pom.xml2
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java4
-rw-r--r--plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java74
-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--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml2
-rwxr-xr-xplugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java14
-rwxr-xr-xreleng/main/pom.xml35
-rw-r--r--releng/main/site/category.xml6
-rw-r--r--releng/main/site/pom.xml38
-rwxr-xr-xreleng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target53
-rwxr-xr-xreleng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd103
-rw-r--r--releng/pom.xml21
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml7
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml3
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement18
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product5
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml98
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/META-INF/MANIFEST.MF2
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg34
-rw-r--r--releng/rcp/org.eclipse.papyrus.rcp/plugin.properties2
-rwxr-xr-xreleng/rcp/org.eclipse.papyrus.rcp/pom.xml3
-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.target87
-rw-r--r--releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd55
-rw-r--r--releng/rcp/targetPlatform/pom.xml2
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.target59
-rwxr-xr-xreleng/tests/main-tests-with-cdo/targetPlatform/org.eclipse.papyrus.main.tests.cdo.targetplatform.tpd25
-rwxr-xr-xreleng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.target57
-rw-r--r--releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd5
-rwxr-xr-xreleng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target95
-rwxr-xr-xreleng/toolsmiths/pom.xml3
-rw-r--r--releng/toolsmiths/site/category.xml4
-rw-r--r--releng/toolsmiths/site/pom.xml35
-rwxr-xr-xreleng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target95
-rw-r--r--releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd40
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml2
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/APIReports.java97
-rwxr-xr-xtests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java2
-rw-r--r--tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java394
-rwxr-xr-xtests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndexTest.java1
-rw-r--r--tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/CombinedFragmentRegressionTest.java1
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLConstraintOnInstanceSpec.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLValidationRuleFromFile.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestStereotypeValidation.java2
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java3
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInPluginXML.java5
-rw-r--r--tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInProfile.java3
110 files changed, 1531 insertions, 1262 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 d80e4647c15..9e4ac1174c7 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.1.0.qualifier"
+ version="6.2.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 2e0b6c4b2c6..39c124e29c6 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.1.0-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
index 3a5765238fb..d4d5d5ced97 100755
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/META-INF/MANIFEST.MF
@@ -1,9 +1,10 @@
Manifest-Version: 1.0
Require-Bundle: com.ibm.icu,
- org.apache.batik.dom;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.util;bundle-version="[1.6.0,1.7.0)",
- org.apache.batik.xml;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom;bundle-version="[1.14.0,1.15.0)",
+ org.apache.batik.dom.svg;bundle-version="[1.14.0,1.15.0)",
+ org.apache.batik.util;bundle-version="[1.14.0,1.15.0)",
+ org.apache.batik.xml;bundle-version="[1.14.0,1.15.0)",
+ org.apache.batik.anim;bundle-version="[1.14.0,1.15.0)",
org.eclipse.core.databinding.property;bundle-version="[1.8.0,2.0.0)",
org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
@@ -99,7 +100,7 @@ Bundle-Activator: org.eclipse.papyrus.infra.gmfdiag.common.Activator
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.3.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
@@ -109,5 +110,5 @@ Import-Package: com.google.common.base;version="[30.1.0, 31.0.0)",
com.google.common.util.concurrent;version="[30.1.0, 31.0.0)",
org.osgi.service.component.annotations;version="1.3.0";resolution:=optional
Automatic-Module-Name: org.eclipse.papyrus.infra.gmfdiag.common
-Service-Component: OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml,
- OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml
+Service-Component: OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.EditPolicyProviderServiceImpl.xml,
+ OSGI-INF/org.eclipse.papyrus.infra.gmfdiag.common.internal.service.ViewProviderServiceImpl.xml
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
index fd848859279..84919191723 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/plugin.xml
@@ -43,14 +43,17 @@
label="Refresh"
style="push"
tooltip="Refresh the current diagram">
- <visibleWhen
- checkEnabled="false">
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <visibleWhen>
+ <and>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
+ </and>
</visibleWhen>
</command>
</menuContribution>
@@ -220,6 +223,13 @@
properties="canDelete,isSemanticDeletion"
type="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
</propertyTester>
+ <propertyTester
+ class="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester"
+ id="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester"
+ namespace="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester"
+ properties="isPapyrusGMFDiagramActive"
+ type="org.eclipse.jface.viewers.IStructuredSelection">
+ </propertyTester>
</extension>
<extension
point="org.eclipse.ui.menus">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
index 5a748174bbb..76eff12ab77 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.common</artifactId>
- <version>4.2.0-SNAPSHOT</version>
+ <version>4.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java
index c7dadd06b19..a9d2887378f 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/ProviderServiceUtil.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2018 EclipseSource and others.
+ * Copyright (c) 2018, 2022 EclipseSource 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,16 +10,18 @@
*
* Contributors:
* EclipseSource - Initial API and implementation (Bug 533701)
- *
+ * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 577845
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.common.service;
import org.eclipse.gef.EditPart;
import org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider;
import org.eclipse.gmf.runtime.diagram.ui.services.editpolicy.IEditPolicyProvider;
+import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
/**
@@ -32,6 +34,46 @@ import org.eclipse.papyrus.infra.gmfdiag.common.utils.ServiceUtilsForEditPart;
public class ProviderServiceUtil {
/**
+ * this method allows to identify if the editpart is associated to a Papyrus GMF Diagram (diagram.eContainer()==null)
+ *
+ * @param editPart
+ * an edit part
+ * @return
+ * <code>true</code> if the editPart probably concerns the Papyrus GMF Diagram
+ * <code>false</code> otherwise (editPart is <code>null</code> or diagram.eContainer()!=null in case of a Papyrus Sirius Diagram)
+ *
+ */
+ private static final boolean isPapyrusGMFPart(final EditPart editPart) {
+ if (editPart != null) {
+ final Object model = editPart.getModel();
+ if (model instanceof View) {
+ return isPapyrusGMFView((View) model);
+ }
+ }
+ return false;
+ }
+
+ /**
+ * this method allows to identify if the view is associated to a Papyrus GMF Diagram (diagram.eContainer()==null)
+ *
+ * @param view
+ * a view
+ * @return
+ * <code>true</code> if the view probably concerns the Papyrus GMF Diagram
+ * <code>false</code> otherwise (view is <code>null</code> or diagram.eContainer()!=null in case of a Papyrus Sirius Diagram)
+ *
+ */
+ private static final boolean isPapyrusGMFView(final View view) {
+ if (view != null) {
+ final Diagram d = view.getDiagram();
+ if (d != null) {
+ return DiagramUtils.isPapyrusGMFDiagram(d);
+ }
+ }
+ return false;
+ }
+
+ /**
* <p>
* Tests if the given edit part is a Papyrus Edit Part, by testing if a Papyrus {@link ServicesRegistry}
* is present.
@@ -43,6 +85,9 @@ public class ProviderServiceUtil {
* <code>true</code> if this edit part is part of a Papyrus environment (Using a Papyrus {@link ServicesRegistry}), <code>false</code> otherwise
*/
public static boolean isPapyrusPart(EditPart editPart) {
+ if (!isPapyrusGMFPart(editPart)) {
+ return false;
+ }
try {
return ServiceUtilsForEditPart.getInstance().getServiceRegistry(editPart) != null;
} catch (Exception ex) {
@@ -63,6 +108,9 @@ public class ProviderServiceUtil {
* <code>true</code> if this view is part of a Papyrus environment (Using a Papyrus {@link ServicesRegistry}), <code>false</code> otherwise
*/
public static boolean isPapyrusView(View view) {
+ if (!isPapyrusGMFView(view)) {
+ return false;
+ }
try {
return ServiceUtilsForEObject.getInstance().getServiceRegistry(view) != null;
} catch (Exception ex) {
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
index c2f15ec90db..29593dc9533 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/service/shape/AbstractShapeProvider.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.WeakHashMap;
-import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
import org.apache.batik.dom.util.DOMUtilities;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.draw2d.PositionConstants;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
index 2c7fed7f86b..5ab212de21a 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/utils/DiagramUtils.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2013, 2017, 2019, 2020 CEA LIST and others.
+ * Copyright (c) 2013, 2017, 2019, 2020, 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
@@ -15,8 +15,7 @@
* Christian W. Damus - bug 527580
* Ansgar Radermacher - bug 539754
* Nicolas FAUVERGUE (CEA LIST) nicolas.fauvergue@cea.fr - Bug 550568
- * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 560644
- *
+ * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 560644, 577845
*****************************************************************************/
package org.eclipse.papyrus.infra.gmfdiag.common.utils;
@@ -412,4 +411,17 @@ public class DiagramUtils {
return null;
}
+ /**
+ *
+ * @param diagram
+ * a diagram, can't be <code>null</code>
+ * @return
+ * <code>true</code> if the view probably concerns the Papyrus GMF Diagram (diagram.eContainer()==null)
+ * <code>false</code> the view probably concerns a Papyrus Sirius Diagram (diagram.eContainer()!=null)
+ * @since 4.3
+ */
+ public static final boolean isPapyrusGMFDiagram(final Diagram diagram) {
+ return diagram.eContainer() == null; // diagram.eContainer()!=null for papyrus sirius diagram
+ }
+
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java
new file mode 100644
index 00000000000..776ba74e5b6
--- /dev/null
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/internal/common/expressions/PapyrusGMFDiagramTester.java
@@ -0,0 +1,66 @@
+/*****************************************************************************
+ * Copyright (c) 2021 CEA LIST.
+ *
+ * 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
+ * https://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.gmfdiag.internal.common.expressions;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.gmfdiag.common.SynchronizableGmfDiagramEditor;
+import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
+import org.eclipse.papyrus.infra.ui.util.EditorHelper;
+import org.eclipse.ui.IEditorPart;
+
+/**
+ * This tester is used to check if the current Editor is a Papyrus GMF diagram (and not a papyrus Sirius Diagram) (see bug 577822)
+ */
+public class PapyrusGMFDiagramTester extends PropertyTester {
+
+ /**
+ * this property is used to know is the current Editor is a Papyrus GMF diagram (and not a papyrus Sirius Diagram)
+ */
+ private static final String IS_PAPYRUS_GMF_DIAGRAM_ACTIVE = "isPapyrusGMFDiagramActive";//$NON-NLS-1$
+
+
+ /**
+ *
+ * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
+ *
+ * @param receiver
+ * @param property
+ * @param args
+ * @param expectedValue
+ * @return
+ */
+ @Override
+ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+ if (IS_PAPYRUS_GMF_DIAGRAM_ACTIVE.equals(property) && receiver instanceof IStructuredSelection && expectedValue instanceof Boolean) {
+ return expectedValue.equals(isPapyrusGMFDiagramActive());
+ }
+ return false;
+ }
+
+
+ /**
+ *
+ * @return
+ * <code>true</code> if the current active editor represents a Papyrus GMF Editor
+ */
+ private final boolean isPapyrusGMFDiagramActive() {
+ IEditorPart editorPart = EditorHelper.getCurrentEditor();
+ // this code also should work when the SynchronizableGmfDiagramEditor is not embedded in the IMultiDiagramEditor
+ if (editorPart instanceof IMultiDiagramEditor) {
+ editorPart = ((IMultiDiagramEditor) editorPart).getActiveEditor();
+ }
+ return editorPart instanceof SynchronizableGmfDiagramEditor;
+ }
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
index 6d9f5811181..a5ecc441667 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.gmfmenu.filter/plugin.xml
@@ -478,6 +478,26 @@
removeFromMenubar="false"
removeFromToolbar="true">
</partPredefinedItem>
+ <partPredefinedItem
+ id="toolbarFontGroup"
+ removeFromMenubar="false"
+ removeFromToolbar="true">
+ </partPredefinedItem>
+ <partPredefinedItem
+ id="fontColorContributionItem"
+ removeFromMenubar="false"
+ removeFromToolbar="true">
+ </partPredefinedItem>
+ <partPredefinedItem
+ id="fillColorContributionItem"
+ removeFromMenubar="false"
+ removeFromToolbar="true">
+ </partPredefinedItem>
+ <partPredefinedItem
+ id="lineColorContributionItem"
+ removeFromMenubar="false"
+ removeFromToolbar="true">
+ </partPredefinedItem>
</partContribution>
<popupContribution
class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider">
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
index c8f72e5c3d9..2b24b7f73e4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/META-INF/MANIFEST.MF
@@ -24,7 +24,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
index c20a10b90dd..1ce8ff3cc15 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/pom.xml
@@ -9,7 +9,7 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.gmfdiag.modelexplorer</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<description>This plugin provides : - the facets and the customization to display the GMF Diagrams in the ModelExplorer</description>
</project> \ No newline at end of file
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java
index 0c7f563759e..522b0210ea3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2011 Atos, Christian W. Damus, and others.
+ * Copyright (c) 2011, 2022 Atos, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,7 +11,7 @@
* Contributors:
* Atos - Initial API and implementation
* Christian W. Damus - bug 485220
- *
+ * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 577843
*/
package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
@@ -28,19 +28,21 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
/** Get the collection of all contained diagrams */
public class GetContainedDiagrams implements IJavaQuery2<EObject, Collection<org.eclipse.gmf.runtime.notation.Diagram>> {
+ @Override
public Collection<Diagram> evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
- List<Diagram> result = new ArrayList<Diagram>();
+ List<Diagram> result = new ArrayList<>();
Collection<Setting> settings = EMFHelper.getUsages(source);
if (settings != null) {
for (Setting setting : settings) {
Diagram diagram = NotationUtils.getOwnedDiagram(setting.getEObject(), source);
- if (diagram != null) {
+ if (diagram != null && DiagramUtils.isPapyrusGMFDiagram(diagram)) {
result.add(diagram);
}
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java
index ae9c064a156..9a4e8e66d97 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2011 Atos, Christian W. Damus, and others.
+ * Copyright (c) 2011, 2022 Atos, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -11,7 +11,7 @@
* Contributors:
* Atos - Initial API and implementation
* Christian W. Damus - bug 485220
- *
+ * Vincent Lorenzo (CEA LIST) - vincent.lorenzo@cea.fr - Bug 577843
*/
package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
@@ -26,18 +26,20 @@ import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationUtils;
+import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
public class IsDiagramContainer implements IJavaQuery2<EObject, Boolean> {
/**
* Return true if the element is a Diagram Container
*/
+ @Override
public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
Collection<Setting> settings = EMFHelper.getUsages(source);
if (settings != null) {
for (Setting setting : settings) {
Diagram diagram = NotationUtils.getOwnedDiagram(setting.getEObject(), source);
- if (diagram != null) {
+ if (diagram != null && DiagramUtils.isPapyrusGMFDiagram(diagram)) {
return true;
}
}
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
index c628a45b285..87408fb79cb 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/META-INF/MANIFEST.MF
@@ -92,7 +92,7 @@ Require-Bundle: ca.odell.glazedlists;bundle-version="[1.9.0,2.0.0)",
org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 7.1.0.qualifier
+Bundle-Version: 7.1.100.qualifier
Bundle-Name: %Bundle-Name
Bundle-Activator: org.eclipse.papyrus.infra.nattable.Activator
Bundle-ManifestVersion: 2
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
index 731eab8f9d9..3663c176e91 100644
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.nattable</artifactId>
- <version>7.1.0-SNAPSHOT</version>
+ <version>7.1.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
index c0a08fb9d2b..244d41a9676 100755
--- a/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
+++ b/plugins/infra/nattable/org.eclipse.papyrus.infra.nattable/src/org/eclipse/papyrus/infra/nattable/wizard/ConfigureTableCategoriesWizard.java
@@ -1,6 +1,6 @@
/*****************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
- *
+ * Copyright (c) 2014, 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
@@ -11,7 +11,7 @@
* Contributors:
* CEA LIST - Initial API and implementation
* Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.ne - Bug 455060
- *
+ * Vincent LORENZO (CEA LIST) vincent.lorenzo@cea.fr - Bug 579399
*****************************************************************************/
package org.eclipse.papyrus.infra.nattable.wizard;
@@ -142,7 +142,7 @@ public class ConfigureTableCategoriesWizard extends AbstractTableWizard implemen
@Override
public boolean isValidValue(Object element) {
// EMF dependency, must not be done here, it should be better with a new content provider service
- return element instanceof EReference && ((EReference) element).isMany() && element != EcorePackage.eINSTANCE.getEModelElement_EAnnotations();
+ return element instanceof EReference && element != EcorePackage.eINSTANCE.getEModelElement_EAnnotations();
}
};
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
index 93887eadd92..6cfa26e36d7 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.9.0,2.0.0)",
org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.1.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.onefile.Activator
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
index e0a755aee0c..e752ddc3ec0 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.onefile</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
index bbffed52975..a3541907725 100644
--- a/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
+++ b/plugins/infra/onefile/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/infra/onefile/utils/OneFileUtils.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2011, 2016 Atos Origin Integration, Christian W. Damus, and others.
+ * Copyright (c) 2011, 2016, 2022 Atos Origin Integration, Christian W. Damus, and others.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -12,11 +12,14 @@
* Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
* Christian W. Damus - bug 485220
* Nicolas FAUVERGUE (ALL4TEC) nicolas.fauvergue@all4tec.net - Bug 496905
- *
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 578434
*****************************************************************************/
package org.eclipse.papyrus.infra.onefile.utils;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
@@ -59,7 +62,7 @@ public class OneFileUtils {
return null;
}
final String substring = getFileNameForDi(fileName, parent);
- IFile file = parent.getFile(new Path(substring + "." + DiModel.DI_FILE_EXTENSION));
+ IFile file = parent.getFile(new Path(substring + "." + DiModel.DI_FILE_EXTENSION)); //$NON-NLS-1$
if (file.exists()) {
return file;
}
@@ -138,6 +141,24 @@ public class OneFileUtils {
}
/**
+ * @param resources
+ * a list of {@link IResource}
+ * @return <code>true</code> if the list contains a di file
+ * @since 3.1
+ */
+ public static boolean containsDi(final Collection<IResource> resources) {
+ final Iterator<IResource> iter = resources.iterator();
+ while (iter.hasNext()) {
+ final IResource current = iter.next();
+ if (isDi(current)) {
+ return true;
+ }
+ }
+ return false;
+
+ }
+
+ /**
* Returns the name without the extension of the file
*
* @param res
@@ -180,7 +201,7 @@ public class OneFileUtils {
}
public static IFile[] getAssociatedFiles(IPapyrusFile papyrusFile) {
- ArrayList<IFile> files = new ArrayList<IFile>();
+ List<IFile> files = new ArrayList<>();
for (IResource res : papyrusFile.getAssociatedResources()) {
if (res instanceof IFile) {
files.add((IFile) res);
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 0432942da5b..e8c19ec5089 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.0.qualifier
+Bundle-Version: 1.1.0.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 f014c31f7dc..2775269b9b0 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
@@ -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 578648, 579033, 580115, 580042
*****************************************************************************/
package org.eclipse.papyrus.infra.textedit.xtext.nested.editor;
@@ -18,32 +18,47 @@ 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;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
import org.eclipse.papyrus.infra.core.sasheditor.editor.ISashWindowsContainer;
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;
import org.eclipse.ui.IPartListener2;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.xtext.ui.editor.XtextEditor;
+import org.eclipse.xtext.ui.editor.model.IXtextDocument;
+import org.eclipse.xtext.ui.editor.model.XtextDocument;
+import org.eclipse.xtext.ui.editor.model.XtextDocumentProvider;
+
/**
* This Customization of the {@link XtextEditor} allows us to open an XtextEditor in the Papyrus sash editor
@@ -53,27 +68,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
@@ -130,6 +130,11 @@ public class PapyrusXTextEditor extends XtextEditor {
private SaveTextOnFocusLostPageLifeCycleEventsListener sashWindowsContainerListener = null;
/**
+ * listener on the IOperationHistory
+ */
+ private UndoableTextChangeListener historyListener;
+
+ /**
*
* Constructor.
*
@@ -221,27 +226,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
@@ -254,13 +248,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);
}
@@ -269,10 +271,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);
}
@@ -324,6 +331,22 @@ 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));
+ }
+
+ final IDocumentProvider provider = getDocumentProvider();
+ if (provider instanceof XtextDocumentProvider) {
+ final XtextDocumentProvider xtextDocumentProvider = (XtextDocumentProvider) provider;
+ final IDocument tmp = xtextDocumentProvider.getDocument(this.input);
+
+ if (tmp instanceof XtextDocument) {
+ final XtextDocument xtextDoc = (XtextDocument) tmp;
+ // here to create and display validation marker just after the opening of the editor
+ // bug 580042
+ xtextDoc.checkAndUpdateAnnotations();
+ }
+ }
}
}
@@ -351,7 +374,10 @@ public class PapyrusXTextEditor extends XtextEditor {
this.sashWindowsContainerListener = new SaveTextOnFocusLostPageLifeCycleEventsListener(this);
this.sashWindowsContainer.addPageChangedListener(this.sashWindowsContainerListener);
} catch (ServiceException e) {
- Activator.log.error(e);
+ // we get an exception when we reopen a Papyrus model with an XtextEditor already open.
+ // This method is called at least 3 times during the loading and at the end we succeed to register the listen
+ // see bug 578648
+ Activator.log.warn(NLS.bind("The service {0} is not yet initialized. We will retry at the next focus change.", ISashWindowsContainer.class)); //$NON-NLS-1$
}
}
}
@@ -367,4 +393,76 @@ public class PapyrusXTextEditor extends XtextEditor {
this.sashWindowsContainerListener = null;
}
+ /**
+ * this method do nothing to avoid to break Undo/Redo Papyrus nested editor (diagram/table/...)
+ * see Bug 579033: [Diagram][KeyBinding] Undo/Redo actions are broken in diagram and it seems comes form the keybinding
+ */
+ @Override
+ protected void createUndoRedoActions() {
+ // 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/plugin.xml b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml
index 87cb9b4cc67..44bf59a3c28 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/plugin.xml
@@ -5,7 +5,7 @@
point="org.eclipse.papyrus.infra.ui.papyrusDiagram">
<actionBarContributor
id="org.eclipse.papyrus.infra.textedit.xtext.PapyrusXTextActionBarContributor"
- implementingClass="org.eclipse.ui.editors.text.TextEditorActionContributor">
+ implementingClass="org.eclipse.papyrus.infra.textedit.xtext.internal.actions.CustomXtextActionBarContributor">
</actionBarContributor>
</extension>
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 1b4c022948d..49e3b773d1b 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.0-SNAPSHOT</version>
+ <version>1.1.0-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/Activator.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.java
index 2a96764f342..de442928fa6 100755
--- a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.java
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/Activator.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 578648
*****************************************************************************/
package org.eclipse.papyrus.infra.textedit.xtext;
@@ -41,12 +41,14 @@ public class Activator extends AbstractUIPlugin {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+ log = new LogHelper(this);
}
@Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
+ log = null;
}
/**
diff --git a/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java
new file mode 100755
index 00000000000..8dd9b80bfe6
--- /dev/null
+++ b/plugins/infra/textedit/org.eclipse.papyrus.infra.textedit.xtext/src/org/eclipse/papyrus/infra/textedit/xtext/internal/actions/CustomXtextActionBarContributor.java
@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * 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.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.actions.ActionFactory;
+
+/**
+ * A custom version of the Text actionbar contributor for org.eclipse.papyrus.infra.textedit.xtext.nested.editor.PapyrusXTextEditor.
+ * This action bar contributor allows to preserve the Undo/Redo actions inside Papyrus
+ */
+public class CustomXtextActionBarContributor extends org.eclipse.ui.editors.text.TextEditorActionContributor {
+
+
+ /**
+ * Constructor.
+ *
+ */
+ public CustomXtextActionBarContributor() {
+ // nothing to do
+ }
+
+
+ /**
+ * @see org.eclipse.ui.editors.text.TextEditorActionContributor#setActiveEditor(org.eclipse.ui.IEditorPart)
+ *
+ * @param part
+ */
+ @Override
+ public void setActiveEditor(IEditorPart part) {
+ final IActionBars actionBars = getActionBars();
+
+ final IAction undo = actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
+ final IAction redo = actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
+
+ super.setActiveEditor(part);// this super seems erase undo/redo actions
+
+ // see bug Bug 579033: [Diagram][KeyBinding] Undo/Redo actions are broken in diagram and it seems comes form the keybinding
+ if (undo != null) {
+ actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
+ }
+ if (redo != null) {
+ actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
+ }
+ }
+}
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/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
index 2d0f4023a5c..a9ccaba3d3b 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.emf;bundle-version="[4.0.0,5.0.0)",
org.eclipse.papyrus.infra.internationalization;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.infra.onefile;bundle-version="[3.0.0,4.0.0)",
+ org.eclipse.papyrus.infra.onefile;bundle-version="[3.1.0,4.0.0)",
org.eclipse.papyrus.infra.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui.ide;bundle-version="[3.17.0,4.0.0)",
org.eclipse.ui.navigator;bundle-version="[3.9.0,4.0.0)",
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.100.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.infra.onefile.internal.ui.Activator
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml
index ef52c3f380d..15abab788e3 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.infra.onefile.ui</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java
index fdddf7197bc..e6fcf4b4857 100644
--- a/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java
+++ b/plugins/infra/ui/org.eclipse.papyrus.infra.onefile.ui/src/org/eclipse/papyrus/infra/onefile/internal/ui/providers/PapyrusModelActionProvider.java
@@ -1,5 +1,5 @@
/*****************************************************************************
- * Copyright (c) 2011 Atos Origin Integration - CEA LIST.
+ * Copyright (c) 2011, 2022 Atos Origin Integration - CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -12,6 +12,7 @@
* Tristan Faure (Atos Origin Integration) tristan.faure@atosorigin.com - Initial API and implementation
* Camille Letavernier (CEA LIST) camille.letavernier@cea.fr
* Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Add copy Action
+ * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Bug 578434
*****************************************************************************/
package org.eclipse.papyrus.infra.onefile.internal.ui.providers;
@@ -157,7 +158,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
if (getIFile() != null) {
try {
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- page.openEditor(new FileEditorInput(getIFile()), "org.eclipse.papyrus.infra.core.papyrusEditor", true, IWorkbenchPage.MATCH_ID | IWorkbenchPage.MATCH_INPUT);
+ page.openEditor(new FileEditorInput(getIFile()), "org.eclipse.papyrus.infra.core.papyrusEditor", true, IWorkbenchPage.MATCH_ID | IWorkbenchPage.MATCH_INPUT); //$NON-NLS-1$
} catch (WorkbenchException e) {
Activator.log.error(e);
}
@@ -183,8 +184,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
@Override
public boolean isEnabled() {
- return getSelectedResources() != null && getSelectedResources().size() > 0 && OneFileUtils.isDi((IResource) getSelectedResources().get(0));
-
+ return getSelectedResources() != null && getSelectedResources().size() > 0 && OneFileUtils.containsDi(getSelectedResources());
}
@Override
@@ -193,7 +193,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
}
@Override
- protected List getSelectedResources() {
+ protected List<IResource> getSelectedResources() {
return helper.getSelectedResources(getContext());
}
};
@@ -206,7 +206,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
}
@Override
- protected List getSelectedResources() {
+ protected List<IResource> getSelectedResources() {
return helper.getSelectedResources(getContext());
}
};
@@ -219,7 +219,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
}
@Override
- protected List getSelectedResources() {
+ protected List<IResource> getSelectedResources() {
return helper.getSelectedResources(getContext());
}
@@ -326,6 +326,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
*
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
*/
+ @Override
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NONE);
composite.setLayout(new GridLayout(2, false));
@@ -342,6 +343,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
fNameField.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
fNameField.addModifyListener(new ModifyListener() {
+ @Override
public void modifyText(ModifyEvent e) {
validatePage();
}
@@ -361,7 +363,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
}
protected final void validatePage() {
- String text = fNameField.getText() + ".di";
+ String text = fNameField.getText() + ".di"; //$NON-NLS-1$
RefactoringStatus status = fRefactoringProcessor.validateNewElementName(text);
setPageComplete(status);
}
@@ -394,7 +396,7 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
}
private void initializeRefactoring() {
- fRefactoringProcessor.setNewResourceName(fNameField.getText() + ".di");
+ fRefactoringProcessor.setNewResourceName(fNameField.getText() + ".di"); //$NON-NLS-1$
}
}
}
@@ -446,12 +448,12 @@ public class PapyrusModelActionProvider extends CommonActionProvider {
return null;
}
- protected List getSelectedResources(ActionContext context) {
+ protected List<IResource> getSelectedResources(ActionContext context) {
ISelection selec = context.getSelection();
- List<IResource> resources = new ArrayList<IResource>();
+ List<IResource> resources = new ArrayList<>();
if (selec instanceof IStructuredSelection) {
IStructuredSelection struc = (IStructuredSelection) selec;
- for (Iterator<Object> i = struc.iterator(); i.hasNext();) {
+ for (Iterator<?> i = struc.iterator(); i.hasNext();) {
Object o = i.next();
if (o instanceof IPapyrusFile) {
IPapyrusFile papy = (IPapyrusFile) o;
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 a28b9597df3..51b1fda3d04 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.1.0.qualifier
+Bundle-Version: 6.2.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties b/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties
index c68b097147c..86d93a098f2 100644
--- a/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties
+++ b/plugins/sdk/org.eclipse.papyrus.sdk/plugin.properties
@@ -1,5 +1,5 @@
-#
-# Copyright (c) 2016 Christian W. Damus and others.
+################################################################################
+# Copyright (c) 2016-2022 Christian W. Damus 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:
# Christian W. Damus - Initial API and implementation
-#
+################################################################################
pluginName=Papyrus UML Modeller
providerName=Eclipse Modeling Project
diff --git a/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml b/plugins/sdk/org.eclipse.papyrus.sdk/pom.xml
index 6861a50f788..48013784f50 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.1.0-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
index b566df1ad9f..c1f7c2bda2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 3.0.0.qualifier
+Bundle-Version: 3.0.100.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.uml.diagram.menu.Activator
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
index f5322b31ed9..e82ea048453 100755
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/plugin.xml
@@ -32,12 +32,16 @@
label="&amp;Diagram"
tooltip="Diagram Menu">
<visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <and>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
+ </and>
</visibleWhen>
</menu>
</menuContribution>
@@ -207,12 +211,14 @@
tooltip="Line Style Action">
<visibleWhen>
<and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -229,11 +235,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -250,11 +258,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -267,11 +277,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -284,11 +296,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -301,11 +315,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -318,11 +334,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -335,11 +353,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -352,11 +372,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -373,10 +395,12 @@
<visibleWhen
checkEnabled="false">
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
</with>
</visibleWhen>
</command>
@@ -387,12 +411,14 @@
tooltip="Auto Size">
<visibleWhen>
<and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -405,11 +431,13 @@
<visibleWhen>
<and>
<with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</command>
@@ -419,22 +447,29 @@
<visibleWhen
checkEnabled="false">
<and>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
</and>
</visibleWhen>
</dynamic>
- <visibleWhen>
- <with
- variable="activeEditorId">
- <equals
- value="org.eclipse.papyrus.infra.core.papyrusEditor">
- </equals>
- </with>
+ <visibleWhen
+ checkEnabled="false">
+ <and>
+ <with
+ variable="selection">
+ <test
+ forcePluginActivation="false"
+ property="org.eclipse.papyrus.infra.gmfdiag.internal.common.expressions.PapyrusGMFDiagramTester.isPapyrusGMFDiagramActive"
+ value="true">
+ </test>
+ </with>
+ </and>
</visibleWhen>
</toolbar>
</menuContribution>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
index d2ca70dad93..287d17915b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.menu/pom.xml
@@ -7,6 +7,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.diagram.menu</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>3.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration
index 1a82cd3ca38..a0c1e6b5ff8 100644
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.clazz.config/configs/class_synchronized_tree.nattableconfiguration
@@ -63,6 +63,7 @@
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_UJa7yDzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_UJa7xjzQEei_1txcmoHe_A"/>
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_UJa7yTzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_UJa7xjzQEei_1txcmoHe_A"/>
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_UJa7yjzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_UJa7xzzQEei_1txcmoHe_A"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_rcyucGneEeqTUc47pzPrfw" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_UJa7xzzQEei_1txcmoHe_A"/>
</columnHeaderAxisConfiguration>
<columnAxisProviders xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_UJa7yzzQEei_1txcmoHe_A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
<axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_UJbi0DzQEei_1txcmoHe_A" manager="_UJa7yDzQEei_1txcmoHe_A">
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration
index f22d9e9c0bd..72914811036 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration
@@ -14,6 +14,7 @@
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_P0EFFDzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_P0EFEjzQEei_1txcmoHe_A"/>
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_P0EFFTzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_P0EFEjzQEei_1txcmoHe_A"/>
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_P0EFFjzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_P0EFEzzQEei_1txcmoHe_A"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_e6RCAGneEeqTUc47pzPrfw" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_P0EFEzzQEei_1txcmoHe_A"/>
</columnHeaderAxisConfiguration>
<columnAxisProviders xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_P0EFFzzQEei_1txcmoHe_A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider"/>
<rowAxisProviders xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_P0EFGDzQEei_1txcmoHe_A" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider"/>
diff --git a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration
index fad615ca8e2..2c09a0f69af 100755
--- a/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration
+++ b/plugins/uml/nattable/org.eclipse.papyrus.uml.nattable/configs/genericTreeTable.nattableconfiguration
@@ -32,6 +32,7 @@
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_Wa4BBDzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.feature.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_Wa4BAjzQEei_1txcmoHe_A"/>
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_Wa4BBTzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.property.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.feature.labelprovider" headerLabelConfiguration="_Wa4BAjzQEei_1txcmoHe_A"/>
<axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_Wa4BBjzQEei_1txcmoHe_A" axisManagerId="org.eclipse.papyrus.uml.nattable.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_Wa4BAzzQEei_1txcmoHe_A"/>
+ <axisManagers xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" xmi:id="_8HDsUGneEeqTUc47pzPrfw" axisManagerId="org.eclipse.papyrus.uml.nattable.stereotype.operation.axis.manager" labelProviderContext="org.eclipse.papyrus.infra.nattable.header.operation.labelprovider" headerLabelConfiguration="_Wa4BAzzQEei_1txcmoHe_A"/>
</columnHeaderAxisConfiguration>
<columnAxisProviders xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_Wa4BBzzQEei_1txcmoHe_A" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
<axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_Wa4BCDzQEei_1txcmoHe_A" manager="_Wa4BBDzQEei_1txcmoHe_A">
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
index 489707c13ba..2d8f0eb7929 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/META-INF/MANIFEST.MF
@@ -2,10 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.papyrus.uml.export;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.1.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: com.google.gson;bundle-version="[2.7.0,2.8.0)",
- org.apache.batik.dom.svg;bundle-version="[1.6.0,1.7.0)",
+ org.apache.batik.dom.svg;bundle-version="[1.14.0,1.15.0)",
+ org.apache.batik.anim;bundle-version="[1.14.0,1.15.0)",
org.eclipse.emf.databinding;bundle-version="[1.5.0,2.0.0)",
org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="[1.9.0,2.0.0)",
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml b/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml
index cd561feaaab..cb7735c2d55 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.uml.export</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java
index 245ce8a0488..0ec8035fca4 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/extension/contribution/CommentAnnotateSVG.java
@@ -13,7 +13,7 @@
*****************************************************************************/
package org.eclipse.papyrus.uml.export.extension.contribution;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.svg.export.GraphicsSVG;
@@ -48,7 +48,7 @@ public class CommentAnnotateSVG implements AnnotateSVG {
EObject eObject = view.getElement();
if (eObject instanceof NamedElement) {
NamedElement namedElement = (NamedElement) eObject;
- EList<Comment> ownedComments = namedElement.getOwnedComments();
+ EList<Comment> ownedComments = namedElement.getOwnedComments();
if (!ownedComments.isEmpty()) {
rectangle.setAttributeNS(null, ATTRIBUTE_TITLE, ownedComments.get(0).getBody());
Element title = svgG.getDocument().createElementNS(SVGDOMImplementation.SVG_NAMESPACE_URI, ATTRIBUTE_TITLE);
diff --git a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java
index 3459e842a85..8c34357f9e6 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.export/src/org/eclipse/papyrus/uml/export/svgextension/PapyrusDiagramSVGGenerator.java
@@ -28,7 +28,7 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.anim.dom.SVGDOMImplementation;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -59,15 +59,17 @@ import org.w3c.dom.Element;
public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
/** The annotations. */
- private List<AnnotateSVG> annotations = new ArrayList<>();
-
+ private List<AnnotateSVG> annotations = new ArrayList<>();
+
/**
* Instantiates a new papyrus diagram SVG generator.
*
- * @param diagramEditPart the diagram edit part
- * @param annotations the annotations
+ * @param diagramEditPart
+ * the diagram edit part
+ * @param annotations
+ * the annotations
*/
- public PapyrusDiagramSVGGenerator(DiagramEditPart diagramEditPart, List<AnnotateSVG> annotations ) {
+ public PapyrusDiagramSVGGenerator(DiagramEditPart diagramEditPart, List<AnnotateSVG> annotations) {
super(diagramEditPart);
this.annotations = annotations;
}
@@ -90,7 +92,7 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
*/
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator#
* setUpGraphics(int, int)
*/
@@ -108,7 +110,7 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
*/
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator#
* getImageDescriptor(org.eclipse.draw2d.Graphics)
*/
@@ -118,11 +120,11 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
Activator.log(IStatus.INFO, "Start transformation from Graphics to image descriptor");
GraphicsSVG svgG = (GraphicsSVG) g;
- svgRoot = svgG.getRoot();
-
+ svgRoot = svgG.getRoot();
+
//////// Papyrus Specific code //////////
List<PartPositionInfo> allPartPositionInfo = this.getDiagramPartInfo();
-
+
Collections.reverse(allPartPositionInfo);// Required to have property after class
for (PartPositionInfo partPositionInfo : allPartPositionInfo) {
Element rectangle = svgG.getDocument().createElementNS(SVGDOMImplementation.SVG_NAMESPACE_URI, "rect");
@@ -130,27 +132,27 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
NamedElement nameElement = (NamedElement) partPositionInfo.getSemanticElement();
rectangle.setAttributeNS(null, "id", nameElement.getName());// useful for svg debug
}
-
+
rectangle.setAttributeNS(null, "x", String.valueOf(partPositionInfo.getPartX()));
rectangle.setAttributeNS(null, "y", String.valueOf(partPositionInfo.getPartY()));
rectangle.setAttributeNS(null, "width", String.valueOf(partPositionInfo.getPartWidth()));
rectangle.setAttributeNS(null, "height", String.valueOf(partPositionInfo.getPartHeight()));
- rectangle.setAttributeNS(null, "fill-opacity", "0"); //transparent
+ rectangle.setAttributeNS(null, "fill-opacity", "0"); // transparent
rectangle.setAttributeNS(null, "stroke-opacity", "0"); // no border
- View view = partPositionInfo.getView();
+ View view = partPositionInfo.getView();
if (view instanceof Shape) { // filter on shape only to avoid duplication
boolean hasAnnotation = applyAll(view, svgG, rectangle);
if (hasAnnotation) {
- svgRoot.appendChild(rectangle);
- }
+ svgRoot.appendChild(rectangle);
+ }
}
}
-
+
/////////////////////////
-
-
+
+
ByteArrayOutputStream os = new ByteArrayOutputStream(5000); // 5K
// buffer
stream(os);
@@ -159,22 +161,25 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
setRenderedImage(RenderedImageFactory.getInstance(os.toByteArray()));
return RenderedImageDescriptor
- .createFromRenderedImage(getRenderedImage());
+ .createFromRenderedImage(getRenderedImage());
} catch (IOException ex) {
Log.error(DiagramUIRenderPlugin.getInstance(), IStatus.ERROR, ex
- .getMessage(), ex);
+ .getMessage(), ex);
}
return null;
}
-
+
/**
* Apply all.
*
- * @param view the view
- * @param svgG the svg G
- * @param rectangle the rectangle
+ * @param view
+ * the view
+ * @param svgG
+ * the svg G
+ * @param rectangle
+ * the rectangle
* @return true, if successful
*/
public boolean applyAll(View view, GraphicsSVG svgG, Element rectangle) {
@@ -183,14 +188,15 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
res = res || annotateSVG.addAnnotation(view, svgG, rectangle);
}
return true;
- }
-
+ }
+
/**
* Writes the SVG Model out to a file.
- *
+ *
* @param outputStream
* output stream to store the SVG Model
*/
+ @Override
public void stream(OutputStream outputStream) {
try {
// Define the view box
@@ -222,17 +228,19 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
*/
/*
* (non-Javadoc)
- *
+ *
* @see org.eclipse.gmf.runtime.diagram.ui.internal.clipboard.DiagramGenerator#
* createAWTImageForParts(java.util.List)
*/
+ @Override
public Image createAWTImageForParts(List editparts, org.eclipse.swt.graphics.Rectangle sourceRect) {
createSWTImageDescriptorForParts(editparts, sourceRect);
if (getRenderedImage() != null) {
try {
- BufferedImage bufImg = (BufferedImage) getRenderedImage().getAdapter(BufferedImage.class);
- if (bufImg == null)
+ BufferedImage bufImg = getRenderedImage().getAdapter(BufferedImage.class);
+ if (bufImg == null) {
bufImg = ImageConverter.convert(getRenderedImage().getSWTImage());
+ }
return bufImg;
} catch (Error e) {
// log the Error but allow execution to continue
@@ -259,6 +267,7 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
* @return Returns the rendered image created by previous call to
* createSWTImageDescriptorForParts
*/
+ @Override
public RenderedImage getRenderedImage() {
return renderedImage;
}
@@ -266,7 +275,8 @@ public class PapyrusDiagramSVGGenerator extends OpenAPIDiagramSVGGenerator {
/**
* Sets the rendered image.
*
- * @param renderedImage the new rendered image
+ * @param renderedImage
+ * the new rendered image
*/
private void setRenderedImage(RenderedImage renderedImage) {
this.renderedImage = renderedImage;
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/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index 0e3ed866073..cdd44d71c20 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -51,7 +51,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)",
org.eclipse.uml2.types;bundle-version="[2.5.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
-Bundle-Version: 5.0.0.qualifier
+Bundle-Version: 5.0.100.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
index b425b5a7ca5..a1d940c69a9 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/pom.xml
@@ -9,6 +9,6 @@
<version>0.0.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.views.modelexplorer</artifactId>
- <version>5.0.0-SNAPSHOT</version>
+ <version>5.0.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project> \ No newline at end of file
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java
index e5fc47b4246..7b2c4932b11 100755
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/provider/IsIOpenablePropertyTester.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 578357
*****************************************************************************/
package org.eclipse.papyrus.views.modelexplorer.provider;
@@ -56,11 +56,13 @@ public class IsIOpenablePropertyTester extends org.eclipse.core.expressions.Prop
// /!\ Here we don't use the "selection" variable because it is updated too late to be used by enablement of org.eclipse.ui.navigator.navigatorContent#actionProvider
final ISelectionProvider selectionProvider = wp.getSite().getSelectionProvider();
final ISelection selection = selectionProvider.getSelection();
- if (selection instanceof IStructuredSelection) {
+ if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
final EObject current = EMFHelper.getEObject(((IStructuredSelection) selection).getFirstElement());
- IAdapterManager adapterManager = Platform.getAdapterManager();
- IOpenable adapter = adapterManager.getAdapter(current, IOpenable.class);
- return Boolean.valueOf(adapter != null).equals(expectedValue);
+ if (current != null) {
+ IAdapterManager adapterManager = Platform.getAdapterManager();
+ IOpenable adapter = adapterManager.getAdapter(current, IOpenable.class);
+ return Boolean.valueOf(adapter != null).equals(expectedValue);
+ }
}
}
}
diff --git a/releng/main/pom.xml b/releng/main/pom.xml
index 1a7d9c51be4..ae223c897f2 100755
--- a/releng/main/pom.xml
+++ b/releng/main/pom.xml
@@ -16,7 +16,7 @@
<!-- https://repo.maven.apache.org/maven2/ -->
<mojo.buildhelper.version>3.2.0</mojo.buildhelper.version>
<mylyn.wikitext.version>3.0.38</mylyn.wikitext.version>
-
+
<target.platform>org.eclipse.papyrus.main.targetplatform</target.platform>
</properties>
@@ -49,7 +49,7 @@
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -97,25 +97,11 @@
</pluginManagement>
<plugins>
- <!-- Test local parameters
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>3.0.0</version>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <echoproperties />
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin-->
+ <!-- Test local parameters <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId> <version>3.0.0</version> <executions>
+ <execution> <phase>validate</phase> <goals> <goal>run</goal> </goals> <configuration>
+ <target> <echoproperties /> </target> </configuration> </execution> </executions>
+ </plugin -->
<!-- local plugins -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -180,7 +166,7 @@
only. Activation: SIGN=true pack: produce a simple update site (Packed).
Used for nightly or feature branch builds. Activation: SIGN=false -->
<profiles>
-
+
<!-- The update site is not needed during gerrit jobs -->
<profile>
<id>buildP2</id>
@@ -222,7 +208,8 @@
</build>
</profile>
- <!-- nightly profile is useful for developers that want to link to nightly build -->
+ <!-- nightly profile is useful for developers that want to link to nightly
+ build -->
<profile>
<id>nightly</id>
<activation>
@@ -262,13 +249,11 @@
<value>true</value>
</property>
</activation>
- <!-- Pack200 -->
<build>
<plugins>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>${jarSignerVersion}</version>
<executions>
<execution>
<id>sign</id>
diff --git a/releng/main/site/category.xml b/releng/main/site/category.xml
index 9071b6785ad..0fef2bc4cc0 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.1.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="6.1.0.qualifier">
+ <feature url="features/org.eclipse.papyrus.sdk.feature_6.2.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature" version="6.2.0.qualifier">
<category name="org.eclipse.papyrus.category"/>
</feature>
- <feature url="features/org.eclipse.papyrus.sdk.feature.source_6.1.0.qualifier.jar" id="org.eclipse.papyrus.sdk.feature.source" version="6.1.0.qualifier">
+ <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">
<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">
@@ -22,6 +22,6 @@
Papyrus User Examples offers a set of plugins dedicated to gather examples of Papyrus usage.
</description>
</category-def>
- <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/" enabled="true" />
+ <repository-reference location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" enabled="true" />
<repository-reference location="https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" enabled="true" />
</site>
diff --git a/releng/main/site/pom.xml b/releng/main/site/pom.xml
index 73d27037438..d9fe1bae7ea 100644
--- a/releng/main/site/pom.xml
+++ b/releng/main/site/pom.xml
@@ -11,19 +11,9 @@
</parent>
<artifactId>org.eclipse.papyrus.p2</artifactId>
- <version>6.1.0-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
- <properties>
- <jboss.utils.version>1.7.0</jboss.utils.version>
- </properties>
-
- <pluginRepositories>
- <pluginRepository>
- <id>org.jboss.tools.tycho-plugins</id>
- <url>https://repository.jboss.org/</url>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
@@ -35,32 +25,6 @@
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
-
- <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
- <plugin>
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>${jboss.utils.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>generate-repository-facade</goal>
- </goals>
- <configuration>
- <!-- do not generate the pesky web folder and index.html -->
- <skipWebContentGeneration>true</skipWebContentGeneration>
- <!-- p2 update site transitive dependencies repositories -->
- <associateSites>
- <!-- Oxygen orbit bundles for batik 1.6.0 -->
- <site>https://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository/</site>
- <!-- XWT 1.7.0-S updatesite, remove when train has been rewired -->
- <site>https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/</site>
- </associateSites>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.target
index 40da887c1fc..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="1641977667">
+<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"/>
@@ -27,15 +27,19 @@
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
<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.v20220110-1723"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723"/>
+ <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"/>
@@ -47,41 +51,42 @@
<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.23.0.v20220105-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-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.18.0.v20220110-1232"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.18.0.v20220110-1232"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/>
+ <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.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/>
+ <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.12.1.v20210218-2134"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+ <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.25.0/S-3.25.0.M1-20220106092734/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.13.1.202106221344"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+ <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.29.0.v20211216-0741"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439"/>
+ <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"/>
@@ -96,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 c4c7851f0bd..f388ebebba2 100755
--- a/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
+++ b/releng/main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd
@@ -1,17 +1,14 @@
target "Papyrus Main" with requirements source
-// I-build should be referenced lazily due to their volatility, unless a specific version is needed
+// I-build should be referenced lazily due to their volatility, unless a specific version is needed
/*** Manual referencing ***/
-
-//manualUpdate
-
+// manualUpdate
location nebula "http://download.eclipse.org/nebula/releases/1.2.0/" {
org.eclipse.nebula.widgets.richtext.feature.feature.group
org.eclipse.nebula.cwt.feature.feature.group
}
-//manualUpdate
-
+// manualUpdate
location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repository" {
org.eclipse.nebula.widgets.nattable.core.feature.feature.group
org.eclipse.nebula.widgets.nattable.core.source.feature.feature.group
@@ -21,123 +18,109 @@ location nattable "http://download.eclipse.org/nattable/releases/1.5.0/repositor
org.eclipse.nebula.widgets.nattable.extension.nebula.source.feature.feature.group
}
-//manualUpdate
-
-location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/" {
+// manualUpdate
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/" {
com.google.guava [21.0.0,31.0.0) // emf.compare still needs guava 21.0.0
com.google.guava.source [21.0.0,31.0.0)
- com.google.gson [2.7.0,2.8.0)
+ com.google.gson [2.7.0,2.8.0)
com.google.gson.source [2.7.0,2.8.0)
- org.apache.commons.lang3 3.1.0
+ org.apache.commons.lang3 3.1.0
org.apache.commons.lang3.source 3.1.0
- org.objectweb.asm [5.0.1, 6.0.0)
+ org.objectweb.asm [5.0.1, 6.0.0)
org.objectweb.asm.source [5.0.1, 6.0.0)
com.google.inject [3.0.0, 4.0.0)
- // The batik plugins are transitively fetched through GMF_Runtime sdk's org.eclipse.gmf.runtime.thirdparty
- // see the pom.xml under main/site
+ // update batik to be in adequation with latest gmf runtime https://www.eclipse.org/lists/mdt-papyrus.dev/msg04486.html
+ org.apache.batik.anim [1.14.0,1.15.0)
+ org.apache.batik.dom [1.14.0,1.15.0)
+ org.apache.batik.dom.svg [1.14.0,1.15.0)
+ org.apache.batik.xml [1.14.0,1.15.0)
}
-
/*** Updates from the Simrel repository ***/
-
-//updateFrom("XWT",0)
-
+// updateFrom("XWT",0)
location xwt "https://download.eclipse.org/xwt/milestones-1.7.0/1.7.0-S/" {
- org.eclipse.xwt.feature.feature.group lazy
+ org.eclipse.xwt.feature.feature.group lazy
}
-//updateFrom("QVT Operational for 2022-03",0)
-
-location qvto "https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723" {
+// updateFrom("QVT Operational for 2022-06",0)
+location qvto "https://download.eclipse.org/mmt/qvto/updates/releases/3.10.7" {
org.eclipse.m2m.qvt.oml.sdk.feature.group
}
-//updateFrom("M2T Xpand for 2021-03",0)
-
+// updateFrom("M2T Xpand for 2021-03",0)
location xpand "https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/" {
org.eclipse.xpand.sdk.feature.group
org.eclipse.xtend.feature.group
}
-//updateFrom("MDT UML2",0)
-
+// updateFrom("MDT UML2",0)
location uml "https://download.eclipse.org/modeling/mdt/uml2/updates/5.5" {
org.eclipse.uml2.sdk.feature.group
}
-//updateFrom("Eclipse",0)
-
-location platform "https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-1800/" {
+// updateFrom("Eclipse",0)
+location platform "https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/" {
org.eclipse.sdk.feature.group
}
-//updateFrom("OCL for 2022-03",0)
-
-location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232" {
+// updateFrom("OCL for 2022-06",0)
+location ocl "https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1" {
org.eclipse.ocl.examples.classic.feature.group
org.eclipse.ocl.examples.feature.group
}
-//updateFrom("Xtext, Xtend",0)
-
-location xtext "https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0" {
+// updateFrom("Xtext, Xtend",0)
+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
org.eclipse.xtext.runtime.feature.group
- org.eclipse.xtext.ui.feature.group
+ org.eclipse.xtext.ui.feature.group
+ org.eclipse.xtext.generator.feature.group
}
-//updateFrom("EMFT MWE for 2021-03",0)
-
-location mwe "https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/" {
+// updateFrom("EMFT MWE for 2022-06",0)
+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.25 for SimRel 2022-03",0)
-
-location webtools "https://download.eclipse.org/webtools/downloads/drops/R3.25.0/S-3.25.0.M1-20220106092734/repository/" {
- org.eclipse.wst.xml_ui.feature.feature.group lazy
+// 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.26RC1-20220526191850/repository/" {
+ org.eclipse.wst.xml_ui.feature.feature.group lazy
}
-//updateFrom("GMF Runtime 1.13.1 for SimRel 2021-09",0)
-
-location gmfRuntime "https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/" {
+// 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.13.1 for SimRel 2021-09",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/S202201030439" {
+// updateFrom("EMF (Core)",0)
+location emf "https://download.eclipse.org/modeling/emf/emf/builds/release/2.30" {
org.eclipse.emf.sdk.feature.group
}
-//updateFrom("EMF Services for SimRel 2021-09",0)
-
+// updateFrom("EMF Services for SimRel 2021-09",0)
location emfQuery "https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653" {
org.eclipse.emf.query.sdk.feature.group
}
-//updateFrom("EMF Services for SimRel 2021-09",1)
-
+// updateFrom("EMF Services for SimRel 2021-09",1)
location emfValidation "https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805" {
org.eclipse.emf.validation.sdk.feature.group
}
-//updateFrom("EMF Services for SimRel 2021-09",2)
-
+// updateFrom("EMF Services for SimRel 2021-09",2)
location emfTransaction "https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/" {
org.eclipse.emf.transaction.sdk.feature.group
}
-//updateFrom("GEF",0)
-
-location gef "https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952" {
+// updateFrom("GEF",0)
+location gef "https://download.eclipse.org/tools/gef/classic/releases/3.14.0" {
org.eclipse.gef.feature.group
}
+
diff --git a/releng/pom.xml b/releng/pom.xml
index 62da6e78571..15d37989fa1 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -10,8 +10,8 @@
<properties>
<!-- https://repo.maven.apache.org/maven2/ -->
- <tycho-version>2.2.0</tycho-version>
- <tychoExtrasVersion>2.2.0</tychoExtrasVersion>
+ <tycho-version>2.4.0</tycho-version>
+ <tychoExtrasVersion>2.4.0</tychoExtrasVersion>
<xtend-version>2.25.0.M1</xtend-version>
<xtext.version>2.25.0.M1</xtext.version>
<maven.resources.version>3.2.0</maven.resources.version>
@@ -21,7 +21,7 @@
<maven.compiler.version>3.8.1</maven.compiler.version>
<!-- https://repo.eclipse.org/content/repositories/cbi-releases/ -->
- <jarSignerVersion>1.3.1</jarSignerVersion>
+ <eclipse-cbi.version>1.3.2</eclipse-cbi.version>
<java.source.version>11</java.source.version>
<java.target.version>11</java.target.version>
@@ -130,6 +130,21 @@
<extensions>true</extensions>
</plugin>
<plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-jarsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <version>${eclipse-cbi.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-repository-plugin</artifactId>
<version>${tycho-version}</version>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml
index a9cd06686ee..670383e2772 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.1.0.qualifier"
+ version="6.2.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2">
@@ -20,9 +20,8 @@
</license>
<url>
- <discovery label="Eclipse latest" url="http://download.eclipse.org/releases/latest/"/>
- <discovery label="2021-12" url="http://download.eclipse.org/releases/2021-12/"/>
- <discovery label="Eclipse Platform 4.22" url="http://download.eclipse.org/eclipse/updates/4.22"/>
+ <discovery label="2022-06" url="http://download.eclipse.org/releases/2022-06/"/>
+ <discovery label="Eclipse Platform 4.24" url="http://download.eclipse.org/eclipse/updates/4.24"/>
</url>
<requires>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
index 0226f8c5c50..2b9ec2aa9ec 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml
@@ -7,8 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>6.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>6.2.0-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.papyrus.rcp.feature</artifactId>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement b/releng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement
new file mode 100755
index 00000000000..6fdb9d33d10
--- /dev/null
+++ b/releng/rcp/org.eclipse.papyrus.rcp.product/application.entitlement
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>com.apple.security.cs.allow-jit</key>
+ <true/>
+ <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+ <true/>
+ <key>com.apple.security.cs.disable-executable-page-protection</key>
+ <true/>
+ <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+ <true/>
+ <key>com.apple.security.cs.disable-library-validation</key>
+ <true/>
+ <key>com.apple.security.cs.debugger</key>
+ <true/>
+</dict>
+</plist> \ No newline at end of file
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product b/releng/rcp/org.eclipse.papyrus.rcp.product/papyrus.product
index e9ca32b2e81..d110ba26608 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.1.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.2.0.qualifier" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/org.eclipse.papyrus.rcp/icons/papyrus_lg.png"/>
@@ -209,8 +209,7 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<repositories>
<repository location="https://download.eclipse.org/modeling/mdt/papyrus/updates/nightly/master/" enabled="true" />
<repository location="https://download.eclipse.org/releases/latest/" enabled="true" />
- <repository location="https://download.eclipse.org/releases/2021-12/" enabled="true" />
- <repository location="https://download.eclipse.org/eclipse/updates/4.22/" enabled="true" />
+ <repository location="https://download.eclipse.org/eclipse/updates/4.24/" 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 8654a0d857a..906b064dccd 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.1.0-SNAPSHOT</version>
+ <version>6.2.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -29,30 +29,30 @@
</configuration>
</plugin>
<!-- The 32 bit launchers are not supported by the new 4.10 platform framework -->
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
@@ -88,9 +88,57 @@
<goals>
<goal>archive-products</goal>
</goals>
+ <phase>pre-integration-test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>
+
+ <profiles>
+ <profile>
+ <id>sign</id>
+ <activation>
+ <property>
+ <name>SIGN</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <configuration>
+ <fileNames>Papyrus.app</fileNames>
+ <entitlements>${project.basedir}/application.entitlement</entitlements>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <configuration>
+ <fileNames>Papyrus.exe,eclipsec.exe</fileNames>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
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 410b6ca9557..fd43456c679 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.1.0.qualifier
+Bundle-Version: 6.2.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 1a6b82301d3..6a644d3acd9 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
+++ b/releng/rcp/org.eclipse.papyrus.rcp/icons/splash.svg
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg2"
height="350"
width="460"
version="1.2"
sodipodi:docname="splash.svg"
- inkscape:version="1.1 (c68e22c387, 2021-05-23)"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
inkscape:export-filename="C:\cygwin64\home\Papyrus\Papyrus-Master\releng\rcp\org.eclipse.papyrus.rcp\icons\splash.png"
inkscape:export-xdpi="96"
- inkscape:export-ydpi="96"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
+ inkscape:export-ydpi="96">
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
@@ -26,14 +26,14 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1017"
+ inkscape:window-width="2560"
+ inkscape:window-height="1377"
id="namedview334"
showgrid="false"
inkscape:zoom="1.3485714"
- inkscape:cx="39.671611"
+ inkscape:cx="-230.98517"
inkscape:cy="102.70127"
- inkscape:window-x="-8"
+ inkscape:window-x="4472"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="svg2"
@@ -1776,7 +1776,7 @@
style="fill:#ffffff;fill-opacity:1;stroke:none" />
<text
xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.6667px;line-height:0%;font-family:'Indie Flower';-inkscape-font-specification:'Indie Flower';letter-spacing:0px;word-spacing:0px;fill:#0099ba;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.66670036px;line-height:0%;font-family:'Indie Flower';-inkscape-font-specification:'Indie Flower';letter-spacing:0px;word-spacing:0px;fill:#0099ba;fill-opacity:1;stroke:none;stroke-width:1;stroke-opacity:1"
x="197.48167"
y="240.93285"
id="text4834"
@@ -1785,6 +1785,6 @@
id="tspan4832"
x="197.48167"
y="240.93285"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14.6667px;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-03N</tspan></text>
+ 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>
</svg>
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
index ec0b9f75dee..122651986ca 100644
--- a/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
+++ b/releng/rcp/org.eclipse.papyrus.rcp/plugin.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2008-2021 CEA LIST.
+# Copyright (c) 2008-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
# which accompanies this distribution, and is available at
diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
index 511836b72c6..6ad3ef30589 100755
--- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
+++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml
@@ -7,8 +7,7 @@
<parent>
<artifactId>org.eclipse.papyrus.rcp.releng</artifactId>
<groupId>org.eclipse.papyrus</groupId>
- <version>6.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <version>6.2.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 2a47de3bd84..593eab993f4 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 cdc3585a0e9..8b69bac19e6 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.1.0-SNAPSHOT</version>
+ <version>6.2.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>2021-12 (4.22)</eclipse.simultaneous.release.name>
+ <eclipse.simultaneous.release.name>2022-06 (4.24)</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 1de2673c3a0..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="1641977667">
+<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"/>
@@ -27,15 +27,19 @@
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
<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.v20220110-1723"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723"/>
+ <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"/>
@@ -47,29 +51,30 @@
<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.ocl.examples.classic.feature.group" version="5.18.0.v20220110-1232"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.18.0.v20220110-1232"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/>
+ <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.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/>
+ <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.12.1.v20210218-2134"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+ <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.25.0/S-3.25.0.M1-20220106092734/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.13.1.202106221344"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+ <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"/>
@@ -88,25 +93,14 @@
<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"/>
<repository id="justj" location="https://download.eclipse.org/justj/jres/11/updates/release"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.egit.feature.group" version="6.0.0.202111291000-r"/>
- <repository id="egit" location="https://download.eclipse.org/egit/updates-6.0"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="4.23.0.v20211126-0725"/>
- <unit id="org.eclipse.rcp.configuration.feature.group" version="1.1.1600.v20220105-1800"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.1500.v20211126-1225"/>
- <unit id="org.eclipse.sdk.feature.group" version="4.23.0.v20220105-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-1800/"/>
- </location>
- <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.mylyn.ide_feature.feature.group" version="3.25.2.v20200828-1617"/>
<unit id="org.eclipse.mylyn.java_feature.feature.group" version="3.25.2.v20200828-1617"/>
<unit id="org.eclipse.mylyn.pde_feature.feature.group" version="3.25.2.v20200828-1617"/>
@@ -116,22 +110,33 @@
<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.emf.compare.source.feature.group" version="3.3.17.202111290942"/>
- <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.17.202111290942"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942"/>
+ <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.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"/>
+ <unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="3.3.18.202202240907"/>
+ <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
- <unit id="org.eclipse.xsd.sdk.feature.group" version="2.29.0.v20211216-0600"/>
- <unit id="org.eclipse.emf.sdk.feature.group" version="2.29.0.v20211216-0741"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439"/>
+ <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.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.16.0.v20211202-1357"/>
- <repository id="cdo" location="https://download.eclipse.org/modeling/emf/cdo/drops/R20211202-0900"/>
+ <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.9.2.v20210826-0851"/>
- <repository id="marketPlace" location="https://download.eclipse.org/mpc/drops/1.9.2/v20210826-0851/"/>
+ <unit id="org.eclipse.epp.mpc.feature.group" version="1.10.0.v20220502-0731"/>
+ <repository id="marketPlace" location="https://download.eclipse.org/mpc/drops/1.10.0/v20220502-0731/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.userstorage.feature.group" version="1.2.0.v20210517-0327"/>
diff --git a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
index 7aa42d0846a..8fb77341f4b 100644
--- a/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
+++ b/releng/rcp/targetPlatform/org.eclipse.papyrus.rcp.targetplatform.tpd
@@ -2,30 +2,11 @@ target "Papyrus RCP" with requirements source
include "../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd"
-//manualUpdate
-
+// manualUpdate
location "https://download.eclipse.org/justj/jres/11/updates/release" justj {
org.eclipse.justj.openjdk.hotspot.jre.full.feature.group lazy
}
-/*** Updates from the Simrel repository ***/
-
-//updateFrom("EGit",0)
-
-location egit "https://download.eclipse.org/egit/updates-6.0" {
- org.eclipse.egit.feature.group
-}
-
-//updateFrom("Eclipse",0)
-
-location platform "https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-1800/" {
- org.eclipse.e4.core.tools.feature.feature.group
- org.eclipse.rcp.configuration.feature.group
- org.eclipse.equinox.executable.feature.group
-}
-
-//updateFrom("Mylyn",0)
-
location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" {
org.eclipse.mylyn.ide_feature.feature.group
org.eclipse.mylyn.java_feature.feature.group
@@ -35,33 +16,41 @@ location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956"
org.eclipse.mylyn_feature.feature.group
}
-//updateFrom("EMF Compare",0)
+/*** Updates from the Simrel repository ***/
+// updateFrom("EGit",0)
+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/R-4.24-202206070700/" {
+ org.eclipse.e4.core.tools.feature.feature.group
+ org.eclipse.rcp.configuration.feature.group
+ org.eclipse.equinox.executable.feature.group
+}
-location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942" {
+// updateFrom("EMF Compare",0)
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907" {
org.eclipse.emf.compare.source.feature.group
org.eclipse.emf.compare.ide.ui.source.feature.group
}
-//updateFrom("EMF (Core)",0)
-
-location emf "https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439" {
+// updateFrom("EMF (Core)",0)
+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/R20211202-0900" {
+// updateFrom("EMF CDO",0)
+location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20220608-1105" {
org.eclipse.emf.cdo.epp.feature.group
}
-//updateFrom("EPP Marketplace Client",0)
-
-location marketPlace "https://download.eclipse.org/mpc/drops/1.9.2/v20210826-0851/" {
+// updateFrom("EPP Marketplace Client",0)
+location marketPlace "https://download.eclipse.org/mpc/drops/1.10.0/v20220502-0731/" {
org.eclipse.epp.mpc.feature.group
}
-//updateFrom("User Storage SDK",0)
-
+// updateFrom("User Storage SDK",0)
location userstorage "https://download.eclipse.org/usssdk/drops/release/1.2.2/" {
org.eclipse.userstorage.feature.group
}
diff --git a/releng/rcp/targetPlatform/pom.xml b/releng/rcp/targetPlatform/pom.xml
index e925acc88b9..ec9377c2c60 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.1.0-SNAPSHOT</version>
+ <version>6.2.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 495337cff54..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="1641977667">
+<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"/>
@@ -27,15 +27,19 @@
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
<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.v20220110-1723"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723"/>
+ <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"/>
@@ -47,41 +51,42 @@
<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.23.0.v20220105-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-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.18.0.v20220110-1232"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.18.0.v20220110-1232"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/>
+ <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.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/>
+ <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.12.1.v20210218-2134"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+ <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.25.0/S-3.25.0.M1-20220106092734/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.13.1.202106221344"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+ <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.29.0.v20211216-0741"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439"/>
+ <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"/>
@@ -96,12 +101,12 @@
<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.17.202111290942"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
+ <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.emf.cdo.admin" version="0.0.0"/>
@@ -113,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/R20211202-0900"/>
+ <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 7747ad6c9e3..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
@@ -2,19 +2,16 @@ target "Papyrus CDO Tests" with source requirements
include "../../main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd"
-
/*** Updates from the Simrel repository ***/
-
-//updateFrom("EMF CDO",0)
-
-location cdo "https://download.eclipse.org/modeling/emf/cdo/drops/R20211202-0900" {
- org.eclipse.emf.cdo.admin lazy
- org.eclipse.emf.cdo.dawn lazy
- org.eclipse.emf.cdo.dawn.gmf lazy
- org.eclipse.emf.cdo.ecore lazy
- org.eclipse.emf.cdo.explorer lazy
- org.eclipse.emf.cdo.explorer.ui lazy
- org.eclipse.emf.cdo.gmf.notation lazy
- org.eclipse.emf.cdo.server.ocl lazy
- org.eclipse.emf.cdo.ui.admin lazy
+// updateFrom("EMF CDO",0)
+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
+ org.eclipse.emf.cdo.ecore lazy
+ org.eclipse.emf.cdo.explorer lazy
+ org.eclipse.emf.cdo.explorer.ui lazy
+ org.eclipse.emf.cdo.gmf.notation lazy
+ org.eclipse.emf.cdo.server.ocl lazy
+ org.eclipse.emf.cdo.ui.admin lazy
} \ No newline at end of file
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 6b966f40fdf..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="1641977667">
+<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"/>
@@ -27,15 +27,19 @@
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
<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.v20220110-1723"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723"/>
+ <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"/>
@@ -47,41 +51,42 @@
<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.23.0.v20220105-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-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.18.0.v20220110-1232"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.18.0.v20220110-1232"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/>
+ <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.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/>
+ <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.12.1.v20210218-2134"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+ <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.25.0/S-3.25.0.M1-20220106092734/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.13.1.202106221344"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+ <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.29.0.v20211216-0741"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439"/>
+ <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"/>
@@ -96,12 +101,12 @@
<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.17.202111290942"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
+ <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/>
</location>
</locations>
</target>
diff --git a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd
index 53866dc707e..f005ea7fa75 100644
--- a/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd
+++ b/releng/tests/main-tests/targetPlatform/org.eclipse.papyrus.main.tests.targetplatform.tpd
@@ -2,8 +2,7 @@ target "Papyrus Tests" with source requirements
include "../../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd"
-//updateFrom("EMF Compare",0)
-
-location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942" {
+// updateFrom("EMF Compare",0)
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907" {
org.eclipse.emf.compare.source.feature.group
} \ No newline at end of file
diff --git a/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target b/releng/toolkit/relengplatform/org.eclipse.papyrus.releng.platform.target
index aacf1b468d4..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="1641977667">
+<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"/>
@@ -27,15 +27,19 @@
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
<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.v20220110-1723"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723"/>
+ <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"/>
@@ -47,41 +51,42 @@
<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.23.0.v20220105-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-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.18.0.v20220110-1232"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.18.0.v20220110-1232"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/>
+ <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.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/>
+ <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.12.1.v20210218-2134"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+ <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.25.0/S-3.25.0.M1-20220106092734/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.13.1.202106221344"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+ <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.29.0.v20211216-0741"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439"/>
+ <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"/>
@@ -96,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"/>
@@ -110,37 +115,37 @@
<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.15.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.15.0.v20211015-0620"/>
- <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.14.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.15.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.16.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.14.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.14.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.14.0.v20211107-0906"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.19.0.v20211015-0620"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.18.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.15.0.v20211031-1011"/>
- <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.20.0.v20211007-0506"/>
- <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.15.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.21.0.v20211116-0849"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.23.0.v20211116-0849"/>
- <unit id="org.eclipse.oomph.preferences.feature.group" version="1.14.0.v20210924-1427"/>
- <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.23.0"/>
+ <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.0"/>
+ <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.19.0/"/>
+ <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<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.emf.compare.source.feature.group" version="3.3.17.202111290942"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942"/>
+ <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/>
</location>
</locations>
</target>
diff --git a/releng/toolsmiths/pom.xml b/releng/toolsmiths/pom.xml
index f26690c8972..0fbf736175d 100755
--- a/releng/toolsmiths/pom.xml
+++ b/releng/toolsmiths/pom.xml
@@ -154,7 +154,6 @@
<!-- Stable release profile. Takes +30min. Eclipse servers only -->
<profile>
<id>sign</id>
- <!-- Pack200 -->
<activation>
<property>
<name>SIGN</name>
@@ -166,7 +165,7 @@
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
- <version>${jarSignerVersion}</version>
+ <version>${eclipse-cbi.version}</version>
<executions>
<execution>
<id>sign</id>
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/site/pom.xml b/releng/toolsmiths/site/pom.xml
index 847078c6504..d347f56b3dd 100644
--- a/releng/toolsmiths/site/pom.xml
+++ b/releng/toolsmiths/site/pom.xml
@@ -15,18 +15,6 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
- <properties>
- <!-- https://repository.jboss.org/ -->
- <jboss.utils.version>1.7.0</jboss.utils.version>
- </properties>
-
- <pluginRepositories>
- <pluginRepository>
- <id>org.jboss.tools.tycho-plugins</id>
- <url>https://repository.jboss.org/</url>
- </pluginRepository>
- </pluginRepositories>
-
<build>
<plugins>
<plugin>
@@ -37,29 +25,6 @@
<includePackedArtifacts>true</includePackedArtifacts>
</configuration>
</plugin>
-
- <!-- workaround https://bugs.eclipse.org/bugs/show_bug.cgi?id=453708 -->
- <plugin>
- <groupId>org.jboss.tools.tycho-plugins</groupId>
- <artifactId>repository-utils</artifactId>
- <version>${jboss.utils.version}</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>generate-repository-facade</goal>
- </goals>
- <configuration>
- <!-- do not generate the pesky web folder and index.html -->
- <skipWebContentGeneration>true</skipWebContentGeneration>
- <!-- Integrate the p2 as it fails to be indexed by the installer from the original update site -->
- <associateSites>
- <site>https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/</site>
- </associateSites>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.target
index 59aaaae34df..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="1641977667">
+<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"/>
@@ -27,15 +27,19 @@
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="com.google.inject" version="3.0.0.v201605172100"/>
- <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository/"/>
+ <unit id="org.apache.batik.anim" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.dom.svg" version="1.14.0.v20210324-0332"/>
+ <unit id="org.apache.batik.xml" version="1.14.0.v20210324-0332"/>
+ <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<unit id="org.eclipse.xwt.feature.feature.group" version="0.0.0"/>
<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.v20220110-1723"/>
- <repository id="qvto" location="https://download.eclipse.org/mmt/qvto/updates/milestones/3.10.6/S202201101723"/>
+ <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"/>
@@ -47,41 +51,42 @@
<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.23.0.v20220105-1800"/>
- <repository id="platform" location="https://download.eclipse.org/eclipse/updates/4.23-I-builds/I20220105-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.18.0.v20220110-1232"/>
- <unit id="org.eclipse.ocl.examples.feature.group" version="6.18.0.v20220110-1232"/>
- <repository id="ocl" location="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202201101232"/>
+ <unit id="org.eclipse.ocl.examples.classic.feature.group" version="5.17.1.v20220309-0840"/>
+ <unit id="org.eclipse.ocl.examples.feature.group" version="6.17.1.v20220309-0840"/>
+ <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.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtend.sdk.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.redist.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.runtime.feature.group" version="2.25.0.v20210301-1429"/>
- <unit id="org.eclipse.xtext.ui.feature.group" version="2.25.0.v20210301-1429"/>
- <repository id="xtext" location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.25.0"/>
+ <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.12.1.v20210218-2134"/>
- <repository id="mwe" location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.12.1/"/>
+ <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.25.0/S-3.25.0.M1-20220106092734/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.13.1.202106221344"/>
- <repository id="gmfRuntime" location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+ <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.29.0.v20211216-0741"/>
- <repository id="emf" location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/S202201030439"/>
+ <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"/>
@@ -96,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"/>
@@ -110,37 +115,37 @@
<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.15.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.workingsets.feature.group" version="1.15.0.v20211015-0620"/>
- <unit id="org.eclipse.oomph.projectconfig.feature.group" version="1.14.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.targlets.feature.group" version="1.15.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.mylyn.feature.group" version="1.16.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.workbench.feature.group" version="1.14.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.projectset.feature.group" version="1.14.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.pde.feature.group" version="1.14.0.v20211107-0906"/>
- <unit id="org.eclipse.oomph.targlets.feature.group" version="1.19.0.v20211015-0620"/>
- <unit id="org.eclipse.oomph.setup.jdt.feature.group" version="1.18.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.setup.projects.feature.group" version="1.15.0.v20211031-1011"/>
- <unit id="org.eclipse.oomph.setup.git.feature.group" version="1.20.0.v20211007-0506"/>
- <unit id="org.eclipse.oomph.setup.maven.feature.group" version="1.15.0.v20210924-1427"/>
- <unit id="org.eclipse.oomph.p2.feature.group" version="1.21.0.v20211116-0849"/>
- <unit id="org.eclipse.oomph.setup.feature.group" version="1.23.0.v20211116-0849"/>
- <unit id="org.eclipse.oomph.preferences.feature.group" version="1.14.0.v20210924-1427"/>
- <repository id="oomph" location="https://download.eclipse.org/oomph/drops/release/1.23.0"/>
+ <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.0"/>
+ <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.19.0/"/>
+ <repository id="m2e" location="https://download.eclipse.org/technology/m2e/releases/1.20.1/"/>
</location>
<location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
<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.emf.compare.ide.ui.feature.group" version="0.0.0"/>
- <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.17.202111290942"/>
- <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942"/>
+ <unit id="org.eclipse.emf.compare.source.feature.group" version="3.3.18.202202240907"/>
+ <repository id="emfCompare" location="https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907"/>
</location>
</locations>
</target>
diff --git a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
index 4108b4716f4..12fae85f17a 100644
--- a/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
+++ b/releng/toolsmiths/targetPlatform/org.eclipse.papyrus.toolsmiths.targetplatform.tpd
@@ -2,28 +2,23 @@ target "Papyrus Toolsmiths" with requirements source
include "../../main/targetPlatform/org.eclipse.papyrus.main.targetplatform.tpd"
-
/*** Manual referencing ***/
-
-//manualUpdate
+// manualUpdate
// This will need to be changed as soon as the new build is available @see Bug 538414
location tpd "http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT" {
- org.eclipse.cbi.targetplatform-feature.feature.group lazy
+ org.eclipse.cbi.targetplatform-feature.feature.group lazy
}
-//manualUpdate
-
+// manualUpdate
location cbiAggregator "https://download.eclipse.org/cbi/updates/aggregator/ide/4.13/" {
- org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group lazy
- org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group lazy
- org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group lazy
+ org.eclipse.cbi.p2repo.aggregator.editor.feature.source.feature.group lazy
+ org.eclipse.cbi.p2repo.aggregator.editor.feature.feature.group lazy
+ org.eclipse.cbi.p2repo.aggregator.engine.feature.source.feature.group lazy
}
/*** Updates from the Simrel repository ***/
-
-//updateFrom("Oomph",0)
-
-location oomph "https://download.eclipse.org/oomph/drops/release/1.23.0" {
+// updateFrom("Oomph",0)
+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
@@ -42,21 +37,16 @@ location oomph "https://download.eclipse.org/oomph/drops/release/1.23.0" {
org.eclipse.oomph.preferences.feature.group
}
-//updateFrom("EGit",0)
+// updateFrom("EGit",0)
+location egit "https://download.eclipse.org/egit/updates-6.2" // oomph
-location egit "https://download.eclipse.org/egit/updates-6.0" // oomph
-
-//updateFrom("m2e",0)
-
-location m2e "https://download.eclipse.org/technology/m2e/releases/1.19.0/" // oomph
-
-//updateFrom("Mylyn",0)
+// updateFrom("m2e",0)
+location m2e "https://download.eclipse.org/technology/m2e/releases/1.20.1/" // oomph
location mylyn "https://download.eclipse.org/mylyn/drops/3.25.2/v20200831-1956" // oomph
-//updateFrom("EMF Compare",0)
-
-location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202111290942" {
+// updateFrom("EMF Compare",0)
+location emfCompare "https://download.eclipse.org/modeling/emf/compare/updates/milestones/3.3/S202202240907" {
org.eclipse.emf.compare.ide.ui.feature.group lazy
org.eclipse.emf.compare.source.feature.group
-} \ No newline at end of file
+}
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
index 99927081265..3d1fd262a26 100644
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)",
Export-Package: org.eclipse.papyrus.bundles.tests
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
-Bundle-Version: 2.1.0.qualifier
+Bundle-Version: 3.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.bundles.tests.Activator
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml
index a82ed21e34c..1207d717662 100644
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml
+++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/pom.xml
@@ -10,7 +10,7 @@
</parent>
<groupId>org.eclipse.papyrus.tests</groupId>
<artifactId>org.eclipse.papyrus.bundles.tests</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/APIReports.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/APIReports.java
deleted file mode 100644
index e9ffeb0bab8..00000000000
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/APIReports.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus 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
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Christian W. Damus - Initial API and implementation
- *
- *****************************************************************************/
-
-package org.eclipse.papyrus.bundles.tests;
-
-import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assume.assumeThat;
-
-import java.io.File;
-import java.util.Calendar;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.papyrus.bundles.tests.apireport.API2HTML;
-import org.eclipse.papyrus.bundles.tests.apireport.APIReportGenerator;
-import org.eclipse.papyrus.bundles.tests.apireport.ReportFixture;
-import org.eclipse.papyrus.junit.framework.classification.tests.AbstractPapyrusTest;
-import org.eclipse.papyrus.junit.utils.PrintingProgressMonitor;
-import org.junit.Test;
-
-/**
- * Pseudo-test cases that generate API reports.
- *
- * @since 1.2
- */
-public class APIReports extends AbstractPapyrusTest {
-
- /**
- * System property name for the location of the API Baseline for calculation of
- * the API delta report. The value must be an absolute path in the local filesystem.
- * If this property is not specified, the {@link #apiDeltaReport()} pseudo-test is skipped.
- */
- public static final String APIREPORT_BASELINE_PROPERTY = "apireport.baseline"; //$NON-NLS-1$
-
- /**
- * System property name for the location of the API delta report to generate.
- * The value must be an absolute path in the local filesystem. If this property
- * is not specified, the report will be generated in the current working directory.
- */
- public static final String APIREPORT_OUTPUT_DIR_PROPERTY = "apireport.outputdir"; //$NON-NLS-1$
-
- /**
- * System property name for a boolean indicating whether to log verbose progress
- * of the API report generation to stdout.
- */
- public static final String APIREPORT_VERBOSE = "apireport.verbose"; //$NON-NLS-1$
-
- /**
- * Constructor.
- *
- */
- public APIReports() {
- super();
- }
-
- /**
- * Run the API change analysis report, if the baseline is provided by the
- * {@linkplain #APIREPORT_BASELINE_PROPERTY system property}.
- */
- @Test
- public void apiDeltaReport() throws Exception {
- String baseline = System.getProperty(APIREPORT_BASELINE_PROPERTY, "");
- assumeThat("No API baseline specified via -D" + APIREPORT_BASELINE_PROPERTY, baseline, not(""));
-
- File baselineLocation = new File(baseline);
- IPath outputDir = new Path(System.getProperty(APIREPORT_OUTPUT_DIR_PROPERTY, System.getProperty("user.dir")));
-
- // Generate the report XML
- ReportFixture fixture = new ReportFixture(outputDir);
-
- PrintingProgressMonitor progress = new PrintingProgressMonitor();
- if (!Boolean.getBoolean(APIREPORT_VERBOSE)) {
- progress = progress.filter("^\\s+add");
- }
- new APIReportGenerator(baselineLocation, fixture.getXMLReportFile()).generate(progress);
-
- // And the HTML from that
- Calendar today = Calendar.getInstance();
- String qualifier = String.format("v%04d%02d%02d-%02d%02d%02d",
- today.get(Calendar.YEAR), today.get(Calendar.MONTH) + 1, today.get(Calendar.DATE),
- today.get(Calendar.HOUR_OF_DAY), today.get(Calendar.MINUTE), today.get(Calendar.SECOND));
- new API2HTML(fixture.getXMLReportFile(), qualifier).generate(fixture.getHTMLReportFile());
- }
-
-}
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
index d0f9c0f3da7..977e37259b7 100755
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
+++ b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/BundlesTests.java
@@ -59,7 +59,7 @@ public class BundlesTests extends AbstractPapyrusTest {
private static final String INCUBATION_KEYWORD = "(Incubation)"; //$NON-NLS-1$
- private static final String BATIK_VERSION = "\"[1.6.0,1.7.0)\""; //$NON-NLS-1$
+ private static final String BATIK_VERSION = "\"[1.14.0,1.15.0)\""; //$NON-NLS-1$
private static final String NATTABLE_VERSION = "1.5.0"; //$NON-NLS-1$
diff --git a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java b/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java
deleted file mode 100644
index a7bbf811d9e..00000000000
--- a/tests/junit/framework/org.eclipse.papyrus.bundles.tests/src/org/eclipse/papyrus/bundles/tests/apireport/APIReportGenerator.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (c) 2012, 2016 Eike Stepper (Berlin, Germany), Christian W. Damus, 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
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- * Eike Stepper - initial API and implementation
- * Christian W. Damus - adapt for Papyrus bundle tests (bug 440910)
- * Christian W. Damus - bug 491116
- */
-package org.eclipse.papyrus.bundles.tests.apireport;
-
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubMonitor;
-import org.eclipse.papyrus.bundles.tests.Activator;
-import org.eclipse.papyrus.bundles.tests.BundleTestsUtils;
-import org.eclipse.pde.api.tools.internal.model.ApiModelFactory;
-import org.eclipse.pde.api.tools.internal.model.BundleComponent;
-import org.eclipse.pde.api.tools.internal.provisional.VisibilityModifiers;
-import org.eclipse.pde.api.tools.internal.provisional.comparator.ApiComparator;
-import org.eclipse.pde.api.tools.internal.provisional.comparator.ApiScope;
-import org.eclipse.pde.api.tools.internal.provisional.comparator.IDelta;
-import org.eclipse.pde.api.tools.internal.provisional.model.IApiBaseline;
-import org.eclipse.pde.api.tools.internal.provisional.model.IApiComponent;
-import org.eclipse.pde.api.tools.internal.provisional.model.IApiScope;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * <p>
- * A generator of API delta reports: given an API baseline (a set of plug-ins
- * from the "previous" or "latest" stable release of Papyrus), computes the
- * changes in the current installed/workspace versions of the same bundles.
- * These changes are of three kinds:
- * </p>
- * <ul>
- * <li>incompatible/breaking changes in public APIs</li>
- * <li>compatible changes in public APIs</li>
- * <li>changes in APIs re-exported by the plug-ins included in the report</li>
- * </ul>
- * <p>
- * The plug-ins in the scope of the report are all plug-ins that don't match any
- * of the exclusion filters in the <tt>excludes.txt</tt> file in this package.
- * The format of the file is the same as the exclusion/inclusion filters used
- * by the PDE API Tools Ant tasks.
- * </p>
- */
-public class APIReportGenerator {
- // A decreasing sequence of bundle IDs that won't clash with those allocated by API Tools
- private static AtomicInteger nextDevWorkspaceBundleID = new AtomicInteger(Integer.MAX_VALUE);
-
- /**
- * Match a bundle location that is a <tt>file:</tt> URI optionally preceded
- * by <tt>reference:</tt>, <tt>initial@reference:</tt>, or other. for the purpose
- * of extracting the file URI.
- */
- private final Pattern bundleLocation = Pattern.compile("([^:]+:)?file:(.*)");
-
- private final File baselineLocation;
- private final File apiXML;
-
- /**
- * Initializes me.
- *
- * @param baselineLocation
- * a directory in the local filesystem containing the plug-ins
- * that comprise the baseline of API comparison. This should usually be either a
- * self-contained (non-bundle-pooled) Eclipse installation or a leaf-level (single release)
- * p2 repository. In any case, the report generator searches within this location for a
- * <tt>plugins/</tt> directory and scans that for JAR and directory bundles. This must be
- * an absolute path
- * @param apiXML
- * the XML file (absolute path) to generate
- */
- public APIReportGenerator(File baselineLocation, File apiXML) {
- super();
-
- this.baselineLocation = baselineLocation;
- this.apiXML = apiXML;
- }
-
- /**
- * Generates the XML API delta report file.
- */
- public IStatus generate(IProgressMonitor monitor) throws CoreException {
- Pattern[] exclusionPatterns = loadExclusions("excludes.txt"); //$NON-NLS-1$
-
- SubMonitor progress = SubMonitor.convert(monitor, 100);
-
- try {
- try {
- try (BufferedWriter writer = new BufferedWriter(new FileWriter(apiXML))) {
- progress.subTask("Discovering API baseline...");
- IApiBaseline baseline = getBaseline(exclusionPatterns, progress.newChild(25));
- if (baseline == null) {
- return new Status(IStatus.ERROR, Activator.PLUGIN_ID, "No API baseline configured");
- }
- checkCancellation(progress);
-
- progress.subTask("Discovering current API...");
- IApiScope scope = getAPIToCompare(exclusionPatterns, progress.newChild(25));
- checkCancellation(progress);
-
- progress.subTask("Computing deltas...");
- IDelta delta = ApiComparator.compare(scope, baseline, VisibilityModifiers.API, false, true, progress.newChild(25));
- if (delta != null) {
- checkCancellation(progress);
-
- Java8DeltaXMLVisitor visitor = new Java8DeltaXMLVisitor();
- delta.accept(visitor);
-
- visitor.appendTo(writer);
- writer.flush();
-
- progress.done();
- }
- } catch (IOException e) {
- Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "I/O problem in API analysis", e));
- } catch (CoreException e) {
- Activator.getDefault().getLog().log(e.getStatus());
- }
-
- progress.worked(25);
- return Status.OK_STATUS;
- } catch (OperationCanceledException e) {
- // ignore
- }
- } finally {
- monitor.done();
- }
-
- return Status.CANCEL_STATUS;
- }
-
- IApiBaseline getBaseline(Pattern[] exclusionPatterns, IProgressMonitor monitor) throws IOException, CoreException {
- IApiBaseline result = ApiModelFactory.newApiBaseline("Configured Baseline");
- List<IApiComponent> components = new ArrayList<>();
-
- Files.walkFileTree(Paths.get(baselineLocation.toURI()), new SimpleFileVisitor<Path>() {
- private boolean inPlugins;
-
- @Override
- public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
- FileVisitResult result = FileVisitResult.CONTINUE;
-
- // Don't delve into directory bundles
- if (inPlugins) {
- result = FileVisitResult.SKIP_SUBTREE;
- }
- // Don't clear this flag on directories nested within 'plugins'
- else if ("plugins".equals(dir.getFileName().toString())) {
- inPlugins = true;
- }
-
- return result;
- }
-
- @Override
- public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
- FileVisitResult result = FileVisitResult.CONTINUE;
-
- if ("plugins".equals(dir.getFileName().toString())) {
- inPlugins = false;
- result = FileVisitResult.TERMINATE;
- }
-
- return result;
- }
-
- @Override
- public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
- if (inPlugins) {
- try {
- IApiComponent component = ApiModelFactory.newApiComponent(result, file.toString());
- if ((component != null) && !isExcluded(exclusionPatterns, component.getSymbolicName())) {
- components.add(component);
- monitor.subTask(" added component " + component.getSymbolicName());
- }
- } catch (CoreException e) {
- // It's fine, it's not a bundle (maybe it's a pack200 archive)
- }
- }
-
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFileFailed(Path file, IOException exc) throws IOException {
- System.out.printf("Error visiting %s: %s%n", file, exc.getMessage());
- return FileVisitResult.CONTINUE;
- }
- });
-
- result.addApiComponents(components.toArray(new IApiComponent[components.size()]));
-
- return result;
- }
-
- private static boolean isExcluded(Pattern[] patterns, String name) {
- for (Pattern pattern : patterns) {
- Matcher matcher = pattern.matcher(name);
- if (matcher.matches()) {
- return true;
- }
- }
-
- return false;
- }
-
- ApiScope getAPIToCompare(Pattern[] exclusionPatterns, IProgressMonitor monitor) throws CoreException {
- ApiScope result = new ApiScope();
-
- IApiBaseline currentBaseline = ApiModelFactory.newApiBaseline("Test Baseline");
- if (currentBaseline != null) {
- for (Bundle next : BundleTestsUtils.getPapyrusBundles()) {
- if (((next.getState() & (Bundle.INSTALLED | Bundle.STARTING | Bundle.ACTIVE)) != 0)
- && !isExcluded(exclusionPatterns, next.getSymbolicName())) {
-
- try {
- String installLocation = getInstallLocation(next);
- if (installLocation != null) {
- IApiComponent component = null;
- Path installPath = Paths.get(installLocation);
- Path dotClasspath = installPath.resolve(".classpath");
- if (Files.isDirectory(installPath) && Files.exists(dotClasspath)) {
- // It's a project in the development workspace (we are a run-time instance)
- component = createDevWorkspaceComponent(currentBaseline, installPath, dotClasspath);
- } else {
- // Standard approach for JAR bundles and expanded installed bundles
- component = ApiModelFactory.newApiComponent(currentBaseline, installLocation);
- }
-
- if (component != null) {
- result.addElement(component);
- monitor.subTask(" added component " + component.getSymbolicName());
- }
- }
- } catch (CoreException e) {
- // Hmm, shouldn't happen for a successfully installed bundle
- Activator.getDefault().getLog().log(e.getStatus());
- }
- }
- }
-
- List<IApiComponent> allComponents = Stream.of(result.getApiElements())
- .filter(IApiComponent.class::isInstance)
- .map(IApiComponent.class::cast)
- .collect(Collectors.toList());
- currentBaseline.addApiComponents(allComponents.toArray(new IApiComponent[allComponents.size()]));
- }
-
- return result;
- }
-
- /**
- * Obtains the location in the local filesystem where the specified {@code bundle} is installed.
- *
- * @param bundle
- * an installed bundle
- * @return its location in the local filesystem, or {@code null} if it could not be determined
- */
- String getInstallLocation(Bundle bundle) {
- String result = null;
-
- Matcher m = bundleLocation.matcher(bundle.getLocation());
- if (m.matches()) {
- // Don't try to create a URI-based file using the file: URI because
- // in some installations, it will actually be a relative URI, which
- // the File(URI) constructor would reject
- result = new File(m.group(2)).getAbsolutePath();
- }
-
- return result;
- }
-
- protected IApiComponent createDevWorkspaceComponent(IApiBaseline parent, Path installLocation, Path dotClasspath) throws CoreException {
- BundleComponent result = new BundleComponent(parent, installLocation.toString(), nextDevWorkspaceBundleID()) {
- @Override
- protected String[] getClasspathEntries(Map<String, String> manifest) throws BundleException {
- List<String> classpathEntries = parseClasspath(dotClasspath);
- return classpathEntries.toArray(new String[classpathEntries.size()]);
- }
- };
-
- return result;
- }
-
- private static int nextDevWorkspaceBundleID() {
- return nextDevWorkspaceBundleID.getAndDecrement();
- }
-
- protected List<String> parseClasspath(Path dotClasspath) throws BundleException {
- List<String> result = new ArrayList<>();
-
- try {
- SAXParserFactory.newInstance().newSAXParser().parse(dotClasspath.toFile(), new DefaultHandler() {
- @Override
- public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
- if ("classpathentry".equals(qName)) {
- String kind = attributes.getValue("kind");
- if (kind != null) {
- switch (kind) {
- case "lib":
- case "output":
- result.add(attributes.getValue("path"));
- break;
- }
- }
- }
- }
- });
- } catch (SAXException | IOException | ParserConfigurationException e) {
- throw new BundleException("Failed to parse bundle classpath", e);
- }
-
- return result;
- }
-
- private static void checkCancellation(IProgressMonitor monitor) throws OperationCanceledException {
- if (monitor == null) {
- return;
- }
-
- if (monitor.isCanceled()) {
- throw new OperationCanceledException();
- }
- }
-
- private static Pattern[] loadExclusions(String resourceName) {
- List<Pattern> result;
-
- URL url = APIReportGenerator.class.getResource(resourceName);
-
- try (BufferedReader input = new BufferedReader(new InputStreamReader(url.openStream(), StandardCharsets.UTF_8))) {
- result = input.lines()
- .map(String::trim)
- .filter(((Predicate<String>) String::isEmpty).negate())
- .filter(line -> !line.startsWith("#")) //$NON-NLS-1$
- .map(pattern -> {
- if (pattern.startsWith("R:")) { //$NON-NLS-1$
- pattern = pattern.substring("R:".length()); //$NON-NLS-1$
- } else {
- pattern = Pattern.quote(pattern);
- }
- return Pattern.compile(pattern);
- })
- .collect(Collectors.toList());
- } catch (IOException e) {
- // Fine, no exclusions, then
- result = Collections.emptyList();
- }
-
- return result.toArray(new Pattern[result.size()]);
- }
-}
diff --git a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
index db7dbd2ca23..86db89c8c96 100755
--- a/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/bundlestests/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.18.0,3.0.0)",
org.eclipse.gmf.runtime.common.ui;bundle-version="[1.8.0,2.0.0)",
org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
- org.eclipse.papyrus.bundles.tests;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.papyrus.bundles.tests;bundle-version="[3.0.0,4.0.0)",
org.eclipse.papyrus.junit.framework;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.junit.utils;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui.views.properties.tabbed;bundle-version="[3.8.0,4.0.0)",
diff --git a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndexTest.java b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndexTest.java
index d39cbcaf238..4e3b1867e0b 100644
--- a/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndexTest.java
+++ b/tests/junit/plugins/infra/emf/org.eclipse.papyrus.infra.emf.tests/tests/org/eclipse/papyrus/infra/emf/resource/index/WorkspaceModelIndexTest.java
@@ -191,6 +191,7 @@ public class WorkspaceModelIndexTest extends AbstractPapyrusTest {
}
@FailingTest
+ @Test
public void indexRebuiltOnProjectClose() throws Exception {
// Initial build
Map<IFile, CrossReferenceIndex> index = fixture.getIndex().get();
diff --git a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/CombinedFragmentRegressionTest.java b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/CombinedFragmentRegressionTest.java
index f637ddf3569..8fb89a0dabf 100644
--- a/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/CombinedFragmentRegressionTest.java
+++ b/tests/junit/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence.tests/src/org/eclipse/papyrus/uml/diagram/sequence/tests/bug/CombinedFragmentRegressionTest.java
@@ -688,6 +688,7 @@ public class CombinedFragmentRegressionTest extends AbstractPapyrusTest {
* Verify the validation of an interaction operand when it is resized.
*/
@FailingTest
+ @Test
@PluginResource("resource/bugs/bug533676.di")
public void validateResizedInteractionOperand_533676() {
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLConstraintOnInstanceSpec.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLConstraintOnInstanceSpec.java
index fc5e987d4f8..da63b005ecb 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLConstraintOnInstanceSpec.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLConstraintOnInstanceSpec.java
@@ -31,6 +31,7 @@ import org.eclipse.uml2.uml.InstanceSpecification;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Test;
/**
* Test suite for validation rules. It tests
@@ -71,6 +72,7 @@ public class TestOCLConstraintOnInstanceSpec extends AbstractValidationEditorTes
* Validation needs to create an entry for the violated constraint of the instance specification
*/
@FailingTest
+ @Test
public void validateOCLOnInstanceSpec() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), instance);
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLValidationRuleFromFile.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLValidationRuleFromFile.java
index 72872ad04ee..6e8d26ae052 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLValidationRuleFromFile.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestOCLValidationRuleFromFile.java
@@ -41,6 +41,7 @@ import org.eclipse.uml2.uml.Package;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Test;
/**
* Test suite for validation rules:
@@ -96,6 +97,7 @@ public class TestOCLValidationRuleFromFile extends AbstractValidationEditorTest
* Failing validation for rule defined in ExtraUMLValidation
*/
@FailingTest
+ @Test
public void validateCamelCaseRule() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), lowerCaseClass);
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestStereotypeValidation.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestStereotypeValidation.java
index 9491384a3d4..f23554a5edc 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestStereotypeValidation.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestStereotypeValidation.java
@@ -31,6 +31,7 @@ import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Test;
/**
* Test suite for validation rules. It tests
@@ -72,6 +73,7 @@ public class TestStereotypeValidation extends AbstractValidationEditorTest {
* Failing validation for stereotype whose required attribute is unset
*/
@FailingTest
+ @Test
public void validateUnsetStereotypeAttribute() throws Exception {
// get the diagnostic and check for the given capsule
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), class1);
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java
index 3f424e93508..6ace51b9ea9 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestUMLValidationRules.java
@@ -32,6 +32,7 @@ import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.Package;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Test;
/**
* Test suite for UML validation rules. It tests
@@ -86,6 +87,7 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest {
* Simple failing validation for IsActiveEntityRule
*/
@FailingTest
+ @Test
public void validateNameClashDetection() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), class1);
@@ -96,6 +98,7 @@ public class TestUMLValidationRules extends AbstractValidationEditorTest {
* Simple valid validation for IsActiveEntityRule
*/
@FailingTest
+ @Test
public void validateNonStandardMultiplicity() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), nonStandardMultiplicity);
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInPluginXML.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInPluginXML.java
index cfd12081ad2..f39255da9a1 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInPluginXML.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInPluginXML.java
@@ -33,6 +33,7 @@ import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Test;
/**
* Test suite for validation rules. It tests
@@ -110,6 +111,7 @@ public class TestValidationRulesInPluginXML extends AbstractValidationEditorTest
* Failing validation for IsActiveEntityRule (OCL rule, on inactive class)
*/
@FailingTest
+ @Test
public void validateIsActiveOCLRule_inactiveClass() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), inactiveOCL);
@@ -120,6 +122,7 @@ public class TestValidationRulesInPluginXML extends AbstractValidationEditorTest
* Successful validation for IsActiveEntityRule (OCL rule, on active class)
*/
@FailingTest
+ @Test
public void validateIsActiveOCLRule_activeClass() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), activeOCL);
@@ -130,6 +133,7 @@ public class TestValidationRulesInPluginXML extends AbstractValidationEditorTest
* Successful validation for IsPassiveEntityRule (Java rule, on inactive class)
*/
@FailingTest
+ @Test
public void validateIsPassiveJavaRule_inactiveClass() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), inactiveJava);
@@ -140,6 +144,7 @@ public class TestValidationRulesInPluginXML extends AbstractValidationEditorTest
* Failing validation for IsPassiveEntityRule (Java rule, on active class)
*/
@FailingTest
+ @Test
public void validateIsPassiveJavaRule_activeClass() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), activeJava);
diff --git a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInProfile.java b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInProfile.java
index ca664db8735..7396c4c9223 100644
--- a/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInProfile.java
+++ b/tests/junit/plugins/uml/validation/org.eclipse.papyrus.uml.validation.tests/src/org/eclipse/papyrus/uml/validation/tests/rules/TestValidationRulesInProfile.java
@@ -31,6 +31,7 @@ import org.eclipse.uml2.uml.Class;
import org.eclipse.uml2.uml.Model;
import org.junit.Assert;
import org.junit.Before;
+import org.junit.Test;
/**
* Test suite for validation rules. It tests
@@ -97,6 +98,7 @@ public class TestValidationRulesInProfile extends AbstractValidationEditorTest {
* No errors on active class
*/
@FailingTest
+ @Test
public void validateIsActiveRule_ActiveCapsule() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), active);
@@ -117,6 +119,7 @@ public class TestValidationRulesInProfile extends AbstractValidationEditorTest {
* One error on malformed class
*/
@FailingTest
+ @Test
public void validateMalformedActiveRule_notActiveCapsule() throws Exception {
// get the diagnostic and check for the given class
List<Diagnostic> diagnostics = filterDiagnosticsByElement(globalDiagnostic.getChildren(), activeMalformed);

Back to the top