X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/XMLTextTools.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/XMLTextTools.java index 8d05650..5ae2620 100644 --- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/XMLTextTools.java +++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/text/XMLTextTools.java @@ -8,7 +8,7 @@ * Contributors: * Igor Malinin - initial contribution * - * $Id: XMLTextTools.java,v 1.3 2005-05-15 23:23:02 axelcl Exp $ + * $Id: XMLTextTools.java,v 1.4 2006-10-21 23:14:13 pombredanne Exp $ */ package net.sourceforge.phpeclipse.xml.ui.text; @@ -26,11 +26,11 @@ import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLTagScanner; 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.DefaultPartitioner; +import org.eclipse.jface.text.rules.FastPartitioner; import org.eclipse.jface.text.rules.ITokenScanner; import org.eclipse.jface.text.rules.RuleBasedScanner; - /** * * @@ -38,37 +38,27 @@ import org.eclipse.jface.text.rules.RuleBasedScanner; */ public class XMLTextTools extends AbstractTextTools { /** Text Attributes for XML editors */ - public static final String[] TOKENS = { - IXMLSyntaxConstants.XML_DEFAULT, - IXMLSyntaxConstants.XML_TAG, - IXMLSyntaxConstants.XML_ATT_NAME, - IXMLSyntaxConstants.XML_ATT_VALUE, - IXMLSyntaxConstants.XML_ENTITY, - IXMLSyntaxConstants.XML_PI, - IXMLSyntaxConstants.XML_CDATA, - IXMLSyntaxConstants.XML_COMMENT, - IXMLSyntaxConstants.XML_SMARTY, - IXMLSyntaxConstants.XML_DECL, - }; + public static final String[] TOKENS = { IXMLSyntaxConstants.XML_DEFAULT, + IXMLSyntaxConstants.XML_TAG, IXMLSyntaxConstants.XML_ATT_NAME, + IXMLSyntaxConstants.XML_ATT_VALUE, IXMLSyntaxConstants.XML_ENTITY, + IXMLSyntaxConstants.XML_PI, IXMLSyntaxConstants.XML_CDATA, + IXMLSyntaxConstants.XML_COMMENT, IXMLSyntaxConstants.XML_SMARTY, + IXMLSyntaxConstants.XML_DECL, }; /** Content types for XML editors */ - public static final String[] TYPES = { - XMLPartitionScanner.XML_PI, - XMLPartitionScanner.XML_COMMENT, - XMLPartitionScanner.XML_DECL, - XMLPartitionScanner.XML_TAG, - XMLPartitionScanner.XML_ATTRIBUTE, - XMLPartitionScanner.XML_CDATA, - XMLPartitionScanner.DTD_INTERNAL, - XMLPartitionScanner.DTD_INTERNAL_PI, - XMLPartitionScanner.DTD_INTERNAL_COMMENT, - XMLPartitionScanner.DTD_INTERNAL_DECL, - }; + public static final String[] TYPES = { XMLPartitionScanner.XML_PI, + XMLPartitionScanner.XML_COMMENT, XMLPartitionScanner.XML_DECL, + XMLPartitionScanner.XML_TAG, XMLPartitionScanner.XML_ATTRIBUTE, + XMLPartitionScanner.XML_CDATA, XMLPartitionScanner.DTD_INTERNAL, + XMLPartitionScanner.DTD_INTERNAL_PI, + XMLPartitionScanner.DTD_INTERNAL_COMMENT, + XMLPartitionScanner.DTD_INTERNAL_DECL, }; /** The XML partitions scanner */ - private XMLPartitionScanner xmlPartitionScanner; - + private XMLPartitionScanner xmlPartitionScanner; + private PHPXMLPartitionScanner phpXMLPartitionScanner; + /** The XML text scanner */ private TextScanner xmlTextScanner; @@ -87,68 +77,69 @@ public class XMLTextTools 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 */ private DeclScanner xmlDeclScanner; - public XMLTextTools( IPreferenceStore store ) { - this( store, TOKENS ); + + public XMLTextTools(IPreferenceStore store) { + this(store, TOKENS); } + /** * Creates a new XML text tools collection. */ - public XMLTextTools( IPreferenceStore store, String[] strTokens ) { - super( store, strTokens ); + public XMLTextTools(IPreferenceStore store, String[] strTokens) { + super(store, strTokens); - xmlPartitionScanner = new XMLPartitionScanner( false ); - phpXMLPartitionScanner = new PHPXMLPartitionScanner( false ); + xmlPartitionScanner = new XMLPartitionScanner(false); + phpXMLPartitionScanner = new PHPXMLPartitionScanner(false); Map tokens = getTokens(); - xmlTextScanner = new TextScanner( - tokens, '&', IXMLSyntaxConstants.XML_DEFAULT ); + xmlTextScanner = new TextScanner(tokens, '&', + IXMLSyntaxConstants.XML_DEFAULT); - dtdTextScanner = new TextScanner( - tokens, '%', IXMLSyntaxConstants.XML_DEFAULT ); + dtdTextScanner = new TextScanner(tokens, '%', + IXMLSyntaxConstants.XML_DEFAULT); - 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); - xmlTagScanner = new XMLTagScanner( tokens ); + xmlTagScanner = new XMLTagScanner(tokens); - xmlAttributeScanner = new TextScanner( - tokens, '&', IXMLSyntaxConstants.XML_ATT_VALUE ); + xmlAttributeScanner = new TextScanner(tokens, '&', + IXMLSyntaxConstants.XML_ATT_VALUE); - xmlCDATAScanner = new XMLCDATAScanner( tokens ); + xmlCDATAScanner = new XMLCDATAScanner(tokens); } /** * */ public IDocumentPartitioner createXMLPartitioner() { - return new DefaultPartitioner( xmlPartitionScanner, TYPES ); + return new /*DefaultPartitioner*/FastPartitioner(xmlPartitionScanner, TYPES); } public IDocumentPartitioner createPHPXMLPartitioner() { - return new DefaultPartitioner( phpXMLPartitionScanner, TYPES ); + return new /*DefaultPartitioner*/FastPartitioner(phpXMLPartitionScanner, TYPES); } - + /** * */ -// public IPartitionTokenScanner getXMLPartitionScanner() { -// return xmlPartitionScanner; -// } - + // public IPartitionTokenScanner getXMLPartitionScanner() { + // return xmlPartitionScanner; + // } /** * Returns a scanner which is configured to scan XML text. * - * @return an XML text scanner + * @return an XML text scanner */ public RuleBasedScanner getXMLTextScanner() { return xmlTextScanner; @@ -157,7 +148,7 @@ public class XMLTextTools 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; @@ -166,7 +157,7 @@ public class XMLTextTools extends AbstractTextTools { /** * Returns a scanner which is configured to scan XML tags. * - * @return an XML tag scanner + * @return an XML tag scanner */ public RuleBasedScanner getXMLTagScanner() { return xmlTagScanner; @@ -175,7 +166,7 @@ public class XMLTextTools extends AbstractTextTools { /** * Returns a scanner which is configured to scan XML tag attributes. * - * @return an XML tag attribute scanner + * @return an XML tag attribute scanner */ public RuleBasedScanner getXMLAttributeScanner() { return xmlAttributeScanner; @@ -184,17 +175,17 @@ public class XMLTextTools extends AbstractTextTools { /** * Returns a scanner which is configured to scan XML CDATA sections. * - * @return an XML CDATA section scanner + * @return an XML CDATA section scanner */ public ITokenScanner getXMLCDATAScanner() { return xmlCDATAScanner; } /** - * 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; @@ -203,7 +194,7 @@ public class XMLTextTools 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; @@ -212,7 +203,7 @@ public class XMLTextTools 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;