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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
index 3be2d55..4d7ed3e 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
@@ -15,7 +15,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Hashtable;
-import java.util.Locale;
+//import java.util.Locale;
 import java.util.Map;
 
 //import javax.swing.text.html.Option;
@@ -148,9 +148,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
 	 * 
 	 * @deprecated Use CodeFormatter(ConfigurableOption[]) instead
 	 */
-	public CodeFormatter() {
-		this((Map) null);
-	}
+//	public CodeFormatter() {
+//		this((Map) null);
+//	}
 
 	/**
 	 * Creates a new instance of Code Formatter using the given settings.
@@ -1261,40 +1261,40 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
 	 * 
 	 * @deprecated backport 1.0 internal functionality
 	 */
-	public static ConfigurableOption[] getDefaultOptions(Locale locale) {
-		String componentName = CodeFormatter.class.getName();
-		FormatterOptions options = new FormatterOptions();
-		return new ConfigurableOption[] {
-				new ConfigurableOption(componentName, "newline.openingBrace",
-						locale, options.newLineBeforeOpeningBraceMode ? 0 : 1),
-				//$NON-NLS-1$
-				new ConfigurableOption(componentName,
-						"newline.controlStatement", locale,
-						options.newlineInControlStatementMode ? 0 : 1),
-				//$NON-NLS-1$
-				new ConfigurableOption(componentName, "newline.clearAll",
-						locale, options.clearAllBlankLinesMode ? 0 : 1),
-				//$NON-NLS-1$
-				// new ConfigurableOption(componentName, "newline.elseIf",
-				// locale,
-				// options.compactElseIfMode ? 0 : 1), //$NON-NLS-1$
-				new ConfigurableOption(componentName, "newline.emptyBlock",
-						locale, options.newLineInEmptyBlockMode ? 0 : 1),
-				//$NON-NLS-1$
-				new ConfigurableOption(componentName, "line.split", locale,
-						options.maxLineLength),
-				//$NON-NLS-1$
-				new ConfigurableOption(componentName,
-						"style.compactAssignment", locale,
-						options.compactAssignmentMode ? 0 : 1),
-				//$NON-NLS-1$
-				new ConfigurableOption(componentName, "tabulation.char",
-						locale, options.indentWithTab ? 0 : 1),
-				//$NON-NLS-1$
-				new ConfigurableOption(componentName,
-						"tabulation.size", locale, options.tabSize) //$NON-NLS-1$
-		};
-	}
+//	public static ConfigurableOption[] getDefaultOptions(Locale locale) {
+//		String componentName = CodeFormatter.class.getName();
+//		FormatterOptions options = new FormatterOptions();
+//		return new ConfigurableOption[] {
+//				new ConfigurableOption(componentName, "newline.openingBrace",
+//						locale, options.newLineBeforeOpeningBraceMode ? 0 : 1),
+//				//$NON-NLS-1$
+//				new ConfigurableOption(componentName,
+//						"newline.controlStatement", locale,
+//						options.newlineInControlStatementMode ? 0 : 1),
+//				//$NON-NLS-1$
+//				new ConfigurableOption(componentName, "newline.clearAll",
+//						locale, options.clearAllBlankLinesMode ? 0 : 1),
+//				//$NON-NLS-1$
+//				// new ConfigurableOption(componentName, "newline.elseIf",
+//				// locale,
+//				// options.compactElseIfMode ? 0 : 1), //$NON-NLS-1$
+//				new ConfigurableOption(componentName, "newline.emptyBlock",
+//						locale, options.newLineInEmptyBlockMode ? 0 : 1),
+//				//$NON-NLS-1$
+//				new ConfigurableOption(componentName, "line.split", locale,
+//						options.maxLineLength),
+//				//$NON-NLS-1$
+//				new ConfigurableOption(componentName,
+//						"style.compactAssignment", locale,
+//						options.compactAssignmentMode ? 0 : 1),
+//				//$NON-NLS-1$
+//				new ConfigurableOption(componentName, "tabulation.char",
+//						locale, options.indentWithTab ? 0 : 1),
+//				//$NON-NLS-1$
+//				new ConfigurableOption(componentName,
+//						"tabulation.size", locale, options.tabSize) //$NON-NLS-1$
+//		};
+//	}
 
 	/**
 	 * Returns the array of mapped positions. Returns null is no positions have
@@ -2256,9 +2256,9 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
 	 * @return an object containing the operator and all the substrings or null
 	 *         if the string cannot be split
 	 */
-	public SplitLine split(String stringToSplit) {
-		return split(stringToSplit, 0);
-	}
+//	public SplitLine split(String stringToSplit) {
+//		return split(stringToSplit, 0);
+//	}
 
 	/**
 	 * Splits <code>stringToSplit</code> on the top level token <br>