Codeformatter preferences should work now

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / formatter / impl / FormatterOptions.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java
index ba4127f..3b9f9b7 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/impl/FormatterOptions.java
@@ -17,15 +17,15 @@ public class FormatterOptions {
   /**
    * Option IDs
    */
-  public static final String OPTION_InsertNewlineBeforeOpeningBrace = "net.sourceforge.phpdt.core.formatter.newline.openingBrace"; //$NON-NLS-1$
-  public static final String OPTION_InsertNewlineInControlStatement = "net.sourceforge.phpdt.core.formatter.newline.controlStatement"; //$NON-NLS-1$
-  public static final String OPTION_InsertNewLineBetweenElseAndIf = "net.sourceforge.phpdt.core.formatter.newline.elseIf"; //$NON-NLS-1$
-  public static final String OPTION_InsertNewLineInEmptyBlock = "net.sourceforge.phpdt.core.formatter.newline.emptyBlock"; //$NON-NLS-1$
-  public static final String OPTION_ClearAllBlankLines = "net.sourceforge.phpdt.core.formatter.newline.clearAll"; //$NON-NLS-1$
-  public static final String OPTION_SplitLineExceedingLength = "net.sourceforge.phpdt.core.formatter.lineSplit"; //$NON-NLS-1$
-  public static final String OPTION_CompactAssignment = "net.sourceforge.phpdt.core.formatter.style.assignment"; //$NON-NLS-1$
-  public static final String OPTION_TabulationChar = "net.sourceforge.phpdt.core.formatter.tabulation.char"; //$NON-NLS-1$
-  public static final String OPTION_TabulationSize = "net.sourceforge.phpdt.core.formatter.tabulation.size"; //$NON-NLS-1$
+  public static final String OPTION_InsertNewlineBeforeOpeningBrace = "net.sourceforge.phpeclipse.core.formatter.newline.openingBrace"; //$NON-NLS-1$
+  public static final String OPTION_InsertNewlineInControlStatement = "net.sourceforge.phpeclipse.core.formatter.newline.controlStatement"; //$NON-NLS-1$
+ // public static final String OPTION_InsertNewLineBetweenElseAndIf = "net.sourceforge.phpeclipse.core.formatter.newline.elseIf"; //$NON-NLS-1$
+  public static final String OPTION_InsertNewLineInEmptyBlock = "net.sourceforge.phpeclipse.core.formatter.newline.emptyBlock"; //$NON-NLS-1$
+  public static final String OPTION_ClearAllBlankLines = "net.sourceforge.phpeclipse.core.formatter.newline.clearAll"; //$NON-NLS-1$
+  public static final String OPTION_SplitLineExceedingLength = "net.sourceforge.phpeclipse.core.formatter.lineSplit"; //$NON-NLS-1$
+  public static final String OPTION_CompactAssignment = "net.sourceforge.phpeclipse.core.formatter.style.assignment"; //$NON-NLS-1$
+  public static final String OPTION_TabulationChar = "net.sourceforge.phpeclipse.core.formatter.tabulation.char"; //$NON-NLS-1$
+  public static final String OPTION_TabulationSize = "net.sourceforge.phpeclipse.core.formatter.tabulation.size"; //$NON-NLS-1$
 
   public static final String INSERT = "insert"; //$NON-NLS-1$
   public static final String DO_NOT_INSERT = "do not insert"; //$NON-NLS-1$
@@ -55,7 +55,7 @@ public class FormatterOptions {
   public int tabSize = 4; // n spaces for one tab
   public boolean indentWithTab = true;
 
-  public boolean compactElseIfMode = true;
+  //public boolean compactElseIfMode = true;
   // if true, else and if are kept on the same line.
   public boolean newLineInEmptyBlockMode = true;
   // if false, no new line in {} if it's empty.
@@ -108,14 +108,14 @@ public class FormatterOptions {
         }
         continue;
       }
-      if (optionID.equals(OPTION_InsertNewLineBetweenElseAndIf)) {
-        if (optionValue.equals(INSERT)) {
-          this.compactElseIfMode = false;
-        } else if (optionValue.equals(DO_NOT_INSERT)) {
-          this.compactElseIfMode = true;
-        }
-        continue;
-      }
+//      if (optionID.equals(OPTION_InsertNewLineBetweenElseAndIf)) {
+//        if (optionValue.equals(INSERT)) {
+//          this.compactElseIfMode = false;
+//        } else if (optionValue.equals(DO_NOT_INSERT)) {
+//          this.compactElseIfMode = true;
+//        }
+//        continue;
+//      }
       if (optionID.equals(OPTION_InsertNewLineInEmptyBlock)) {
         if (optionValue.equals(INSERT)) {
           this.newLineInEmptyBlockMode = true;
@@ -184,9 +184,9 @@ public class FormatterOptions {
   public boolean isCompactingAssignment() {
     return compactAssignmentMode;
   }
-  public boolean isCompactingElseIf() {
-    return compactElseIfMode;
-  }
+//  public boolean isCompactingElseIf() {
+//    return compactElseIfMode;
+//  }
   public boolean isUsingTabForIndenting() {
     return indentWithTab;
   }
@@ -202,8 +202,8 @@ public class FormatterOptions {
   /**
    * @deprecated - should use a Map when creating the options.
    */
-  public void setCompactElseIfMode(boolean flag) {
-    compactElseIfMode = flag;
-  }
+//  public void setCompactElseIfMode(boolean flag) {
+//    compactElseIfMode = flag;
+//  }
 
 }