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

diff --git a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java
index ef0c4ae..a98eacd 100644
--- a/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java
+++ b/net.sourceforge.phpeclipse.ui/src/net/sourceforge/phpdt/internal/ui/text/JavaIndenter.java
@@ -16,7 +16,9 @@ import net.sourceforge.phpeclipse.ui.WebUI;
 //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;
@@ -1465,41 +1467,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();