Skip to content

Commit

Permalink
Merge pull request #989 from JetBrains/bugfix/remove_jdom2
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexanderpann
alexanderpann authored Oct 18, 2024
2 parents ce3d407 + d6e04d3 commit 567a7cd
Show file tree
Hide file tree
Showing 10 changed files with 246 additions and 561 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,21 @@ The format is *loosely* based on [Keep a Changelog](https://keepachangelog.com/e

## October 2024

### Fixed
### Removed

- *de.itemis.mps.editor.diagram*: *IDragPaletteEntry* and *IPaletteEntry* are not mutually exclusive anymore and can be implement by one class.
- *de.itemis.mps.utils.serializer.xml*: The jdom2 and jaxen stubs were removed. Please use the corresponding stubs from MPS itself.

### Added

- *com.mbeddr.mpsutil.editor.querylist*: The expression *queryListNode* was renamed to node and a new expression *index* can now be used to refer to the index of the current queried node.
- *de.itemis.mps.spellcheck*: This new language enhances the MPS spell checker to support custom dictionaries declared in a language and also adds some dictionary-related intentions to a new intention group *Dictionary.*
- *com.mbeddr.mpsutil.blutil.rt*: Provide useful scope class *UniqueElementScope* which ensures that there are no duplicates in the scope.

### Fixed

- *de.slisson.mps.tables*: Various fixes to table end cells in combination with insert and deletion handlers were made.
- *de.itemis.mps.editor.diagram*: *IDragPaletteEntry* and *IPaletteEntry* are not mutually exclusive anymore and can be implement by one class.

## September 2024

### Added
Expand Down
76 changes: 5 additions & 71 deletions .../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8032,53 +8032,6 @@
<ref role="3bR37D" to="ffeo:7Kfy9QB6LaO" resolve="jetbrains.mps.lang.structure" />
</node>
</node>
<node concept="1SiIV0" id="6860Y5A04yg" role="3bR37C">
<node concept="1BurEX" id="6860Y5A04yh" role="1SiIV1">
<node concept="398BVA" id="6860Y5A04y1" role="1BurEY">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="6860Y5A04y2" role="iGT6I">
<property role="2Ry0Am" value="utils" />
<node concept="2Ry0Ak" id="6860Y5A04y3" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A04y4" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A04y5" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6860Y5A04y6" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6860Y5A04y7" role="2Ry0An">
<property role="2Ry0Am" value="jaxen-1.1.6.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1SiIV0" id="6860Y5A04yv" role="3bR37C">
<node concept="1BurEX" id="6860Y5A04yw" role="1SiIV1">
<node concept="398BVA" id="6860Y5A04yi" role="1BurEY">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="6860Y5A04yj" role="iGT6I">
<property role="2Ry0Am" value="utils" />
<node concept="2Ry0Ak" id="6860Y5A04yk" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A04yl" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A04ym" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
<node concept="2Ry0Ak" id="6860Y5A04yn" role="2Ry0An">
<property role="2Ry0Am" value="jdom2-2.0.6.jar" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="1BupzO" id="2eucapX080U" role="3bR31x">
<property role="3ZfqAx" value="models" />
<property role="1Hdu6h" value="true" />
Expand All @@ -8104,6 +8057,11 @@
</node>
</node>
</node>
<node concept="1SiIV0" id="nnzoijD28J" role="3bR37C">
<node concept="3bR9La" id="nnzoijD28K" role="1SiIV1">
<ref role="3bR37D" to="ffeo:HHlBn9$wJ2" resolve="org.jdom" />
</node>
</node>
</node>
<node concept="1E1JtA" id="5zr7Q_1BD5a" role="2G$12L">
<property role="BnDLt" value="true" />
Expand Down Expand Up @@ -16679,30 +16637,6 @@
</node>
<node concept="m$_wl" id="6860Y5A0_cI" role="39821P">
<ref role="m_rDy" node="6860Y5_ZW8e" resolve="de.itemis.mps.utils" />
<node concept="398223" id="6860Y5A0_J4" role="39821P">
<node concept="3_J27D" id="6860Y5A0_J5" role="Nbhlr">
<node concept="3Mxwew" id="6860Y5A0_J8" role="3MwsjC">
<property role="3MwjfP" value="lib" />
</node>
</node>
<node concept="2HvfSZ" id="6860Y5A0_Ja" role="39821P">
<node concept="398BVA" id="6860Y5A0_Je" role="2HvfZ0">
<ref role="398BVh" node="2fo8bJE$D4t" resolve="extensions.code" />
<node concept="2Ry0Ak" id="6860Y5A0_ZV" role="iGT6I">
<property role="2Ry0Am" value="utils" />
<node concept="2Ry0Ak" id="6860Y5A0A00" role="2Ry0An">
<property role="2Ry0Am" value="solutions" />
<node concept="2Ry0Ak" id="6860Y5A0A05" role="2Ry0An">
<property role="2Ry0Am" value="de.itemis.mps.utils.serializer.xml" />
<node concept="2Ry0Ak" id="6860Y5A0A0a" role="2Ry0An">
<property role="2Ry0Am" value="lib" />
</node>
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="pUk6x" id="3D0nl1ssJJV" role="pUk7w" />
</node>
<node concept="m$_wl" id="4hvHh3QWqH0" role="39821P">
Expand Down
148 changes: 106 additions & 42 deletions ...olutions/de.itemis.mps.extensions.changelog/models/de.itemis.mps.extensions.changelog.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,69 +235,68 @@
<property role="15ShDY" value="Po4Z58IgBa/October" />
<property role="15ShDw" value="2024" />
</node>
<node concept="15bAme" id="23hO2UA61k_" role="15bAlL">
<node concept="2DRihI" id="23hO2UA61kA" role="15bAlk">
<node concept="2hgSXJ" id="23hO2UA61sQ" role="1PaTwD">
<node concept="1PaTwC" id="23hO2UA61sR" role="2hiFM$">
<node concept="15Ami3" id="23hO2UA61sS" role="1PaTwD">
<node concept="37shsh" id="23hO2UA61sT" role="15Aodc">
<node concept="1dCxOk" id="23hO2UA61sU" role="37shsm">
<property role="1XweGW" value="fa13cc63-c476-4d46-9c96-d53670abe7bc" />
<property role="1XxBO9" value="de.itemis.mps.editor.diagram" />
<node concept="15bAme" id="25K5MUJkvha" role="15bAlL">
<property role="15bAli" value="Po4Z58tnOM/removed" />
<node concept="2DRihI" id="25K5MUJkvhb" role="15bAlk">
<node concept="2hgSXJ" id="25K5MUJkvpC" role="1PaTwD">
<node concept="1PaTwC" id="25K5MUJkvpD" role="2hiFM$">
<node concept="15Ami3" id="25K5MUJkvpE" role="1PaTwD">
<node concept="37shsh" id="25K5MUJkvpF" role="15Aodc">
<node concept="1dCxOk" id="25K5MUJkvpG" role="37shsm">
<property role="1XweGW" value="5454dbfd-2075-4de0-b85e-fa645eb6957e" />
<property role="1XxBO9" value="de.itemis.mps.utils.serializer.xml" />
</node>
</node>
</node>
<node concept="3oM_SD" id="23hO2UA61sV" role="1PaTwD">
<node concept="3oM_SD" id="25K5MUJkvpH" role="1PaTwD">
<property role="3oM_SC" value=":" />
</node>
</node>
</node>
<node concept="3oM_SD" id="23hO2UA61u3" role="1PaTwD">
<property role="3oM_SC" value="IDragPaletteEntry" />
<property role="1X82VY" value="true" />
<node concept="3oM_SD" id="25K5MUJkvqH" role="1PaTwD">
<property role="3oM_SC" value="The" />
</node>
<node concept="3oM_SD" id="23hO2UA61u4" role="1PaTwD">
<property role="3oM_SC" value="and" />
<node concept="3oM_SD" id="25K5MUJkvqP" role="1PaTwD">
<property role="3oM_SC" value="jdom2" />
</node>
<node concept="3oM_SD" id="23hO2UA61u5" role="1PaTwD">
<property role="3oM_SC" value="IPaletteEntry" />
<property role="1X82VY" value="true" />
<node concept="3oM_SD" id="25K5MUJkvtP" role="1PaTwD">
<property role="3oM_SC" value="and" />
</node>
<node concept="3oM_SD" id="23hO2UA61JK" role="1PaTwD">
<property role="3oM_SC" value="are" />
<node concept="3oM_SD" id="25K5MUJkvz3" role="1PaTwD">
<property role="3oM_SC" value="jaxen" />
</node>
<node concept="3oM_SD" id="23hO2UA61LB" role="1PaTwD">
<property role="3oM_SC" value="not" />
<node concept="3oM_SD" id="25K5MUJkv$U" role="1PaTwD">
<property role="3oM_SC" value="stubs" />
</node>
<node concept="3oM_SD" id="23hO2UA61MD" role="1PaTwD">
<property role="3oM_SC" value="mutually" />
<node concept="3oM_SD" id="25K5MUJkv_6" role="1PaTwD">
<property role="3oM_SC" value="were" />
</node>
<node concept="3oM_SD" id="23hO2UA61NG" role="1PaTwD">
<property role="3oM_SC" value="exclusive" />
<node concept="3oM_SD" id="25K5MUJkvA9" role="1PaTwD">
<property role="3oM_SC" value="removed." />
</node>
<node concept="3oM_SD" id="23hO2UA61SY" role="1PaTwD">
<property role="3oM_SC" value="anymore" />
<node concept="3oM_SD" id="25K5MUJkvBd" role="1PaTwD">
<property role="3oM_SC" value="Please" />
</node>
<node concept="3oM_SD" id="23hO2UA61U3" role="1PaTwD">
<property role="3oM_SC" value="and" />
<node concept="3oM_SD" id="25K5MUJkvCi" role="1PaTwD">
<property role="3oM_SC" value="use" />
</node>
<node concept="3oM_SD" id="23hO2UA61V9" role="1PaTwD">
<property role="3oM_SC" value="can" />
<node concept="3oM_SD" id="25K5MUJkvDo" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="23hO2UA61Wg" role="1PaTwD">
<property role="3oM_SC" value="be" />
<node concept="3oM_SD" id="25K5MUJkvDD" role="1PaTwD">
<property role="3oM_SC" value="corresponding" />
</node>
<node concept="3oM_SD" id="23hO2UA61Wy" role="1PaTwD">
<property role="3oM_SC" value="implement" />
<node concept="3oM_SD" id="25K5MUJkvFB" role="1PaTwD">
<property role="3oM_SC" value="stubs" />
</node>
<node concept="3oM_SD" id="23hO2UA61XF" role="1PaTwD">
<property role="3oM_SC" value="by" />
<node concept="3oM_SD" id="25K5MUJkvFU" role="1PaTwD">
<property role="3oM_SC" value="from" />
</node>
<node concept="3oM_SD" id="23hO2UA61XZ" role="1PaTwD">
<property role="3oM_SC" value="one" />
<node concept="3oM_SD" id="25K5MUJkvH4" role="1PaTwD">
<property role="3oM_SC" value="MPS" />
</node>
<node concept="3oM_SD" id="23hO2UA61Za" role="1PaTwD">
<property role="3oM_SC" value="class." />
<node concept="3oM_SD" id="25K5MUJkvHp" role="1PaTwD">
<property role="3oM_SC" value="itself." />
</node>
</node>
</node>
Expand Down Expand Up @@ -631,6 +630,71 @@
<property role="3oM_SC" value="made." />
</node>
</node>
<node concept="2DRihI" id="25K5MUJkvbz" role="15bAlk">
<property role="2RT3bR" value="0" />
<node concept="2hgSXJ" id="25K5MUJkvcD" role="1PaTwD">
<node concept="1PaTwC" id="25K5MUJkvcE" role="2hiFM$">
<node concept="15Ami3" id="25K5MUJkvcF" role="1PaTwD">
<node concept="37shsh" id="25K5MUJkvcG" role="15Aodc">
<node concept="1dCxOk" id="25K5MUJkvcH" role="37shsm">
<property role="1XweGW" value="fa13cc63-c476-4d46-9c96-d53670abe7bc" />
<property role="1XxBO9" value="de.itemis.mps.editor.diagram" />
</node>
</node>
</node>
<node concept="3oM_SD" id="25K5MUJkvcI" role="1PaTwD">
<property role="3oM_SC" value=":" />
</node>
</node>
</node>
<node concept="3oM_SD" id="25K5MUJkvcJ" role="1PaTwD">
<property role="3oM_SC" value="IDragPaletteEntry" />
<property role="1X82VY" value="true" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcK" role="1PaTwD">
<property role="3oM_SC" value="and" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcL" role="1PaTwD">
<property role="3oM_SC" value="IPaletteEntry" />
<property role="1X82VY" value="true" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcM" role="1PaTwD">
<property role="3oM_SC" value="are" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcN" role="1PaTwD">
<property role="3oM_SC" value="not" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcO" role="1PaTwD">
<property role="3oM_SC" value="mutually" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcP" role="1PaTwD">
<property role="3oM_SC" value="exclusive" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcQ" role="1PaTwD">
<property role="3oM_SC" value="anymore" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcR" role="1PaTwD">
<property role="3oM_SC" value="and" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcS" role="1PaTwD">
<property role="3oM_SC" value="can" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcT" role="1PaTwD">
<property role="3oM_SC" value="be" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcU" role="1PaTwD">
<property role="3oM_SC" value="implement" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcV" role="1PaTwD">
<property role="3oM_SC" value="by" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcW" role="1PaTwD">
<property role="3oM_SC" value="one" />
</node>
<node concept="3oM_SD" id="25K5MUJkvcX" role="1PaTwD">
<property role="3oM_SC" value="class." />
</node>
</node>
</node>
</node>
<node concept="15bmVD" id="2IcGFIaJNN3" role="15bmVC">
Expand Down
12 changes: 3 additions & 9 deletions ...utils/solutions/de.itemis.mps.utils.serializer.xml/de.itemis.mps.utils.serializer.xml.msd
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<solution name="de.itemis.mps.utils.serializer.xml" uuid="5454dbfd-2075-4de0-b85e-fa645eb6957e" moduleVersion="0">
<models>
<modelRoot contentPath="${module}" type="default">
<modelRoot type="default" contentPath="${module}">
<sourceRoot location="models" />
</modelRoot>
<modelRoot contentPath="${module}/lib" type="java_classes">
<sourceRoot location="jdom2-2.0.6.jar" />
</modelRoot>
<modelRoot contentPath="${module}/lib/lib" type="java_classes">
<sourceRoot location="jaxen-1.1.6.jar" />
</modelRoot>
</models>
<facets>
<facet type="java" compile="mps" classes="mps" ext="yes">
<classes generated="true" path="${module}/classes_gen" />
<library location="${module}/lib/lib/jaxen-1.1.6.jar" />
<library location="${module}/lib/jdom2-2.0.6.jar" />
</facet>
</facets>
<dependencies>
<dependency reexport="false">6354ebe7-c22a-4a0f-ac54-50b52ab9b065(JDK)</dependency>
<dependency reexport="false">8865b7a8-5271-43d3-884c-6fd1d9cfdd34(MPS.OpenAPI)</dependency>
<dependency reexport="false">ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)</dependency>
<dependency reexport="false">c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)</dependency>
<dependency reexport="false">f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)</dependency>
</dependencies>
<languageVersions>
<language slang="l:f3061a53-9226-4cc5-a443-f952ceaf5816:jetbrains.mps.baseLanguage" version="12" />
Expand Down Expand Up @@ -68,6 +61,7 @@
<module reference="ceab5195-25ea-4f22-9b92-103b95ca8c0c(jetbrains.mps.lang.core)" version="0" />
<module reference="d7eb0a2a-bd50-4576-beae-e4a89db35f20(jetbrains.mps.lang.scopes.runtime)" version="0" />
<module reference="c72da2b9-7cce-4447-8389-f407dc1158b7(jetbrains.mps.lang.structure)" version="0" />
<module reference="f647e48e-4568-4f4c-b48a-1546492c6a2e(org.jdom)" version="0" />
</dependencyVersions>
</solution>

54 changes: 0 additions & 54 deletions code/utils/solutions/de.itemis.mps.utils.serializer.xml/lib/LICENSE.txt
View file

This file was deleted.

Loading

0 comments on commit 567a7cd

Please sign in to comment.