Clean Sirius implementation plugin for release

ipa320 · Apr 17, 2024 · b796405 · b796405
1 parent 437dd52
commit b796405
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 786 deletions.
diff --git a/plugins/de.fraunhofer.ipa.ros.sirius/META-INF/MANIFEST.MF b/plugins/de.fraunhofer.ipa.ros.sirius/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: de.fraunhofer.ipa.ros.sirius;singleton:=true
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: de.fraunhofer.ipa.ros.sirius.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.sirius.diagram.ui,
  de.fraunhofer.ipa.rossystem
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: %providerName
+Bundle-RequiredExecutionEnvironment: JavaSE-19
+Bundle-Vendor: Fraunhofer IPA
 Automatic-Module-Name: de.fraunhofer.ipa.ros.sirius
 Export-Package: de.fraunhofer.ipa.ros.sirius
diff --git a/plugins/de.fraunhofer.ipa.ros.sirius/description/ros.odesign b/plugins/de.fraunhofer.ipa.ros.sirius/description/ros.odesign
@@ -71,7 +71,7 @@
             </style>
           </borderedNodeMappings>
           <borderedNodeMappings name="RosActionServer" semanticCandidatesExpression="[rosinterfaces.reference/]" domainClass="system::RosActionServerReference">
-            <style xsi:type="style:SquareDescription" labelSize="10" showIcon="false" labelExpression="[eContainer().toString().substring(eContainer().toString().indexOf('name:') + 5, eContainer().toString().lastIndexOf(')') - 1)/]" labelAlignment="RIGHT" sizeComputationExpression="2" resizeKind="NSEW">
+            <style xsi:type="style:SquareDescription" labelSize="10" showIcon="false" labelExpression="[eContainer().toString().substring(eContainer().toString().indexOf('name:') + 5, eContainer().toString().lastIndexOf(')') - 1)/]" labelAlignment="LEFT" sizeComputationExpression="2" resizeKind="NSEW">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <forbiddenSides>WEST</forbiddenSides>
@@ -101,29 +101,21 @@
           </style>
         </containerMappings>
         <containerMappings name="SubSystem" semanticCandidatesExpression="feature:components" domainClass="system::SubSystem" reusedBorderedNodeMappings="//@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosPublisher'] //@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosSubscriber']">
-          <borderedNodeMappings name="Publisher" semanticCandidatesExpression="[self.system.components.rosinterfaces.reference/]" domainClass="system::RosPublisherReference">
-            <style xsi:type="style:SquareDescription" labelSize="10" showIcon="false" labelExpression="[eContainer().toString().substring(eContainer().toString().indexOf('name:') + 5, eContainer().toString().lastIndexOf(')') - 1)/]" labelAlignment="LEFT" sizeComputationExpression="2" resizeKind="NSEW">
-              <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-              <forbiddenSides>WEST</forbiddenSides>
-              <forbiddenSides>SOUTH</forbiddenSides>
-              <forbiddenSides>NORTH</forbiddenSides>
-              <color xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
-            </style>
-          </borderedNodeMappings>
           <subContainerMappings name="SubComponent" semanticCandidatesExpression="[self.system.components/]" domainClass="system::RosNode" reusedBorderedNodeMappings="//@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosPublisher'] //@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosActionClient'] //@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosActionServer'] //@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosServiceClient'] //@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosServiceServer'] //@ownedViewpoints[name='System']/@ownedRepresentations[name='RosSystem']/@defaultLayer/@containerMappings[name='Component']/@borderedNodeMappings[name='RosSubscriber']">
-            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12">
+            <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="10" showIcon="false">
               <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
+              <labelFormat>bold</labelFormat>
               <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
               <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
+              <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_purple']"/>
+              <labelBorderStyle href="environment:/viewpoint#//@labelBorderStyles/@labelBorderStyleDescriptions.1"/>
             </style>
           </subContainerMappings>
           <style xsi:type="style:FlatContainerStyleDescription" borderSizeComputationExpression="1" labelSize="12" showIcon="false" labelExpression="[self.system.name/]">
             <borderColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <labelColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>
             <backgroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='white']"/>
-            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='blue']"/>
+            <foregroundColor xsi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='light_gray']"/>
           </style>
         </containerMappings>
         <toolSections name="Tools"/>

diff --git a/plugins/de.fraunhofer.ipa.ros.sirius/plugin.xml b/plugins/de.fraunhofer.ipa.ros.sirius/plugin.xml
@@ -4,51 +4,9 @@
   <extension point="org.eclipse.sirius.componentization">
     <component class="de.fraunhofer.ipa.ros.sirius.Activator"
                id="de.fraunhofer.ipa.ros.sirius"
-	       name="ros">
+           name="ros">
     </component>
   </extension>
-  <extension
-        point="org.eclipse.sirius.externalJavaAction">
-     <javaActions
-           actionClass="de.fraunhofer.ipa.ros.sirius.ExternalJavaActionNewComponents"
-           id="de.fraunhofer.ipa.ros.sirius.javaActionsNewComponent">
-     </javaActions>
-  </extension>
-  <!--extension
-        point="org.eclipse.sirius.externalJavaAction">
-     <javaActions
-           actionClass="de.fraunhofer.ipa.ros.sirius.ExternalJavaActionNewParameter"
-           id="de.fraunhofer.ipa.ros.sirius.javaActionsNewParameter">
-     </javaActions>
-  </extension-->
-  <extension
-        point="org.eclipse.sirius.externalJavaAction">
-     <javaActions
-           actionClass="de.fraunhofer.ipa.ros.sirius.AutoConnect"
-           id="de.fraunhofer.ipa.ros.sirius.javaActionsAutoConnect">
-     </javaActions>
-  </extension>
-  <extension
-        point="org.eclipse.sirius.externalJavaAction">
-     <javaActions
-           actionClass="de.fraunhofer.ipa.ros.sirius.SimulateRuntimeConnections"
-           id="de.fraunhofer.ipa.ros.sirius.javaActionsSimulateRuntimeConnections">
-     </javaActions>
-  </extension>
-  <extension
-        point="org.eclipse.sirius.externalJavaAction">
-     <javaActions
-           actionClass="de.fraunhofer.ipa.ros.sirius.RemoveAllConnections"
-           id="de.fraunhofer.ipa.ros.sirius.javaActionsRemoveAllConnections">
-     </javaActions>
-  </extension>
 
-  <extension
-        point="org.eclipse.sirius.externalJavaAction">
-     <javaActions
-           actionClass="de.fraunhofer.ipa.ros.sirius.RemoveComponentsWithConnections"
-           id="de.fraunhofer.ipa.ros.sirius.javaActionsRemoveComponentsWithConnections">
-     </javaActions>
-  </extension>
 
 </plugin>
diff --git a/plugins/de.fraunhofer.ipa.ros.sirius/src/de/fraunhofer/ipa/ros/sirius/AutoConnect.java b/plugins/de.fraunhofer.ipa.ros.sirius/src/de/fraunhofer/ipa/ros/sirius/AutoConnect.java
diff --git a/.../de.fraunhofer.ipa.ros.sirius/src/de/fraunhofer/ipa/ros/sirius/ConnectionsCheckUtils.java b/.../de.fraunhofer.ipa.ros.sirius/src/de/fraunhofer/ipa/ros/sirius/ConnectionsCheckUtils.java