Fix some bugs with the OML Sirius viewpoint and its API

melaasar · melaasar · commit ff1b79a604f8 · 2025-08-27T15:19:18.000-07:00
diff --git a/io.opencaesar.rosetta.feature/feature.xml b/io.opencaesar.rosetta.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.rosetta.feature"
       label="%featureName"
-      version="2.13.0"
+      version="2.13.1"
       provider-name="%providerName">
 
    <description url="https://github.com/opencaesar/oml-rosetta">
diff --git a/io.opencaesar.rosetta.feature/pom.xml b/io.opencaesar.rosetta.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/io.opencaesar.rosetta.oml.ui/META-INF/MANIFEST.MF b/io.opencaesar.rosetta.oml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.oml.ui;singleton:=true
-Bundle-Version: 2.13.0
+Bundle-Version: 2.13.1
 Automatic-Module-Name: io.opencaesar.rosetta.oml.ui
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Localization: plugin
diff --git a/io.opencaesar.rosetta.oml.ui/pom.xml b/io.opencaesar.rosetta.oml.ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.oml.ui</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/io.opencaesar.rosetta.product/pom.xml b/io.opencaesar.rosetta.product/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	
 	<build>
diff --git a/io.opencaesar.rosetta.product/rosetta.product b/io.opencaesar.rosetta.product/rosetta.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Rosetta" uid="rosetta" id="io.opencaesar.rosetta.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.13.0" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="Rosetta" uid="rosetta" id="io.opencaesar.rosetta.rcp.product" application="org.eclipse.ui.ide.workbench" version="2.13.1" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="/io.opencaesar.rosetta.rcp/images/about.png"/>
diff --git a/io.opencaesar.rosetta.rcp.feature/feature.xml b/io.opencaesar.rosetta.rcp.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="io.opencaesar.rosetta.rcp.feature"
       label="%featureName"
-      version="2.13.0"
+      version="2.13.1"
       provider-name="%providerName">
 
    <description url="https://github.com/opencaesar/oml-rosetta">
diff --git a/io.opencaesar.rosetta.rcp.feature/pom.xml b/io.opencaesar.rosetta.rcp.feature/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.rcp.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
diff --git a/io.opencaesar.rosetta.rcp/META-INF/MANIFEST.MF b/io.opencaesar.rosetta.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.rcp;singleton:=true
-Bundle-Version: 2.13.0
+Bundle-Version: 2.13.1
 Automatic-Module-Name: io.opencaesar.rosetta.rcp
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Localization: plugin
diff --git a/io.opencaesar.rosetta.rcp/pom.xml b/io.opencaesar.rosetta.rcp/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	<artifactId>io.opencaesar.rosetta.rcp</artifactId>
 	<packaging>eclipse-plugin</packaging>
diff --git a/io.opencaesar.rosetta.repository/pom.xml b/io.opencaesar.rosetta.repository/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	
 	<artifactId>io.opencaesar.rosetta.repository</artifactId>
diff --git a/io.opencaesar.rosetta.sirius.viewpoint/META-INF/MANIFEST.MF b/io.opencaesar.rosetta.sirius.viewpoint/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.sirius.viewpoint;singleton:=true
-Bundle-Version: 2.13.0
+Bundle-Version: 2.13.1
 Export-Package: io.opencaesar.rosetta.sirius.viewpoint
 Automatic-Module-Name: io.opencaesar.rosetta.sirius.viewpoint
 Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign b/io.opencaesar.rosetta.sirius.viewpoint/description/oml.odesign
@@ -153,6 +153,7 @@
         </layoutOptions>
         <layoutOptions xsi:type="description_1:EnumLayoutOption" id="org.eclipse.elk.direction">
           <targets>PARENT</targets>
+          <value name="UP"/>
         </layoutOptions>
         <layoutOptions xsi:type="description_1:DoubleLayoutOption" id="org.eclipse.elk.layered.spacing.edgeEdgeBetweenLayers" value="15.0">
           <targets>PARENT</targets>
diff --git a/io.opencaesar.rosetta.sirius.viewpoint/pom.xml b/io.opencaesar.rosetta.sirius.viewpoint/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>io.opencaesar.rosetta</groupId>
 		<artifactId>io.opencaesar.rosetta.parent</artifactId>
-		<version>2.13.0</version>
+		<version>2.13.1</version>
 	</parent>
 	
 	<artifactId>io.opencaesar.rosetta.sirius.viewpoint</artifactId>
diff --git a/io.opencaesar.rosetta.sirius.viewpoint/src/io/opencaesar/rosetta/sirius/viewpoint/internal/OmlServices.java b/io.opencaesar.rosetta.sirius.viewpoint/src/io/opencaesar/rosetta/sirius/viewpoint/internal/OmlServices.java
@@ -424,6 +424,7 @@ public static Set<NamedInstance> getVisualizableNamedInstances(Description descr
 				.flatMap(i -> i.getOwnedPropertyValues().stream())
 				.filter(i -> i.getProperty() instanceof Relation)
 				.flatMap(i -> i.getObject().stream())
+				.filter(i -> i instanceof NamedInstance)
 				.map(i -> (NamedInstance) i)
 				.flatMap(i -> {
 					var list = new ArrayList<NamedInstance>();
diff --git a/io.opencaesar.rosetta.sirius/META-INF/MANIFEST.MF b/io.opencaesar.rosetta.sirius/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: io.opencaesar.rosetta.sirius;singleton:=true
-Bundle-Version: 2.13.0
+Bundle-Version: 2.13.1
 Bundle-Localization: plugin
 Automatic-Module-Name: io.opencaesar.rosetta.sirius
 Bundle-RequiredExecutionEnvironment: JavaSE-21
diff --git a/io.opencaesar.rosetta.target/pom.xml b/io.opencaesar.rosetta.target/pom.xml
@@ -7,7 +7,7 @@
   <parent>
   	<groupId>io.opencaesar.rosetta</groupId>
 	<artifactId>io.opencaesar.rosetta.parent</artifactId>
-  	<version>2.13.0</version>
+  	<version>2.13.1</version>
   </parent>
 
 </project>
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.opencaesar.rosetta</groupId>
 	<artifactId>io.opencaesar.rosetta.parent</artifactId>
-	<version>2.13.0</version>
+	<version>2.13.1</version>
 	<packaging>pom</packaging>
 	
 	<modules>
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-2.13.0
+2.13.1
