From d1d1ba386ab7a079b45d324babf0b2a18620d587 Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Tue, 19 Apr 2005 21:04:12 +0000
Subject: [PATCH] Further token refactoring.

---
 .../core/parser/scanner2/DOMScanner.java         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java
index ffb8d665690..4390f9e0d65 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/DOMScanner.java
@@ -289,12 +289,12 @@ public class DOMScanner extends BaseScanner {
      * @return
      */
     protected IToken newToken(int signal) {
-        return new SimpleToken2(signal,
+        return new _BasicToken(signal,
                 resolveOffset(bufferPos[bufferStackPos] + 1));
     }
 
     protected IToken newToken(int signal, char[] buffer) {
-        IToken i = new ImagedToken2(signal, buffer,
+        IToken i = new _ImagedToken(signal, buffer,
                 resolveOffset(bufferPos[bufferStackPos] + 1));
         if (buffer != null && buffer.length == 0 && signal != IToken.tSTRING
                 && signal != IToken.tLSTRING)
@@ -458,9 +458,9 @@ public class DOMScanner extends BaseScanner {
         return reader;
     }
 
-    public static class SimpleToken2 implements IToken, ITokenDuple {
+    private static class _BasicToken implements IToken, ITokenDuple {
 
-        public SimpleToken2( int type, int endOffset )
+        public _BasicToken( int type, int endOffset )
         {
             setType( type );
             setOffsetByLength( endOffset );
@@ -717,7 +717,7 @@ public class DOMScanner extends BaseScanner {
              */
             public Object next() {
                 hasNext = false;
-                return SimpleToken2.this;
+                return _BasicToken.this;
             }
             
         }
@@ -1092,11 +1092,11 @@ public class DOMScanner extends BaseScanner {
         
     }
 
-    public static class ImagedToken2 extends SimpleToken2 {
+    private static class _ImagedToken extends _BasicToken {
 
         private char [] image = null;
         
-        public ImagedToken2( int t, char[] i, int endOffset ) {
+        public _ImagedToken( int t, char[] i, int endOffset ) {
             super( t, 0 );
             setImage(i);
             setOffsetByLength( endOffset );
@@ -1144,7 +1144,7 @@ public class DOMScanner extends BaseScanner {
     }
 
     
-    static public char[] getCharImage( int type ){
+    static char[] getCharImage( int type ){
         switch ( type ) {
         case IToken.tCOLONCOLON :   return Keywords.cpCOLONCOLON; 
         case IToken.tCOLON :        return Keywords.cpCOLON;