Merge pull request #79 from adangel:update-to-pmd-7.0.0-snapshot

Update to latest PMD 7.0.0-SNAPSHOT #79
pmd · Feb 9, 2024 · 0279ad2 · 0279ad2
2 parents e6ee175 + 482a880
commit 0279ad2
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 * [#77](https://github.com/pmd/pmd-designer/pull/77) Enable PMD checks with PMD 7 by [@adangel](https://github.com/adangel)
 * [#78](https://github.com/pmd/pmd-designer/pull/78) Fix deprecations from PMD 7 (getTerseName -> getId) by [@adangel](https://github.com/adangel)
+* [#79](https://github.com/pmd/pmd-designer/pull/79) Update to latest PMD 7.0.0-SNAPSHOT by [@adangel](https://github.com/adangel)
 
 ## 7.0.0-rc4
 

diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableRuleBuilder.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableRuleBuilder.java
@@ -14,9 +14,9 @@
 import org.reactfx.value.Val;
 import org.reactfx.value.Var;
 
-import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.rule.RulePriority;
 import net.sourceforge.pmd.util.fxdesigner.model.testing.LiveTestCase;
 import net.sourceforge.pmd.util.fxdesigner.model.testing.TestCollection;
 import net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry;

diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableXPathRuleBuilder.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/model/ObservableXPathRuleBuilder.java
@@ -7,7 +7,7 @@
 import org.reactfx.EventStream;
 import org.reactfx.value.Var;
 
-import net.sourceforge.pmd.lang.rule.XPathRule;
+import net.sourceforge.pmd.lang.rule.xpath.XPathRule;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 import net.sourceforge.pmd.util.fxdesigner.util.beans.SettingsPersistenceUtil.PersistentProperty;
 import net.sourceforge.pmd.util.fxdesigner.util.reactfx.ObservableTickList;

diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java
@@ -22,9 +22,9 @@
 import org.reactfx.Subscription;
 import org.reactfx.value.Var;
 
-import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageVersion;
+import net.sourceforge.pmd.lang.rule.RulePriority;
 import net.sourceforge.pmd.lang.rule.xpath.XPathVersion;
 import net.sourceforge.pmd.properties.PropertyTypeId;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
@@ -286,7 +286,6 @@ private static LiveTemplateBuilder<ObservableXPathRuleBuilder> liveTemplateBuild
                             .append("\" description=\"").bind(PropertyDescriptorSpec::descriptionProperty)
                             .appendLine("\"/>")
             )
-            .appendIndent(2).append("<property name=\"version\" value=\"").bind(ObservableXPathRuleBuilder::xpathVersionProperty).appendLine("\"/>")
             .appendIndent(2).appendLine("<property name=\"xpath\">")
             .appendIndent(3).appendLine("<value>")
             .appendLine("<![CDATA[")

diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/SettingsPersistenceUtil.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/beans/SettingsPersistenceUtil.java
@@ -31,10 +31,10 @@
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
-import net.sourceforge.pmd.RulePriority;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.lang.document.TextRegion;
+import net.sourceforge.pmd.lang.rule.RulePriority;
 import net.sourceforge.pmd.properties.PropertyTypeId;
 import net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry;
 import net.sourceforge.pmd.util.fxdesigner.util.beans.converters.Serializer;

diff --git a/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/RulePrioritySlider.java b/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/RulePrioritySlider.java
@@ -4,13 +4,13 @@
 
 package net.sourceforge.pmd.util.fxdesigner.util.controls;
 
-import static net.sourceforge.pmd.RulePriority.HIGH;
-import static net.sourceforge.pmd.RulePriority.LOW;
-import static net.sourceforge.pmd.RulePriority.MEDIUM;
+import static net.sourceforge.pmd.lang.rule.RulePriority.HIGH;
+import static net.sourceforge.pmd.lang.rule.RulePriority.LOW;
+import static net.sourceforge.pmd.lang.rule.RulePriority.MEDIUM;
 
 import org.reactfx.value.Var;
 
-import net.sourceforge.pmd.RulePriority;
+import net.sourceforge.pmd.lang.rule.RulePriority;
 import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 
 import javafx.scene.control.Slider;