From e7e95b85b2d114cb0a67d9c73a907d562b44d97c Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 16 Sep 2015 20:34:17 -0400 Subject: [PATCH 01/15] Initial build w/ use of ServiceLoader for loading languages. --- pom.xml | 76 +++ .../DefaultTokenMakerFactory.java | 116 ++-- .../ui/rsyntaxtextarea/RSyntaxTextArea.java | 7 +- .../RSyntaxTextAreaEditorKit.java | 3 +- .../ui/rsyntaxtextarea/SyntaxConstants.java | 507 +++++++++--------- .../TokenMakerRegistration.java | 21 + .../folding/FoldParserManager.java | 200 +++---- .../modes/ActionScriptTokenRegistration.java | 33 ++ .../modes/AssemplerX86TokenRegistration.java | 34 ++ .../modes/BBCodeTokenRegistration.java | 34 ++ .../modes/BshTokenRegistration.java | 35 ++ .../modes/CPlusPlusTokenRegistration.java | 35 ++ .../modes/CSSTokenRegistration.java | 34 ++ .../modes/CSharpTokenRegistration.java | 36 ++ .../modes/CTokenRegistration.java | 35 ++ .../modes/ClojureTokenRegistration.java | 34 ++ .../modes/DTokenRegistration.java | 34 ++ .../modes/DartTokenRegistration.java | 35 ++ .../modes/DelphiTokenRegistration.java | 34 ++ .../modes/DtdTokenRegistration.java | 34 ++ .../modes/FortranTokenRegistration.java | 34 ++ .../modes/GroovyTokenRegistration.java | 35 ++ .../modes/HTMLTokenRegistration.java | 35 ++ .../modes/HtaccessTokenRegistration.java | 35 ++ .../modes/JSPTokenRegistration.java | 35 ++ .../modes/JavaScriptTokenRegistration.java | 34 ++ .../modes/JavaTokenRegistration.java | 34 ++ .../modes/JshintrcTokenRegistration.java | 34 ++ .../modes/JsonRegistration.java | 34 ++ .../modes/LatexTokenRegistration.java | 34 ++ .../modes/LessTokenRegistration.java | 34 ++ .../modes/LispTokenRegistration.java | 35 ++ .../modes/LuaTokenRegistration.java | 33 ++ .../modes/MakefileTokenRegistration.java | 33 ++ .../modes/MxmlTokenRegistration.java | 34 ++ .../modes/NSISTokenRegistration.java | 34 ++ .../modes/PHPTokenRegistration.java | 34 ++ .../modes/PerlTokenRegistration.java | 35 ++ .../modes/PlainTextTokenRegistration.java | 33 ++ .../PropertiesFileTokenRegistration.java | 33 ++ .../modes/PythonTokenRegistration.java | 33 ++ .../modes/RubyTokenRegistration.java | 33 ++ .../modes/SASTokenRegistration.java | 33 ++ .../modes/SQLTokenRegistration.java | 34 ++ .../modes/ScalaTokenRegistration.java | 35 ++ .../modes/TclTokenRegistration.java | 33 ++ .../modes/UnixShellTokenRegistration.java | 33 ++ .../modes/VisualBasicTokenRegistration.java | 33 ++ .../modes/WindowsBatchTokenRegistration.java | 33 ++ .../modes/XMLTokenRegistration.java | 34 ++ .../rsyntaxtextarea/parser/TaskTagParser.java | 3 +- ....ui.rsyntaxtextarea.TokenMakerRegistration | 43 ++ .../rsyntaxtextarea/RSyntaxDocumentTest.java | 78 +-- ...eaEditorKitDumbCompleteWordActionTest.java | 16 +- ...taxTextAreaEditorKitEndWordActionTest.java | 3 +- .../rsyntaxtextarea/RSyntaxTextAreaTest.java | 14 +- .../fife/ui/rsyntaxtextarea/ThemeTest.java | 11 +- .../ui/rsyntaxtextarea/TokenIteratorTest.java | 7 +- 58 files changed, 2099 insertions(+), 469 deletions(-) create mode 100644 pom.xml create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/ActionScriptTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/AssemplerX86TokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/CTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java create mode 100644 src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..cafadef7f --- /dev/null +++ b/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + com.artistech + rsyntaxtextarea + 2.5.8 + jar + + + + eu.somatik.serviceloader-maven-plugin + serviceloader-maven-plugin + 1.0.3 + + + org.fife.ui.rsyntaxtextarea.TokenMakerRegistration + + + + + + generate + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.10 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/lib + false + false + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.5.1 + + true + + + + + + src/main/resources + true + + + + + + junit + junit + 4.11 + test + + + + UTF-8 + 1.6 + 1.6 + + \ No newline at end of file diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java b/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java index 4b65e0f90..75c92b40c 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java @@ -8,9 +8,10 @@ */ package org.fife.ui.rsyntaxtextarea; +import java.util.ServiceLoader; /** - * The default implementation of TokenMakerFactory. This factory + * The default implementation of TokenMakerFactory. This factory * can create {@link TokenMaker}s for all languages known to * {@link RSyntaxTextArea}. * @@ -18,61 +19,64 @@ * @version 1.0 */ class DefaultTokenMakerFactory extends AbstractTokenMakerFactory - implements SyntaxConstants { + implements SyntaxConstants { + + /** + * {@inheritDoc} + */ + @Override + protected void initTokenMakerMap() { + ServiceLoader s = ServiceLoader.load(TokenMakerRegistration.class); + for (TokenMakerRegistration l : s) { + putMapping(l.getLanguage(), l.getTokenMaker()); + } +// String pkg = "org.fife.ui.rsyntaxtextarea.modes."; +// +// putMapping(SYNTAX_STYLE_NONE, pkg + "PlainTextTokenMaker"); +// putMapping(SYNTAX_STYLE_ACTIONSCRIPT, pkg + "ActionScriptTokenMaker"); +// putMapping(SYNTAX_STYLE_ASSEMBLER_X86, pkg + "AssemblerX86TokenMaker"); +// putMapping(SYNTAX_STYLE_BBCODE, pkg + "BBCodeTokenMaker"); +// putMapping(SYNTAX_STYLE_C, pkg + "CTokenMaker"); +// putMapping(SYNTAX_STYLE_CLOJURE, pkg + "ClojureTokenMaker"); +// putMapping(SYNTAX_STYLE_CPLUSPLUS, pkg + "CPlusPlusTokenMaker"); +// putMapping(SYNTAX_STYLE_CSHARP, pkg + "CSharpTokenMaker"); +// putMapping(SYNTAX_STYLE_CSS, pkg + "CSSTokenMaker"); +// putMapping(SYNTAX_STYLE_D, pkg + "DTokenMaker"); +// putMapping(SYNTAX_STYLE_DART, pkg + "DartTokenMaker"); +// putMapping(SYNTAX_STYLE_DELPHI, pkg + "DelphiTokenMaker"); +// putMapping(SYNTAX_STYLE_DTD, pkg + "DtdTokenMaker"); +// putMapping(SYNTAX_STYLE_FORTRAN, pkg + "FortranTokenMaker"); +// putMapping(SYNTAX_STYLE_GROOVY, pkg + "GroovyTokenMaker"); +// putMapping(SYNTAX_STYLE_HTACCESS, pkg + "HtaccessTokenMaker"); +// putMapping(SYNTAX_STYLE_HTML, pkg + "HTMLTokenMaker"); +// putMapping(SYNTAX_STYLE_JAVA, pkg + "JavaTokenMaker"); +// putMapping(SYNTAX_STYLE_BSH, pkg + "JavaTokenMaker"); +// putMapping(SYNTAX_STYLE_JAVASCRIPT, pkg + "JavaScriptTokenMaker"); +// putMapping(SYNTAX_STYLE_JSHINTRC, pkg + "JshintrcTokenMaker"); +// putMapping(SYNTAX_STYLE_JSON, pkg + "JsonTokenMaker"); +// putMapping(SYNTAX_STYLE_JSP, pkg + "JSPTokenMaker"); +// putMapping(SYNTAX_STYLE_LATEX, pkg + "LatexTokenMaker"); +// putMapping(SYNTAX_STYLE_LESS, pkg + "LessTokenMaker"); +// putMapping(SYNTAX_STYLE_LISP, pkg + "LispTokenMaker"); +// putMapping(SYNTAX_STYLE_LUA, pkg + "LuaTokenMaker"); +// putMapping(SYNTAX_STYLE_MAKEFILE, pkg + "MakefileTokenMaker"); +// putMapping(SYNTAX_STYLE_MXML, pkg + "MxmlTokenMaker"); +// putMapping(SYNTAX_STYLE_NSIS, pkg + "NSISTokenMaker"); +// putMapping(SYNTAX_STYLE_PERL, pkg + "PerlTokenMaker"); +// putMapping(SYNTAX_STYLE_PHP, pkg + "PHPTokenMaker"); +// putMapping(SYNTAX_STYLE_PROPERTIES_FILE,pkg + "PropertiesFileTokenMaker"); +// putMapping(SYNTAX_STYLE_PYTHON, pkg + "PythonTokenMaker"); +// putMapping(SYNTAX_STYLE_RUBY, pkg + "RubyTokenMaker"); +// putMapping(SYNTAX_STYLE_SAS, pkg + "SASTokenMaker"); +// putMapping(SYNTAX_STYLE_SCALA, pkg + "ScalaTokenMaker"); +// putMapping(SYNTAX_STYLE_SQL, pkg + "SQLTokenMaker"); +// putMapping(SYNTAX_STYLE_TCL, pkg + "TclTokenMaker"); +// putMapping(SYNTAX_STYLE_UNIX_SHELL, pkg + "UnixShellTokenMaker"); +// putMapping(SYNTAX_STYLE_VISUAL_BASIC, pkg + "VisualBasicTokenMaker"); +// putMapping(SYNTAX_STYLE_WINDOWS_BATCH, pkg + "WindowsBatchTokenMaker"); +// putMapping(SYNTAX_STYLE_XML, pkg + "XMLTokenMaker"); - /** - * {@inheritDoc} - */ - @Override - protected void initTokenMakerMap() { + } - String pkg = "org.fife.ui.rsyntaxtextarea.modes."; - - putMapping(SYNTAX_STYLE_NONE, pkg + "PlainTextTokenMaker"); - putMapping(SYNTAX_STYLE_ACTIONSCRIPT, pkg + "ActionScriptTokenMaker"); - putMapping(SYNTAX_STYLE_ASSEMBLER_X86, pkg + "AssemblerX86TokenMaker"); - putMapping(SYNTAX_STYLE_BBCODE, pkg + "BBCodeTokenMaker"); - putMapping(SYNTAX_STYLE_C, pkg + "CTokenMaker"); - putMapping(SYNTAX_STYLE_CLOJURE, pkg + "ClojureTokenMaker"); - putMapping(SYNTAX_STYLE_CPLUSPLUS, pkg + "CPlusPlusTokenMaker"); - putMapping(SYNTAX_STYLE_CSHARP, pkg + "CSharpTokenMaker"); - putMapping(SYNTAX_STYLE_CSS, pkg + "CSSTokenMaker"); - putMapping(SYNTAX_STYLE_D, pkg + "DTokenMaker"); - putMapping(SYNTAX_STYLE_DART, pkg + "DartTokenMaker"); - putMapping(SYNTAX_STYLE_DELPHI, pkg + "DelphiTokenMaker"); - putMapping(SYNTAX_STYLE_DTD, pkg + "DtdTokenMaker"); - putMapping(SYNTAX_STYLE_FORTRAN, pkg + "FortranTokenMaker"); - putMapping(SYNTAX_STYLE_GROOVY, pkg + "GroovyTokenMaker"); - putMapping(SYNTAX_STYLE_HTACCESS, pkg + "HtaccessTokenMaker"); - putMapping(SYNTAX_STYLE_HTML, pkg + "HTMLTokenMaker"); - putMapping(SYNTAX_STYLE_JAVA, pkg + "JavaTokenMaker"); - putMapping(SYNTAX_STYLE_JAVASCRIPT, pkg + "JavaScriptTokenMaker"); - putMapping(SYNTAX_STYLE_JSHINTRC, pkg + "JshintrcTokenMaker"); - putMapping(SYNTAX_STYLE_JSON, pkg + "JsonTokenMaker"); - putMapping(SYNTAX_STYLE_JSP, pkg + "JSPTokenMaker"); - putMapping(SYNTAX_STYLE_LATEX, pkg + "LatexTokenMaker"); - putMapping(SYNTAX_STYLE_LESS, pkg + "LessTokenMaker"); - putMapping(SYNTAX_STYLE_LISP, pkg + "LispTokenMaker"); - putMapping(SYNTAX_STYLE_LUA, pkg + "LuaTokenMaker"); - putMapping(SYNTAX_STYLE_MAKEFILE, pkg + "MakefileTokenMaker"); - putMapping(SYNTAX_STYLE_MXML, pkg + "MxmlTokenMaker"); - putMapping(SYNTAX_STYLE_NSIS, pkg + "NSISTokenMaker"); - putMapping(SYNTAX_STYLE_PERL, pkg + "PerlTokenMaker"); - putMapping(SYNTAX_STYLE_PHP, pkg + "PHPTokenMaker"); - putMapping(SYNTAX_STYLE_PROPERTIES_FILE,pkg + "PropertiesFileTokenMaker"); - putMapping(SYNTAX_STYLE_PYTHON, pkg + "PythonTokenMaker"); - putMapping(SYNTAX_STYLE_RUBY, pkg + "RubyTokenMaker"); - putMapping(SYNTAX_STYLE_SAS, pkg + "SASTokenMaker"); - putMapping(SYNTAX_STYLE_SCALA, pkg + "ScalaTokenMaker"); - putMapping(SYNTAX_STYLE_SQL, pkg + "SQLTokenMaker"); - putMapping(SYNTAX_STYLE_TCL, pkg + "TclTokenMaker"); - putMapping(SYNTAX_STYLE_UNIX_SHELL, pkg + "UnixShellTokenMaker"); - putMapping(SYNTAX_STYLE_VISUAL_BASIC, pkg + "VisualBasicTokenMaker"); - putMapping(SYNTAX_STYLE_WINDOWS_BATCH, pkg + "WindowsBatchTokenMaker"); - putMapping(SYNTAX_STYLE_XML, pkg + "XMLTokenMaker"); - - } - - -} \ No newline at end of file +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextArea.java b/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextArea.java index 8756cffe7..8afa1dbc8 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextArea.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextArea.java @@ -53,6 +53,7 @@ import org.fife.ui.rsyntaxtextarea.focusabletip.FocusableTip; import org.fife.ui.rsyntaxtextarea.folding.Fold; import org.fife.ui.rsyntaxtextarea.folding.FoldManager; +import org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration; import org.fife.ui.rsyntaxtextarea.parser.Parser; import org.fife.ui.rsyntaxtextarea.parser.ParserNotice; import org.fife.ui.rsyntaxtextarea.parser.ToolTipInfo; @@ -682,7 +683,7 @@ public void copyAsRtf() { */ @Override protected Document createDefaultModel() { - return new RSyntaxDocument(SYNTAX_STYLE_NONE); + return new RSyntaxDocument(PlainTextTokenRegistration.SYNTAX_STYLE); } @@ -1875,7 +1876,7 @@ protected void init() { } // Set some RSyntaxTextArea default values. - syntaxStyleKey = SYNTAX_STYLE_NONE; + syntaxStyleKey = PlainTextTokenRegistration.SYNTAX_STYLE; setMatchedBracketBGColor(getDefaultBracketMatchBGColor()); setMatchedBracketBorderColor(getDefaultBracketMatchBorderColor()); setBracketMatchingEnabled(true); @@ -2802,7 +2803,7 @@ public void setSecondaryLanguageBackground(int index, Color color) { */ public void setSyntaxEditingStyle(String styleKey) { if (styleKey==null) { - styleKey = SYNTAX_STYLE_NONE; + styleKey = PlainTextTokenRegistration.SYNTAX_STYLE; } if (!styleKey.equals(syntaxStyleKey)) { String oldStyle = syntaxStyleKey; diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java b/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java index 136076881..61d211586 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKit.java @@ -19,6 +19,7 @@ import org.fife.ui.rsyntaxtextarea.folding.Fold; import org.fife.ui.rsyntaxtextarea.folding.FoldCollapser; import org.fife.ui.rsyntaxtextarea.folding.FoldManager; +import org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration; import org.fife.ui.rsyntaxtextarea.templates.CodeTemplate; import org.fife.ui.rtextarea.Gutter; import org.fife.ui.rtextarea.IconRowHeader; @@ -127,7 +128,7 @@ public RSyntaxTextAreaEditorKit() { */ @Override public Document createDefaultDocument() { - return new RSyntaxDocument(SyntaxConstants.SYNTAX_STYLE_NONE); + return new RSyntaxDocument(PlainTextTokenRegistration.SYNTAX_STYLE); } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java index 98b4d40ed..2450f358a 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java @@ -28,256 +28,261 @@ */ public interface SyntaxConstants { - /** - * Style meaning don't syntax highlight anything. - */ - public static final String SYNTAX_STYLE_NONE = "text/plain"; - - - /** - * Style for highlighting ActionScript. - */ - public static final String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; - - - /** - * Style for highlighting x86 assembler. - */ - public static final String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; - - - /** - * Style for highlighting BBCode. - */ - public static final String SYNTAX_STYLE_BBCODE = "text/bbcode"; - - - /** - * Style for highlighting C. - */ - public static final String SYNTAX_STYLE_C = "text/c"; - - - /** - * Style for highlighting Clojure. - */ - public static final String SYNTAX_STYLE_CLOJURE = "text/clojure"; - - - /** - * Style for highlighting C++. - */ - public static final String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; - - - /** - * Style for highlighting C#. - */ - public static final String SYNTAX_STYLE_CSHARP = "text/cs"; - - - /** - * Style for highlighting CSS. - */ - public static final String SYNTAX_STYLE_CSS = "text/css"; - - - /** - * Syntax style for highlighting D. - */ - public static final String SYNTAX_STYLE_D = "text/d"; - - - /** - * Style for highlighting Dart. - */ - public static final String SYNTAX_STYLE_DART = "text/dart"; - - - /** - * Style for highlighting Delphi/Pascal. - */ - public static final String SYNTAX_STYLE_DELPHI = "text/delphi"; - - - /** - * Style for highlighting DTD files. - */ - public static final String SYNTAX_STYLE_DTD = "text/dtd"; - - - /** - * Style for highlighting Fortran. - */ - public static final String SYNTAX_STYLE_FORTRAN = "text/fortran"; - - - /** - * Style for highlighting Groovy. - */ - public static final String SYNTAX_STYLE_GROOVY = "text/groovy"; - - - /** - * Style for highlighting .htaccess files. - */ - public static final String SYNTAX_STYLE_HTACCESS = "text/htaccess"; - - - /** - * Style for highlighting HTML. - */ - public static final String SYNTAX_STYLE_HTML = "text/html"; - - - /** - * Style for highlighting Java. - */ - public static final String SYNTAX_STYLE_JAVA = "text/java"; - - - /** - * Style for highlighting JavaScript. - */ - public static final String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; - - - /** - * Style for highlighting .jshintrc files. - */ - public static final String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; - - - /** - * Style for highlighting JSON. - */ - public static final String SYNTAX_STYLE_JSON = "text/json"; - - - /** - * Style for highlighting JSP. - */ - public static final String SYNTAX_STYLE_JSP = "text/jsp"; - - - /** - * Style for highlighting LaTeX. - */ - public static final String SYNTAX_STYLE_LATEX = "text/latex"; - - - /** - * Style for highlighting Less. - */ - public static final String SYNTAX_STYLE_LESS = "text/less"; - - - /** - * Style for highlighting Lisp. - */ - public static final String SYNTAX_STYLE_LISP = "text/lisp"; - - - /** - * Style for highlighting Lua. - */ - public static final String SYNTAX_STYLE_LUA = "text/lua"; - - - /** - * Style for highlighting makefiles. - */ - public static final String SYNTAX_STYLE_MAKEFILE = "text/makefile"; - - - /** - * Style for highlighting MXML. - */ - public static final String SYNTAX_STYLE_MXML = "text/mxml"; - - - /** - * Style for highlighting NSIS install scripts. - */ - public static final String SYNTAX_STYLE_NSIS = "text/nsis"; - - - /** - * Style for highlighting Perl. - */ - public static final String SYNTAX_STYLE_PERL = "text/perl"; - - - /** - * Style for highlighting PHP. - */ - public static final String SYNTAX_STYLE_PHP = "text/php"; - - - /** - * Style for highlighting properties files. - */ - public static final String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; - - - /** - * Style for highlighting Python. - */ - public static final String SYNTAX_STYLE_PYTHON = "text/python"; - - - /** - * Style for highlighting Ruby. - */ - public static final String SYNTAX_STYLE_RUBY = "text/ruby"; - - - /** - * Style for highlighting SAS keywords. - */ - public static final String SYNTAX_STYLE_SAS = "text/sas"; - - - /** - * Style for highlighting Scala. - */ - public static final String SYNTAX_STYLE_SCALA = "text/scala"; - - - /** - * Style for highlighting SQL. - */ - public static final String SYNTAX_STYLE_SQL = "text/sql"; - - - /** - * Style for highlighting Tcl. - */ - public static final String SYNTAX_STYLE_TCL = "text/tcl"; - - - /** - * Style for highlighting UNIX shell keywords. - */ - public static final String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; - - - /** - * Style for highlighting Visual Basic. - */ - public static final String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; - - - /** - * Style for highlighting Windows batch files. - */ - public static final String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; - - - /** - * Style for highlighting XML. - */ - public static final String SYNTAX_STYLE_XML = "text/xml"; - +// /** +// * Style meaning don't syntax highlight anything. +// */ +// public static final String SYNTAX_STYLE_NONE = "text/plain"; +// +// +// /** +// * Style for highlighting ActionScript. +// */ +// public static final String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; +// +// +// /** +// * Style for highlighting x86 assembler. +// */ +// public static final String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; +// +// +// /** +// * Style for highlighting BBCode. +// */ +// public static final String SYNTAX_STYLE_BBCODE = "text/bbcode"; +// +// +// /** +// * Style for highlighting C. +// */ +// public static final String SYNTAX_STYLE_C = "text/c"; +// +// +// /** +// * Style for highlighting Clojure. +// */ +// public static final String SYNTAX_STYLE_CLOJURE = "text/clojure"; +// +// +// /** +// * Style for highlighting C++. +// */ +// public static final String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; +// +// +// /** +// * Style for highlighting C#. +// */ +// public static final String SYNTAX_STYLE_CSHARP = "text/cs"; +// +// +// /** +// * Style for highlighting CSS. +// */ +// public static final String SYNTAX_STYLE_CSS = "text/css"; +// +// +// /** +// * Syntax style for highlighting D. +// */ +// public static final String SYNTAX_STYLE_D = "text/d"; +// +// +// /** +// * Style for highlighting Dart. +// */ +// public static final String SYNTAX_STYLE_DART = "text/dart"; +// +// +// /** +// * Style for highlighting Delphi/Pascal. +// */ +// public static final String SYNTAX_STYLE_DELPHI = "text/delphi"; +// +// +// /** +// * Style for highlighting DTD files. +// */ +// public static final String SYNTAX_STYLE_DTD = "text/dtd"; +// +// +// /** +// * Style for highlighting Fortran. +// */ +// public static final String SYNTAX_STYLE_FORTRAN = "text/fortran"; +// +// +// /** +// * Style for highlighting Groovy. +// */ +// public static final String SYNTAX_STYLE_GROOVY = "text/groovy"; +// +// +// /** +// * Style for highlighting .htaccess files. +// */ +// public static final String SYNTAX_STYLE_HTACCESS = "text/htaccess"; +// +// +// /** +// * Style for highlighting HTML. +// */ +// public static final String SYNTAX_STYLE_HTML = "text/html"; +// +// +// /** +// * Style for highlighting Java. +// */ +// public static final String SYNTAX_STYLE_JAVA = "text/java"; +// +// /** +// * Style for highlighting BeanShell. +// */ +// public static final String SYNTAX_STYLE_BSH = "text/bsh"; +// +// +// /** +// * Style for highlighting JavaScript. +// */ +// public static final String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; +// +// +// /** +// * Style for highlighting .jshintrc files. +// */ +// public static final String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; +// +// +// /** +// * Style for highlighting JSON. +// */ +// public static final String SYNTAX_STYLE_JSON = "text/json"; +// +// +// /** +// * Style for highlighting JSP. +// */ +// public static final String SYNTAX_STYLE_JSP = "text/jsp"; +// +// +// /** +// * Style for highlighting LaTeX. +// */ +// public static final String SYNTAX_STYLE_LATEX = "text/latex"; +// +// +// /** +// * Style for highlighting Less. +// */ +// public static final String SYNTAX_STYLE_LESS = "text/less"; +// +// +// /** +// * Style for highlighting Lisp. +// */ +// public static final String SYNTAX_STYLE_LISP = "text/lisp"; +// +// +// /** +// * Style for highlighting Lua. +// */ +// public static final String SYNTAX_STYLE_LUA = "text/lua"; +// +// +// /** +// * Style for highlighting makefiles. +// */ +// public static final String SYNTAX_STYLE_MAKEFILE = "text/makefile"; +// +// +// /** +// * Style for highlighting MXML. +// */ +// public static final String SYNTAX_STYLE_MXML = "text/mxml"; +// +// +// /** +// * Style for highlighting NSIS install scripts. +// */ +// public static final String SYNTAX_STYLE_NSIS = "text/nsis"; +// +// +// /** +// * Style for highlighting Perl. +// */ +// public static final String SYNTAX_STYLE_PERL = "text/perl"; +// +// +// /** +// * Style for highlighting PHP. +// */ +// public static final String SYNTAX_STYLE_PHP = "text/php"; +// +// +// /** +// * Style for highlighting properties files. +// */ +// public static final String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; +// +// +// /** +// * Style for highlighting Python. +// */ +// public static final String SYNTAX_STYLE_PYTHON = "text/python"; +// +// +// /** +// * Style for highlighting Ruby. +// */ +// public static final String SYNTAX_STYLE_RUBY = "text/ruby"; +// +// +// /** +// * Style for highlighting SAS keywords. +// */ +// public static final String SYNTAX_STYLE_SAS = "text/sas"; +// +// +// /** +// * Style for highlighting Scala. +// */ +// public static final String SYNTAX_STYLE_SCALA = "text/scala"; +// +// +// /** +// * Style for highlighting SQL. +// */ +// public static final String SYNTAX_STYLE_SQL = "text/sql"; +// +// +// /** +// * Style for highlighting Tcl. +// */ +// public static final String SYNTAX_STYLE_TCL = "text/tcl"; +// +// +// /** +// * Style for highlighting UNIX shell keywords. +// */ +// public static final String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; +// +// +// /** +// * Style for highlighting Visual Basic. +// */ +// public static final String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; +// +// +// /** +// * Style for highlighting Windows batch files. +// */ +// public static final String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; +// +// +// /** +// * Style for highlighting XML. +// */ +// public static final String SYNTAX_STYLE_XML = "text/xml"; +// } \ No newline at end of file diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java new file mode 100644 index 000000000..dd252c0a3 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java @@ -0,0 +1,21 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea; + +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public interface TokenMakerRegistration { + + public String getLanguage(); + + public String getTokenMaker(); + + public FoldParser getFoldParser(); +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java index 521847cd3..adf0fd0f6 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java @@ -11,12 +11,13 @@ import java.util.HashMap; import java.util.Map; +import java.util.ServiceLoader; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; - +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; /** - * Manages fold parsers. Instances of RSyntaxTextArea call into + * Manages fold parsers. Instances of RSyntaxTextArea call into * this class to retrieve fold parsers for whatever language they're editing. * Folks implementing custom languages can add a {@link FoldParser} * implementation for their language to this manager and it will be used by @@ -27,100 +28,101 @@ */ public class FoldParserManager implements SyntaxConstants { - /** - * Map from syntax styles to fold parsers. - */ - private Map foldParserMap; - - private static final FoldParserManager INSTANCE = new FoldParserManager(); - - - /** - * Private constructor to prevent instantiation. - */ - private FoldParserManager() { - foldParserMap = createFoldParserMap(); - } - - - /** - * Adds a mapping from a syntax style to a fold parser. The parser - * specified will be shared among all RSTA instances editing that language, - * so it should be stateless (which should not be difficult for a fold - * parser). You can also override the fold parser for built-in languages, - * such as SYNTAX_STYLE_JAVA, with your own parser - * implementations. - * - * @param syntaxStyle The syntax style. - * @param parser The parser. - * @see SyntaxConstants - */ - public void addFoldParserMapping(String syntaxStyle, FoldParser parser) { - foldParserMap.put(syntaxStyle, parser); - } - - - /** - * Creates the syntax style-to-fold parser mapping for built-in languages. - * - * @return The style-to-fold parser mapping. - */ - private Map createFoldParserMap() { - - Map map = new HashMap(); - - map.put(SYNTAX_STYLE_C, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CPLUSPLUS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CSHARP, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CLOJURE, new LispFoldParser()); - map.put(SYNTAX_STYLE_CSS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_D, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_DART, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_GROOVY, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_HTACCESS, new XmlFoldParser()); - map.put(SYNTAX_STYLE_HTML, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML)); - map.put(SYNTAX_STYLE_JAVA, new CurlyFoldParser(true, true)); - map.put(SYNTAX_STYLE_JAVASCRIPT, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_JSHINTRC, new JsonFoldParser()); - map.put(SYNTAX_STYLE_JSON, new JsonFoldParser()); - map.put(SYNTAX_STYLE_JSP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP)); - map.put(SYNTAX_STYLE_LATEX, new LatexFoldParser()); - map.put(SYNTAX_STYLE_LESS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_LISP, new LispFoldParser()); - map.put(SYNTAX_STYLE_MXML, new XmlFoldParser()); - map.put(SYNTAX_STYLE_NSIS, new NsisFoldParser()); - map.put(SYNTAX_STYLE_PERL, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_PHP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP)); - map.put(SYNTAX_STYLE_SCALA, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_XML, new XmlFoldParser()); - - return map; - - } - - - /** - * Returns the singleton instance of this class. - * - * @return The singleton instance. - */ - public static FoldParserManager get() { - return INSTANCE; - } - - - /** - * Returns a fold parser to use for an editor highlighting code of a - * specific language. - * - * @param syntaxStyle A value from {@link SyntaxConstants}, such as - * SYNTAX_STYLE_JAVA. - * @return A fold parser to use, or null if none is registered - * for the language. - */ - public FoldParser getFoldParser(String syntaxStyle) { - return foldParserMap.get(syntaxStyle); - } - - -} \ No newline at end of file + /** + * Map from syntax styles to fold parsers. + */ + private final Map foldParserMap; + + private static final FoldParserManager INSTANCE = new FoldParserManager(); + + /** + * Private constructor to prevent instantiation. + */ + private FoldParserManager() { + foldParserMap = new HashMap(); + ServiceLoader s = ServiceLoader.load(TokenMakerRegistration.class); + for (TokenMakerRegistration l : s) { + FoldParser fp = l.getFoldParser(); + if (fp != null) { + foldParserMap.put(l.getLanguage(), fp); + } + } + } + + /** + * Adds a mapping from a syntax style to a fold parser. The parser specified + * will be shared among all RSTA instances editing that language, so it + * should be stateless (which should not be difficult for a fold parser). + * You can also override the fold parser for built-in languages, such as + * SYNTAX_STYLE_JAVA, with your own parser implementations. + * + * @param syntaxStyle The syntax style. + * @param parser The parser. + * @see SyntaxConstants + */ + public void addFoldParserMapping(String syntaxStyle, FoldParser parser) { + foldParserMap.put(syntaxStyle, parser); + } + +// /** +// * Creates the syntax style-to-fold parser mapping for built-in languages. +// * +// * @return The style-to-fold parser mapping. +// */ +// private Map createFoldParserMap() { +// +// Map map = new HashMap(); +// +// map.put(SYNTAX_STYLE_C, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_CPLUSPLUS, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_CSHARP, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_CLOJURE, new LispFoldParser()); +// map.put(SYNTAX_STYLE_CSS, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_D, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_DART, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_GROOVY, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_HTACCESS, new XmlFoldParser()); +// map.put(SYNTAX_STYLE_HTML, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML)); +// map.put(SYNTAX_STYLE_JAVA, new CurlyFoldParser(true, true)); +// map.put(SYNTAX_STYLE_BSH, new CurlyFoldParser(true, true)); +// map.put(SYNTAX_STYLE_JAVASCRIPT, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_JSHINTRC, new JsonFoldParser()); +// map.put(SYNTAX_STYLE_JSON, new JsonFoldParser()); +// map.put(SYNTAX_STYLE_JSP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP)); +// map.put(SYNTAX_STYLE_LATEX, new LatexFoldParser()); +// map.put(SYNTAX_STYLE_LESS, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_LISP, new LispFoldParser()); +// map.put(SYNTAX_STYLE_MXML, new XmlFoldParser()); +// map.put(SYNTAX_STYLE_NSIS, new NsisFoldParser()); +// map.put(SYNTAX_STYLE_PERL, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_PHP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP)); +// map.put(SYNTAX_STYLE_SCALA, new CurlyFoldParser()); +// map.put(SYNTAX_STYLE_XML, new XmlFoldParser()); +// +// return map; +// +// } + + /** + * Returns the singleton instance of this class. + * + * @return The singleton instance. + */ + public static FoldParserManager get() { + return INSTANCE; + } + + /** + * Returns a fold parser to use for an editor highlighting code of a + * specific language. + * + * @param syntaxStyle A value from {@link SyntaxConstants}, such as + * SYNTAX_STYLE_JAVA. + * @return A fold parser to use, or null if none is registered + * for the language. + */ + public FoldParser getFoldParser(String syntaxStyle) { + return foldParserMap.get(syntaxStyle); + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ActionScriptTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ActionScriptTokenRegistration.java new file mode 100644 index 000000000..33a73307d --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ActionScriptTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class ActionScriptTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/actionscript"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return ActionScriptTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/AssemplerX86TokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/AssemplerX86TokenRegistration.java new file mode 100644 index 000000000..501787e1b --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/AssemplerX86TokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class AssemplerX86TokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/asm"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return AssemblerX86TokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java new file mode 100644 index 000000000..ce5d117d8 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class BBCodeTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/bbcode"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return BBCodeTokenRegistration.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java new file mode 100644 index 000000000..935bcbac2 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class BshTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/bsh"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return JavaTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(true, true); + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java new file mode 100644 index 000000000..c413ff2c1 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class CPlusPlusTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/cpp"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return CPlusPlusTokenMaker.class.getName(); + } + + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java new file mode 100644 index 000000000..498c32fc9 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class CSSTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/css"; + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return CSSTokenMaker.class.getName(); + } + + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java new file mode 100644 index 000000000..9e9371bb0 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java @@ -0,0 +1,36 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.SyntaxConstants; +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class CSharpTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/cs"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return CSharpTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CTokenRegistration.java new file mode 100644 index 000000000..bfa818f52 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class CTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/c"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return CTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java new file mode 100644 index 000000000..32918c1c0 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.LispFoldParser; + +/** + * + * @author matta + */ +public class ClojureTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/clojure"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return ClojureTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new LispFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java new file mode 100644 index 000000000..da014a2b8 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class DTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/d"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return DTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java new file mode 100644 index 000000000..7bbc9c99c --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class DartTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/dart"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return DartTokenMaker.class.getName(); + } + + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java new file mode 100644 index 000000000..2faf19608 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class DelphiTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/delphi"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return DelphiTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java new file mode 100644 index 000000000..4fe96ef70 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class DtdTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/dtd"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return DtdTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java new file mode 100644 index 000000000..c9962775a --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class FortranTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/fortran"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return FortranTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java new file mode 100644 index 000000000..7288de534 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class GroovyTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/groovy"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return GroovyTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java new file mode 100644 index 000000000..1fda3aea1 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; + +/** + * + * @author matta + */ +public class HTMLTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/html"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return HTMLTokenMaker.class.getName(); + } + + + @Override + public FoldParser getFoldParser() { + return new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java new file mode 100644 index 000000000..0aa911326 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.XmlFoldParser; + +/** + * + * @author matta + */ +public class HtaccessTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/htaccess"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return HtaccessTokenMaker.class.getName(); + } + + + @Override + public FoldParser getFoldParser() { + return new XmlFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java new file mode 100644 index 000000000..4a70c24fb --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; + +/** + * + * @author matta + */ +public class JSPTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/jsp"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return JSPTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP); + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java new file mode 100644 index 000000000..0ea338d01 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class JavaScriptTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/javascript"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return JavaScriptTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java new file mode 100644 index 000000000..22bd885d4 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class JavaTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/java"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return JavaTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(true, true); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java new file mode 100644 index 000000000..3b13a8bc6 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.JsonFoldParser; + +/** + * + * @author matta + */ +public class JshintrcTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/jshintrc"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return JshintrcTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new JsonFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java new file mode 100644 index 000000000..06af39280 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.JsonFoldParser; + +/** + * + * @author matta + */ +public class JsonRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/json"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return JsonTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new JsonFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java new file mode 100644 index 000000000..2d898a9cf --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.LatexFoldParser; + +/** + * + * @author matta + */ +public class LatexTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/latex"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return LatexTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new LatexFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java new file mode 100644 index 000000000..1410ccc0c --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class LessTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/less"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return LessTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java new file mode 100644 index 000000000..465775acf --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.LispFoldParser; + +/** + * + * @author matta + */ +public class LispTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/lisp"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return LispTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new LispFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java new file mode 100644 index 000000000..38aac6b13 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class LuaTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/lua"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return LuaTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java new file mode 100644 index 000000000..1392a6c13 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class MakefileTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/makefile"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return MakefileTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java new file mode 100644 index 000000000..448e8551a --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.XmlFoldParser; + +/** + * + * @author matta + */ +public class MxmlTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/mxml"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return MxmlTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new XmlFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java new file mode 100644 index 000000000..a0cc7f9b9 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.NsisFoldParser; + +/** + * + * @author matta + */ +public class NSISTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/nsis"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return NSISTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new NsisFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java new file mode 100644 index 000000000..b224205b5 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; + +/** + * + * @author matta + */ +public class PHPTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/php"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return PHPTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java new file mode 100644 index 000000000..fa779a109 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; + +/** + * + * @author matta + */ +public class PerlTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/perl"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return PerlTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java new file mode 100644 index 000000000..808ba1e6a --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class PlainTextTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/none"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return PlainTextTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java new file mode 100644 index 000000000..ed6a8cc87 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class PropertiesFileTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/properties"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return PropertiesFileTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java new file mode 100644 index 000000000..6c7725f41 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class PythonTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/python"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return PythonTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java new file mode 100644 index 000000000..e3badcb3f --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class RubyTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/ruby"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return RubyTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java new file mode 100644 index 000000000..9d49ff593 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class SASTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/sas"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return SASTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java new file mode 100644 index 000000000..aa6f1b4f0 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.SyntaxConstants; +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class SQLTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/sql"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return SQLTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java new file mode 100644 index 000000000..fb191b11a --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java @@ -0,0 +1,35 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.SyntaxConstants; +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class ScalaTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/scala"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return ScalaTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new CurlyFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java new file mode 100644 index 000000000..41cbcab06 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class TclTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/tcl"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return TclTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java new file mode 100644 index 000000000..0a26a43ba --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class UnixShellTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/unix"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return UnixShellTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java new file mode 100644 index 000000000..cb44757ac --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class VisualBasicTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/vb"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return VisualBasicTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java new file mode 100644 index 000000000..0cf4fe4e0 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class WindowsBatchTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/bat"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return WindowsBatchTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java new file mode 100644 index 000000000..7cd197b1c --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; +import org.fife.ui.rsyntaxtextarea.folding.XmlFoldParser; + +/** + * + * @author matta + */ +public class XMLTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/xml"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return XMLTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return new XmlFoldParser(); + } +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java b/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java index 3c93f2116..4e8bd7f2a 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java @@ -18,6 +18,7 @@ import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rsyntaxtextarea.Token; +import org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration; /** @@ -66,7 +67,7 @@ public ParseResult parse(RSyntaxDocument doc, String style) { int lineCount = root.getElementCount(); if (taskPattern==null || - style==null || SyntaxConstants.SYNTAX_STYLE_NONE.equals(style)){ + style==null || PlainTextTokenRegistration.SYNTAX_STYLE.equals(style)){ result.clearNotices(); result.setParsedLines(0, lineCount-1); return result; diff --git a/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration b/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration new file mode 100644 index 000000000..7a2d5e4e2 --- /dev/null +++ b/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration @@ -0,0 +1,43 @@ +org.fife.ui.rsyntaxtextarea.modes.SASTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.GroovyTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.LispTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.JavaScriptTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.AssemplerX86TokenRegistration +org.fife.ui.rsyntaxtextarea.modes.FortranTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.ActionScriptTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.LessTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.RubyTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.SQLTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.JshintrcTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.VisualBasicTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.PythonTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.JSPTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.DtdTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.PerlTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.WindowsBatchTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.LatexTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.CSharpTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.UnixShellTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.DartTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.BshTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.DelphiTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.CPlusPlusTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.XMLTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.MxmlTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.PHPTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.CSSTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.MakefileTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.TclTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.ScalaTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.JsonRegistration +org.fife.ui.rsyntaxtextarea.modes.LuaTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.HtaccessTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.DTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.BBCodeTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.HTMLTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.ClojureTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.PropertiesFileTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.CTokenRegistration +org.fife.ui.rsyntaxtextarea.modes.NSISTokenRegistration \ No newline at end of file diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxDocumentTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxDocumentTest.java index 17078859b..916a2de37 100644 --- a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxDocumentTest.java +++ b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxDocumentTest.java @@ -12,9 +12,15 @@ import javax.swing.event.DocumentListener; import org.fife.ui.rsyntaxtextarea.modes.CTokenMaker; +import org.fife.ui.rsyntaxtextarea.modes.CTokenRegistration; import org.fife.ui.rsyntaxtextarea.modes.HTMLTokenMaker; +import org.fife.ui.rsyntaxtextarea.modes.HTMLTokenRegistration; import org.fife.ui.rsyntaxtextarea.modes.JavaScriptTokenMaker; +import org.fife.ui.rsyntaxtextarea.modes.JavaScriptTokenRegistration; +import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration; +import org.fife.ui.rsyntaxtextarea.modes.PHPTokenRegistration; import org.fife.ui.rsyntaxtextarea.modes.XMLTokenMaker; +import org.fife.ui.rsyntaxtextarea.modes.XMLTokenRegistration; import org.junit.Assert; import org.junit.Test; @@ -52,7 +58,7 @@ private static final void insertHelloWorldC(RSyntaxDocument doc) @Test public void test1ArgConstructor() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_JAVA; + String syntaxStyle = JavaTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); //Assert.assertEquals(syntaxStyle, doc.getSyntaxStyle()); } @@ -61,7 +67,7 @@ public void test1ArgConstructor() { @Test public void test2ArgConstructor() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_JAVA; + String syntaxStyle = JavaTokenRegistration.SYNTAX_STYLE; // Standard case, taking default TokenMakerFactory doc = new RSyntaxDocument(null, syntaxStyle); @@ -83,7 +89,7 @@ protected void initTokenMakerMap() { @Test public void testFireDocumentEvent_InsertWithNoNewLines() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_JAVA; + String syntaxStyle = JavaTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); TestDocumentListener l = new TestDocumentListener(); @@ -107,7 +113,7 @@ public void testFireDocumentEvent_InsertWithNoNewLines() throws Exception { @Test public void testFireDocumentEvent_InsertWithTwoNewLines() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -134,7 +140,7 @@ public void testFireDocumentEvent_InsertWithTwoNewLines() throws Exception { @Test public void testFireDocumentEvent_InsertWithTwoNewLinesOneReplaced() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -170,7 +176,7 @@ public void testFireDocumentEvent_InsertWithTwoNewLinesOneReplaced() throws Exce @Test public void testFireDocumentEvent_RemoveWithinOneLine() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -195,7 +201,7 @@ public void testFireDocumentEvent_RemoveWithinOneLine() throws Exception { @Test public void testGetClosestStandardTokenTypeForInternalType() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT; + String syntaxStyle = JavaScriptTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); JavaScriptTokenMaker tokenMaker = new JavaScriptTokenMaker(); @@ -212,17 +218,17 @@ public void testGetClosestStandardTokenTypeForInternalType() throws Exception { public void testGetCompleteMarkupCloseTags() { // Non-markup language - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertFalse(doc.getCompleteMarkupCloseTags()); // Markup language defaulting to false - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_PHP; + syntaxStyle = PHPTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertFalse(doc.getCompleteMarkupCloseTags()); // Markup language defaulting to true - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertTrue(doc.getCompleteMarkupCloseTags()); @@ -233,21 +239,21 @@ public void testGetCompleteMarkupCloseTags() { public void testGetCurlyBracesDenoteCodeBlocks() { // Language that does use curly braces - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); TokenMaker tokenMaker = new CTokenMaker(); Assert.assertEquals(tokenMaker.getCurlyBracesDenoteCodeBlocks(0), doc.getCurlyBracesDenoteCodeBlocks(0)); // Language that does not use curly braces - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); tokenMaker = new XMLTokenMaker(); Assert.assertEquals(tokenMaker.getCurlyBracesDenoteCodeBlocks(0), doc.getCurlyBracesDenoteCodeBlocks(0)); // Language in which some sub-languages do, some don't - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_HTML; + syntaxStyle = HTMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); tokenMaker = new HTMLTokenMaker(); Assert.assertEquals(tokenMaker.getCurlyBracesDenoteCodeBlocks(0), @@ -267,12 +273,12 @@ public void testGetCurlyBracesDenoteCodeBlocks() { @Test public void testGetLanguageIsMarkup() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertFalse(doc.getLanguageIsMarkup()); // Language that does not use curly braces - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); Assert.assertTrue(doc.getLanguageIsMarkup()); @@ -282,7 +288,7 @@ public void testGetLanguageIsMarkup() { @Test public void testGetLastTokenTypeOnLine() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -296,7 +302,7 @@ public void testGetLastTokenTypeOnLine() throws Exception { @Test(expected = IndexOutOfBoundsException.class) public void testGetLastTokenTypeOnLine_InvalidIndex() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -308,7 +314,7 @@ public void testGetLastTokenTypeOnLine_InvalidIndex() throws Exception { @Test public void testGetLineCommentStartAndEnd() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); String[] actual = doc.getLineCommentStartAndEnd(0); Assert.assertEquals(2, actual.length); @@ -316,7 +322,7 @@ public void testGetLineCommentStartAndEnd() { Assert.assertNull(actual[1]); // Language that does not use curly braces - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); actual = doc.getLineCommentStartAndEnd(0); Assert.assertEquals(2, actual.length); @@ -329,7 +335,7 @@ public void testGetLineCommentStartAndEnd() { @Test public void testGetMarkOccurrencesOfTokenType() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertTrue(doc.getMarkOccurrencesOfTokenType(TokenTypes.IDENTIFIER)); Assert.assertFalse(doc.getMarkOccurrencesOfTokenType(TokenTypes.COMMENT_EOL)); @@ -340,7 +346,7 @@ public void testGetMarkOccurrencesOfTokenType() { @Test public void testGetOccurrenceMarker() { // Not really much we can test here - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertNotNull(doc.getOccurrenceMarker()); } @@ -349,7 +355,7 @@ public void testGetOccurrenceMarker() { @Test public void testGetShouldIndentNextLine() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -365,11 +371,11 @@ public void testGetShouldIndentNextLine() throws Exception { @Test public void testGetSyntaxStyle() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertEquals(syntaxStyle, doc.getSyntaxStyle()); - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); Assert.assertEquals(syntaxStyle, doc.getSyntaxStyle()); @@ -383,7 +389,7 @@ public void testGetSyntaxStyle() { @Test public void testGetTokenListForLine() throws Exception { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); insertHelloWorldC(doc); @@ -411,12 +417,12 @@ public void testGetTokenListForLine() throws Exception { @Test public void testInsertBreakSpecialHandling() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertTrue(doc.insertBreakSpecialHandling(null)); // Language that does not use curly braces - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); Assert.assertFalse(doc.insertBreakSpecialHandling(null)); @@ -426,7 +432,7 @@ public void testInsertBreakSpecialHandling() { @Test public void testIsIdentifierChar() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertTrue(doc.isIdentifierChar(0, 'a')); Assert.assertFalse(doc.isIdentifierChar(0, '%')); @@ -437,7 +443,7 @@ public void testIsIdentifierChar() { @Test public void testIterator() { // Not much to test here - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertNotNull(doc.iterator()); } @@ -446,11 +452,11 @@ public void testIterator() { @Test public void testSetSyntaxStyle() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertEquals(syntaxStyle, doc.getSyntaxStyle()); - syntaxStyle = SyntaxConstants.SYNTAX_STYLE_XML; + syntaxStyle = XMLTokenRegistration.SYNTAX_STYLE; doc.setSyntaxStyle(syntaxStyle); Assert.assertEquals(syntaxStyle, doc.getSyntaxStyle()); @@ -464,7 +470,7 @@ public void testSetSyntaxStyle() { @Test public void testSetSyntaxStyle_CustomTokenMaker() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); Assert.assertEquals(syntaxStyle, doc.getSyntaxStyle()); @@ -478,22 +484,22 @@ public void testSetSyntaxStyle_CustomTokenMaker() { @Test public void testSetTokenMakerFactory() { - String syntaxStyle = SyntaxConstants.SYNTAX_STYLE_C; + String syntaxStyle = CTokenRegistration.SYNTAX_STYLE; doc = new RSyntaxDocument(syntaxStyle); // By default, we do indeed get syntax highlighting for Java - doc.setSyntaxStyle(SyntaxConstants.SYNTAX_STYLE_JAVA); + doc.setSyntaxStyle(JavaTokenRegistration.SYNTAX_STYLE); Assert.assertNotNull(doc.getLineCommentStartAndEnd(0)); // No mappings -> default to PlainTextTokenMaker doc.setTokenMakerFactory(new EmptyTokenMakerFactory()); - doc.setSyntaxStyle(SyntaxConstants.SYNTAX_STYLE_JAVA); + doc.setSyntaxStyle(JavaTokenRegistration.SYNTAX_STYLE); // Ghetto test to show we are not picking up a JavaTokenMaker Assert.assertNull(doc.getLineCommentStartAndEnd(0)); // Verify restoring default instance doc.setTokenMakerFactory(null); - doc.setSyntaxStyle(SyntaxConstants.SYNTAX_STYLE_JAVA); + doc.setSyntaxStyle(JavaTokenRegistration.SYNTAX_STYLE); Assert.assertNotNull(doc.getLineCommentStartAndEnd(0)); } diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitDumbCompleteWordActionTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitDumbCompleteWordActionTest.java index cd1c527a8..d315c2f01 100644 --- a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitDumbCompleteWordActionTest.java +++ b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitDumbCompleteWordActionTest.java @@ -11,6 +11,8 @@ import org.fife.ui.SwingRunner; import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit.DumbCompleteWordAction; +import org.fife.ui.rsyntaxtextarea.modes.JavaScriptTokenRegistration; +import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration; import org.fife.ui.rtextarea.RTextArea; import org.fife.ui.rtextarea.RTextAreaEditorKit; import org.junit.Assert; @@ -60,7 +62,7 @@ public void testActionPerformed_manyLinesInBetween() throws Exception { DumbCompleteWordAction action = new DumbCompleteWordAction(); RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); textArea.setText("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n a"); @@ -82,7 +84,7 @@ public void testActionPerformed_manyLinesInBetween() throws Exception { public void testActionPerformed_dollarSignImportant() throws Exception { RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT); + JavaScriptTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); DumbCompleteWordAction action = getDumbCompleteWordAction(textArea); @@ -98,7 +100,7 @@ public void testActionPerformed_dollarSignImportant() throws Exception { public void testActionPerformed_underscoresImportant() throws Exception { RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVASCRIPT); + JavaScriptTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); DumbCompleteWordAction action = getDumbCompleteWordAction(textArea); @@ -129,7 +131,7 @@ public void testGetWordStart() throws Exception { DumbCompleteWordAction action = new DumbCompleteWordAction(); RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); textArea.setText("for if while"); @@ -169,7 +171,7 @@ public void testGetWordEnd() throws Exception { DumbCompleteWordAction action = new DumbCompleteWordAction(); RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); textArea.setText("for if while"); @@ -209,7 +211,7 @@ public void testGetPreviousWord() throws Exception { DumbCompleteWordAction action = new DumbCompleteWordAction(); RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); textArea.setText("for if while"); @@ -249,7 +251,7 @@ public void testGetPreviousWord_manyLinesInBetween() throws Exception { DumbCompleteWordAction action = new DumbCompleteWordAction(); RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); textArea.setText("aaron arthur aardvark\nfoo bar\n// bad code\namazing\n a"); diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitEndWordActionTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitEndWordActionTest.java index d546cade5..83f957817 100644 --- a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitEndWordActionTest.java +++ b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaEditorKitEndWordActionTest.java @@ -10,6 +10,7 @@ import javax.swing.text.DefaultEditorKit; import org.fife.ui.rsyntaxtextarea.RSyntaxTextAreaEditorKit.EndWordAction; +import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration; import org.fife.ui.rtextarea.RTextArea; import org.junit.Assert; import org.junit.Test; @@ -40,7 +41,7 @@ public void testGetWordEnd_noSelection_happyPath() { EndWordAction action = new EndWordAction("endWordAction", false); RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); RSyntaxTextArea textArea = new RSyntaxTextArea(doc); final String TEXT = "This is the best"; diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaTest.java index 3ac337a09..8cb79e0d4 100644 --- a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaTest.java +++ b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaTest.java @@ -13,6 +13,8 @@ import org.junit.runner.RunWith; import org.fife.ui.SwingRunner; +import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration; +import org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration; /** @@ -159,9 +161,9 @@ public void testGetPaintTabLines() { @Test public void testGetSyntaxEditingStyle() { RSyntaxTextArea textArea = new RSyntaxTextArea(); - Assert.assertEquals(SyntaxConstants.SYNTAX_STYLE_NONE, textArea.getSyntaxEditingStyle()); - textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA); - Assert.assertEquals(SyntaxConstants.SYNTAX_STYLE_JAVA, textArea.getSyntaxEditingStyle()); + Assert.assertEquals(PlainTextTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle()); + textArea.setSyntaxEditingStyle(JavaTokenRegistration.SYNTAX_STYLE); + Assert.assertEquals(JavaTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle()); } @@ -421,9 +423,9 @@ public void testSetParserDelay() { @Test public void testSetSyntaxEditingStyle() { RSyntaxTextArea textArea = new RSyntaxTextArea(); - Assert.assertEquals(SyntaxConstants.SYNTAX_STYLE_NONE, textArea.getSyntaxEditingStyle()); - textArea.setSyntaxEditingStyle(SyntaxConstants.SYNTAX_STYLE_JAVA); - Assert.assertEquals(SyntaxConstants.SYNTAX_STYLE_JAVA, textArea.getSyntaxEditingStyle()); + Assert.assertEquals(PlainTextTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle()); + textArea.setSyntaxEditingStyle(JavaTokenRegistration.SYNTAX_STYLE); + Assert.assertEquals(JavaTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle()); } @Test diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/ThemeTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/ThemeTest.java index dc2c58e94..bfc79bd76 100644 --- a/src/test/java/org/fife/ui/rsyntaxtextarea/ThemeTest.java +++ b/src/test/java/org/fife/ui/rsyntaxtextarea/ThemeTest.java @@ -11,6 +11,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; +import org.fife.ui.rsyntaxtextarea.modes.PHPTokenRegistration; import org.fife.ui.rtextarea.Gutter; import org.fife.ui.rtextarea.RTextScrollPane; @@ -239,13 +240,13 @@ public void testConstructor_TextAreaArg() { public void testApply() { RSyntaxTextArea textArea1 = new RSyntaxTextArea( - SyntaxConstants.SYNTAX_STYLE_PHP); + PHPTokenRegistration.SYNTAX_STYLE); RTextScrollPane sp1 = new RTextScrollPane(textArea1); Gutter gutter1 = sp1.getGutter(); initWithOddProperties(textArea1, gutter1); RSyntaxTextArea textArea2 = new RSyntaxTextArea( - SyntaxConstants.SYNTAX_STYLE_PHP); + PHPTokenRegistration.SYNTAX_STYLE); RTextScrollPane sp2 = new RTextScrollPane(textArea2); Gutter gutter2 = sp2.getGutter(); @@ -266,7 +267,7 @@ public void testLoad_FromStream_NoDefaultFont() throws Exception { in.close(); RSyntaxTextArea textArea1 = new RSyntaxTextArea( - SyntaxConstants.SYNTAX_STYLE_PHP); + PHPTokenRegistration.SYNTAX_STYLE); RTextScrollPane sp1 = new RTextScrollPane(textArea1); Gutter gutter1 = sp1.getGutter(); initWithOddProperties(textArea1, gutter1); @@ -281,13 +282,13 @@ public void testLoad_FromStream_NoDefaultFont() throws Exception { public void testSave() throws Exception { RSyntaxTextArea textArea1 = new RSyntaxTextArea( - SyntaxConstants.SYNTAX_STYLE_PHP); + PHPTokenRegistration.SYNTAX_STYLE); RTextScrollPane sp1 = new RTextScrollPane(textArea1); Gutter gutter1 = sp1.getGutter(); initWithOddProperties(textArea1, gutter1); RSyntaxTextArea textArea2 = new RSyntaxTextArea( - SyntaxConstants.SYNTAX_STYLE_PHP); + PHPTokenRegistration.SYNTAX_STYLE); RTextScrollPane sp2 = new RTextScrollPane(textArea2); Gutter gutter2 = sp2.getGutter(); diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/TokenIteratorTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/TokenIteratorTest.java index b1f20e820..fe37bd284 100644 --- a/src/test/java/org/fife/ui/rsyntaxtextarea/TokenIteratorTest.java +++ b/src/test/java/org/fife/ui/rsyntaxtextarea/TokenIteratorTest.java @@ -14,6 +14,7 @@ import java.util.ArrayList; import java.util.List; import javax.swing.text.Element; +import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration; import org.junit.Test; import static org.junit.Assert.*; @@ -42,12 +43,12 @@ public void testBasicIteration() throws Exception { // A well-formed Java document. doc = loadResource("TokenIteratorTest_JavaBasic.txt", - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); assertIteratorMatchesList(doc); // An unterminated Javadoc comment. doc = loadResource("TokenIteratorTest_UnterminatedJavadoc.txt", - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); assertIteratorMatchesList(doc); // A single line. @@ -68,7 +69,7 @@ public void testBasicIteration() throws Exception { public void testEmptyLines() throws Exception { RSyntaxDocument doc = new RSyntaxDocument( - SyntaxConstants.SYNTAX_STYLE_JAVA); + JavaTokenRegistration.SYNTAX_STYLE); // An empty document. doc.remove(0, doc.getLength()); From 9849d3d022fc34ec386bcf8035be603969ac4e41 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Thu, 17 Sep 2015 11:51:57 -0400 Subject: [PATCH 02/15] Removed BeanShell --- .../services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration b/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration index 7a2d5e4e2..9d6d7e148 100644 --- a/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration +++ b/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration @@ -20,7 +20,6 @@ org.fife.ui.rsyntaxtextarea.modes.LatexTokenRegistration org.fife.ui.rsyntaxtextarea.modes.CSharpTokenRegistration org.fife.ui.rsyntaxtextarea.modes.UnixShellTokenRegistration org.fife.ui.rsyntaxtextarea.modes.DartTokenRegistration -org.fife.ui.rsyntaxtextarea.modes.BshTokenRegistration org.fife.ui.rsyntaxtextarea.modes.DelphiTokenRegistration org.fife.ui.rsyntaxtextarea.modes.CPlusPlusTokenRegistration org.fife.ui.rsyntaxtextarea.modes.XMLTokenRegistration From c264520d937171fd097075f1e73105e036f67151 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Thu, 17 Sep 2015 11:54:14 -0400 Subject: [PATCH 03/15] Removed BeanShell --- .../modes/BshTokenRegistration.java | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java deleted file mode 100644 index 935bcbac2..000000000 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BshTokenRegistration.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package org.fife.ui.rsyntaxtextarea.modes; - -import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; -import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; -import org.fife.ui.rsyntaxtextarea.folding.FoldParser; - -/** - * - * @author matta - */ -public class BshTokenRegistration implements TokenMakerRegistration { - - public static final String SYNTAX_STYLE = "text/bsh"; - - @Override - public String getLanguage() { - return SYNTAX_STYLE; - } - - @Override - public String getTokenMaker() { - return JavaTokenMaker.class.getName(); - } - - @Override - public FoldParser getFoldParser() { - return new CurlyFoldParser(true, true); - } - -} From fc47c1ccf7e5853229fdcd9011f44dac57f94a23 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Thu, 17 Sep 2015 13:20:11 -0400 Subject: [PATCH 04/15] Re-added the constant values in SyntaxConstants --- pom.xml | 2 +- .../ui/rsyntaxtextarea/SyntaxConstants.java | 483 ++++++++---------- 2 files changed, 221 insertions(+), 264 deletions(-) diff --git a/pom.xml b/pom.xml index cafadef7f..da8349a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - com.artistech + org.tros rsyntaxtextarea 2.5.8 jar diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java index 2450f358a..7b46af6c2 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java @@ -8,18 +8,17 @@ */ package org.fife.ui.rsyntaxtextarea; - /** * Constants that define the different programming languages understood by - * RSyntaxTextArea. These constants are the values you can pass - * to {@link RSyntaxTextArea#setSyntaxEditingStyle(String)} to get syntax + * RSyntaxTextArea. These constants are the values you can pass to + * {@link RSyntaxTextArea#setSyntaxEditingStyle(String)} to get syntax * highlighting.

* * By default, all RSyntaxTextAreas can render all of these * languages, but this can be changed (the list can be augmented or completely - * overwritten) on a per-text area basis. What languages can be rendered is + * overwritten) on a per-text area basis. What languages can be rendered is * actually managed by the {@link TokenMakerFactory} installed on the text - * area's {@link RSyntaxDocument}. By default, all + * area's {@link RSyntaxDocument}. By default, all * RSyntaxDocumenets have a factory installed capable of handling * all of these languages. * @@ -28,261 +27,219 @@ */ public interface SyntaxConstants { -// /** -// * Style meaning don't syntax highlight anything. -// */ -// public static final String SYNTAX_STYLE_NONE = "text/plain"; -// -// -// /** -// * Style for highlighting ActionScript. -// */ -// public static final String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; -// -// -// /** -// * Style for highlighting x86 assembler. -// */ -// public static final String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; -// -// -// /** -// * Style for highlighting BBCode. -// */ -// public static final String SYNTAX_STYLE_BBCODE = "text/bbcode"; -// -// -// /** -// * Style for highlighting C. -// */ -// public static final String SYNTAX_STYLE_C = "text/c"; -// -// -// /** -// * Style for highlighting Clojure. -// */ -// public static final String SYNTAX_STYLE_CLOJURE = "text/clojure"; -// -// -// /** -// * Style for highlighting C++. -// */ -// public static final String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; -// -// -// /** -// * Style for highlighting C#. -// */ -// public static final String SYNTAX_STYLE_CSHARP = "text/cs"; -// -// -// /** -// * Style for highlighting CSS. -// */ -// public static final String SYNTAX_STYLE_CSS = "text/css"; -// -// -// /** -// * Syntax style for highlighting D. -// */ -// public static final String SYNTAX_STYLE_D = "text/d"; -// -// -// /** -// * Style for highlighting Dart. -// */ -// public static final String SYNTAX_STYLE_DART = "text/dart"; -// -// -// /** -// * Style for highlighting Delphi/Pascal. -// */ -// public static final String SYNTAX_STYLE_DELPHI = "text/delphi"; -// -// -// /** -// * Style for highlighting DTD files. -// */ -// public static final String SYNTAX_STYLE_DTD = "text/dtd"; -// -// -// /** -// * Style for highlighting Fortran. -// */ -// public static final String SYNTAX_STYLE_FORTRAN = "text/fortran"; -// -// -// /** -// * Style for highlighting Groovy. -// */ -// public static final String SYNTAX_STYLE_GROOVY = "text/groovy"; -// -// -// /** -// * Style for highlighting .htaccess files. -// */ -// public static final String SYNTAX_STYLE_HTACCESS = "text/htaccess"; -// -// -// /** -// * Style for highlighting HTML. -// */ -// public static final String SYNTAX_STYLE_HTML = "text/html"; -// -// -// /** -// * Style for highlighting Java. -// */ -// public static final String SYNTAX_STYLE_JAVA = "text/java"; -// -// /** -// * Style for highlighting BeanShell. -// */ -// public static final String SYNTAX_STYLE_BSH = "text/bsh"; -// -// -// /** -// * Style for highlighting JavaScript. -// */ -// public static final String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; -// -// -// /** -// * Style for highlighting .jshintrc files. -// */ -// public static final String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; -// -// -// /** -// * Style for highlighting JSON. -// */ -// public static final String SYNTAX_STYLE_JSON = "text/json"; -// -// -// /** -// * Style for highlighting JSP. -// */ -// public static final String SYNTAX_STYLE_JSP = "text/jsp"; -// -// -// /** -// * Style for highlighting LaTeX. -// */ -// public static final String SYNTAX_STYLE_LATEX = "text/latex"; -// -// -// /** -// * Style for highlighting Less. -// */ -// public static final String SYNTAX_STYLE_LESS = "text/less"; -// -// -// /** -// * Style for highlighting Lisp. -// */ -// public static final String SYNTAX_STYLE_LISP = "text/lisp"; -// -// -// /** -// * Style for highlighting Lua. -// */ -// public static final String SYNTAX_STYLE_LUA = "text/lua"; -// -// -// /** -// * Style for highlighting makefiles. -// */ -// public static final String SYNTAX_STYLE_MAKEFILE = "text/makefile"; -// -// -// /** -// * Style for highlighting MXML. -// */ -// public static final String SYNTAX_STYLE_MXML = "text/mxml"; -// -// -// /** -// * Style for highlighting NSIS install scripts. -// */ -// public static final String SYNTAX_STYLE_NSIS = "text/nsis"; -// -// -// /** -// * Style for highlighting Perl. -// */ -// public static final String SYNTAX_STYLE_PERL = "text/perl"; -// -// -// /** -// * Style for highlighting PHP. -// */ -// public static final String SYNTAX_STYLE_PHP = "text/php"; -// -// -// /** -// * Style for highlighting properties files. -// */ -// public static final String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; -// -// -// /** -// * Style for highlighting Python. -// */ -// public static final String SYNTAX_STYLE_PYTHON = "text/python"; -// -// -// /** -// * Style for highlighting Ruby. -// */ -// public static final String SYNTAX_STYLE_RUBY = "text/ruby"; -// -// -// /** -// * Style for highlighting SAS keywords. -// */ -// public static final String SYNTAX_STYLE_SAS = "text/sas"; -// -// -// /** -// * Style for highlighting Scala. -// */ -// public static final String SYNTAX_STYLE_SCALA = "text/scala"; -// -// -// /** -// * Style for highlighting SQL. -// */ -// public static final String SYNTAX_STYLE_SQL = "text/sql"; -// -// -// /** -// * Style for highlighting Tcl. -// */ -// public static final String SYNTAX_STYLE_TCL = "text/tcl"; -// -// -// /** -// * Style for highlighting UNIX shell keywords. -// */ -// public static final String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; -// -// -// /** -// * Style for highlighting Visual Basic. -// */ -// public static final String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; -// -// -// /** -// * Style for highlighting Windows batch files. -// */ -// public static final String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; -// -// -// /** -// * Style for highlighting XML. -// */ -// public static final String SYNTAX_STYLE_XML = "text/xml"; -// - -} \ No newline at end of file + /** + * Style meaning don't syntax highlight anything. + */ + public static final String SYNTAX_STYLE_NONE = "text/plain"; + + /** + * Style for highlighting ActionScript. + */ + public static final String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; + + /** + * Style for highlighting x86 assembler. + */ + public static final String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; + + /** + * Style for highlighting BBCode. + */ + public static final String SYNTAX_STYLE_BBCODE = "text/bbcode"; + + /** + * Style for highlighting C. + */ + public static final String SYNTAX_STYLE_C = "text/c"; + + /** + * Style for highlighting Clojure. + */ + public static final String SYNTAX_STYLE_CLOJURE = "text/clojure"; + + /** + * Style for highlighting C++. + */ + public static final String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; + + /** + * Style for highlighting C#. + */ + public static final String SYNTAX_STYLE_CSHARP = "text/cs"; + + /** + * Style for highlighting CSS. + */ + public static final String SYNTAX_STYLE_CSS = "text/css"; + + /** + * Syntax style for highlighting D. + */ + public static final String SYNTAX_STYLE_D = "text/d"; + + /** + * Style for highlighting Dart. + */ + public static final String SYNTAX_STYLE_DART = "text/dart"; + + /** + * Style for highlighting Delphi/Pascal. + */ + public static final String SYNTAX_STYLE_DELPHI = "text/delphi"; + + /** + * Style for highlighting DTD files. + */ + public static final String SYNTAX_STYLE_DTD = "text/dtd"; + + /** + * Style for highlighting Fortran. + */ + public static final String SYNTAX_STYLE_FORTRAN = "text/fortran"; + + /** + * Style for highlighting Groovy. + */ + public static final String SYNTAX_STYLE_GROOVY = "text/groovy"; + + /** + * Style for highlighting .htaccess files. + */ + public static final String SYNTAX_STYLE_HTACCESS = "text/htaccess"; + + /** + * Style for highlighting HTML. + */ + public static final String SYNTAX_STYLE_HTML = "text/html"; + + /** + * Style for highlighting Java. + */ + public static final String SYNTAX_STYLE_JAVA = "text/java"; + + /** + * Style for highlighting BeanShell. + */ + public static final String SYNTAX_STYLE_BSH = "text/bsh"; + + /** + * Style for highlighting JavaScript. + */ + public static final String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; + + /** + * Style for highlighting .jshintrc files. + */ + public static final String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; + + /** + * Style for highlighting JSON. + */ + public static final String SYNTAX_STYLE_JSON = "text/json"; + + /** + * Style for highlighting JSP. + */ + public static final String SYNTAX_STYLE_JSP = "text/jsp"; + + /** + * Style for highlighting LaTeX. + */ + public static final String SYNTAX_STYLE_LATEX = "text/latex"; + + /** + * Style for highlighting Less. + */ + public static final String SYNTAX_STYLE_LESS = "text/less"; + + /** + * Style for highlighting Lisp. + */ + public static final String SYNTAX_STYLE_LISP = "text/lisp"; + + /** + * Style for highlighting Lua. + */ + public static final String SYNTAX_STYLE_LUA = "text/lua"; + + /** + * Style for highlighting makefiles. + */ + public static final String SYNTAX_STYLE_MAKEFILE = "text/makefile"; + + /** + * Style for highlighting MXML. + */ + public static final String SYNTAX_STYLE_MXML = "text/mxml"; + + /** + * Style for highlighting NSIS install scripts. + */ + public static final String SYNTAX_STYLE_NSIS = "text/nsis"; + + /** + * Style for highlighting Perl. + */ + public static final String SYNTAX_STYLE_PERL = "text/perl"; + + /** + * Style for highlighting PHP. + */ + public static final String SYNTAX_STYLE_PHP = "text/php"; + + /** + * Style for highlighting properties files. + */ + public static final String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; + + /** + * Style for highlighting Python. + */ + public static final String SYNTAX_STYLE_PYTHON = "text/python"; + + /** + * Style for highlighting Ruby. + */ + public static final String SYNTAX_STYLE_RUBY = "text/ruby"; + + /** + * Style for highlighting SAS keywords. + */ + public static final String SYNTAX_STYLE_SAS = "text/sas"; + + /** + * Style for highlighting Scala. + */ + public static final String SYNTAX_STYLE_SCALA = "text/scala"; + + /** + * Style for highlighting SQL. + */ + public static final String SYNTAX_STYLE_SQL = "text/sql"; + + /** + * Style for highlighting Tcl. + */ + public static final String SYNTAX_STYLE_TCL = "text/tcl"; + + /** + * Style for highlighting UNIX shell keywords. + */ + public static final String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; + + /** + * Style for highlighting Visual Basic. + */ + public static final String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; + + /** + * Style for highlighting Windows batch files. + */ + public static final String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; + + /** + * Style for highlighting XML. + */ + public static final String SYNTAX_STYLE_XML = "text/xml"; + +} From 1cfdbe5b158f68e52253053ad4ffcb5cd07af6d0 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Thu, 17 Sep 2015 13:27:25 -0400 Subject: [PATCH 05/15] Removed 'public' from interface methods. --- .../org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java index dd252c0a3..e63d68cc2 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java @@ -13,9 +13,9 @@ */ public interface TokenMakerRegistration { - public String getLanguage(); + String getLanguage(); - public String getTokenMaker(); + String getTokenMaker(); - public FoldParser getFoldParser(); + FoldParser getFoldParser(); } From 7789d49ff56bb4a922ce9784c20685f166be8e09 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Sat, 19 Sep 2015 18:53:27 -0400 Subject: [PATCH 06/15] Changed version to 1.5 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index da8349a5b..445696236 100644 --- a/pom.xml +++ b/pom.xml @@ -70,7 +70,7 @@ UTF-8 - 1.6 - 1.6 + 1.5 + 1.5 \ No newline at end of file From f38fdfcaa97c5843d11a95fcc0a1b48587511812 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Tue, 10 Jan 2017 20:38:24 -0500 Subject: [PATCH 07/15] Added Yaml support to fork --- .../DefaultTokenMakerFactory.java | 57 ---- .../ui/rsyntaxtextarea/SyntaxConstants.java | 281 +----------------- .../folding/FoldParserManager.java | 102 ------- .../modes/YamlTokenRegistration.java | 33 ++ 4 files changed, 34 insertions(+), 439 deletions(-) create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java b/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java index 2ac1929f1..a233cc6f9 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/DefaultTokenMakerFactory.java @@ -79,61 +79,4 @@ protected void initTokenMakerMap() { } -<<<<<<< HEAD } -======= - String pkg = "org.fife.ui.rsyntaxtextarea.modes."; - - putMapping(SYNTAX_STYLE_NONE, pkg + "PlainTextTokenMaker"); - putMapping(SYNTAX_STYLE_ACTIONSCRIPT, pkg + "ActionScriptTokenMaker"); - putMapping(SYNTAX_STYLE_ASSEMBLER_X86, pkg + "AssemblerX86TokenMaker"); - putMapping(SYNTAX_STYLE_BBCODE, pkg + "BBCodeTokenMaker"); - putMapping(SYNTAX_STYLE_C, pkg + "CTokenMaker"); - putMapping(SYNTAX_STYLE_CLOJURE, pkg + "ClojureTokenMaker"); - putMapping(SYNTAX_STYLE_CPLUSPLUS, pkg + "CPlusPlusTokenMaker"); - putMapping(SYNTAX_STYLE_CSHARP, pkg + "CSharpTokenMaker"); - putMapping(SYNTAX_STYLE_CSS, pkg + "CSSTokenMaker"); - putMapping(SYNTAX_STYLE_D, pkg + "DTokenMaker"); - putMapping(SYNTAX_STYLE_DART, pkg + "DartTokenMaker"); - putMapping(SYNTAX_STYLE_DELPHI, pkg + "DelphiTokenMaker"); - putMapping(SYNTAX_STYLE_DOCKERFILE, pkg + "DockerTokenMaker"); - putMapping(SYNTAX_STYLE_DTD, pkg + "DtdTokenMaker"); - putMapping(SYNTAX_STYLE_FORTRAN, pkg + "FortranTokenMaker"); - putMapping(SYNTAX_STYLE_GROOVY, pkg + "GroovyTokenMaker"); - putMapping(SYNTAX_STYLE_HOSTS, pkg + "HostsTokenMaker"); - putMapping(SYNTAX_STYLE_HTACCESS, pkg + "HtaccessTokenMaker"); - putMapping(SYNTAX_STYLE_HTML, pkg + "HTMLTokenMaker"); - putMapping(SYNTAX_STYLE_INI, pkg + "IniTokenMaker"); - putMapping(SYNTAX_STYLE_JAVA, pkg + "JavaTokenMaker"); - putMapping(SYNTAX_STYLE_JAVASCRIPT, pkg + "JavaScriptTokenMaker"); - putMapping(SYNTAX_STYLE_JSON_WITH_COMMENTS, pkg + "JshintrcTokenMaker"); - putMapping(SYNTAX_STYLE_JSON, pkg + "JsonTokenMaker"); - putMapping(SYNTAX_STYLE_JSP, pkg + "JSPTokenMaker"); - putMapping(SYNTAX_STYLE_LATEX, pkg + "LatexTokenMaker"); - putMapping(SYNTAX_STYLE_LESS, pkg + "LessTokenMaker"); - putMapping(SYNTAX_STYLE_LISP, pkg + "LispTokenMaker"); - putMapping(SYNTAX_STYLE_LUA, pkg + "LuaTokenMaker"); - putMapping(SYNTAX_STYLE_MAKEFILE, pkg + "MakefileTokenMaker"); - putMapping(SYNTAX_STYLE_MXML, pkg + "MxmlTokenMaker"); - putMapping(SYNTAX_STYLE_NSIS, pkg + "NSISTokenMaker"); - putMapping(SYNTAX_STYLE_PERL, pkg + "PerlTokenMaker"); - putMapping(SYNTAX_STYLE_PHP, pkg + "PHPTokenMaker"); - putMapping(SYNTAX_STYLE_PROPERTIES_FILE,pkg + "PropertiesFileTokenMaker"); - putMapping(SYNTAX_STYLE_PYTHON, pkg + "PythonTokenMaker"); - putMapping(SYNTAX_STYLE_RUBY, pkg + "RubyTokenMaker"); - putMapping(SYNTAX_STYLE_SAS, pkg + "SASTokenMaker"); - putMapping(SYNTAX_STYLE_SCALA, pkg + "ScalaTokenMaker"); - putMapping(SYNTAX_STYLE_SQL, pkg + "SQLTokenMaker"); - putMapping(SYNTAX_STYLE_TCL, pkg + "TclTokenMaker"); - putMapping(SYNTAX_STYLE_TYPESCRIPT, pkg + "TypeScriptTokenMaker"); - putMapping(SYNTAX_STYLE_UNIX_SHELL, pkg + "UnixShellTokenMaker"); - putMapping(SYNTAX_STYLE_VISUAL_BASIC, pkg + "VisualBasicTokenMaker"); - putMapping(SYNTAX_STYLE_WINDOWS_BATCH, pkg + "WindowsBatchTokenMaker"); - putMapping(SYNTAX_STYLE_XML, pkg + "XMLTokenMaker"); - putMapping(SYNTAX_STYLE_YAML, pkg + "YamlTokenMaker"); - - } - - -} ->>>>>>> upstream/master diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java index 66dd07519..22c7e14b9 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java @@ -28,7 +28,6 @@ */ public interface SyntaxConstants { -<<<<<<< HEAD /** * Style meaning don't syntax highlight anything. */ @@ -243,289 +242,11 @@ public interface SyntaxConstants { * Style for highlighting XML. */ public static final String SYNTAX_STYLE_XML = "text/xml"; -======= - /** - * Style meaning don't syntax highlight anything. - */ - String SYNTAX_STYLE_NONE = "text/plain"; - - - /** - * Style for highlighting ActionScript. - */ - String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; - - - /** - * Style for highlighting x86 assembler. - */ - String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; - - - /** - * Style for highlighting BBCode. - */ - String SYNTAX_STYLE_BBCODE = "text/bbcode"; - - - /** - * Style for highlighting C. - */ - String SYNTAX_STYLE_C = "text/c"; - - - /** - * Style for highlighting Clojure. - */ - String SYNTAX_STYLE_CLOJURE = "text/clojure"; - - - /** - * Style for highlighting C++. - */ - String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; - - - /** - * Style for highlighting C#. - */ - String SYNTAX_STYLE_CSHARP = "text/cs"; - - - /** - * Style for highlighting CSS. - */ - String SYNTAX_STYLE_CSS = "text/css"; - - - /** - * Syntax style for highlighting D. - */ - String SYNTAX_STYLE_D = "text/d"; - - - /** - * Syntax style for highlighting Dockerfiles. - */ - String SYNTAX_STYLE_DOCKERFILE = "text/dockerfile"; - - - /** - * Style for highlighting Dart. - */ - String SYNTAX_STYLE_DART = "text/dart"; - - - /** - * Style for highlighting Delphi/Pascal. - */ - String SYNTAX_STYLE_DELPHI = "text/delphi"; - - - /** - * Style for highlighting DTD files. - */ - String SYNTAX_STYLE_DTD = "text/dtd"; - - - /** - * Style for highlighting Fortran. - */ - String SYNTAX_STYLE_FORTRAN = "text/fortran"; - - - /** - * Style for highlighting Groovy. - */ - String SYNTAX_STYLE_GROOVY = "text/groovy"; - - - /** - * Style for highlighting hosts files. - */ - String SYNTAX_STYLE_HOSTS = "text/hosts"; - - - /** - * Style for highlighting .htaccess files. - */ - String SYNTAX_STYLE_HTACCESS = "text/htaccess"; - - - /** - * Style for highlighting HTML. - */ - String SYNTAX_STYLE_HTML = "text/html"; - - - /** - * Style for highlighting INI files. - */ - String SYNTAX_STYLE_INI = "text/ini"; - - - /** - * Style for highlighting Java. - */ - String SYNTAX_STYLE_JAVA = "text/java"; - - - /** - * Style for highlighting JavaScript. - */ - String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; - - - /** - * Style for highlighting JSON. - */ - String SYNTAX_STYLE_JSON = "text/json"; - - - /** - * Style for highlighting .jshintrc files (JSON with comments, so can be - * used for other times when you want this behavior). - */ - String SYNTAX_STYLE_JSON_WITH_COMMENTS = "text/jshintrc"; - - - /** - * Style for highlighting JSP. - */ - String SYNTAX_STYLE_JSP = "text/jsp"; - - - /** - * Style for highlighting LaTeX. - */ - String SYNTAX_STYLE_LATEX = "text/latex"; - - - /** - * Style for highlighting Less. - */ - String SYNTAX_STYLE_LESS = "text/less"; - - - /** - * Style for highlighting Lisp. - */ - String SYNTAX_STYLE_LISP = "text/lisp"; - - - /** - * Style for highlighting Lua. - */ - String SYNTAX_STYLE_LUA = "text/lua"; - - - /** - * Style for highlighting makefiles. - */ - String SYNTAX_STYLE_MAKEFILE = "text/makefile"; - - - /** - * Style for highlighting MXML. - */ - String SYNTAX_STYLE_MXML = "text/mxml"; - - - /** - * Style for highlighting NSIS install scripts. - */ - String SYNTAX_STYLE_NSIS = "text/nsis"; - - - /** - * Style for highlighting Perl. - */ - String SYNTAX_STYLE_PERL = "text/perl"; - - - /** - * Style for highlighting PHP. - */ - String SYNTAX_STYLE_PHP = "text/php"; - - - /** - * Style for highlighting properties files. - */ - String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; - - - /** - * Style for highlighting Python. - */ - String SYNTAX_STYLE_PYTHON = "text/python"; - - - /** - * Style for highlighting Ruby. - */ - String SYNTAX_STYLE_RUBY = "text/ruby"; - - - /** - * Style for highlighting SAS keywords. - */ - String SYNTAX_STYLE_SAS = "text/sas"; - - - /** - * Style for highlighting Scala. - */ - String SYNTAX_STYLE_SCALA = "text/scala"; - - - /** - * Style for highlighting SQL. - */ - String SYNTAX_STYLE_SQL = "text/sql"; - - - /** - * Style for highlighting Tcl. - */ - String SYNTAX_STYLE_TCL = "text/tcl"; - - - /** - * Style for highlighting TypeScript. - */ - String SYNTAX_STYLE_TYPESCRIPT = "text/typescript"; - - - /** - * Style for highlighting UNIX shell keywords. - */ - String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; - - - /** - * Style for highlighting Visual Basic. - */ - String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; - - - /** - * Style for highlighting Windows batch files. - */ - String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; - - - /** - * Style for highlighting XML. - */ - String SYNTAX_STYLE_XML = "text/xml"; - ->>>>>>> upstream/master /** * Syntax style for highlighting YAML. */ - String SYNTAX_STYLE_YAML = "text/yaml"; + public static final String SYNTAX_STYLE_YAML = "text/yaml"; } \ No newline at end of file diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java index e5c460eab..d64b78341 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java @@ -26,7 +26,6 @@ * @author Robert Futrell * @version 1.0 */ -<<<<<<< HEAD public class FoldParserManager implements SyntaxConstants { /** @@ -125,105 +124,4 @@ public static FoldParserManager get() { public FoldParser getFoldParser(String syntaxStyle) { return foldParserMap.get(syntaxStyle); } -======= -public final class FoldParserManager implements SyntaxConstants { - - /** - * Map from syntax styles to fold parsers. - */ - private Map foldParserMap; - - private static final FoldParserManager INSTANCE = new FoldParserManager(); - - - /** - * Private constructor to prevent instantiation. - */ - private FoldParserManager() { - foldParserMap = createFoldParserMap(); - } - - - /** - * Adds a mapping from a syntax style to a fold parser. The parser - * specified will be shared among all RSTA instances editing that language, - * so it should be stateless (which should not be difficult for a fold - * parser). You can also override the fold parser for built-in languages, - * such as SYNTAX_STYLE_JAVA, with your own parser - * implementations. - * - * @param syntaxStyle The syntax style. - * @param parser The parser. - * @see SyntaxConstants - */ - public void addFoldParserMapping(String syntaxStyle, FoldParser parser) { - foldParserMap.put(syntaxStyle, parser); - } - - - /** - * Creates the syntax style-to-fold parser mapping for built-in languages. - * - * @return The style-to-fold parser mapping. - */ - private Map createFoldParserMap() { - - Map map = new HashMap(); - - map.put(SYNTAX_STYLE_C, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CPLUSPLUS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CSHARP, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CLOJURE, new LispFoldParser()); - map.put(SYNTAX_STYLE_CSS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_D, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_DART, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_GROOVY, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_HTACCESS, new XmlFoldParser()); - map.put(SYNTAX_STYLE_HTML, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML)); - map.put(SYNTAX_STYLE_JAVA, new CurlyFoldParser(true, true)); - map.put(SYNTAX_STYLE_JAVASCRIPT, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_JSON, new JsonFoldParser()); - map.put(SYNTAX_STYLE_JSON_WITH_COMMENTS,new JsonFoldParser()); - map.put(SYNTAX_STYLE_JSP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP)); - map.put(SYNTAX_STYLE_LATEX, new LatexFoldParser()); - map.put(SYNTAX_STYLE_LESS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_LISP, new LispFoldParser()); - map.put(SYNTAX_STYLE_MXML, new XmlFoldParser()); - map.put(SYNTAX_STYLE_NSIS, new NsisFoldParser()); - map.put(SYNTAX_STYLE_PERL, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_PHP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP)); - map.put(SYNTAX_STYLE_SCALA, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_TYPESCRIPT, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_XML, new XmlFoldParser()); - - return map; - - } - - - /** - * Returns the singleton instance of this class. - * - * @return The singleton instance. - */ - public static FoldParserManager get() { - return INSTANCE; - } - - - /** - * Returns a fold parser to use for an editor highlighting code of a - * specific language. - * - * @param syntaxStyle A value from {@link SyntaxConstants}, such as - * SYNTAX_STYLE_JAVA. - * @return A fold parser to use, or null if none is registered - * for the language. - */ - public FoldParser getFoldParser(String syntaxStyle) { - return foldParserMap.get(syntaxStyle); - } - ->>>>>>> upstream/master - } \ No newline at end of file diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java new file mode 100644 index 000000000..4a0105a77 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class YamlTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/yaml"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return YamlTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } +} From 4f9fdf2c40154db24c31c207bba9d81ac8ef5513 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Tue, 10 Jan 2017 20:50:38 -0500 Subject: [PATCH 08/15] Updatd pom.xml version. --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 445696236..e6d606ddd 100644 --- a/pom.xml +++ b/pom.xml @@ -3,14 +3,14 @@ 4.0.0 org.tros rsyntaxtextarea - 2.5.8 + 2.6.0 jar eu.somatik.serviceloader-maven-plugin serviceloader-maven-plugin - 1.0.3 + 1.0.7 org.fife.ui.rsyntaxtextarea.TokenMakerRegistration @@ -47,7 +47,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.6.0 true @@ -64,7 +64,7 @@ junit junit - 4.11 + 4.12 test From 2a0fce13fc7a005993d1f23bacaacfa5dfb5cae7 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Tue, 10 Jan 2017 21:37:46 -0500 Subject: [PATCH 09/15] Removed .gitignore.orig which was a conflict file. --- .gitignore.orig | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .gitignore.orig diff --git a/.gitignore.orig b/.gitignore.orig deleted file mode 100644 index e46810fcf..000000000 --- a/.gitignore.orig +++ /dev/null @@ -1,15 +0,0 @@ -ant-classes -bin -dist -javadoc -rsyntaxtextarea_*.zip -*.java~ -build -.gradle -/.settings/ -<<<<<<< HEAD -target/ -======= -.checkstyle - ->>>>>>> upstream/master From d40d7dc166607dfed34c3978ba143b1856a05eb6 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 11 Jan 2017 10:50:33 -0500 Subject: [PATCH 10/15] Removed two confilict resolution files. Cleaned up SyntaxConstants to remove 'final public static' --- .../ui/rsyntaxtextarea/SyntaxConstants.java | 92 ++-- .../rsyntaxtextarea/SyntaxConstants.java.orig | 519 ------------------ .../folding/FoldParserManager.java.orig | 227 -------- 3 files changed, 46 insertions(+), 792 deletions(-) delete mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java.orig delete mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java.orig diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java index 22c7e14b9..7a52433dd 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java @@ -2,7 +2,7 @@ * 03/08/2004 * * SyntaxConstants.java - Constants used by RSyntaxTextArea and friends. - * + * * This library is distributed under a modified BSD license. See the included * RSyntaxTextArea.License.txt file for details. */ @@ -31,222 +31,222 @@ public interface SyntaxConstants { /** * Style meaning don't syntax highlight anything. */ - public static final String SYNTAX_STYLE_NONE = "text/plain"; + String SYNTAX_STYLE_NONE = "text/plain"; /** * Style for highlighting ActionScript. */ - public static final String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; + String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; /** * Style for highlighting x86 assembler. */ - public static final String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; + String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; /** * Style for highlighting BBCode. */ - public static final String SYNTAX_STYLE_BBCODE = "text/bbcode"; + String SYNTAX_STYLE_BBCODE = "text/bbcode"; /** * Style for highlighting C. */ - public static final String SYNTAX_STYLE_C = "text/c"; + String SYNTAX_STYLE_C = "text/c"; /** * Style for highlighting Clojure. */ - public static final String SYNTAX_STYLE_CLOJURE = "text/clojure"; + String SYNTAX_STYLE_CLOJURE = "text/clojure"; /** * Style for highlighting C++. */ - public static final String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; + String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; /** * Style for highlighting C#. */ - public static final String SYNTAX_STYLE_CSHARP = "text/cs"; + String SYNTAX_STYLE_CSHARP = "text/cs"; /** * Style for highlighting CSS. */ - public static final String SYNTAX_STYLE_CSS = "text/css"; + String SYNTAX_STYLE_CSS = "text/css"; /** * Syntax style for highlighting D. */ - public static final String SYNTAX_STYLE_D = "text/d"; + String SYNTAX_STYLE_D = "text/d"; /** * Style for highlighting Dart. */ - public static final String SYNTAX_STYLE_DART = "text/dart"; + String SYNTAX_STYLE_DART = "text/dart"; /** * Style for highlighting Delphi/Pascal. */ - public static final String SYNTAX_STYLE_DELPHI = "text/delphi"; + String SYNTAX_STYLE_DELPHI = "text/delphi"; /** * Style for highlighting DTD files. */ - public static final String SYNTAX_STYLE_DTD = "text/dtd"; + String SYNTAX_STYLE_DTD = "text/dtd"; /** * Style for highlighting Fortran. */ - public static final String SYNTAX_STYLE_FORTRAN = "text/fortran"; + String SYNTAX_STYLE_FORTRAN = "text/fortran"; /** * Style for highlighting Groovy. */ - public static final String SYNTAX_STYLE_GROOVY = "text/groovy"; + String SYNTAX_STYLE_GROOVY = "text/groovy"; /** * Style for highlighting .htaccess files. */ - public static final String SYNTAX_STYLE_HTACCESS = "text/htaccess"; + String SYNTAX_STYLE_HTACCESS = "text/htaccess"; /** * Style for highlighting HTML. */ - public static final String SYNTAX_STYLE_HTML = "text/html"; + String SYNTAX_STYLE_HTML = "text/html"; /** * Style for highlighting Java. */ - public static final String SYNTAX_STYLE_JAVA = "text/java"; + String SYNTAX_STYLE_JAVA = "text/java"; /** * Style for highlighting BeanShell. */ - public static final String SYNTAX_STYLE_BSH = "text/bsh"; + String SYNTAX_STYLE_BSH = "text/bsh"; /** * Style for highlighting JavaScript. */ - public static final String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; + String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; /** * Style for highlighting .jshintrc files. */ - public static final String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; + String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; /** * Style for highlighting JSON. */ - public static final String SYNTAX_STYLE_JSON = "text/json"; + String SYNTAX_STYLE_JSON = "text/json"; /** * Style for highlighting JSP. */ - public static final String SYNTAX_STYLE_JSP = "text/jsp"; + String SYNTAX_STYLE_JSP = "text/jsp"; /** * Style for highlighting LaTeX. */ - public static final String SYNTAX_STYLE_LATEX = "text/latex"; + String SYNTAX_STYLE_LATEX = "text/latex"; /** * Style for highlighting Less. */ - public static final String SYNTAX_STYLE_LESS = "text/less"; + String SYNTAX_STYLE_LESS = "text/less"; /** * Style for highlighting Lisp. */ - public static final String SYNTAX_STYLE_LISP = "text/lisp"; + String SYNTAX_STYLE_LISP = "text/lisp"; /** * Style for highlighting Lua. */ - public static final String SYNTAX_STYLE_LUA = "text/lua"; + String SYNTAX_STYLE_LUA = "text/lua"; /** * Style for highlighting makefiles. */ - public static final String SYNTAX_STYLE_MAKEFILE = "text/makefile"; + String SYNTAX_STYLE_MAKEFILE = "text/makefile"; /** * Style for highlighting MXML. */ - public static final String SYNTAX_STYLE_MXML = "text/mxml"; + String SYNTAX_STYLE_MXML = "text/mxml"; /** * Style for highlighting NSIS install scripts. */ - public static final String SYNTAX_STYLE_NSIS = "text/nsis"; + String SYNTAX_STYLE_NSIS = "text/nsis"; /** * Style for highlighting Perl. */ - public static final String SYNTAX_STYLE_PERL = "text/perl"; + String SYNTAX_STYLE_PERL = "text/perl"; /** * Style for highlighting PHP. */ - public static final String SYNTAX_STYLE_PHP = "text/php"; + String SYNTAX_STYLE_PHP = "text/php"; /** * Style for highlighting properties files. */ - public static final String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; + String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; /** * Style for highlighting Python. */ - public static final String SYNTAX_STYLE_PYTHON = "text/python"; + String SYNTAX_STYLE_PYTHON = "text/python"; /** * Style for highlighting Ruby. */ - public static final String SYNTAX_STYLE_RUBY = "text/ruby"; + String SYNTAX_STYLE_RUBY = "text/ruby"; /** * Style for highlighting SAS keywords. */ - public static final String SYNTAX_STYLE_SAS = "text/sas"; + String SYNTAX_STYLE_SAS = "text/sas"; /** * Style for highlighting Scala. */ - public static final String SYNTAX_STYLE_SCALA = "text/scala"; + String SYNTAX_STYLE_SCALA = "text/scala"; /** * Style for highlighting SQL. */ - public static final String SYNTAX_STYLE_SQL = "text/sql"; + String SYNTAX_STYLE_SQL = "text/sql"; /** * Style for highlighting Tcl. */ - public static final String SYNTAX_STYLE_TCL = "text/tcl"; + String SYNTAX_STYLE_TCL = "text/tcl"; /** * Style for highlighting UNIX shell keywords. */ - public static final String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; + String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; /** * Style for highlighting Visual Basic. */ - public static final String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; + String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; /** * Style for highlighting Windows batch files. */ - public static final String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; + String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; /** * Style for highlighting XML. */ - public static final String SYNTAX_STYLE_XML = "text/xml"; + String SYNTAX_STYLE_XML = "text/xml"; /** * Syntax style for highlighting YAML. */ - public static final String SYNTAX_STYLE_YAML = "text/yaml"; + String SYNTAX_STYLE_YAML = "text/yaml"; -} \ No newline at end of file +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java.orig b/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java.orig deleted file mode 100644 index 26a30939d..000000000 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/SyntaxConstants.java.orig +++ /dev/null @@ -1,519 +0,0 @@ -/* - * 03/08/2004 - * - * SyntaxConstants.java - Constants used by RSyntaxTextArea and friends. - * - * This library is distributed under a modified BSD license. See the included - * RSyntaxTextArea.License.txt file for details. - */ -package org.fife.ui.rsyntaxtextarea; - -/** - * Constants that define the different programming languages understood by - * RSyntaxTextArea. These constants are the values you can pass to - * {@link RSyntaxTextArea#setSyntaxEditingStyle(String)} to get syntax - * highlighting.

- * - * By default, all RSyntaxTextAreas can render all of these - * languages, but this can be changed (the list can be augmented or completely - * overwritten) on a per-text area basis. What languages can be rendered is - * actually managed by the {@link TokenMakerFactory} installed on the text - * area's {@link RSyntaxDocument}. By default, all - * RSyntaxDocumenets have a factory installed capable of handling - * all of these languages. - * - * @author Robert Futrell - * @version 1.0 - */ -public interface SyntaxConstants { - -<<<<<<< HEAD - /** - * Style meaning don't syntax highlight anything. - */ - public static final String SYNTAX_STYLE_NONE = "text/plain"; - - /** - * Style for highlighting ActionScript. - */ - public static final String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; - - /** - * Style for highlighting x86 assembler. - */ - public static final String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; - - /** - * Style for highlighting BBCode. - */ - public static final String SYNTAX_STYLE_BBCODE = "text/bbcode"; - - /** - * Style for highlighting C. - */ - public static final String SYNTAX_STYLE_C = "text/c"; - - /** - * Style for highlighting Clojure. - */ - public static final String SYNTAX_STYLE_CLOJURE = "text/clojure"; - - /** - * Style for highlighting C++. - */ - public static final String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; - - /** - * Style for highlighting C#. - */ - public static final String SYNTAX_STYLE_CSHARP = "text/cs"; - - /** - * Style for highlighting CSS. - */ - public static final String SYNTAX_STYLE_CSS = "text/css"; - - /** - * Syntax style for highlighting D. - */ - public static final String SYNTAX_STYLE_D = "text/d"; - - /** - * Style for highlighting Dart. - */ - public static final String SYNTAX_STYLE_DART = "text/dart"; - - /** - * Style for highlighting Delphi/Pascal. - */ - public static final String SYNTAX_STYLE_DELPHI = "text/delphi"; - - /** - * Style for highlighting DTD files. - */ - public static final String SYNTAX_STYLE_DTD = "text/dtd"; - - /** - * Style for highlighting Fortran. - */ - public static final String SYNTAX_STYLE_FORTRAN = "text/fortran"; - - /** - * Style for highlighting Groovy. - */ - public static final String SYNTAX_STYLE_GROOVY = "text/groovy"; - - /** - * Style for highlighting .htaccess files. - */ - public static final String SYNTAX_STYLE_HTACCESS = "text/htaccess"; - - /** - * Style for highlighting HTML. - */ - public static final String SYNTAX_STYLE_HTML = "text/html"; - - /** - * Style for highlighting Java. - */ - public static final String SYNTAX_STYLE_JAVA = "text/java"; - - /** - * Style for highlighting BeanShell. - */ - public static final String SYNTAX_STYLE_BSH = "text/bsh"; - - /** - * Style for highlighting JavaScript. - */ - public static final String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; - - /** - * Style for highlighting .jshintrc files. - */ - public static final String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; - - /** - * Style for highlighting JSON. - */ - public static final String SYNTAX_STYLE_JSON = "text/json"; - - /** - * Style for highlighting JSP. - */ - public static final String SYNTAX_STYLE_JSP = "text/jsp"; - - /** - * Style for highlighting LaTeX. - */ - public static final String SYNTAX_STYLE_LATEX = "text/latex"; - - /** - * Style for highlighting Less. - */ - public static final String SYNTAX_STYLE_LESS = "text/less"; - - /** - * Style for highlighting Lisp. - */ - public static final String SYNTAX_STYLE_LISP = "text/lisp"; - - /** - * Style for highlighting Lua. - */ - public static final String SYNTAX_STYLE_LUA = "text/lua"; - - /** - * Style for highlighting makefiles. - */ - public static final String SYNTAX_STYLE_MAKEFILE = "text/makefile"; - - /** - * Style for highlighting MXML. - */ - public static final String SYNTAX_STYLE_MXML = "text/mxml"; - - /** - * Style for highlighting NSIS install scripts. - */ - public static final String SYNTAX_STYLE_NSIS = "text/nsis"; - - /** - * Style for highlighting Perl. - */ - public static final String SYNTAX_STYLE_PERL = "text/perl"; - - /** - * Style for highlighting PHP. - */ - public static final String SYNTAX_STYLE_PHP = "text/php"; - - /** - * Style for highlighting properties files. - */ - public static final String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; - - /** - * Style for highlighting Python. - */ - public static final String SYNTAX_STYLE_PYTHON = "text/python"; - - /** - * Style for highlighting Ruby. - */ - public static final String SYNTAX_STYLE_RUBY = "text/ruby"; - - /** - * Style for highlighting SAS keywords. - */ - public static final String SYNTAX_STYLE_SAS = "text/sas"; - - /** - * Style for highlighting Scala. - */ - public static final String SYNTAX_STYLE_SCALA = "text/scala"; - - /** - * Style for highlighting SQL. - */ - public static final String SYNTAX_STYLE_SQL = "text/sql"; - - /** - * Style for highlighting Tcl. - */ - public static final String SYNTAX_STYLE_TCL = "text/tcl"; - - /** - * Style for highlighting UNIX shell keywords. - */ - public static final String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; - - /** - * Style for highlighting Visual Basic. - */ - public static final String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; - - /** - * Style for highlighting Windows batch files. - */ - public static final String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; - - /** - * Style for highlighting XML. - */ - public static final String SYNTAX_STYLE_XML = "text/xml"; - -} -======= - /** - * Style meaning don't syntax highlight anything. - */ - String SYNTAX_STYLE_NONE = "text/plain"; - - - /** - * Style for highlighting ActionScript. - */ - String SYNTAX_STYLE_ACTIONSCRIPT = "text/actionscript"; - - - /** - * Style for highlighting x86 assembler. - */ - String SYNTAX_STYLE_ASSEMBLER_X86 = "text/asm"; - - - /** - * Style for highlighting BBCode. - */ - String SYNTAX_STYLE_BBCODE = "text/bbcode"; - - - /** - * Style for highlighting C. - */ - String SYNTAX_STYLE_C = "text/c"; - - - /** - * Style for highlighting Clojure. - */ - String SYNTAX_STYLE_CLOJURE = "text/clojure"; - - - /** - * Style for highlighting C++. - */ - String SYNTAX_STYLE_CPLUSPLUS = "text/cpp"; - - - /** - * Style for highlighting C#. - */ - String SYNTAX_STYLE_CSHARP = "text/cs"; - - - /** - * Style for highlighting CSS. - */ - String SYNTAX_STYLE_CSS = "text/css"; - - - /** - * Syntax style for highlighting D. - */ - String SYNTAX_STYLE_D = "text/d"; - - - /** - * Syntax style for highlighting Dockerfiles. - */ - String SYNTAX_STYLE_DOCKERFILE = "text/dockerfile"; - - - /** - * Style for highlighting Dart. - */ - String SYNTAX_STYLE_DART = "text/dart"; - - - /** - * Style for highlighting Delphi/Pascal. - */ - String SYNTAX_STYLE_DELPHI = "text/delphi"; - - - /** - * Style for highlighting DTD files. - */ - String SYNTAX_STYLE_DTD = "text/dtd"; - - - /** - * Style for highlighting Fortran. - */ - String SYNTAX_STYLE_FORTRAN = "text/fortran"; - - - /** - * Style for highlighting Groovy. - */ - String SYNTAX_STYLE_GROOVY = "text/groovy"; - - - /** - * Style for highlighting hosts files. - */ - String SYNTAX_STYLE_HOSTS = "text/hosts"; - - - /** - * Style for highlighting .htaccess files. - */ - String SYNTAX_STYLE_HTACCESS = "text/htaccess"; - - - /** - * Style for highlighting HTML. - */ - String SYNTAX_STYLE_HTML = "text/html"; - - - /** - * Style for highlighting Java. - */ - String SYNTAX_STYLE_JAVA = "text/java"; - - - /** - * Style for highlighting JavaScript. - */ - String SYNTAX_STYLE_JAVASCRIPT = "text/javascript"; - - - /** - * Style for highlighting .jshintrc files. - */ - String SYNTAX_STYLE_JSHINTRC = "text/jshintrc"; - - - /** - * Style for highlighting JSON. - */ - String SYNTAX_STYLE_JSON = "text/json"; - - - /** - * Style for highlighting JSP. - */ - String SYNTAX_STYLE_JSP = "text/jsp"; - - - /** - * Style for highlighting LaTeX. - */ - String SYNTAX_STYLE_LATEX = "text/latex"; - - - /** - * Style for highlighting Less. - */ - String SYNTAX_STYLE_LESS = "text/less"; - - - /** - * Style for highlighting Lisp. - */ - String SYNTAX_STYLE_LISP = "text/lisp"; - - - /** - * Style for highlighting Lua. - */ - String SYNTAX_STYLE_LUA = "text/lua"; - - - /** - * Style for highlighting makefiles. - */ - String SYNTAX_STYLE_MAKEFILE = "text/makefile"; - - - /** - * Style for highlighting MXML. - */ - String SYNTAX_STYLE_MXML = "text/mxml"; - - - /** - * Style for highlighting NSIS install scripts. - */ - String SYNTAX_STYLE_NSIS = "text/nsis"; - - - /** - * Style for highlighting Perl. - */ - String SYNTAX_STYLE_PERL = "text/perl"; - - - /** - * Style for highlighting PHP. - */ - String SYNTAX_STYLE_PHP = "text/php"; - - - /** - * Style for highlighting properties files. - */ - String SYNTAX_STYLE_PROPERTIES_FILE = "text/properties"; - - - /** - * Style for highlighting Python. - */ - String SYNTAX_STYLE_PYTHON = "text/python"; - - - /** - * Style for highlighting Ruby. - */ - String SYNTAX_STYLE_RUBY = "text/ruby"; - - - /** - * Style for highlighting SAS keywords. - */ - String SYNTAX_STYLE_SAS = "text/sas"; - - - /** - * Style for highlighting Scala. - */ - String SYNTAX_STYLE_SCALA = "text/scala"; - - - /** - * Style for highlighting SQL. - */ - String SYNTAX_STYLE_SQL = "text/sql"; - - - /** - * Style for highlighting Tcl. - */ - String SYNTAX_STYLE_TCL = "text/tcl"; - - - /** - * Style for highlighting TypeScript. - */ - String SYNTAX_STYLE_TYPESCRIPT = "text/typescript"; - - - /** - * Style for highlighting UNIX shell keywords. - */ - String SYNTAX_STYLE_UNIX_SHELL = "text/unix"; - - - /** - * Style for highlighting Visual Basic. - */ - String SYNTAX_STYLE_VISUAL_BASIC = "text/vb"; - - - /** - * Style for highlighting Windows batch files. - */ - String SYNTAX_STYLE_WINDOWS_BATCH = "text/bat"; - - - /** - * Style for highlighting XML. - */ - String SYNTAX_STYLE_XML = "text/xml"; - - -} ->>>>>>> upstream/master diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java.orig b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java.orig deleted file mode 100644 index 00f9fdd39..000000000 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java.orig +++ /dev/null @@ -1,227 +0,0 @@ -/* - * 10/08/2011 - * - * FoldParserManager.java - Used by RSTA to determine what fold parser to use - * for each language it supports. - * - * This library is distributed under a modified BSD license. See the included - * RSyntaxTextArea.License.txt file for details. - */ -package org.fife.ui.rsyntaxtextarea.folding; - -import java.util.HashMap; -import java.util.Map; -import java.util.ServiceLoader; - -import org.fife.ui.rsyntaxtextarea.SyntaxConstants; -import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; - -/** - * Manages fold parsers. Instances of RSyntaxTextArea call into - * this class to retrieve fold parsers for whatever language they're editing. - * Folks implementing custom languages can add a {@link FoldParser} - * implementation for their language to this manager and it will be used by - * RSTA. - * - * @author Robert Futrell - * @version 1.0 - */ -public final class FoldParserManager implements SyntaxConstants { - -<<<<<<< HEAD - /** - * Map from syntax styles to fold parsers. - */ - private final Map foldParserMap; - - private static final FoldParserManager INSTANCE = new FoldParserManager(); - - /** - * Private constructor to prevent instantiation. - */ - private FoldParserManager() { - foldParserMap = new HashMap(); - ServiceLoader s = ServiceLoader.load(TokenMakerRegistration.class); - for (TokenMakerRegistration l : s) { - FoldParser fp = l.getFoldParser(); - if (fp != null) { - foldParserMap.put(l.getLanguage(), fp); - } - } - } - - /** - * Adds a mapping from a syntax style to a fold parser. The parser specified - * will be shared among all RSTA instances editing that language, so it - * should be stateless (which should not be difficult for a fold parser). - * You can also override the fold parser for built-in languages, such as - * SYNTAX_STYLE_JAVA, with your own parser implementations. - * - * @param syntaxStyle The syntax style. - * @param parser The parser. - * @see SyntaxConstants - */ - public void addFoldParserMapping(String syntaxStyle, FoldParser parser) { - foldParserMap.put(syntaxStyle, parser); - } - -// /** -// * Creates the syntax style-to-fold parser mapping for built-in languages. -// * -// * @return The style-to-fold parser mapping. -// */ -// private Map createFoldParserMap() { -// -// Map map = new HashMap(); -// -// map.put(SYNTAX_STYLE_C, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_CPLUSPLUS, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_CSHARP, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_CLOJURE, new LispFoldParser()); -// map.put(SYNTAX_STYLE_CSS, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_D, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_DART, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_GROOVY, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_HTACCESS, new XmlFoldParser()); -// map.put(SYNTAX_STYLE_HTML, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML)); -// map.put(SYNTAX_STYLE_JAVA, new CurlyFoldParser(true, true)); -// map.put(SYNTAX_STYLE_BSH, new CurlyFoldParser(true, true)); -// map.put(SYNTAX_STYLE_JAVASCRIPT, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_JSHINTRC, new JsonFoldParser()); -// map.put(SYNTAX_STYLE_JSON, new JsonFoldParser()); -// map.put(SYNTAX_STYLE_JSP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP)); -// map.put(SYNTAX_STYLE_LATEX, new LatexFoldParser()); -// map.put(SYNTAX_STYLE_LESS, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_LISP, new LispFoldParser()); -// map.put(SYNTAX_STYLE_MXML, new XmlFoldParser()); -// map.put(SYNTAX_STYLE_NSIS, new NsisFoldParser()); -// map.put(SYNTAX_STYLE_PERL, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_PHP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP)); -// map.put(SYNTAX_STYLE_SCALA, new CurlyFoldParser()); -// map.put(SYNTAX_STYLE_XML, new XmlFoldParser()); -// -// return map; -// -// } - - /** - * Returns the singleton instance of this class. - * - * @return The singleton instance. - */ - public static FoldParserManager get() { - return INSTANCE; - } - - /** - * Returns a fold parser to use for an editor highlighting code of a - * specific language. - * - * @param syntaxStyle A value from {@link SyntaxConstants}, such as - * SYNTAX_STYLE_JAVA. - * @return A fold parser to use, or null if none is registered - * for the language. - */ - public FoldParser getFoldParser(String syntaxStyle) { - return foldParserMap.get(syntaxStyle); - } -======= - /** - * Map from syntax styles to fold parsers. - */ - private Map foldParserMap; - - private static final FoldParserManager INSTANCE = new FoldParserManager(); - - - /** - * Private constructor to prevent instantiation. - */ - private FoldParserManager() { - foldParserMap = createFoldParserMap(); - } - - - /** - * Adds a mapping from a syntax style to a fold parser. The parser - * specified will be shared among all RSTA instances editing that language, - * so it should be stateless (which should not be difficult for a fold - * parser). You can also override the fold parser for built-in languages, - * such as SYNTAX_STYLE_JAVA, with your own parser - * implementations. - * - * @param syntaxStyle The syntax style. - * @param parser The parser. - * @see SyntaxConstants - */ - public void addFoldParserMapping(String syntaxStyle, FoldParser parser) { - foldParserMap.put(syntaxStyle, parser); - } - - - /** - * Creates the syntax style-to-fold parser mapping for built-in languages. - * - * @return The style-to-fold parser mapping. - */ - private Map createFoldParserMap() { - - Map map = new HashMap(); - - map.put(SYNTAX_STYLE_C, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CPLUSPLUS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CSHARP, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_CLOJURE, new LispFoldParser()); - map.put(SYNTAX_STYLE_CSS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_D, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_DART, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_GROOVY, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_HTACCESS, new XmlFoldParser()); - map.put(SYNTAX_STYLE_HTML, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML)); - map.put(SYNTAX_STYLE_JAVA, new CurlyFoldParser(true, true)); - map.put(SYNTAX_STYLE_JAVASCRIPT, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_JSHINTRC, new JsonFoldParser()); - map.put(SYNTAX_STYLE_JSON, new JsonFoldParser()); - map.put(SYNTAX_STYLE_JSP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP)); - map.put(SYNTAX_STYLE_LATEX, new LatexFoldParser()); - map.put(SYNTAX_STYLE_LESS, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_LISP, new LispFoldParser()); - map.put(SYNTAX_STYLE_MXML, new XmlFoldParser()); - map.put(SYNTAX_STYLE_NSIS, new NsisFoldParser()); - map.put(SYNTAX_STYLE_PERL, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_PHP, new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP)); - map.put(SYNTAX_STYLE_SCALA, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_TYPESCRIPT, new CurlyFoldParser()); - map.put(SYNTAX_STYLE_XML, new XmlFoldParser()); - - return map; - - } - - - /** - * Returns the singleton instance of this class. - * - * @return The singleton instance. - */ - public static FoldParserManager get() { - return INSTANCE; - } - - - /** - * Returns a fold parser to use for an editor highlighting code of a - * specific language. - * - * @param syntaxStyle A value from {@link SyntaxConstants}, such as - * SYNTAX_STYLE_JAVA. - * @return A fold parser to use, or null if none is registered - * for the language. - */ - public FoldParser getFoldParser(String syntaxStyle) { - return foldParserMap.get(syntaxStyle); - } - ->>>>>>> upstream/master - -} \ No newline at end of file From 481fb17f1d689cfaba56358118f9630c11f4d0b5 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 11 Jan 2017 11:08:44 -0500 Subject: [PATCH 11/15] Cleaned up Source for registration. --- .../fife/ui/rsyntaxtextarea/folding/FoldParserManager.java | 4 ++-- .../ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java | 6 +++--- .../rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java | 1 - .../fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java | 1 - .../ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java | 3 +-- .../ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java | 2 +- .../ui/rsyntaxtextarea/modes/DartTokenRegistration.java | 1 - .../ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java | 2 +- .../fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java | 2 +- .../ui/rsyntaxtextarea/modes/FortranTokenRegistration.java | 3 +-- .../ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java | 4 ++-- .../ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java | 2 +- .../ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java | 2 +- .../fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java | 2 +- .../rsyntaxtextarea/modes/JavaScriptTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/JavaTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java | 3 ++- .../{JsonRegistration.java => JsonTokenRegistration.java} | 5 +++-- .../ui/rsyntaxtextarea/modes/LatexTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/LessTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/LispTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/NSISTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/PerlTokenRegistration.java | 3 ++- .../rsyntaxtextarea/modes/PlainTextTokenRegistration.java | 3 ++- .../modes/PropertiesFileTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/PythonTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/RubyTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java | 3 ++- .../rsyntaxtextarea/modes/UnixShellTokenRegistration.java | 3 ++- .../rsyntaxtextarea/modes/VisualBasicTokenRegistration.java | 3 ++- .../modes/WindowsBatchTokenRegistration.java | 3 ++- .../fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java | 3 ++- .../ui/rsyntaxtextarea/modes/YamlTokenRegistration.java | 3 ++- 41 files changed, 70 insertions(+), 48 deletions(-) rename src/main/java/org/fife/ui/rsyntaxtextarea/modes/{JsonRegistration.java => JsonTokenRegistration.java} (91%) diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java index d64b78341..fff6ab5d9 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/folding/FoldParserManager.java @@ -3,7 +3,7 @@ * * FoldParserManager.java - Used by RSTA to determine what fold parser to use * for each language it supports. - * + * * This library is distributed under a modified BSD license. See the included * RSyntaxTextArea.License.txt file for details. */ @@ -26,7 +26,7 @@ * @author Robert Futrell * @version 1.0 */ -public class FoldParserManager implements SyntaxConstants { +public final class FoldParserManager implements SyntaxConstants { /** * Map from syntax styles to fold parsers. diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java index ce5d117d8..c8595de2e 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/BBCodeTokenRegistration.java @@ -25,10 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return BBCodeTokenRegistration.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } - -} + +} \ No newline at end of file diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java index c413ff2c1..0e84e41d1 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.java @@ -26,7 +26,6 @@ public String getLanguage() { public String getTokenMaker() { return CPlusPlusTokenMaker.class.getName(); } - @Override public FoldParser getFoldParser() { diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java index 498c32fc9..dc183917d 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.java @@ -25,7 +25,6 @@ public String getLanguage() { public String getTokenMaker() { return CSSTokenMaker.class.getName(); } - @Override public FoldParser getFoldParser() { diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java index 9e9371bb0..51fe03807 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.java @@ -5,7 +5,6 @@ */ package org.fife.ui.rsyntaxtextarea.modes; -import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; import org.fife.ui.rsyntaxtextarea.folding.FoldParser; @@ -32,5 +31,5 @@ public String getTokenMaker() { public FoldParser getFoldParser() { return new CurlyFoldParser(); } - + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java index 32918c1c0..e50ef87e7 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return ClojureTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new LispFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java index da014a2b8..5bc79e4c4 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DTokenRegistration.java @@ -26,7 +26,7 @@ public String getLanguage() { public String getTokenMaker() { return DTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(); diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java index 7bbc9c99c..76b2033d1 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.java @@ -26,7 +26,6 @@ public String getLanguage() { public String getTokenMaker() { return DartTokenMaker.class.getName(); } - @Override public FoldParser getFoldParser() { diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java index 2faf19608..e6e1f42a1 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DelphiTokenRegistration.java @@ -25,7 +25,7 @@ public String getLanguage() { public String getTokenMaker() { return DelphiTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java index 4fe96ef70..21904cff6 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java @@ -25,7 +25,7 @@ public String getLanguage() { public String getTokenMaker() { return DtdTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java index c9962775a..b51bd9b28 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java @@ -30,5 +30,4 @@ public String getTokenMaker() { public FoldParser getFoldParser() { return null; } - -} +} \ No newline at end of file diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java index 7288de534..95ea211e3 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/GroovyTokenRegistration.java @@ -26,10 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return GroovyTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(); } - + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java index 1fda3aea1..579c549f6 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HTMLTokenRegistration.java @@ -26,10 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return HTMLTokenMaker.class.getName(); } - @Override public FoldParser getFoldParser() { return new HtmlFoldParser(HtmlFoldParser.LANGUAGE_HTML); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java index 0aa911326..52c6c2440 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/HtaccessTokenRegistration.java @@ -26,10 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return HtaccessTokenMaker.class.getName(); } - @Override public FoldParser getFoldParser() { return new XmlFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java index 4a70c24fb..a9f88a35f 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JSPTokenRegistration.java @@ -31,5 +31,5 @@ public String getTokenMaker() { public FoldParser getFoldParser() { return new HtmlFoldParser(HtmlFoldParser.LANGUAGE_JSP); } - + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java index 0ea338d01..95df02f19 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return JavaScriptTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java index 22bd885d4..490b03cef 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return JavaTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(true, true); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java index 3b13a8bc6..12513a30e 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return JshintrcTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new JsonFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonTokenRegistration.java similarity index 91% rename from src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java rename to src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonTokenRegistration.java index 06af39280..7b0d804e1 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonTokenRegistration.java @@ -13,7 +13,7 @@ * * @author matta */ -public class JsonRegistration implements TokenMakerRegistration { +public class JsonTokenRegistration implements TokenMakerRegistration { public static final String SYNTAX_STYLE = "text/json"; @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return JsonTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new JsonFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java index 2d898a9cf..7f44265ef 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return LatexTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new LatexFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java index 1410ccc0c..7cea7af6a 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return LessTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java index 465775acf..988cc048a 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java @@ -27,9 +27,10 @@ public String getLanguage() { public String getTokenMaker() { return LispTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new LispFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java index 38aac6b13..8813f5112 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return LuaTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java index 1392a6c13..354d1a356 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return MakefileTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java index 448e8551a..84f365acf 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return MxmlTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new XmlFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java index a0cc7f9b9..ebb969c03 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return NSISTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new NsisFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java index b224205b5..343fb3a05 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return PHPTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new HtmlFoldParser(HtmlFoldParser.LANGUAGE_PHP); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java index fa779a109..291004774 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java @@ -27,9 +27,10 @@ public String getLanguage() { public String getTokenMaker() { return PerlTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java index 808ba1e6a..7172e58c7 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return PlainTextTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java index ed6a8cc87..357f760e0 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return PropertiesFileTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java index 6c7725f41..879f9c22b 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return PythonTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java index e3badcb3f..540179c9c 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return RubyTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java index 9d49ff593..8a77e17f2 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return SASTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java index aa6f1b4f0..d259cb6d1 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return SQLTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java index fb191b11a..48450bdb0 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java @@ -27,9 +27,10 @@ public String getLanguage() { public String getTokenMaker() { return ScalaTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new CurlyFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java index 41cbcab06..16c1e615e 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return TclTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java index 0a26a43ba..fec384d7c 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return UnixShellTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java index cb44757ac..b661326e0 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return VisualBasicTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java index 0cf4fe4e0..99c902646 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return WindowsBatchTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java index 7cd197b1c..39b903464 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.java @@ -26,9 +26,10 @@ public String getLanguage() { public String getTokenMaker() { return XMLTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return new XmlFoldParser(); } + } diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java index 4a0105a77..40090dc66 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java @@ -25,9 +25,10 @@ public String getLanguage() { public String getTokenMaker() { return YamlTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; } + } From 3ad037d8fddef6bd893bc378ab5b9e3dad32814c Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 11 Jan 2017 11:15:05 -0500 Subject: [PATCH 12/15] Added registration for Docker and Ini --- .../modes/DockerTokenRegistration.java | 34 +++++++++++++++++++ .../modes/IniTokenRegistration.java | 34 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/DockerTokenRegistration.java create mode 100644 src/main/java/org/fife/ui/rsyntaxtextarea/modes/IniTokenRegistration.java diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DockerTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DockerTokenRegistration.java new file mode 100644 index 000000000..1cb11fafb --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DockerTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class DockerTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/dockerfile"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return DockerTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/IniTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/IniTokenRegistration.java new file mode 100644 index 000000000..eb038b303 --- /dev/null +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/IniTokenRegistration.java @@ -0,0 +1,34 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package org.fife.ui.rsyntaxtextarea.modes; + +import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; +import org.fife.ui.rsyntaxtextarea.folding.FoldParser; + +/** + * + * @author matta + */ +public class IniTokenRegistration implements TokenMakerRegistration { + + public static final String SYNTAX_STYLE = "text/ini"; + + @Override + public String getLanguage() { + return SYNTAX_STYLE; + } + + @Override + public String getTokenMaker() { + return IniTokenMaker.class.getName(); + } + + @Override + public FoldParser getFoldParser() { + return null; + } + +} From e8cba40ad2f361d717133e40ac8ba1114f19c8e3 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 11 Jan 2017 11:19:58 -0500 Subject: [PATCH 13/15] Removed unused imports. --- .../fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java | 2 +- .../fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java | 1 - .../fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java | 1 - .../org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java | 1 - .../fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java | 1 - .../java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java index b51bd9b28..cebcf83c4 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.java @@ -25,7 +25,7 @@ public String getLanguage() { public String getTokenMaker() { return FortranTokenMaker.class.getName(); } - + @Override public FoldParser getFoldParser() { return null; diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java index 988cc048a..1a641e9fa 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LispTokenRegistration.java @@ -7,7 +7,6 @@ import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; import org.fife.ui.rsyntaxtextarea.folding.FoldParser; -import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; import org.fife.ui.rsyntaxtextarea.folding.LispFoldParser; /** diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java index 291004774..b05e7d702 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PerlTokenRegistration.java @@ -8,7 +8,6 @@ import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; import org.fife.ui.rsyntaxtextarea.folding.FoldParser; -import org.fife.ui.rsyntaxtextarea.folding.HtmlFoldParser; /** * diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java index d259cb6d1..c82545875 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SQLTokenRegistration.java @@ -5,7 +5,6 @@ */ package org.fife.ui.rsyntaxtextarea.modes; -import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; import org.fife.ui.rsyntaxtextarea.folding.FoldParser; diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java index 48450bdb0..d4fe41839 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ScalaTokenRegistration.java @@ -5,7 +5,6 @@ */ package org.fife.ui.rsyntaxtextarea.modes; -import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rsyntaxtextarea.TokenMakerRegistration; import org.fife.ui.rsyntaxtextarea.folding.CurlyFoldParser; import org.fife.ui.rsyntaxtextarea.folding.FoldParser; diff --git a/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java b/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java index 0232a17dd..0091be122 100644 --- a/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java +++ b/src/main/java/org/fife/ui/rsyntaxtextarea/parser/TaskTagParser.java @@ -15,7 +15,6 @@ import javax.swing.text.Element; import org.fife.ui.rsyntaxtextarea.RSyntaxDocument; -import org.fife.ui.rsyntaxtextarea.SyntaxConstants; import org.fife.ui.rsyntaxtextarea.Token; import org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration; From 98aebb8c0a6b9fa0158b850dcb83237b05f77ebf Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 11 Jan 2017 11:41:39 -0500 Subject: [PATCH 14/15] Updating to use circleci and codecov for ZenHarbinger --- circle.yml | 19 ++++++++ codecov.yml | 28 ++++++++++++ pom.xml | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+) create mode 100644 circle.yml create mode 100644 codecov.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..9aec94217 --- /dev/null +++ b/circle.yml @@ -0,0 +1,19 @@ +machine: + java: + version: oraclejdk8 +test: + override: + - mvn clean cobertura:cobertura + post: + - bash <(curl -s https://codecov.io/bash) +general: + branches: + ignore: + - gh-pages +#general: +# branches: +# only: +# - master # list of branches to build +# - java8 +# - tests +# - /feature-.*/ # or regexes diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 000000000..1c77e8d55 --- /dev/null +++ b/codecov.yml @@ -0,0 +1,28 @@ +codecov: + notify: + require_ci_to_pass: true +comment: + behavior: default + layout: header, diff + require_changes: false +coverage: + precision: 2 +# range: "60...80" + round: down + status: + changes: false + patch: true + project: true + ignore: +#auto-generated files + - .*/antlr/.* + - .*/model/.* +parsers: + gcov: + branch_detection: + conditional: true + loop: true + macro: false + method: false + javascript: + enable_partials: false diff --git a/pom.xml b/pom.xml index e6d606ddd..ddaae653c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,131 @@ rsyntaxtextarea 2.6.0 jar + RSyntaxTextArea + http://tros.org/torgo/ + A Logo interpreter written in Java. + + + bobbylight + Matthew Aguirre + https://github.com/bobbylight/ + + architect + developer + + + + ZenHarbinger + Matthew Aguirre + matt.aguirre@gmail.com + https://github.com/ZenHarbinger/ + tros + http://tros.org/ + + developer + + America/New_York + + + + + modified BSD license + https://raw.githubusercontent.com/bobbylight/RSyntaxTextArea/master/src/main/dist/RSyntaxTextArea.License.txt + repo + + + + Github + https://github.com/ZenHarbinger/RSyntaxTextArea/issues + + + scm:git:git://github.com/ZenHarbinger/RSyntaxTextArea + scm:git:git@github.com/ZenHarbinger/RSyntaxTextArea + https://github.com/ZenHarbinger/RSyntaxTextArea + + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2 + + + + + release + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.9.1 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.5 + + + sign-artifacts + verify + + sign + + + + + + + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + + ossrh + https://oss.sonatype.org/ + true + + eu.somatik.serviceloader-maven-plugin serviceloader-maven-plugin From b01279274d3283fa53958422ce36930dcc00d182 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Wed, 11 Jan 2017 12:42:00 -0500 Subject: [PATCH 15/15] Fixed URL and Java Version in pom.xml --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ddaae653c..452ce2368 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 2.6.0 jar RSyntaxTextArea - http://tros.org/torgo/ + https://bobbylight.github.io/RSyntaxTextArea/ A Logo interpreter written in Java. @@ -193,7 +193,7 @@ UTF-8 - 1.5 - 1.5 + 1.6 + 1.6 - \ No newline at end of file +