1 files changed, 8 insertions, 7 deletions

diff --git a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/STextJava.java b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/STextJava.java
index bb4dff151..5e3d49c0e 100644
--- a/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/STextJava.java
+++ b/bundles/org.eclipse.equinox.bidi/src/org/eclipse/equinox/bidi/internal/consumable/STextJava.java
@@ -10,13 +10,14 @@
  ******************************************************************************/
 package org.eclipse.equinox.bidi.internal.consumable;
 
-import org.eclipse.equinox.bidi.advanced.STextEnvironment;
 import org.eclipse.equinox.bidi.advanced.ISTextExpert;
+import org.eclipse.equinox.bidi.advanced.STextEnvironment;
 import org.eclipse.equinox.bidi.custom.*;
 import org.eclipse.equinox.bidi.internal.STextActivator;
+import org.eclipse.equinox.bidi.internal.STextImpl;
 
 /**
- *  <code>STextJava</code> is a processor for structured text
+ *  <code>STextJava</code> is a handler for structured text
  *  composed of Java statements. Such a structured text may span
  *  multiple lines.
  *  <p>
@@ -34,7 +35,7 @@ import org.eclipse.equinox.bidi.internal.STextActivator;
  *
  *  @author Matitiahu Allouche
  */
-public class STextJava extends STextProcessor {
+public class STextJava extends STextTypeHandler {
 	private static final byte WS = Character.DIRECTIONALITY_WHITESPACE;
 	static final String lineSep = STextActivator.getInstance().getProperty("line.separator"); //$NON-NLS-1$
 
@@ -43,7 +44,7 @@ public class STextJava extends STextProcessor {
 	}
 
 	/**
-	 *  @return 4 as the number of special cases handled by this processor.
+	 *  @return 4 as the number of special cases handled by this handler.
 	 */
 	public int getSpecialsCount(STextEnvironment environment) {
 		return 4;
@@ -85,7 +86,7 @@ public class STextJava extends STextProcessor {
 	public int processSpecial(STextEnvironment environment, String text, STextCharTypes charTypes, STextOffsets offsets, int[] state, int caseNumber, int separLocation) {
 		int location, counter, i;
 
-		STextProcessor.processSeparator(text, charTypes, offsets, separLocation);
+		STextTypeHandler.processSeparator(text, charTypes, offsets, separLocation);
 		switch (caseNumber) {
 			case 1 : /* space */
 				separLocation++;
@@ -114,12 +115,12 @@ public class STextJava extends STextProcessor {
 					location = separLocation + 2; // skip the opening slash-aster
 				location = text.indexOf("*/", location); //$NON-NLS-1$
 				if (location < 0) {
-					state[0] = caseNumber;
+					STextImpl.setState(state, caseNumber);
 					return text.length();
 				}
 				// we need to call processSeparator since text may follow the
 				//  end of comment immediately without even a space
-				STextProcessor.processSeparator(text, charTypes, offsets, location);
+				STextTypeHandler.processSeparator(text, charTypes, offsets, location);
 				return location + 2;
 			case 4 : /* slash-slash comment */
 				location = text.indexOf(lineSep, separLocation + 2);