X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/DTDTextTools.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/DTDTextTools.java
index e787c54..ee3f056 100644
--- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/DTDTextTools.java
+++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/DTDTextTools.java
@@ -8,25 +8,25 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: DTDTextTools.java,v 1.1 2004-09-02 18:28:03 jsurfer Exp $
+ * $Id: DTDTextTools.java,v 1.3 2006-10-21 23:14:13 pombredanne Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.text;
 
 import java.util.Map;
 
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocumentPartitioner;
-import org.eclipse.jface.text.rules.DefaultPartitioner;
-import org.eclipse.jface.text.rules.IPartitionTokenScanner;
-import org.eclipse.jface.text.rules.RuleBasedScanner;
-
 import net.sourceforge.phpeclipse.ui.text.AbstractTextTools;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.DeclScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.SingleTokenScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.TextScanner;
 import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner;
 
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.text.IDocumentPartitioner;
+//import org.eclipse.jface.text.rules.DefaultPartitioner;
+import org.eclipse.jface.text.rules.FastPartitioner;
+import org.eclipse.jface.text.rules.IPartitionTokenScanner;
+import org.eclipse.jface.text.rules.RuleBasedScanner;
 
 /**
  * 
@@ -34,23 +34,15 @@ import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner;
  * @author Igor Malinin
  */
 public class DTDTextTools extends AbstractTextTools {
-	private static final String[] TOKENS = {
-		IXMLSyntaxConstants.XML_DEFAULT,
-		IXMLSyntaxConstants.XML_ATT_NAME,
-		IXMLSyntaxConstants.XML_ATT_VALUE,
-		IXMLSyntaxConstants.XML_ENTITY,
-		IXMLSyntaxConstants.XML_PI,
-		IXMLSyntaxConstants.XML_COMMENT,
-		IXMLSyntaxConstants.XML_DECL,
-		IXMLSyntaxConstants.DTD_CONDITIONAL,
-	};
-
-	private static final String[] TYPES = {
-		XMLPartitionScanner.XML_PI,
-		XMLPartitionScanner.XML_COMMENT,
-		XMLPartitionScanner.XML_DECL,
-		XMLPartitionScanner.DTD_CONDITIONAL,
-	};
+	private static final String[] TOKENS = { IXMLSyntaxConstants.XML_DEFAULT,
+			IXMLSyntaxConstants.XML_ATT_NAME,
+			IXMLSyntaxConstants.XML_ATT_VALUE, IXMLSyntaxConstants.XML_ENTITY,
+			IXMLSyntaxConstants.XML_PI, IXMLSyntaxConstants.XML_COMMENT,
+			IXMLSyntaxConstants.XML_DECL, IXMLSyntaxConstants.DTD_CONDITIONAL, };
+
+	private static final String[] TYPES = { XMLPartitionScanner.XML_PI,
+			XMLPartitionScanner.XML_COMMENT, XMLPartitionScanner.XML_DECL,
+			XMLPartitionScanner.DTD_CONDITIONAL, };
 
 	/** The DTD partitions scanner */
 	private XMLPartitionScanner dtdPartitionScanner;
@@ -64,7 +56,7 @@ public class DTDTextTools extends AbstractTextTools {
 	/** The XML processing instructions scanner */
 	private SingleTokenScanner xmlPIScanner;
 
-	/** The XML comments scanner */	
+	/** The XML comments scanner */
 	private SingleTokenScanner xmlCommentScanner;
 
 	/** The XML declarations scanner */
@@ -73,33 +65,33 @@ public class DTDTextTools extends AbstractTextTools {
 	/**
 	 * Creates a new DTD text tools collection.
 	 */
-	public DTDTextTools( IPreferenceStore store ) {
-		super( store, TOKENS );
+	public DTDTextTools(IPreferenceStore store) {
+		super(store, TOKENS);
 
-		dtdPartitionScanner = new XMLPartitionScanner( true );
+		dtdPartitionScanner = new XMLPartitionScanner(true);
 
 		Map tokens = getTokens();
 
-		dtdTextScanner = new TextScanner(
-			tokens, '%', IXMLSyntaxConstants.XML_DEFAULT );
+		dtdTextScanner = new TextScanner(tokens, '%',
+				IXMLSyntaxConstants.XML_DEFAULT);
 
-		dtdConditionalScanner = new SingleTokenScanner(
-				tokens, IXMLSyntaxConstants.DTD_CONDITIONAL ); //cond
+		dtdConditionalScanner = new SingleTokenScanner(tokens,
+				IXMLSyntaxConstants.DTD_CONDITIONAL); // cond
 
-		xmlPIScanner = new SingleTokenScanner(
-				tokens, IXMLSyntaxConstants.XML_PI );
+		xmlPIScanner = new SingleTokenScanner(tokens,
+				IXMLSyntaxConstants.XML_PI);
 
-		xmlCommentScanner = new SingleTokenScanner(
-				tokens, IXMLSyntaxConstants.XML_COMMENT );
+		xmlCommentScanner = new SingleTokenScanner(tokens,
+				IXMLSyntaxConstants.XML_COMMENT);
 
-		xmlDeclScanner = new DeclScanner( tokens );
+		xmlDeclScanner = new DeclScanner(tokens);
 	}
 
 	/**
 	 * 
 	 */
 	public IDocumentPartitioner createDTDPartitioner() {
-		return new DefaultPartitioner( dtdPartitionScanner, TYPES );
+		return new /*DefaultPartitioner*/FastPartitioner(dtdPartitionScanner, TYPES);
 	}
 
 	/**
@@ -112,27 +104,26 @@ public class DTDTextTools extends AbstractTextTools {
 	/**
 	 * Returns a scanner which is configured to scan DTD text.
 	 * 
-	 * @return  an DTD text scanner
+	 * @return an DTD text scanner
 	 */
 	public RuleBasedScanner getDTDTextScanner() {
 		return dtdTextScanner;
 	}
 
 	/**
-	 * Returns a scanner which is configured to scan DTD
-	 * conditional sections.
+	 * Returns a scanner which is configured to scan DTD conditional sections.
 	 * 
-	 * @return  an DTD conditional section scanner
+	 * @return an DTD conditional section scanner
 	 */
 	public RuleBasedScanner getDTDConditionalScanner() {
 		return dtdConditionalScanner;
 	}
 
 	/**
-	 * Returns a scanner which is configured to scan XML
-	 * processing instructions.
+	 * Returns a scanner which is configured to scan XML processing
+	 * instructions.
 	 * 
-	 * @return  an XML processing instruction scanner
+	 * @return an XML processing instruction scanner
 	 */
 	public RuleBasedScanner getXMLPIScanner() {
 		return xmlPIScanner;
@@ -141,7 +132,7 @@ public class DTDTextTools extends AbstractTextTools {
 	/**
 	 * Returns a scanner which is configured to scan XML comments.
 	 * 
-	 * @return  an XML comment scanner
+	 * @return an XML comment scanner
 	 */
 	public RuleBasedScanner getXMLCommentScanner() {
 		return xmlCommentScanner;
@@ -150,7 +141,7 @@ public class DTDTextTools extends AbstractTextTools {
 	/**
 	 * Returns a scanner which is configured to scan XML declarations.
 	 * 
-	 * @return  an XML declaration scanner
+	 * @return an XML declaration scanner
 	 */
 	public RuleBasedScanner getXMLDeclScanner() {
 		return xmlDeclScanner;