From: axelcl Date: Sun, 9 Oct 2005 12:05:45 +0000 (+0000) Subject: Save PHPPartitionScanner for refactoring X-Git-Url: http://secure.phpeclipse.com?hp=9f407167b74bc3835ded5e01e0bbc6b303219809 Save PHPPartitionScanner for refactoring --- 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 eaf1d71..acb7427 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 @@ -546,7 +546,7 @@ public class JavaTextTools implements IPHPPartitions { } private IDocumentPartitioner createJSPPartitioner() { - return new PHPDocumentPartitioner(getJSPPartitionScanner(), getPHPPartitionScanner()); + return new PHPDocumentPartitioner(getJSPPartitionScanner()); // return new JSPDocumentPartitioner(getJSPPartitionScanner(), jspScriptScanner); } diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPDocumentPartitioner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPDocumentPartitioner.java index 828f11e..7a342c4 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPDocumentPartitioner.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPDocumentPartitioner.java @@ -8,7 +8,7 @@ Contributors: Igor Malinin - initial contribution - $Id: PHPDocumentPartitioner.java,v 1.4 2005-08-18 20:09:25 axelcl Exp $ + $Id: PHPDocumentPartitioner.java,v 1.5 2005-10-09 12:05:31 axelcl Exp $ **********************************************************************/ package net.sourceforge.phpeclipse.phpeditor.php; @@ -23,8 +23,8 @@ import org.eclipse.jface.text.IDocumentPartitioner; import org.eclipse.jface.text.rules.IPartitionTokenScanner; /** - * - * + * + * * @author Igor Malinin */ public class PHPDocumentPartitioner extends MultiViewPartitioner { @@ -36,13 +36,10 @@ public class PHPDocumentPartitioner extends MultiViewPartitioner { PHP_TEMPLATE_DATA, PHP_SCRIPT_CODE }; - - private IPartitionTokenScanner scriptScanner; - public PHPDocumentPartitioner(IPartitionTokenScanner scanner, IPartitionTokenScanner scriptScanner) { - super(scanner); - this.scriptScanner = scriptScanner; + public PHPDocumentPartitioner(IPartitionTokenScanner scanner) { + super(scanner); } protected FlatNode createNode(String type, int offset, int length) {