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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java
index d3fb1b8..d6b5cf1 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java
@@ -15,7 +15,9 @@ import net.sourceforge.phpdt.core.formatter.DefaultCodeFormatterConstants;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 
 import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
@@ -92,9 +94,9 @@ public class JavaIndenter {
 	 *         reference position to <code>offset</code> resides, or
 	 *         <code>null</code> if it cannot be determined
 	 */
-	public StringBuffer getReferenceIndentation(int offset) {
-		return getReferenceIndentation(offset, false);
-	}
+//	public StringBuffer getReferenceIndentation(int offset) {
+//		return getReferenceIndentation(offset, false);
+//	}
 
 	/**
 	 * Computes the indentation at the reference point of <code>position</code>.
@@ -329,9 +331,9 @@ public class JavaIndenter {
 	 * @return the reference statement relative to which <code>offset</code>
 	 *         should be indented, or {@link JavaHeuristicScanner#NOT_FOUND}
 	 */
-	public int findReferencePosition(int offset) {
-		return findReferencePosition(offset, peekChar(offset));
-	}
+//	public int findReferencePosition(int offset) {
+//		return findReferencePosition(offset, peekChar(offset));
+//	}
 
 	/**
 	 * Peeks the next char in the document that comes after <code>offset</code>
@@ -1464,41 +1466,41 @@ public class JavaIndenter {
 		return 1; // sensible default
 	}
 
-	private boolean prefIndentBracesForBlocks() {
-		Plugin plugin = JavaCore.getPlugin();
-		if (plugin != null) {
-			String option = JavaCore
-					.getOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK);
-			return option
-					.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		}
-
-		return false; // sensible default
-	}
-
-	private boolean prefIndentBracesForArrays() {
-		Plugin plugin = JavaCore.getPlugin();
-		if (plugin != null) {
-			String option = JavaCore
-					.getOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER);
-			return option
-					.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		}
-
-		return false; // sensible default
-	}
-
-	private boolean prefIndentBracesForMethods() {
-		Plugin plugin = JavaCore.getPlugin();
-		if (plugin != null) {
-			String option = JavaCore
-					.getOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION);
-			return option
-					.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
-		}
-
-		return false; // sensible default
-	}
+//	private boolean prefIndentBracesForBlocks() {
+//		Plugin plugin = JavaCore.getPlugin();
+//		if (plugin != null) {
+//			String option = JavaCore
+//					.getOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_BLOCK);
+//			return option
+//					.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
+//		}
+//
+//		return false; // sensible default
+//	}
+
+//	private boolean prefIndentBracesForArrays() {
+//		Plugin plugin = JavaCore.getPlugin();
+//		if (plugin != null) {
+//			String option = JavaCore
+//					.getOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_ARRAY_INITIALIZER);
+//			return option
+//					.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
+//		}
+//
+//		return false; // sensible default
+//	}
+
+//	private boolean prefIndentBracesForMethods() {
+//		Plugin plugin = JavaCore.getPlugin();
+//		if (plugin != null) {
+//			String option = JavaCore
+//					.getOption(DefaultCodeFormatterConstants.FORMATTER_BRACE_POSITION_FOR_METHOD_DECLARATION);
+//			return option
+//					.equals(DefaultCodeFormatterConstants.NEXT_LINE_SHIFTED);
+//		}
+//
+//		return false; // sensible default
+//	}
 
 	private int prefContinuationIndent() {
 		Plugin plugin = JavaCore.getPlugin();