aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2013-03-12 12:03:12 (EDT)
committerMarkus Keller2013-03-12 12:03:12 (EDT)
commit150a5a36aced3fa506baa5ff1c2788af80ed32db (patch)
tree1bbd3e2ded496388a0b82f54aa826b241ec7c9ce
parent3c0f419f41d1e83256757acaeabe5564398fdb56 (diff)
downloadrt.equinox.bundles-150a5a36aced3fa506baa5ff1c2788af80ed32db.zip
rt.equinox.bundles-150a5a36aced3fa506baa5ff1c2788af80ed32db.tar.gz
rt.equinox.bundles-150a5a36aced3fa506baa5ff1c2788af80ed32db.tar.bz2
one spelling of "regexp?" is enough
-rw-r--r--bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextExtensionsTest.java4
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextTypeHandlerFactory.java2
-rw-r--r--bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextTypesCollector.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextExtensionsTest.java b/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextExtensionsTest.java
index 5641d38..792ca7c 100644
--- a/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextExtensionsTest.java
+++ b/bundles/org.eclipse.equinox.bidi.tests/src/org/eclipse/equinox/bidi/internal/tests/StructuredTextExtensionsTest.java
@@ -81,7 +81,7 @@ public class StructuredTextExtensionsTest extends StructuredTextTestBase {
doTest1("Java #9", "A = //B+C* D;", "A@ = //B+C* D;");
doTest1("Java #10", "A = //B+C`|D+E;", "A@ = //B+C`|D@+E;");
- expert = StructuredTextExpertFactory.getStatefulExpert(StructuredTextTypeHandlerFactory.REGEXP, env);
+ expert = StructuredTextExpertFactory.getStatefulExpert(StructuredTextTypeHandlerFactory.REGEX, env);
data = toUT16("ABC(?") + "#" + toUT16("DEF)GHI");
doTest2("Regex #0.0", data, "A@B@C@(?#DEF)@G@H@I");
data = toUT16("ABC(?") + "#" + toUT16("DEF");
@@ -127,7 +127,7 @@ public class StructuredTextExtensionsTest extends StructuredTextTestBase {
doTest1("Regex #17.7", "aB*567", "aB*@567");
env = envArabic;
- expert = StructuredTextExpertFactory.getExpert(StructuredTextTypeHandlerFactory.REGEXP, env);
+ expert = StructuredTextExpertFactory.getExpert(StructuredTextTypeHandlerFactory.REGEX, env);
data = toUT16("#BC(?") + "#" + toUT16("DEF)GHI");
doTest2("Regex #0.0", data, "<&#BC(?#DEF)GHI&^");
data = toUT16("#BC(?") + "#" + toUT16("DEF");
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextTypeHandlerFactory.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextTypeHandlerFactory.java
index 74410f4..1a04a61 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextTypeHandlerFactory.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/StructuredTextTypeHandlerFactory.java
@@ -69,7 +69,7 @@ public final class StructuredTextTypeHandlerFactory {
* Structured text handler identifier for regular expressions,
* possibly spanning multiple lines.
*/
- public static final String REGEXP = "regex"; //$NON-NLS-1$
+ public static final String REGEX = "regex"; //$NON-NLS-1$
/**
* Structured text handler identifier for SQL statements,
diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextTypesCollector.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextTypesCollector.java
index 1d702bb..a1f2cdc 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextTypesCollector.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/StructuredTextTypesCollector.java
@@ -144,7 +144,7 @@ public class StructuredTextTypesCollector implements IRegistryEventListener {
types.put(StructuredTextTypeHandlerFactory.EMAIL, new StructuredTextEmail());
types.put(StructuredTextTypeHandlerFactory.FILE, new StructuredTextFile());
types.put(StructuredTextTypeHandlerFactory.JAVA, new StructuredTextJava());
- types.put(StructuredTextTypeHandlerFactory.REGEXP, new StructuredTextRegex());
+ types.put(StructuredTextTypeHandlerFactory.REGEX, new StructuredTextRegex());
types.put(StructuredTextTypeHandlerFactory.SQL, new StructuredTextSql());
types.put(StructuredTextTypeHandlerFactory.UNDERSCORE, new StructuredTextUnderscore());
types.put(StructuredTextTypeHandlerFactory.URL, new StructuredTextURL());