Merge pull request #164 from ipa-nhg/Release2.0

RosTooling release 2.0 preparation
ipa320 · Oct 4, 2021 · eb8991e · eb8991e
2 parents ab6a329 + 9198d01
commit eb8991e
Show file tree

Hide file tree

Showing 80 changed files with 1,382 additions and 941 deletions.
diff --git a/EclipseInstaller/ROSModel.setup b/EclipseInstaller/ROSModel.setup
@@ -50,16 +50,14 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2020-12"
+      defaultValue="2021-12"
       storageURI="scope://Workspace"/>
   <setupTask
       xsi:type="setup.p2:P2Task">
     <requirement
         name="org.eclipse.xtext.sdk.feature.group"/>
     <requirement
         name="org.eclipse.sirius.specifier.feature.group"/>
-    <requirement
-        name="org.eclipse.sirius.runtime.ide.xtext.feature.group"/>
     <requirement
         name="org.eclipse.cdt.feature.group"/>
       <requirement
@@ -80,9 +78,9 @@
       <requirement
           name="org.eclipse.egit.feature.group"/>
       <repositoryList
-          name="2020-12">
+          name="2021-12">
         <repository
-            url="https://download.eclipse.org/releases/2020-12"/>
+            url="https://download.eclipse.org/releases/2021-12"/>
       </repositoryList>
     </targlet>
   </setupTask>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.edit/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface.edit;singleton:=true
 Automatic-Module-Name: de.fraunhofer.ipa.componentInterface.edit
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: componentInterface.provider.ComponentInterfaceEditPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.edit/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface.edit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.ipa.ros</groupId>
         <artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
     </parent>
     <artifactId>de.fraunhofer.ipa.componentInterface.edit</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.editor/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface.editor;singleton:=true
 Automatic-Module-Name: de.fraunhofer.ipa.componentInterface.editor
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: componentInterface.presentation.ComponentInterfaceEditorPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.editor/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface.editor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.ipa.ros</groupId>
         <artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
     </parent>
     <artifactId>de.fraunhofer.ipa.componentInterface.editor</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext.ide/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.xtext.ide/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.fraunhofer.ipa.componentInterface.xtext.ide
 Bundle-Vendor: Fraunhofer IPA
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface.xtext.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.fraunhofer.ipa.componentInterface.xtext,
  de.fraunhofer.ipa.componentInterface,
  org.eclipse.xtext.ide,
  org.eclipse.xtext.xbase.ide,
- org.antlr.runtime
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: de.fraunhofer.ipa.componentInterface.ide.contentassist.antlr,
  de.fraunhofer.ipa.componentInterface.ide.contentassist.antlr.internal
diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext.ide/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface.xtext.ide/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.fraunhofer.ipa.ros</groupId>
 		<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.fraunhofer.ipa.componentInterface.xtext.ide</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext.tests/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.xtext.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: de.fraunhofer.ipa.componentInterface.xtext.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: de.fraunhofer.ipa.componentInterface.xtext.tests
 Bundle-Vendor: Fraunhofer IPA
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface.xtext.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.fraunhofer.ipa.componentInterface.xtext,

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext.tests/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface.xtext.tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.fraunhofer.ipa.ros</groupId>
 		<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.fraunhofer.ipa.componentInterface.xtext.tests</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext.ui/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.xtext.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.fraunhofer.ipa.componentInterface.xtext.ui
 Bundle-Vendor: Fraunhofer IPA
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface.xtext.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.fraunhofer.ipa.componentInterface.xtext,
@@ -15,8 +15,8 @@ Require-Bundle: de.fraunhofer.ipa.componentInterface.xtext,
  org.eclipse.ui,
  org.eclipse.compare,
  org.eclipse.xtext.builder,
- org.eclipse.xtend.lib,
- org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib;bundle-version="2.14.0",
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.ui.editors
 Import-Package: org.apache.log4j,
  org.eclipse.xtext.generator

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext.ui/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface.xtext.ui/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.fraunhofer.ipa.ros</groupId>
 		<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.fraunhofer.ipa.componentInterface.xtext.ui</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface.xtext/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: de.fraunhofer.ipa.componentInterface.xtext
 Bundle-Vendor: Fraunhofer IPA
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface.xtext; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: de.fraunhofer.ipa.componentInterface,
  org.eclipse.xtext,
  org.eclipse.xtext.xbase,
  org.eclipse.equinox.common,
- org.eclipse.xtext.xbase.lib,
- org.antlr.runtime,
+ org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
+ org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.util,
- org.eclipse.xtend.lib
+ org.eclipse.xtend.lib;bundle-version="2.14.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: de.fraunhofer.ipa.componentInterface,
  de.fraunhofer.ipa.componentInterface.parser.antlr.internal,

diff --git a/plugins/de.fraunhofer.ipa.componentInterface.xtext/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface.xtext/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.fraunhofer.ipa.ros</groupId>
 		<artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-		<version>1.5.0-SNAPSHOT</version>
+		<version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>de.fraunhofer.ipa.componentInterface.xtext</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.componentInterface/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.componentInterface/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: de.fraunhofer.ipa.componentInterface;singleton:=true
 Automatic-Module-Name: de.fraunhofer.ipa.componentInterface
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

diff --git a/plugins/de.fraunhofer.ipa.componentInterface/pom.xml b/plugins/de.fraunhofer.ipa.componentInterface/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.ipa.ros</groupId>
         <artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
     </parent>
     <artifactId>de.fraunhofer.ipa.componentInterface</artifactId>

diff --git a/plugins/de.fraunhofer.ipa.ros.edit/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.ros.edit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: de.fraunhofer.ipa.ros.edit;singleton:=true
 Automatic-Module-Name: de.fraunhofer.ipa.ros.edit
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: ros.provider.RosEditPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/plugins/de.fraunhofer.ipa.ros.edit/pom.xml b/plugins/de.fraunhofer.ipa.ros.edit/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.ipa.ros</groupId>
         <artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
     </parent>
     <artifactId>de.fraunhofer.ipa.ros.edit</artifactId>

diff --git a/...fraunhofer.ipa.ros.edit/src/primitives/provider/PrimitivesItemProviderAdapterFactory.java b/...fraunhofer.ipa.ros.edit/src/primitives/provider/PrimitivesItemProviderAdapterFactory.java
@@ -812,6 +812,7 @@ public Adapter createMessagePartAdapter() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -822,6 +823,7 @@ public ComposeableAdapterFactory getRootAdapterFactory() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -870,6 +872,7 @@ public Object adapt(Object object, Object type) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -880,6 +883,7 @@ public void addListener(INotifyChangedListener notifyChangedListener) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -890,6 +894,7 @@ public void removeListener(INotifyChangedListener notifyChangedListener) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 

diff --git a/plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/AmentPackageItemProvider.java b/plugins/de.fraunhofer.ipa.ros.edit/src/ros/provider/AmentPackageItemProvider.java
@@ -8,7 +8,9 @@
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+
 import ros.AmentPackage;
 
 /**

diff --git a/plugins/de.fraunhofer.ipa.ros.editor/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.ros.editor/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: de.fraunhofer.ipa.ros.editor;singleton:=true
 Automatic-Module-Name: de.fraunhofer.ipa.ros.editor
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: ros.presentation.RosEditorPlugin$Implementation
 Bundle-Vendor: %providerName

diff --git a/plugins/de.fraunhofer.ipa.ros.editor/pom.xml b/plugins/de.fraunhofer.ipa.ros.editor/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>de.fraunhofer.ipa.ros</groupId>
         <artifactId>de.fraunhofer.ipa.ros.parent</artifactId>
-        <version>1.5.0-SNAPSHOT</version>
+        <version>2.0.0-SNAPSHOT</version>
         <relativePath>../de.fraunhofer.ipa.ros.parent/pom.xml</relativePath>
     </parent>
     <artifactId>de.fraunhofer.ipa.ros.editor</artifactId>

diff --git a/...fraunhofer.ipa.ros.editor/src/primitives/presentation/PrimitivesActionBarContributor.java b/...fraunhofer.ipa.ros.editor/src/primitives/presentation/PrimitivesActionBarContributor.java
@@ -202,6 +202,7 @@ public void contributeToMenu(IMenuManager menuManager) {
 		//
 		submenuManager.addMenuListener
 			(new IMenuListener() {
+				 @Override
 				 public void menuAboutToShow(IMenuManager menuManager) {
 					 menuManager.updateAll(true);
 				 }
@@ -249,6 +250,7 @@ public void setActiveEditor(IEditorPart part) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	@Override
 	public void selectionChanged(SelectionChangedEvent event) {
 		// Remove any menu items for old selection.
 		//