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

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 7a342c4..29b5d5d 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.5 2005-10-09 12:05:31 axelcl Exp $
+ $Id: PHPDocumentPartitioner.java,v 1.6 2006-10-21 23:18:33 pombredanne Exp $
  **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor.php;
 
@@ -16,77 +16,80 @@ import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.ui.text.rules.FlatNode;
 import net.sourceforge.phpeclipse.ui.text.rules.MultiViewPartitioner;
 import net.sourceforge.phpeclipse.ui.text.rules.ViewNode;
+import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
 
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IDocumentPartitioner;
 import org.eclipse.jface.text.rules.IPartitionTokenScanner;
 
 /**
- *
- *
+ * 
+ * 
  * @author Igor Malinin
  */
 public class PHPDocumentPartitioner extends MultiViewPartitioner {
-  public static final String PHP_TEMPLATE_DATA = "__php_template_data";
+	public static final String PHP_TEMPLATE_DATA = "__php_template_data";
 
-  public static final String PHP_SCRIPT_CODE = "__php_script_code";
+	public static final String PHP_SCRIPT_CODE = "__php_script_code";
 
-  public static final String[] LEGAL_TYPES = {
-  	PHP_TEMPLATE_DATA,
-  	PHP_SCRIPT_CODE
-  };
+	public static final String[] LEGAL_TYPES = { PHP_TEMPLATE_DATA,
+			PHP_SCRIPT_CODE };
 
+	public PHPDocumentPartitioner(IPartitionTokenScanner scanner) {
+		super(scanner);
+	}
 
-  public PHPDocumentPartitioner(IPartitionTokenScanner scanner) {
-    super(scanner);
-  }
-
-  protected FlatNode createNode(String type, int offset, int length) {
-    if (type.equals(PHPPartitionScanner.PHP_SCRIPTING_AREA)) {
-      if (DEBUG) {
-        Assert.isTrue(offset >= 0);
-      }
-      ViewNode node = new ViewNode(type);
-      node.offset = offset;
-      node.length = length;
-      return node;
-    }
-
-    return super.createNode(type, offset, length);
-  }
-
-  /*
-   * @see net.sf.solareclipse.text.rules.DocumentViewPartitioner#createPartitioner(String)
-   */
-  protected IDocumentPartitioner createPartitioner(String contentType) {
-    if (contentType == null) {
-      //			return JavaTextTools.createHTMLPartitioner();
-      return PHPeclipsePlugin.getDefault().getJavaTextTools().getXMLTextTools().createPHPXMLPartitioner();
-    }
-
-    if (contentType.equals(PHPPartitionScanner.PHP_SCRIPTING_AREA)) {
-      return PHPeclipsePlugin.getDefault().getJavaTextTools().createPHPPartitioner();
-    }
-    return null;
-  }
+	protected FlatNode createNode(String type, int offset, int length) {
+		if (type.equals(PHPPartitionScanner.PHP_SCRIPTING_AREA)) {
+			if (DEBUG) {
+				Assert.isTrue(offset >= 0);
+			}
+			ViewNode node = new ViewNode(type);
+			node.offset = offset;
+			node.length = length;
+			return node;
+		}
+
+		return super.createNode(type, offset, length);
+	}
 
-  /*
-   * @see net.sf.solareclipse.text.rules.DocumentViewPartitioner#getContentType(String, String)
-   */
-  protected String getContentType(String parent, String view) {
-    if (parent == null) {
-      if (view == IDocument.DEFAULT_CONTENT_TYPE) {
-        return PHP_TEMPLATE_DATA;
-      }
-    } else {
-      if (view == IDocument.DEFAULT_CONTENT_TYPE) {
-        return PHP_SCRIPT_CODE;
-      }
-    }
+	/*
+	 * @see net.sf.solareclipse.text.rules.DocumentViewPartitioner#createPartitioner(String)
+	 */
+	protected IDocumentPartitioner createPartitioner(String contentType) {
+		if (contentType == null) {
+			// return JavaTextTools.createHTMLPartitioner();
+			return PHPeclipsePlugin.getDefault().getJavaTextTools()
+					.getXMLTextTools().createPHPXMLPartitioner();
+		}
+
+		if (contentType.equals(PHPPartitionScanner.PHP_SCRIPTING_AREA)) {
+			return PHPeclipsePlugin.getDefault().getJavaTextTools()
+					.createPHPPartitioner();
+		}
+		return null;
+	}
 
-    return super.getContentType(parent, view);
-  }
+	/*
+	 * @see net.sf.solareclipse.text.rules.DocumentViewPartitioner#getContentType(String,
+	 *      String)
+	 */
+	protected String getContentType(String parent, String view) {
+		if (parent == null) {
+			if (view == IDocument.DEFAULT_CONTENT_TYPE) {
+				return PHP_TEMPLATE_DATA;
+			}
+		} else {
+			if (view == IDocument.DEFAULT_CONTENT_TYPE) {
+				return PHP_SCRIPT_CODE;
+			}
+		}
+
+		return super.getContentType(parent, view);
+	}
 
 	public String[] getLegalContentTypes() {
 		return LEGAL_TYPES;