symo: re-use batik library from itemis stubs

mbeddr · Nov 19, 2024 · a1a16b7 · a1a16b7
1 parent f42f89d
commit a1a16b7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 28 deletions.
diff --git a/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl b/code/languages/com.fasten.symo/languages/com.symo.plantuml/com.symo.plantuml.mpl
@@ -61,6 +61,8 @@
     <dependency reexport="false">1ed103c3-3aa6-49b7-9c21-6765ee11f224(MPS.Editor)</dependency>
     <dependency reexport="false">c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)</dependency>
     <dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
+    <dependency reexport="false">5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)</dependency>
+    <dependency reexport="false">563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:9d69e719-78c8-4286-90db-fb19c107d049:com.mbeddr.mpsutil.grammarcells" version="2" />
@@ -111,11 +113,13 @@
     <module reference="377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib)" version="0" />
     <module reference="848ef45d-e560-4e35-853c-f35a64cc135c(de.itemis.mps.editor.celllayout.runtime)" version="0" />
     <module reference="24c96a96-b7a1-4f30-82da-0f8e279a2661(de.itemis.mps.editor.celllayout.styles)" version="0" />
+    <module reference="563a0770-eb88-4f4f-83ed-f708776fc2fe(de.itemis.stubs.batik)" version="0" />
     <module reference="f0fff802-6d26-4d2e-b89d-391357265626(de.slisson.mps.hacks.editor)" version="0" />
     <module reference="2d3c70e9-aab2-4870-8d8d-6036800e4103(jetbrains.mps.kernel)" version="0" />
     <module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
     <module reference="a9e4c532-c5f5-4bb7-99ef-42abb73bbb70(jetbrains.mps.lang.descriptor.aspects)" version="0" />
     <module reference="c7fb639f-be78-4307-89b0-b5959c3fa8c8(jetbrains.mps.lang.text)" version="0" />
+    <module reference="5ad14eca-28d7-4bce-b8e0-648908a49062(org.apache.batik)" version="0" />
   </dependencyVersions>
   <extendedLanguages />
 </language>

diff --git a/...languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps b/...languages/com.fasten.symo/languages/com.symo.plantuml/models/com.symo.plantuml.editor.mps
@@ -14,9 +14,6 @@
     <import index="guwi" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.io(JDK/)" />
     <import index="7x5y" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.nio.charset(JDK/)" />
     <import index="dxuu" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:javax.swing(JDK/)" />
-    <import index="er5d" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.swing(com.symo.plantuml.lib/)" />
-    <import index="iyaa" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.anim.dom(com.symo.plantuml.lib/)" />
-    <import index="e373" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.util(com.symo.plantuml.lib/)" />
     <import index="ughz" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.w3c.dom.svg(com.symo.plantuml.lib/)" />
     <import index="18ew" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.util(MPS.Core/)" />
     <import index="z60i" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt(JDK/)" />
@@ -28,8 +25,11 @@
     <import index="mnlj" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.beans(JDK/)" />
     <import index="fbzs" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.geom(JDK/)" />
     <import index="hyam" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.awt.event(JDK/)" />
+    <import index="er5d" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.swing(org.apache.batik/)" />
+    <import index="iyaa" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.anim.dom(org.apache.batik/)" />
+    <import index="e373" ref="563a0770-eb88-4f4f-83ed-f708776fc2fe/java:org.apache.batik.util(de.itemis.stubs.batik/)" />
     <import index="udwj" ref="r:3cfd1ac4-92be-4123-8876-78cf444bfbcb(com.symo.plantuml.structure)" implicit="true" />
-    <import index="4anb" ref="377bf088-4ffc-48ac-910f-fb1c66ffa60e/java:org.apache.batik.swing.svg(com.symo.plantuml.lib/)" implicit="true" />
+    <import index="4anb" ref="5ad14eca-28d7-4bce-b8e0-648908a49062/java:org.apache.batik.swing.svg(org.apache.batik/)" implicit="true" />
     <import index="lc7h" ref="r:9af299a8-c69a-4780-9c99-063ff8f4181a(com.symo.plantuml.behavior)" implicit="true" />
     <import index="tpco" ref="r:00000000-0000-4000-0000-011c89590284(jetbrains.mps.lang.core.editor)" implicit="true" />
     <import index="tpck" ref="r:00000000-0000-4000-0000-011c89590288(jetbrains.mps.lang.core.structure)" implicit="true" />

diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/com.symo.plantuml.lib.msd
@@ -7,9 +7,6 @@
     <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="plantuml-epl-1.2024.7.jar" />
     </modelRoot>
-    <modelRoot type="java_classes" contentPath="${module}/lib">
-      <sourceRoot location="batik-all-1.18.jar" />
-    </modelRoot>
     <modelRoot type="java_classes" contentPath="${module}/lib">
       <sourceRoot location="xml-apis-ext.jar" />
     </modelRoot>
@@ -22,7 +19,6 @@
       <classes generated="true" path="${module}/classes_gen" />
       <library location="${module}/lib/xmlgraphics-commons-2.7.jar" />
       <library location="${module}/lib/xml-apis-ext.jar" />
-      <library location="${module}/lib/batik-all-1.18.jar" />
       <library location="${module}/lib/plantuml-epl-1.2024.7.jar" />
     </facet>
   </facets>
@@ -37,7 +33,6 @@
   </languageVersions>
   <dependencyVersions>
     <module reference="6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)" version="0" />
-    <module reference="71bb25aa-20fa-4c18-8954-1b176576f52d(com.mpsbasics.docx4j.lib)" version="0" />
     <module reference="377bf088-4ffc-48ac-910f-fb1c66ffa60e(com.symo.plantuml.lib)" version="0" />
   </dependencyVersions>
 </solution>

diff --git a/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/batik-all-1.18.jar b/code/languages/com.fasten.symo/solutions/com.symo.plantuml.lib/lib/batik-all-1.18.jar
diff --git a/...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps b/...safety/solutions/com.mbeddr.formal.safety.build/models/com.mbeddr.formal.safety.build.mps
@@ -3241,6 +3241,16 @@
             <ref role="3bR37D" node="3fV34643kGS" resolve="com.symo.plantuml.lib" />
           </node>
         </node>
+        <node concept="1SiIV0" id="5xCkqdyRMXz" role="3bR37C">
+          <node concept="3bR9La" id="5xCkqdyRMX$" role="1SiIV1">
+            <ref role="3bR37D" to="90a9:6bkzxtWPDx1" resolve="de.itemis.stubs.batik" />
+          </node>
+        </node>
+        <node concept="1SiIV0" id="5xCkqdyRMX_" role="3bR37C">
+          <node concept="3bR9La" id="5xCkqdyRMXA" role="1SiIV1">
+            <ref role="3bR37D" to="al5i:35JynOkF_BM" resolve="org.apache.batik" />
+          </node>
+        </node>
       </node>
       <node concept="1E1JtA" id="3fV34643kGS" role="2G$12L">
         <property role="BnDLt" value="true" />
@@ -3301,25 +3311,6 @@
             </node>
           </node>
         </node>
-        <node concept="1SiIV0" id="3fV34643mDQ" role="3bR37C">
-          <node concept="1BurEX" id="3fV34643mDR" role="1SiIV1">
-            <node concept="398BVA" id="3fV34643mDD" role="1BurEY">
-              <ref role="398BVh" node="1k6eCQnEQWe" resolve="fasten.symo.code" />
-              <node concept="2Ry0Ak" id="3fV34643mDE" role="iGT6I">
-                <property role="2Ry0Am" value="solutions" />
-                <node concept="2Ry0Ak" id="3fV34643mDF" role="2Ry0An">
-                  <property role="2Ry0Am" value="com.symo.plantuml.lib" />
-                  <node concept="2Ry0Ak" id="3fV34643mDG" role="2Ry0An">
-                    <property role="2Ry0Am" value="lib" />
-                    <node concept="2Ry0Ak" id="3fV34643mDH" role="2Ry0An">
-                      <property role="2Ry0Am" value="batik-all-1.18.jar" />
-                    </node>
-                  </node>
-                </node>
-              </node>
-            </node>
-          </node>
-        </node>
         <node concept="1SiIV0" id="3fV34643mE5" role="3bR37C">
           <node concept="1BurEX" id="3fV34643mE6" role="1SiIV1">
             <node concept="398BVA" id="3fV34643mDS" role="1BurEY">