Skip to content

Commit f3211df

Browse files
authored
Merge pull request #66 from adangel/update-pmd-7.0.0-rc3
Update to PMD 7.0.0-rc3
2 parents 4c7d3ea + 635072f commit f3211df

File tree

5 files changed

+8
-82
lines changed

5 files changed

+8
-82
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,13 @@
22

33
## Next
44

5+
* **Bump required pmd-core version to 7.0.0-rc3.**
6+
57
**Fixed issues:**
68

9+
* [#61](https://github.com/pmd/pmd-designer/issues/61) Remove dependency to jcommander
10+
* [#63](https://github.com/pmd/pmd-designer/issues/63) Update to PMD 7.0.0-rc3
11+
712
**Merged pull requests:**
813

914
See https://github.com/pmd/pmd-designer/milestone/11

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
</developers>
5555

5656
<properties>
57-
<pmd.core.version>7.0.0-rc1</pmd.core.version>
57+
<pmd.core.version>7.0.0-rc3</pmd.core.version>
5858
<openjfx.version>11.0.2</openjfx.version>
5959
<java.version>8</java.version>
6060
<kotlin.version>1.7.20</kotlin.version>

src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerStarter.java

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313

1414
import net.sourceforge.pmd.annotation.InternalApi;
1515

16-
import com.beust.jcommander.JCommander;
17-
import com.beust.jcommander.ParameterException;
1816
import javafx.application.Application;
1917

2018
/**
@@ -46,43 +44,12 @@ private static boolean isJavaFxAvailable() {
4644
}
4745
}
4846

49-
@Deprecated
50-
private static MainCliArgs readParameters(String[] argv) {
51-
52-
MainCliArgs argsObj = new MainCliArgs();
53-
JCommander jCommander = new JCommander(argsObj);
54-
jCommander.setProgramName("designer");
55-
56-
try {
57-
jCommander.parse(argv);
58-
59-
if (argsObj.help) {
60-
System.out.println(getHelpText(jCommander));
61-
System.exit(ExitStatus.OK.getCode());
62-
}
63-
64-
return argsObj;
65-
66-
} catch (ParameterException e) {
67-
System.out.println(e.getMessage());
68-
System.out.println();
69-
System.out.println(getHelpText(jCommander));
70-
System.exit(ExitStatus.OK.getCode());
71-
throw new AssertionError();
72-
}
73-
74-
75-
}
76-
7747
/**
7848
* Starting from PMD 7.0.0 this method usage will be limited for development.
7949
* CLI support will be provided by pmd-cli
8050
*/
8151
@InternalApi
8252
public static void main(String[] args) {
83-
84-
readParameters(args);
85-
8653
final ExitStatus ret = launchGui(args);
8754
System.exit(ret.getCode());
8855
}
@@ -122,27 +89,6 @@ private static String getJavaFxVersion() {
12289
return null;
12390
}
12491

125-
@Deprecated
126-
private static String getHelpText(JCommander jCommander) {
127-
128-
StringBuilder sb = new StringBuilder();
129-
130-
131-
jCommander.usage(sb, " ");
132-
sb.append("\n");
133-
sb.append("\n");
134-
sb.append("PMD Rule Designer\n");
135-
sb.append("-----------------\n");
136-
sb.append("\n");
137-
sb.append("The Rule Designer is a graphical tool that helps PMD users develop their custom rules.\n");
138-
sb.append("\n");
139-
sb.append("\n");
140-
sb.append("Source & README: https://github.com/pmd/pmd-designer\n");
141-
sb.append("Usage documentation: https://pmd.github.io/latest/pmd_userdocs_extending_designer_reference.html");
142-
143-
return sb.toString();
144-
}
145-
14692
@SuppressWarnings("PMD.AvoidCatchingThrowable")
14793
public static ExitStatus launchGui(String[] args) {
14894
setSystemProperties();

src/main/java/net/sourceforge/pmd/util/fxdesigner/MainCliArgs.java

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/main/java/net/sourceforge/pmd/util/fxdesigner/app/services/ASTManagerImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
3434
import net.sourceforge.pmd.lang.ast.RootNode;
3535
import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
36+
import net.sourceforge.pmd.lang.document.FileId;
3637
import net.sourceforge.pmd.lang.document.TextDocument;
3738
import net.sourceforge.pmd.util.fxdesigner.SourceEditorController;
3839
import net.sourceforge.pmd.util.fxdesigner.app.ApplicationComponent;
@@ -277,7 +278,7 @@ private static Optional<Node> refreshAST(ApplicationComponent component,
277278
LanguageProcessorRegistry lpRegistry) throws ParseAbortedException {
278279

279280
String dummyFilePath = "dummy." + version.getLanguage().getExtensions().get(0);
280-
TextDocument textDocument = TextDocument.readOnlyString(source, dummyFilePath, version);
281+
TextDocument textDocument = TextDocument.readOnlyString(source, FileId.fromPathLikeString(dummyFilePath), version);
281282

282283
ParserTask task = new ParserTask(
283284
textDocument,

0 commit comments

Comments
 (0)