phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix synchronization problem

Browse Source
This commit is contained in:
Clément Fournier
2017-09-25 23:09:46 +02:00
parent cd16b18ed6
commit 4173e7c495
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/AvailableSyntaxHighlighters.java
View File

@ -23,6 +23,9 @@ public enum AvailableSyntaxHighlighters {
JAVA("java", JavaSyntaxHighlighter.INSTANCE), JAVA("java", JavaSyntaxHighlighter.INSTANCE),
APEX("apex", ApexSyntaxHighlighter.INSTANCE), APEX("apex", ApexSyntaxHighlighter.INSTANCE),
XML("xml", XmlSyntaxHighlighter.INSTANCE), XML("xml", XmlSyntaxHighlighter.INSTANCE),
XSL("xsl", XmlSyntaxHighlighter.INSTANCE),
WSDL("wsdl", XmlSyntaxHighlighter.INSTANCE),
POM("pom", XmlSyntaxHighlighter.INSTANCE),
XPATH("xpath", XPathSyntaxHighlighter.INSTANCE); XPATH("xpath", XPathSyntaxHighlighter.INSTANCE);

3
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/CustomCodeArea.java
View File

@ -142,10 +142,11 @@ public class CustomCodeArea extends CodeArea {
} }
private void launchAsyncSyntaxHighlighting(SyntaxHighlighter computer) { private synchronized void launchAsyncSyntaxHighlighting(SyntaxHighlighter computer) {
this.syntaxHighlighter = computer; this.syntaxHighlighter = computer;
if (executorService != null) { if (executorService != null) {
executorService.shutdown(); executorService.shutdown();
executorService = null;
} }
if (isSyntaxHighlightingEnabled && syntaxHighlighter != null) { if (isSyntaxHighlightingEnabled && syntaxHighlighter != null) {
executorService = Executors.newSingleThreadExecutor(); executorService = Executors.newSingleThreadExecutor();

2
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/syntaxhighlighting/XPathSyntaxHighlighter.java
View File

@ -35,7 +35,7 @@ public class XPathSyntaxHighlighter extends SimpleRegexSyntaxHighlighter {
.or("path", "//?") .or("path", "//?")
.or("paren", "[()]") .or("paren", "[()]")
.or("bracket", "[\\[\\]]") .or("bracket", "[\\[\\]]")
.or("string", "'([^'\\\\]|\\\\.)*'") .or("string", "('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")")
.or("single-line-comment", "\\(:.*:\\)") .or("single-line-comment", "\\(:.*:\\)")
.create(); .create();

4
pmd-ui/src/main/java/net/sourceforge/pmd/util/fxdesigner/util/codearea/syntaxhighlighting/XmlSyntaxHighlighter.java
View File

@ -25,8 +25,8 @@ public class XmlSyntaxHighlighter extends SimpleRegexSyntaxHighlighter {
.or("xml-prolog", "<[?]xml.*[?]>") .or("xml-prolog", "<[?]xml.*[?]>")
.or("lt-gt", "</?|/?>") .or("lt-gt", "</?|/?>")
.or("tag-name", "\\b(?<=(</?))[\\w:]++") .or("tag-name", "\\b(?<=(</?))[\\w:]++")
.or("attribute-name", "\\w+(?=\\s*=\\s*\")") .or("attribute-name", "\\w+(?=\\s*=\\s*[\"'])")
.or("string", "\"([^\"\\\\]|\\\\.)*\"") .or("string", "('([^'\\\\]|\\\\.)*')|(\"([^\"\\\\]|\\\\.)*\")")
.create(Pattern.DOTALL); .create(Pattern.DOTALL);