removed unused private methods.

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

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 d209db0..3be2d55 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
@@ -1322,106 +1322,106 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         * @param token
         *            the token of which the priority is requested
         */
-       private static int getTokenPriority(int token) {
-               switch (token) {
-               case TokenNameextends:
-                       // case TokenNameimplements :
-                       // case TokenNamethrows :
-                       return 10;
-               case TokenNameSEMICOLON:
-                       // ;
-                       return 20;
-               case TokenNameCOMMA:
-                       // ,
-                       return 25;
-               case TokenNameEQUAL:
-                       // =
-                       return 30;
-               case TokenNameAND_AND:
-                       // &&
-               case TokenNameOR_OR:
-                       // ||
-                       return 40;
-               case TokenNameQUESTION:
-                       // ?
-               case TokenNameCOLON:
-                       // :
-                       return 50; // it's better cutting on ?: than on ;
-               case TokenNameEQUAL_EQUAL:
-                       // ==
-               case TokenNameEQUAL_EQUAL_EQUAL:
-                       // ===
-               case TokenNameNOT_EQUAL:
-                       // !=
-               case TokenNameNOT_EQUAL_EQUAL:
-                       // !=
-                       return 60;
-               case TokenNameLESS:
-                       // <
-               case TokenNameLESS_EQUAL:
-                       // <=
-               case TokenNameGREATER:
-                       // >
-               case TokenNameGREATER_EQUAL:
-                       // >=
-                       // case TokenNameinstanceof : // instanceof
-                       return 70;
-               case TokenNamePLUS:
-                       // +
-               case TokenNameMINUS:
-                       // -
-                       return 80;
-               case TokenNameMULTIPLY:
-                       // *
-               case TokenNameDIVIDE:
-                       // /
-               case TokenNameREMAINDER:
-                       // %
-                       return 90;
-               case TokenNameLEFT_SHIFT:
-                       // <<
-               case TokenNameRIGHT_SHIFT:
-                       // >>
-                       // case TokenNameUNSIGNED_RIGHT_SHIFT : // >>>
-                       return 100;
-               case TokenNameAND:
-                       // &
-               case TokenNameOR:
-                       // |
-               case TokenNameXOR:
-                       // ^
-                       return 110;
-               case TokenNameMULTIPLY_EQUAL:
-                       // *=
-               case TokenNameDIVIDE_EQUAL:
-                       // /=
-               case TokenNameREMAINDER_EQUAL:
-                       // %=
-               case TokenNamePLUS_EQUAL:
-                       // +=
-               case TokenNameMINUS_EQUAL:
-                       // -=
-               case TokenNameLEFT_SHIFT_EQUAL:
-                       // <<=
-               case TokenNameRIGHT_SHIFT_EQUAL:
-                       // >>=
-                       // case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>=
-               case TokenNameAND_EQUAL:
-                       // &=
-               case TokenNameXOR_EQUAL:
-                       // ^=
-               case TokenNameOR_EQUAL:
-                       // .=
-               case TokenNameDOT_EQUAL:
-                       // |=
-                       return 120;
-               case TokenNameDOT:
-                       // .
-                       return 130;
-               default:
-                       return Integer.MAX_VALUE;
-               }
-       }
+//     private static int getTokenPriority(int token) {
+//             switch (token) {
+//             case TokenNameextends:
+//                     // case TokenNameimplements :
+//                     // case TokenNamethrows :
+//                     return 10;
+//             case TokenNameSEMICOLON:
+//                     // ;
+//                     return 20;
+//             case TokenNameCOMMA:
+//                     // ,
+//                     return 25;
+//             case TokenNameEQUAL:
+//                     // =
+//                     return 30;
+//             case TokenNameAND_AND:
+//                     // &&
+//             case TokenNameOR_OR:
+//                     // ||
+//                     return 40;
+//             case TokenNameQUESTION:
+//                     // ?
+//             case TokenNameCOLON:
+//                     // :
+//                     return 50; // it's better cutting on ?: than on ;
+//             case TokenNameEQUAL_EQUAL:
+//                     // ==
+//             case TokenNameEQUAL_EQUAL_EQUAL:
+//                     // ===
+//             case TokenNameNOT_EQUAL:
+//                     // !=
+//             case TokenNameNOT_EQUAL_EQUAL:
+//                     // !=
+//                     return 60;
+//             case TokenNameLESS:
+//                     // <
+//             case TokenNameLESS_EQUAL:
+//                     // <=
+//             case TokenNameGREATER:
+//                     // >
+//             case TokenNameGREATER_EQUAL:
+//                     // >=
+//                     // case TokenNameinstanceof : // instanceof
+//                     return 70;
+//             case TokenNamePLUS:
+//                     // +
+//             case TokenNameMINUS:
+//                     // -
+//                     return 80;
+//             case TokenNameMULTIPLY:
+//                     // *
+//             case TokenNameDIVIDE:
+//                     // /
+//             case TokenNameREMAINDER:
+//                     // %
+//                     return 90;
+//             case TokenNameLEFT_SHIFT:
+//                     // <<
+//             case TokenNameRIGHT_SHIFT:
+//                     // >>
+//                     // case TokenNameUNSIGNED_RIGHT_SHIFT : // >>>
+//                     return 100;
+//             case TokenNameAND:
+//                     // &
+//             case TokenNameOR:
+//                     // |
+//             case TokenNameXOR:
+//                     // ^
+//                     return 110;
+//             case TokenNameMULTIPLY_EQUAL:
+//                     // *=
+//             case TokenNameDIVIDE_EQUAL:
+//                     // /=
+//             case TokenNameREMAINDER_EQUAL:
+//                     // %=
+//             case TokenNamePLUS_EQUAL:
+//                     // +=
+//             case TokenNameMINUS_EQUAL:
+//                     // -=
+//             case TokenNameLEFT_SHIFT_EQUAL:
+//                     // <<=
+//             case TokenNameRIGHT_SHIFT_EQUAL:
+//                     // >>=
+//                     // case TokenNameUNSIGNED_RIGHT_SHIFT_EQUAL : // >>>=
+//             case TokenNameAND_EQUAL:
+//                     // &=
+//             case TokenNameXOR_EQUAL:
+//                     // ^=
+//             case TokenNameOR_EQUAL:
+//                     // .=
+//             case TokenNameDOT_EQUAL:
+//                     // |=
+//                     return 120;
+//             case TokenNameDOT:
+//                     // .
+//                     return 130;
+//             default:
+//                     return Integer.MAX_VALUE;
+//             }
+//     }
 
        /**
         * Handles the exception raised when an invalid token is encountered.
@@ -2065,16 +2065,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         * Pops the top statement of the stack if it is a <code>BLOCK</code> or a
         * <code>NONINDENT_BLOCK</code>.
         */
-       private int popBlock() {
-               int delta = 0;
-               if ((constructionsCount > 0)
-                               && ((constructions[constructionsCount - 1] == BLOCK) || (constructions[constructionsCount - 1] == NONINDENT_BLOCK))) {
-                       if (constructions[constructionsCount - 1] == BLOCK)
-                               delta--;
-                       constructionsCount--;
-               }
-               return delta;
-       }
+//     private int popBlock() {
+//             int delta = 0;
+//             if ((constructionsCount > 0)
+//                             && ((constructions[constructionsCount - 1] == BLOCK) || (constructions[constructionsCount - 1] == NONINDENT_BLOCK))) {
+//                     if (constructions[constructionsCount - 1] == BLOCK)
+//                             delta--;
+//                     constructionsCount--;
+//             }
+//             return delta;
+//     }
 
        /**
         * Pops elements until the stack is empty or the top element is
@@ -2084,16 +2084,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
         * @param token
         *            the token to be left as the top of the stack
         */
-       private int popExclusiveUntil(int token) {
-               int delta = 0;
-               int startCount = constructionsCount;
-               for (int i = startCount - 1; i >= 0 && constructions[i] != token; i--) {
-                       if (constructions[i] != NONINDENT_BLOCK)
-                               delta--;
-                       constructionsCount--;
-               }
-               return delta;
-       }
+//     private int popExclusiveUntil(int token) {
+//             int delta = 0;
+//             int startCount = constructionsCount;
+//             for (int i = startCount - 1; i >= 0 && constructions[i] != token; i--) {
+//                     if (constructions[i] != NONINDENT_BLOCK)
+//                             delta--;
+//                     constructionsCount--;
+//             }
+//             return delta;
+//     }
 
        /**
         * Pops elements until the stack is empty or the top element is a
@@ -2211,16 +2211,16 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
                return 1;
        }
 
-       private static boolean separateFirstArgumentOn(int currentToken) {
-               // return (currentToken == TokenNameCOMMA || currentToken ==
-               // TokenNameSEMICOLON);
-               return currentToken != TokenNameif && currentToken != TokenNameLPAREN
-                               && currentToken != TokenNameNOT
-                               && currentToken != TokenNamewhile
-                               && currentToken != TokenNamefor
-                               && currentToken != TokenNameforeach
-                               && currentToken != TokenNameswitch;
-       }
+//     private static boolean separateFirstArgumentOn(int currentToken) {
+//             // return (currentToken == TokenNameCOMMA || currentToken ==
+//             // TokenNameSEMICOLON);
+//             return currentToken != TokenNameif && currentToken != TokenNameLPAREN
+//                             && currentToken != TokenNameNOT
+//                             && currentToken != TokenNamewhile
+//                             && currentToken != TokenNamefor
+//                             && currentToken != TokenNameforeach
+//                             && currentToken != TokenNameswitch;
+//     }
 
        /**
         * Set the positions to map. The mapped positions should be retrieved using