X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java index acb7427..1c69685 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/ui/text/JavaTextTools.java @@ -17,7 +17,6 @@ import net.sourceforge.phpeclipse.phpeditor.php.PHPPartitionScanner; import net.sourceforge.phpeclipse.phpeditor.php.SmartyCodeScanner; import net.sourceforge.phpeclipse.phpeditor.php.SmartyDocCodeScanner; import net.sourceforge.phpeclipse.xml.ui.XMLPlugin; -import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLPartitionScanner; import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools; import org.eclipse.core.runtime.Preferences; @@ -54,15 +53,16 @@ public class JavaTextTools implements IPHPPartitions { PHP_MULTILINE_COMMENT, PHP_SINGLELINE_COMMENT, PHP_STRING_DQ, - PHP_STRING_SQ }; + PHP_STRING_SQ, + PHP_STRING_HEREDOC}; - private static XMLPartitionScanner HTML_PARTITION_SCANNER = null; +// private static XMLPartitionScanner HTML_PARTITION_SCANNER = null; - private static FastJavaPartitionScanner PHP_PARTITION_SCANNER = null; +// private static FastJavaPartitionScanner PHP_PARTITION_SCANNER = null; private static HTMLPartitionScanner SMARTY_PARTITION_SCANNER = null; - private static XMLPartitionScanner XML_PARTITION_SCANNER = null; +// private static XMLPartitionScanner XML_PARTITION_SCANNER = null; // private final static String[] TYPES= new String[] { PHPPartitionScanner.PHP, PHPPartitionScanner.JAVA_DOC, // PHPPartitionScanner.JAVA_MULTILINE_COMMENT }; @@ -107,7 +107,7 @@ public class JavaTextTools implements IPHPPartitions { /** The PHP single quoted string scanner */ // private SingleTokenPHPScanner fStringSQScanner; - + /** The PHPDoc scanner */ private PHPDocCodeScanner fPHPDocScanner; @@ -130,7 +130,7 @@ public class JavaTextTools implements IPHPPartitions { /** * The core preference store. - * + * * @since 2.1 */ private Preferences fCorePreferenceStore; @@ -149,7 +149,7 @@ public class JavaTextTools implements IPHPPartitions { // private RuleBasedScanner jspBracketScanner; /** * Creates a new Java text tools collection. - * + * * @param store * the preference store to initialize the text tools. The text tool instance installs a listener on the passed preference * store to adapt itself to changes in the preference store. In general PreferenceConstants. @@ -167,7 +167,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Creates a new Java text tools collection. - * + * * @param store * the preference store to initialize the text tools. The text tool instance installs a listener on the passed preference * store to adapt itself to changes in the preference store. In general PreferenceConstants. @@ -202,7 +202,7 @@ public class JavaTextTools implements IPHPPartitions { IPreferenceConstants.PHP_SINGLELINE_COMMENT); // fStringDQScanner = new SingleTokenPHPScanner((JavaColorManager) colorManager, store, IPreferenceConstants.PHP_STRING); // fStringSQScanner = new SingleTokenPHPScanner((JavaColorManager) colorManager, store, IPreferenceConstants.PHP_STRING); - + fPHPDocScanner = new PHPDocCodeScanner((JavaColorManager) colorManager, store); // fHTMLScanner = new HTMLCodeScanner((JavaColorManager)fColorManager, store); fSmartyScanner = new SmartyCodeScanner((JavaColorManager) colorManager, store); @@ -221,7 +221,7 @@ public class JavaTextTools implements IPHPPartitions { } /** - * + * */ public XMLTextTools getXMLTextTools() { return xmlTextTools; @@ -260,7 +260,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns the color manager which is used to manage any Java-specific colors needed for such things like syntax highlighting. - * + * * @return the color manager to be used for Java text viewers */ public JavaColorManager getColorManager() { @@ -269,7 +269,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan Java source code. - * + * * @return a Java source code scanner */ public RuleBasedScanner getCodeScanner() { @@ -278,9 +278,9 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan Java multiline comments. - * + * * @return a Java multiline comment scanner - * + * * @since 2.0 */ public RuleBasedScanner getMultilineCommentScanner() { @@ -289,9 +289,9 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan HTML code. - * + * * @return a HTML scanner - * + * * @since 2.0 */ // public RuleBasedScanner getHTMLScanner() { @@ -299,9 +299,9 @@ public class JavaTextTools implements IPHPPartitions { // } /** * Returns a scanner which is configured to scan Smarty code. - * + * * @return a Smarty scanner - * + * * @since 2.0 */ public RuleBasedScanner getSmartyScanner() { @@ -310,9 +310,9 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan Smarty code. - * + * * @return a Smarty scanner - * + * * @since 2.0 */ public RuleBasedScanner getSmartyDocScanner() { @@ -321,9 +321,9 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan Java singleline comments. - * + * * @return a Java singleline comment scanner - * + * * @since 2.0 */ public RuleBasedScanner getSinglelineCommentScanner() { @@ -332,9 +332,9 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan Java strings. - * + * * @return a Java string scanner - * + * * @since 2.0 */ // public RuleBasedScanner getStringScanner() { @@ -344,7 +344,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan JavaDoc compliant comments. Notes that the start sequence "/**" and the * corresponding end sequence are part of the JavaDoc comment. - * + * * @return a JavaDoc scanner */ public RuleBasedScanner getJavaDocScanner() { @@ -354,7 +354,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan Java-specific partitions, which are multi-line comments, JavaDoc comments, and * regular Java source code. - * + * * @return a Java partition scanner */ // public IPartitionTokenScanner getPartitionScanner() { @@ -363,7 +363,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Factory method for creating a PHP-specific document partitioner using this object's partitions scanner. This method is a * convenience method. - * + * * @return a newly created Java document partitioner */ public IDocumentPartitioner createDocumentPartitioner() { @@ -373,7 +373,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Factory method for creating a PHP-specific document partitioner using this object's partitions scanner. This method is a * convenience method. - * + * * @return a newly created Java document partitioner */ public IDocumentPartitioner createDocumentPartitioner(String extension) { @@ -418,14 +418,14 @@ public class JavaTextTools implements IPHPPartitions { /** * Sets up the Java document partitioner for the given document for the given partitioning. - * + * * @param document * the document to be set up * @param partitioning * the document partitioning * @param element * TODO - * + * * @since 3.0 */ // public void setupJavaDocumentPartitioner(IDocument document, String partitioning, Object element) { @@ -466,7 +466,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns the names of the document position categories used by the document partitioners created by this object to manage their * partition information. If the partitioners don't use document position categories, the returned result is null. - * + * * @return the partition managing position categories or null if there is none */ public String[] getPartitionManagingPositionCategories() { @@ -475,7 +475,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Determines whether the preference change encoded by the given event changes the behavior of one its contained components. - * + * * @param event * the event to be investigated * @return true if event causes a behavioral change @@ -492,7 +492,7 @@ public class JavaTextTools implements IPHPPartitions { // } /** * Adapts the behavior of the contained components to the change encoded in the given event. - * + * * @param event * the event to which to adapt * @since 2.0 @@ -551,7 +551,7 @@ public class JavaTextTools implements IPHPPartitions { } /** - * + * */ // public IPartitionTokenScanner getJSPScriptScanner() { // return jspScriptScanner; @@ -592,7 +592,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns a scanner which is configured to scan plain text in JSP. - * + * * @return a JSP text scanner */ // public RuleBasedScanner getJSPTextScanner() { @@ -600,7 +600,7 @@ public class JavaTextTools implements IPHPPartitions { // } /** * Returns a scanner which is configured to scan plain text in JSP. - * + * * @return a JSP text scanner */ // public RuleBasedScanner getJSPBracketScanner() { @@ -635,7 +635,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Sets up the Java document partitioner for the given document for the default partitioning. - * + * * @param document * the document to be set up * @since 3.0 @@ -646,7 +646,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Sets up the Java document partitioner for the given document for the given partitioning. - * + * * @param document * the document to be set up * @param partitioning @@ -666,7 +666,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns this text tool's preference store. - * + * * @return the preference store * @since 3.0 */ @@ -676,7 +676,7 @@ public class JavaTextTools implements IPHPPartitions { /** * Returns this text tool's core preference store. - * + * * @return the core preference store * @since 3.0 */