TokenMakerFactory. This factory
+ * The default implementation of TokenMakerFactory. This factory
* can create {@link TokenMaker}s for all languages known to
* {@link RSyntaxTextArea}.
*
@@ -18,66 +19,64 @@
* @version 1.0
*/
class DefaultTokenMakerFactory extends AbstractTokenMakerFactory
- implements SyntaxConstants {
+ implements SyntaxConstants {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected void initTokenMakerMap() {
+ ServiceLoaderRSyntaxTextArea. 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,287 +28,225 @@
*/
public interface SyntaxConstants {
- /**
- * 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";
-
+ /**
+ * 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";
+
+ /**
+ * 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 .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 BeanShell.
+ */
+ String SYNTAX_STYLE_BSH = "text/bsh";
+
+ /**
+ * 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 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";
/**
* Syntax style for highlighting YAML.
*/
- 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/TokenMakerRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/TokenMakerRegistration.java
new file mode 100644
index 000000000..e63d68cc2
--- /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 {
+
+ String getLanguage();
+
+ String getTokenMaker();
+
+ 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 98925bf13..fff6ab5d9 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,101 +28,100 @@
*/
public final class FoldParserManager implements SyntaxConstants {
- /**
- * Map from syntax styles to fold parsers.
- */
- private MapSYNTAX_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 MapSYNTAX_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 final MapSYNTAX_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 MapSYNTAX_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
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..c8595de2e
--- /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;
+ }
+
+}
\ 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
new file mode 100644
index 000000000..0e84e41d1
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CPlusPlusTokenRegistration.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 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..dc183917d
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSSTokenRegistration.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.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..51fe03807
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/CSharpTokenRegistration.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 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..e50ef87e7
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/ClojureTokenRegistration.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.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..5bc79e4c4
--- /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..76b2033d1
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DartTokenRegistration.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 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..e6e1f42a1
--- /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/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/DtdTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/DtdTokenRegistration.java
new file mode 100644
index 000000000..21904cff6
--- /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..cebcf83c4
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/FortranTokenRegistration.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 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;
+ }
+}
\ 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
new file mode 100644
index 000000000..95ea211e3
--- /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..579c549f6
--- /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..52c6c2440
--- /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/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;
+ }
+
+}
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..a9f88a35f
--- /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..95df02f19
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaScriptTokenRegistration.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 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..490b03cef
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JavaTokenRegistration.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 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..12513a30e
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JshintrcTokenRegistration.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.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/JsonTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonTokenRegistration.java
new file mode 100644
index 000000000..7b0d804e1
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/JsonTokenRegistration.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.JsonFoldParser;
+
+/**
+ *
+ * @author matta
+ */
+public class JsonTokenRegistration 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..7f44265ef
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LatexTokenRegistration.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.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..7cea7af6a
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LessTokenRegistration.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 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..1a641e9fa
--- /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.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..8813f5112
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/LuaTokenRegistration.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 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..354d1a356
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MakefileTokenRegistration.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 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..84f365acf
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/MxmlTokenRegistration.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 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..ebb969c03
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/NSISTokenRegistration.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.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..343fb3a05
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PHPTokenRegistration.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 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..b05e7d702
--- /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;
+
+/**
+ *
+ * @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..7172e58c7
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PlainTextTokenRegistration.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 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..357f760e0
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PropertiesFileTokenRegistration.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 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..879f9c22b
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/PythonTokenRegistration.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 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..540179c9c
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/RubyTokenRegistration.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 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..8a77e17f2
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/SASTokenRegistration.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 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..c82545875
--- /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.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..d4fe41839
--- /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.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..16c1e615e
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/TclTokenRegistration.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 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..fec384d7c
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/UnixShellTokenRegistration.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 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..b661326e0
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/VisualBasicTokenRegistration.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 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..99c902646
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/WindowsBatchTokenRegistration.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 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..39b903464
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/XMLTokenRegistration.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 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/modes/YamlTokenRegistration.java b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.java
new file mode 100644
index 000000000..40090dc66
--- /dev/null
+++ b/src/main/java/org/fife/ui/rsyntaxtextarea/modes/YamlTokenRegistration.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 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;
+ }
+
+}
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 60cd1c573..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,8 +15,8 @@
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;
/**
@@ -66,7 +66,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..9d6d7e148
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.fife.ui.rsyntaxtextarea.TokenMakerRegistration
@@ -0,0 +1,42 @@
+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.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 2d32d075f..325f281d1 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 64c325c30..8cb79e0d4 100644
--- a/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaTest.java
+++ b/src/test/java/org/fife/ui/rsyntaxtextarea/RSyntaxTextAreaTest.java
@@ -8,11 +8,14 @@
import java.awt.Color;
-import org.fife.ui.SwingRunner;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.fife.ui.SwingRunner;
+import org.fife.ui.rsyntaxtextarea.modes.JavaTokenRegistration;
+import org.fife.ui.rsyntaxtextarea.modes.PlainTextTokenRegistration;
+
/**
* Unit tests for the {@link RSyntaxTextArea} class.
@@ -25,7 +28,7 @@ public class RSyntaxTextAreaTest {
@Test
- public void testAnimateBracketMatching() {
+ public void testGetAnimateBracketMatching() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getAnimateBracketMatching());
textArea.setAnimateBracketMatching(false);
@@ -34,7 +37,7 @@ public void testAnimateBracketMatching() {
@Test
- public void testAntiAliasingEnabled() {
+ public void testGetAntiAliasingEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getAntiAliasingEnabled());
textArea.setAntiAliasingEnabled(false);
@@ -43,7 +46,172 @@ public void testAntiAliasingEnabled() {
@Test
- public void testAutoIndentEnabled() {
+ public void testGetCloseCurlyBraces() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getCloseCurlyBraces());
+ textArea.setCloseCurlyBraces(false);
+ Assert.assertFalse(textArea.getCloseCurlyBraces());
+ }
+
+
+ @Test
+ public void testGetCloseMarkupTags() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getCloseMarkupTags());
+ textArea.setCloseMarkupTags(false);
+ Assert.assertFalse(textArea.getCloseMarkupTags());
+ }
+
+
+ @Test
+ public void testGetEOLMarkersVisible() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getEOLMarkersVisible());
+ textArea.setEOLMarkersVisible(true);
+ Assert.assertTrue(textArea.getEOLMarkersVisible());
+ }
+
+
+ @Test
+ public void testGetFractionalFontMetricsEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getFractionalFontMetricsEnabled());
+ textArea.setFractionalFontMetricsEnabled(true);
+ Assert.assertTrue(textArea.getFractionalFontMetricsEnabled());
+ }
+
+
+ @Test
+ public void testGetHighlightSecondaryLanguages() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getHighlightSecondaryLanguages());
+ textArea.setHighlightSecondaryLanguages(false);
+ Assert.assertFalse(textArea.getHighlightSecondaryLanguages());
+ }
+
+
+ @Test
+ public void testGetHyperlinkForeground() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ textArea.setHyperlinkForeground(Color.pink);
+ Assert.assertEquals(Color.pink, textArea.getHyperlinkForeground());
+ }
+
+
+ @Test
+ public void testGetHyperlinksEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getHyperlinksEnabled());
+ textArea.setHyperlinksEnabled(false);
+ Assert.assertFalse(textArea.getHyperlinksEnabled());
+ }
+
+
+ @Test
+ public void testGetMarkOccurrences() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getMarkOccurrences());
+ textArea.setMarkOccurrences(true);
+ Assert.assertTrue(textArea.getMarkOccurrences());
+ }
+
+
+ @Test
+ public void testGetMarkOccurrencesColor() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ textArea.setMarkOccurrencesColor(Color.pink);
+ Assert.assertEquals(Color.pink, textArea.getMarkOccurrencesColor());
+ }
+
+
+ @Test
+ public void testGetMatchedBracketBGColor() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ textArea.setMatchedBracketBGColor(Color.pink);
+ Assert.assertEquals(Color.pink, textArea.getMatchedBracketBGColor());
+ }
+
+
+ @Test
+ public void testGetMatchedBracketBorderColor() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ textArea.setMatchedBracketBorderColor(Color.pink);
+ Assert.assertEquals(Color.pink, textArea.getMatchedBracketBorderColor());
+ }
+
+
+ @Test
+ public void testGetPaintMatchedBracketPair() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getPaintMatchedBracketPair());
+ textArea.setPaintMatchedBracketPair(true);
+ Assert.assertTrue(textArea.getPaintMatchedBracketPair());
+ }
+
+
+ @Test
+ public void testGetPaintTabLines() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getPaintTabLines());
+ textArea.setPaintTabLines(true);
+ Assert.assertTrue(textArea.getPaintTabLines());
+ }
+
+
+ @Test
+ public void testGetSyntaxEditingStyle() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertEquals(PlainTextTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle());
+ textArea.setSyntaxEditingStyle(JavaTokenRegistration.SYNTAX_STYLE);
+ Assert.assertEquals(JavaTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle());
+ }
+
+
+ @Test
+ public void testGetTabLineColor() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ textArea.setTabLineColor(Color.blue);
+ Assert.assertEquals(Color.blue, textArea.getTabLineColor());
+ }
+
+
+ @Test
+ public void testGetPaintMarkOccurrencesBorder() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getPaintMarkOccurrencesBorder());
+ textArea.setPaintMarkOccurrencesBorder(true);
+ Assert.assertTrue(textArea.getPaintMarkOccurrencesBorder());
+ }
+
+
+ @Test
+ public void testGetParserDelay() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ textArea.setParserDelay(6789);
+ Assert.assertEquals(6789, textArea.getParserDelay());
+ }
+
+
+ @Test
+ public void testGetUseFocusableTips() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getUseFocusableTips());
+ textArea.setUseFocusableTips(false);
+ Assert.assertFalse(textArea.getUseFocusableTips());
+ }
+
+
+ @Test
+ public void testGetUseSelectedTextColor() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.getUseSelectedTextColor());
+ textArea.setUseSelectedTextColor(true);
+ Assert.assertTrue(textArea.getUseSelectedTextColor());
+ }
+
+
+ @Test
+ public void testIsAutoIndentEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.isAutoIndentEnabled());
textArea.setAutoIndentEnabled(false);
@@ -52,7 +220,7 @@ public void testAutoIndentEnabled() {
@Test
- public void testBracketMatchingEnabled() {
+ public void testIsBracketMatchingEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.isBracketMatchingEnabled());
textArea.setBracketMatchingEnabled(false);
@@ -61,7 +229,7 @@ public void testBracketMatchingEnabled() {
@Test
- public void testClearWhitespaceLinesEnabled() {
+ public void testIsClearWhitespaceLinesEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.isClearWhitespaceLinesEnabled());
textArea.setClearWhitespaceLinesEnabled(false);
@@ -70,69 +238,121 @@ public void testClearWhitespaceLinesEnabled() {
@Test
- public void testCloseCurlyBraces() {
+ public void testIsCodeFoldingEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.isCodeFoldingEnabled());
+ textArea.setCodeFoldingEnabled(true);
+ Assert.assertTrue(textArea.isCodeFoldingEnabled());
+ }
+
+
+ @Test
+ public void testIsWhitespaceVisible() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertFalse(textArea.isWhitespaceVisible());
+ textArea.setWhitespaceVisible(true);
+ Assert.assertTrue(textArea.isWhitespaceVisible());
+ }
+
+
+ @Test
+ public void testSetAnimateBracketMatching() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getAnimateBracketMatching());
+ textArea.setAnimateBracketMatching(false);
+ Assert.assertFalse(textArea.getAnimateBracketMatching());
+ }
+
+
+ @Test
+ public void testSetAntiAliasingEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.getAntiAliasingEnabled());
+ textArea.setAntiAliasingEnabled(false);
+ Assert.assertFalse(textArea.getAntiAliasingEnabled());
+ }
+
+ @Test
+ public void testSetAutoIndentEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.isAutoIndentEnabled());
+ textArea.setAutoIndentEnabled(false);
+ Assert.assertFalse(textArea.isAutoIndentEnabled());
+ }
+
+ @Test
+ public void testSetBracketMatchingEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.isBracketMatchingEnabled());
+ textArea.setBracketMatchingEnabled(false);
+ Assert.assertFalse(textArea.isBracketMatchingEnabled());
+ }
+
+ @Test
+ public void testSetClearWhitespaceLinesEnabled() {
+ RSyntaxTextArea textArea = new RSyntaxTextArea();
+ Assert.assertTrue(textArea.isClearWhitespaceLinesEnabled());
+ textArea.setClearWhitespaceLinesEnabled(false);
+ Assert.assertFalse(textArea.isClearWhitespaceLinesEnabled());
+ }
+
+ @Test
+ public void testSetCloseCurlyBraces() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getCloseCurlyBraces());
textArea.setCloseCurlyBraces(false);
Assert.assertFalse(textArea.getCloseCurlyBraces());
}
-
@Test
- public void testCloseMarkupTags() {
+ public void testSetCloseMarkupTags() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getCloseMarkupTags());
textArea.setCloseMarkupTags(false);
Assert.assertFalse(textArea.getCloseMarkupTags());
}
-
@Test
- public void testCodeFoldingEnabled() {
+ public void testSetCodeFoldingEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.isCodeFoldingEnabled());
textArea.setCodeFoldingEnabled(true);
Assert.assertTrue(textArea.isCodeFoldingEnabled());
}
-
@Test
- public void testEOLMarkersVisible() {
+ public void testSetEOLMarkersVisible() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.getEOLMarkersVisible());
textArea.setEOLMarkersVisible(true);
Assert.assertTrue(textArea.getEOLMarkersVisible());
}
-
@Test
- public void testFractionalFontMetricsEnabled() {
+ public void testSetFractionalFontMetricsEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.getFractionalFontMetricsEnabled());
textArea.setFractionalFontMetricsEnabled(true);
Assert.assertTrue(textArea.getFractionalFontMetricsEnabled());
}
-
@Test
- public void testHighlightSecondaryLanguages() {
+ public void testSetHighlightSecondaryLanguages() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getHighlightSecondaryLanguages());
textArea.setHighlightSecondaryLanguages(false);
Assert.assertFalse(textArea.getHighlightSecondaryLanguages());
}
-
@Test
- public void testHyperlinkForeground() {
+ public void testSetHyperlinkForeground() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
textArea.setHyperlinkForeground(Color.pink);
Assert.assertEquals(Color.pink, textArea.getHyperlinkForeground());
}
-
@Test
- public void testHyperlinksEnabled() {
+ public void testSetHyperlinksEnabled() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getHyperlinksEnabled());
textArea.setHyperlinksEnabled(false);
@@ -141,116 +361,98 @@ public void testHyperlinksEnabled() {
@Test
- public void testMarkOccurrences() {
+ public void testSetMarkOccurrences() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.getMarkOccurrences());
textArea.setMarkOccurrences(true);
Assert.assertTrue(textArea.getMarkOccurrences());
}
-
@Test
- public void testMarkOccurrencesColor() {
+ public void testSetMarkOccurrencesColor() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
textArea.setMarkOccurrencesColor(Color.pink);
Assert.assertEquals(Color.pink, textArea.getMarkOccurrencesColor());
}
-
- @Test
- public void testMarkOccurrencesDelay() {
- RSyntaxTextArea textArea = new RSyntaxTextArea();
- textArea.setMarkOccurrencesDelay(5432);
- Assert.assertEquals(5432, textArea.getMarkOccurrencesDelay());
- }
-
-
@Test
- public void testMatchedBracketBGColor() {
+ public void testSetMatchedBracketBGColor() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
textArea.setMatchedBracketBGColor(Color.pink);
Assert.assertEquals(Color.pink, textArea.getMatchedBracketBGColor());
}
-
@Test
- public void testMatchedBracketBorderColor() {
+ public void testSetMatchedBracketBorderColor() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
textArea.setMatchedBracketBorderColor(Color.pink);
Assert.assertEquals(Color.pink, textArea.getMatchedBracketBorderColor());
}
-
@Test
- public void testPaintMatchedBracketPair() {
+ public void testSetPaintMarkOccurrencesBorder() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
- Assert.assertFalse(textArea.getPaintMatchedBracketPair());
- textArea.setPaintMatchedBracketPair(true);
- Assert.assertTrue(textArea.getPaintMatchedBracketPair());
+ Assert.assertFalse(textArea.getPaintMarkOccurrencesBorder());
+ textArea.setPaintMarkOccurrencesBorder(true);
+ Assert.assertTrue(textArea.getPaintMarkOccurrencesBorder());
}
@Test
- public void testPaintMarkOccurrencesBorder() {
+ public void testSetPaintMatchedBracketPair() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
- Assert.assertFalse(textArea.getPaintMarkOccurrencesBorder());
- textArea.setPaintMarkOccurrencesBorder(true);
- Assert.assertTrue(textArea.getPaintMarkOccurrencesBorder());
+ Assert.assertFalse(textArea.getPaintMatchedBracketPair());
+ textArea.setPaintMatchedBracketPair(true);
+ Assert.assertTrue(textArea.getPaintMatchedBracketPair());
}
@Test
- public void testPaintTabLines() {
+ public void testSetPaintTabLines() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.getPaintTabLines());
textArea.setPaintTabLines(true);
Assert.assertTrue(textArea.getPaintTabLines());
}
-
@Test
- public void testSyntaxEditingStyle() {
+ public void testSetParserDelay() {
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());
+ textArea.setParserDelay(6789);
+ Assert.assertEquals(6789, textArea.getParserDelay());
}
-
@Test
- public void testTabLineColor() {
+ public void testSetSyntaxEditingStyle() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
- textArea.setTabLineColor(Color.blue);
- Assert.assertEquals(Color.blue, textArea.getTabLineColor());
+ Assert.assertEquals(PlainTextTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle());
+ textArea.setSyntaxEditingStyle(JavaTokenRegistration.SYNTAX_STYLE);
+ Assert.assertEquals(JavaTokenRegistration.SYNTAX_STYLE, textArea.getSyntaxEditingStyle());
}
-
@Test
- public void testParserDelay() {
+ public void testSetTabLineColor() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
- textArea.setParserDelay(6789);
- Assert.assertEquals(6789, textArea.getParserDelay());
+ textArea.setTabLineColor(Color.blue);
+ Assert.assertEquals(Color.blue, textArea.getTabLineColor());
}
-
@Test
- public void testUseFocusableTips() {
+ public void testSetUseFocusableTips() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertTrue(textArea.getUseFocusableTips());
textArea.setUseFocusableTips(false);
Assert.assertFalse(textArea.getUseFocusableTips());
}
-
@Test
- public void testUseSelectedTextColor() {
+ public void testSetUseSelectedTextColor() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.getUseSelectedTextColor());
textArea.setUseSelectedTextColor(true);
Assert.assertTrue(textArea.getUseSelectedTextColor());
}
-
@Test
- public void testWhitespaceVisible() {
+ public void testSetWhitespaceVisible() {
RSyntaxTextArea textArea = new RSyntaxTextArea();
Assert.assertFalse(textArea.isWhitespaceVisible());
textArea.setWhitespaceVisible(true);
diff --git a/src/test/java/org/fife/ui/rsyntaxtextarea/ThemeTest.java b/src/test/java/org/fife/ui/rsyntaxtextarea/ThemeTest.java
index f075616b1..9d46fa200 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;
@@ -247,13 +248,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();
@@ -274,7 +275,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);
@@ -289,13 +290,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 c5ea9677a..d6dec609c 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());