diff --git a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java index 3f2dde01087f..fb9ee44433b2 100644 --- a/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java +++ b/java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java @@ -51,191 +51,195 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett consumer.showAllStandardOptions(); } - private static final String GENERAL_CODE_SAMPLE = "public class Foo {\n" + - " public int[] X = new int[]{1, 3, 5 7, 9, 11};\n" + - "\n" + - " public void foo(boolean a, int x, int y, int z) {\n" + - " label1:\n" + - " do {\n" + - " try {\n" + - " if (x > 0) {\n" + - " int someVariable = a ? x : y;\n" + - " int anotherVariable = a ? x : y;\n" + - " }\n" + - " else if (x < 0) {\n" + - " int someVariable = (y + z);\n" + - " someVariable = x = x + y;\n" + - " }\n" + - " else {\n" + - " label2:\n" + - " for (int i = 0; i < 5; i++) doSomething(i);\n" + - " }\n" + - " switch (a) {\n" + - " case 0:\n" + - " doCase0();\n" + - " break;\n" + - " default:\n" + - " doDefault();\n" + - " }\n" + - " }\n" + - " catch (Exception e) {\n" + - " processException(e.getMessage(), x + y, z, a);\n" + - " }\n" + - " finally {\n" + - " processFinally();\n" + - " }\n" + - " }\n" + - " while (true);\n" + - "\n" + - " if (2 < 3) return;\n" + - " if (3 < 4) return;\n" + - " do {\n" + - " x++\n" + - " }\n" + - " while (x < 10000);\n" + - " while (x < 50000) x++;\n" + - " for (int i = 0; i < 5; i++) System.out.println(i);\n" + - " }\n" + - "\n" + - " private class InnerClass implements I1, I2 {\n" + - " public void bar() throws E1, E2 {\n" + - " }\n" + - " }\n" + - "}"; + private static final String GENERAL_CODE_SAMPLE = + "public class Foo {\n" + + " public int[] X = new int[]{1, 3, 5 7, 9, 11};\n" + + "\n" + + " public void foo(boolean a, int x, int y, int z) {\n" + + " label1:\n" + + " do {\n" + + " try {\n" + + " if (x > 0) {\n" + + " int someVariable = a ? x : y;\n" + + " int anotherVariable = a ? x : y;\n" + + " }\n" + + " else if (x < 0) {\n" + + " int someVariable = (y + z);\n" + + " someVariable = x = x + y;\n" + + " }\n" + + " else {\n" + + " label2:\n" + + " for (int i = 0; i < 5; i++) doSomething(i);\n" + + " }\n" + + " switch (a) {\n" + + " case 0:\n" + + " doCase0();\n" + + " break;\n" + + " default:\n" + + " doDefault();\n" + + " }\n" + + " }\n" + + " catch (Exception e) {\n" + + " processException(e.getMessage(), x + y, z, a);\n" + + " }\n" + + " finally {\n" + + " processFinally();\n" + + " }\n" + + " }\n" + + " while (true);\n" + + "\n" + + " if (2 < 3) return;\n" + + " if (3 < 4) return;\n" + + " do {\n" + + " x++\n" + + " }\n" + + " while (x < 10000);\n" + + " while (x < 50000) x++;\n" + + " for (int i = 0; i < 5; i++) System.out.println(i);\n" + + " }\n" + + "\n" + + " private class InnerClass implements I1, I2 {\n" + + " public void bar() throws E1, E2 {\n" + + " }\n" + + " }\n" + + "}"; - private static final String BLANK_LINE_SAMPLE = "/*\n" + - " * This is a sample file.\n" + - " */\n" + - "package com.intellij.samples;\n" + - "\n" + - "import com.intellij.idea.Main;\n" + - "\n" + - "import javax.swing.*;\n" + - "import java.util.Vector;\n" + - "\n" + - "public class Foo {\n" + - " private int field1;\n" + - " private int field2;\n" + - "\n" + - " public void foo1() {\n" + - " new Runnable() {\n" + - " public void run() {\n" + - " }\n" + - " }\n" + - " }\n" + - "\n" + - " public class InnerClass {\n" + - " }\n" + - "}\n" + - "class AnotherClass {\n" + - "}\n" + - "interface TestInterface {\n" + - " int MAX = 10;\n" + - " int MIN = 1;\n" + - " void method1();\n" + - " void method2();\n" + - "}"; + private static final String BLANK_LINE_SAMPLE = + "/*\n" + + " * This is a sample file.\n" + + " */\n" + + "package com.intellij.samples;\n" + + "\n" + + "import com.intellij.idea.Main;\n" + + "\n" + + "import javax.swing.*;\n" + + "import java.util.Vector;\n" + + "\n" + + "public class Foo {\n" + + " private int field1;\n" + + " private int field2;\n" + + "\n" + + " public void foo1() {\n" + + " new Runnable() {\n" + + " public void run() {\n" + + " }\n" + + " }\n" + + " }\n" + + "\n" + + " public class InnerClass {\n" + + " }\n" + + "}\n" + + "class AnotherClass {\n" + + "}\n" + + "interface TestInterface {\n" + + " int MAX = 10;\n" + + " int MIN = 1;\n" + + " void method1();\n" + + " void method2();\n" + + "}"; - private static final String SPACING_SAMPLE = "@Annotation(param1 = \"value1\", param2 = \"value2\")\n" + - "public class Foo {\n" + - " int[] X = new int[]{1, 3, 5, 6, 7, 87, 1213, 2};\n" + - "\n" + - " public void foo(int x, int y) {\n" + - " for (int i = 0; i < x; i++) {\n" + - " y += (y ^ 0x123) << 2;\n" + - " }\n" + - " do {\n" + - " try {\n" + - " if (0 < x && x < 10) {\n" + - " while (x != y) {\n" + - " x = f(x * 3 + 5);\n" + - " }\n" + - " }\n" + - " else {\n" + - " synchronized (this) {\n" + - " switch (e.getCode()) {\n" + - " //...\n" + - " }\n" + - " }\n" + - " }\n" + - " }\n" + - " catch (MyException e) {\n" + - " }\n" + - " finally {\n" + - " int[] arr = (int[])g(y);\n" + - " x = y >= 0 ? arr[y] : -1;\n" + - " }\n" + - " }\n" + - " while (true);\n" + - " }\n" + - " void bar(){{return;}}\n" + - "}"; + private static final String SPACING_SAMPLE = + "@Annotation(param1 = \"value1\", param2 = \"value2\")\n" + + "public class Foo {\n" + + " int[] X = new int[]{1, 3, 5, 6, 7, 87, 1213, 2};\n" + + "\n" + + " public void foo(int x, int y) {\n" + + " for (int i = 0; i < x; i++) {\n" + + " y += (y ^ 0x123) << 2;\n" + + " }\n" + + " do {\n" + + " try {\n" + + " if (0 < x && x < 10) {\n" + + " while (x != y) {\n" + + " x = f(x * 3 + 5);\n" + + " }\n" + + " }\n" + + " else {\n" + + " synchronized (this) {\n" + + " switch (e.getCode()) {\n" + + " //...\n" + + " }\n" + + " }\n" + + " }\n" + + " }\n" + + " catch (MyException e) {\n" + + " }\n" + + " finally {\n" + + " int[] arr = (int[])g(y);\n" + + " x = y >= 0 ? arr[y] : -1;\n" + + " }\n" + + " }\n" + + " while (true);\n" + + " }\n" + + " void bar(){{return;}}\n" + + "}"; - private static final String WRAPPING_CODE_SAMPLE = "/*\n" + - " * This is a sample file.\n" + - " */\n" + - "\n" + - "public class ThisIsASampleClass extends C1 implements I1, I2, I3, I4, I5 {\n" + - " private int f1 = 1;\n" + - " private String field2 = \"\";\n" + - " public void foo1(int i1, int i2, int i3, int i4, int i5, int i6, int i7) {}\n" + - " public static void longerMethod() throws Exception1, Exception2, Exception3 {\n" + - "// todo something\n" + - " int\n" + - "i = 0;\n" + - " int[] a = new int[] {1, 2, 0x0052, 0x0053, 0x0054};\n" + - " int var1 = 1; int var2 = 2;\n" + - " foo1(0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057);\n" + - " int x = (3 + 4 + 5 + 6) * (7 + 8 + 9 + 10) * (11 + 12 + 13 + 14 + 0xFFFFFFFF);\n" + - " String s1, s2, s3;\n" + - " s1 = s2 = s3 = \"012345678901456\";\n" + - " assert i + j + k + l + n+ m <= 2 : \"assert description\";" + - " int y = 2 > 3 ? 7 + 8 + 9 : 11 + 12 + 13;\n" + - " super.getFoo().foo().getBar().bar();\n" + - "\n" + - " label: " + - " if (2 < 3) return; else if (2 > 3) return; else return;\n" + - " for (int i = 0; i < 0xFFFFFF; i += 2) System.out.println(i);\n" + - " while (x < 50000) x++;\n" + - " do x++ while (x < 10000);\n" + - " switch (a) {\n" + - " case 0:\n" + - " doCase0();\n" + - " break;\n" + - " default:\n" + - " doDefault();\n" + - " }\n" + - " try {\n" + - " doSomething();\n" + - " } catch (Exception e) {\n" + - " processException(e);\n" + - " } finally {\n" + - " processFinally();\n" + - " }\n" + - " do {\n" + - " x--;\n" + - " } while (x > 10) \n" + - " }\n" + - " public static void test() \n" + - " throws Exception { \n" + - " foo.foo().bar(\"arg1\", \n" + - " \"arg2\"); \n" + - " new Object() {};" + - " } \n" + - " class TestInnerClass {}\n" + - " interface TestInnerInterface {}\n" + - "}\n" + - "\n" + - "enum Breed {\n" + - " Dalmatian(), Labrador(), Dachshund()\n" + - "}\n" + - "\n" + - "@Annotation1 @Annotation2 @Annotation3(param1=\"value1\", param2=\"value2\") @Annotation4 class Foo {\n" + - " @Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") public static void foo(){\n" + - " }\n" + - " @Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") public static int myFoo;\n" + - " public void method(@Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") final int param){\n" + - " @Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") final int localVariable;" + - " }\n" + - "}"; + private static final String WRAPPING_CODE_SAMPLE = + "/*\n" + + " * This is a sample file.\n" + + " */\n" + + "\n" + + "public class ThisIsASampleClass extends C1 implements I1, I2, I3, I4, I5 {\n" + + " private int f1 = 1;\n" + + " private String field2 = \"\";\n" + + " public void foo1(int i1, int i2, int i3, int i4, int i5, int i6, int i7) {}\n" + + " public static void longerMethod() throws Exception1, Exception2, Exception3 {\n" + + "// todo something\n" + + " int\n" + + "i = 0;\n" + + " int[] a = new int[] {1, 2, 0x0052, 0x0053, 0x0054};\n" + + " int var1 = 1; int var2 = 2;\n" + + " foo1(0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057);\n" + + " int x = (3 + 4 + 5 + 6) * (7 + 8 + 9 + 10) * (11 + 12 + 13 + 14 + 0xFFFFFFFF);\n" + + " String s1, s2, s3;\n" + + " s1 = s2 = s3 = \"012345678901456\";\n" + + " assert i + j + k + l + n+ m <= 2 : \"assert description\";" + + " int y = 2 > 3 ? 7 + 8 + 9 : 11 + 12 + 13;\n" + + " super.getFoo().foo().getBar().bar();\n" + + "\n" + + " label: " + + " if (2 < 3) return; else if (2 > 3) return; else return;\n" + + " for (int i = 0; i < 0xFFFFFF; i += 2) System.out.println(i);\n" + + " while (x < 50000) x++;\n" + + " do x++ while (x < 10000);\n" + + " switch (a) {\n" + + " case 0:\n" + + " doCase0();\n" + + " break;\n" + + " default:\n" + + " doDefault();\n" + + " }\n" + + " try {\n" + + " doSomething();\n" + + " } catch (Exception e) {\n" + + " processException(e);\n" + + " } finally {\n" + + " processFinally();\n" + + " }\n" + + " do {\n" + + " x--;\n" + + " } while (x > 10) \n" + + " }\n" + + " public static void test() \n" + + " throws Exception { \n" + + " foo.foo().bar(\"arg1\", \n" + + " \"arg2\"); \n" + + " new Object() {};" + + " } \n" + + " class TestInnerClass {}\n" + + " interface TestInnerInterface {}\n" + + "}\n" + + "\n" + + "enum Breed {\n" + + " Dalmatian(), Labrador(), Dachshund()\n" + + "}\n" + + "\n" + + "@Annotation1 @Annotation2 @Annotation3(param1=\"value1\", param2=\"value2\") @Annotation4 class Foo {\n" + + " @Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") public static void foo(){\n" + + " }\n" + + " @Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") public static int myFoo;\n" + + " public void method(@Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") final int param){\n" + + " @Annotation1 @Annotation3(param1=\"value1\", param2=\"value2\") final int localVariable;" + + " }\n" + + "}"; } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java index b65164d1071e..e9bd4f33829f 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleSpacesPanel.java @@ -31,43 +31,26 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel { } protected void initTables() { - initBooleanField("SPACE_BEFORE_METHOD_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.declaration.parentheses"), - SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.call.parentheses"), - SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_METHOD_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.declaration.parentheses"), SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.method.call.parentheses"), SPACES_BEFORE_PARENTHESES); initBooleanField("SPACE_BEFORE_IF_PARENTHESES", ApplicationBundle.message("checkbox.spaces.if.parentheses"), SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_FOR_PARENTHESES", ApplicationBundle.message("checkbox.spaces.for.parentheses"), - SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_WHILE_PARENTHESES", ApplicationBundle.message("checkbox.spaces.while.parentheses"), - SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_SWITCH_PARENTHESES", ApplicationBundle.message("checkbox.spaces.switch.parentheses"), - SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_CATCH_PARENTHESES", ApplicationBundle.message("checkbox.spaces.catch.parentheses"), - SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_SYNCHRONIZED_PARENTHESES", ApplicationBundle.message("checkbox.spaces.synchronized.parentheses"), - SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_BEFORE_ANOTATION_PARAMETER_LIST", ApplicationBundle.message("checkbox.spaces.annotation.parameters"), - SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_FOR_PARENTHESES", ApplicationBundle.message("checkbox.spaces.for.parentheses"), SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_WHILE_PARENTHESES", ApplicationBundle.message("checkbox.spaces.while.parentheses"), SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_SWITCH_PARENTHESES", ApplicationBundle.message("checkbox.spaces.switch.parentheses"), SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_CATCH_PARENTHESES", ApplicationBundle.message("checkbox.spaces.catch.parentheses"), SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_SYNCHRONIZED_PARENTHESES", ApplicationBundle.message("checkbox.spaces.synchronized.parentheses"), SPACES_BEFORE_PARENTHESES); + initBooleanField("SPACE_BEFORE_ANOTATION_PARAMETER_LIST", ApplicationBundle.message("checkbox.spaces.annotation.parameters"), SPACES_BEFORE_PARENTHESES); initCustomOptions(SPACES_BEFORE_PARENTHESES); - initBooleanField("SPACE_AROUND_ASSIGNMENT_OPERATORS", ApplicationBundle.message("checkbox.spaces.assignment.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_LOGICAL_OPERATORS", ApplicationBundle.message("checkbox.spaces.logical.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_EQUALITY_OPERATORS", ApplicationBundle.message("checkbox.spaces.equality.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_RELATIONAL_OPERATORS", ApplicationBundle.message("checkbox.spaces.relational.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_BITWISE_OPERATORS", ApplicationBundle.message("checkbox.spaces.bitwise.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_ADDITIVE_OPERATORS", ApplicationBundle.message("checkbox.spaces.additive.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_MULTIPLICATIVE_OPERATORS", ApplicationBundle.message("checkbox.spaces.multiplicative.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_SHIFT_OPERATORS", ApplicationBundle.message("checkbox.spaces.shift.operators"), - SPACES_AROUND_OPERATORS); - initBooleanField("SPACE_AROUND_UNARY_OPERATOR", ApplicationBundle.message("checkbox.spaces.around.unary.operator"), - SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_ASSIGNMENT_OPERATORS", ApplicationBundle.message("checkbox.spaces.assignment.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_LOGICAL_OPERATORS", ApplicationBundle.message("checkbox.spaces.logical.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_EQUALITY_OPERATORS", ApplicationBundle.message("checkbox.spaces.equality.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_RELATIONAL_OPERATORS", ApplicationBundle.message("checkbox.spaces.relational.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_BITWISE_OPERATORS", ApplicationBundle.message("checkbox.spaces.bitwise.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_ADDITIVE_OPERATORS", ApplicationBundle.message("checkbox.spaces.additive.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_MULTIPLICATIVE_OPERATORS", ApplicationBundle.message("checkbox.spaces.multiplicative.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_SHIFT_OPERATORS", ApplicationBundle.message("checkbox.spaces.shift.operators"), SPACES_AROUND_OPERATORS); + initBooleanField("SPACE_AROUND_UNARY_OPERATOR", ApplicationBundle.message("checkbox.spaces.around.unary.operator"), SPACES_AROUND_OPERATORS); initCustomOptions(SPACES_AROUND_OPERATORS); initBooleanField("SPACE_BEFORE_CLASS_LBRACE", ApplicationBundle.message("checkbox.spaces.class.left.brace"), SPACES_BEFORE_LEFT_BRACE); @@ -80,12 +63,9 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel { initBooleanField("SPACE_BEFORE_SWITCH_LBRACE", ApplicationBundle.message("checkbox.spaces.switch.left.brace"), SPACES_BEFORE_LEFT_BRACE); initBooleanField("SPACE_BEFORE_TRY_LBRACE", ApplicationBundle.message("checkbox.spaces.try.left.brace"), SPACES_BEFORE_LEFT_BRACE); initBooleanField("SPACE_BEFORE_CATCH_LBRACE", ApplicationBundle.message("checkbox.spaces.catch.left.brace"), SPACES_BEFORE_LEFT_BRACE); - initBooleanField("SPACE_BEFORE_FINALLY_LBRACE", ApplicationBundle.message("checkbox.spaces.finally.left.brace"), - SPACES_BEFORE_LEFT_BRACE); - initBooleanField("SPACE_BEFORE_SYNCHRONIZED_LBRACE", ApplicationBundle.message("checkbox.spaces.synchronized.left.brace"), - SPACES_BEFORE_LEFT_BRACE); - initBooleanField("SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE", ApplicationBundle.message("checkbox.spaces.array.initializer.left.brace"), - SPACES_BEFORE_LEFT_BRACE); + initBooleanField("SPACE_BEFORE_FINALLY_LBRACE", ApplicationBundle.message("checkbox.spaces.finally.left.brace"), SPACES_BEFORE_LEFT_BRACE); + initBooleanField("SPACE_BEFORE_SYNCHRONIZED_LBRACE", ApplicationBundle.message("checkbox.spaces.synchronized.left.brace"), SPACES_BEFORE_LEFT_BRACE); + initBooleanField("SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE", ApplicationBundle.message("checkbox.spaces.array.initializer.left.brace"), SPACES_BEFORE_LEFT_BRACE); initCustomOptions(SPACES_BEFORE_LEFT_BRACE); initBooleanField("SPACE_BEFORE_ELSE_KEYWORD", ApplicationBundle.message("checkbox.spaces.else.keyword"), SPACES_BEFORE_KEYWORD); @@ -94,26 +74,20 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel { initBooleanField("SPACE_BEFORE_FINALLY_KEYWORD", ApplicationBundle.message("checkbox.spaces.finally.keyword"), SPACES_BEFORE_KEYWORD); initCustomOptions(SPACES_BEFORE_KEYWORD); - initBooleanField("SPACE_WITHIN_BRACES", ApplicationBundle.message("checkbox.spaces.within.braces"), - SPACES_WITHIN); + initBooleanField("SPACE_WITHIN_BRACES", ApplicationBundle.message("checkbox.spaces.within.braces"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_BRACKETS", ApplicationBundle.message("checkbox.spaces.within.brackets"), SPACES_WITHIN); - initBooleanField("SPACE_WITHIN_ARRAY_INITIALIZER_BRACES", ApplicationBundle.message("checkbox.spaces.within.array.initializer.braces"), - SPACES_WITHIN); + initBooleanField("SPACE_WITHIN_ARRAY_INITIALIZER_BRACES", ApplicationBundle.message("checkbox.spaces.within.array.initializer.braces"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_PARENTHESES", ApplicationBundle.message("checkbox.spaces.within.parentheses"), SPACES_WITHIN); - initBooleanField("SPACE_WITHIN_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.call.parentheses"), - SPACES_WITHIN); - initBooleanField("SPACE_WITHIN_METHOD_PARENTHESES", ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.declaration.parentheses"), - SPACES_WITHIN); + initBooleanField("SPACE_WITHIN_METHOD_CALL_PARENTHESES", ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.call.parentheses"), SPACES_WITHIN); + initBooleanField("SPACE_WITHIN_METHOD_PARENTHESES", ApplicationBundle.message("checkbox.spaces.checkbox.spaces.method.declaration.parentheses"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_IF_PARENTHESES", ApplicationBundle.message("checkbox.spaces.if.parentheses"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_FOR_PARENTHESES", ApplicationBundle.message("checkbox.spaces.for.parentheses"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_WHILE_PARENTHESES", ApplicationBundle.message("checkbox.spaces.while.parentheses"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_SWITCH_PARENTHESES", ApplicationBundle.message("checkbox.spaces.switch.parentheses"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_CATCH_PARENTHESES", ApplicationBundle.message("checkbox.spaces.catch.parentheses"), SPACES_WITHIN); - initBooleanField("SPACE_WITHIN_SYNCHRONIZED_PARENTHESES", ApplicationBundle.message("checkbox.spaces.synchronized.parentheses"), - SPACES_WITHIN); + initBooleanField("SPACE_WITHIN_SYNCHRONIZED_PARENTHESES", ApplicationBundle.message("checkbox.spaces.synchronized.parentheses"), SPACES_WITHIN); initBooleanField("SPACE_WITHIN_CAST_PARENTHESES", ApplicationBundle.message("checkbox.spaces.type.cast.parentheses"), SPACES_WITHIN); - initBooleanField("SPACE_WITHIN_ANNOTATION_PARENTHESES", ApplicationBundle.message("checkbox.spaces.annotation.parentheses"), - SPACES_WITHIN); + initBooleanField("SPACE_WITHIN_ANNOTATION_PARENTHESES", ApplicationBundle.message("checkbox.spaces.annotation.parentheses"), SPACES_WITHIN); initCustomOptions(SPACES_WITHIN); initBooleanField("SPACE_BEFORE_QUEST", ApplicationBundle.message("checkbox.spaces.before.question"), SPACES_IN_TERNARY_OPERATOR); @@ -122,8 +96,7 @@ public class CodeStyleSpacesPanel extends OptionTreeWithPreviewPanel { initBooleanField("SPACE_AFTER_COLON", ApplicationBundle.message("checkbox.spaces.after.colon"), SPACES_IN_TERNARY_OPERATOR); initCustomOptions(SPACES_IN_TERNARY_OPERATOR); - initBooleanField("SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS", ApplicationBundle.message("checkbox.spaces.after.comma"), - SPACES_WITHIN_TYPE_ARGUMENTS); + initBooleanField("SPACE_AFTER_COMMA_IN_TYPE_ARGUMENTS", ApplicationBundle.message("checkbox.spaces.after.comma"), SPACES_WITHIN_TYPE_ARGUMENTS); initCustomOptions(SPACES_WITHIN_TYPE_ARGUMENTS); initBooleanField("SPACE_BEFORE_COMMA", ApplicationBundle.message("checkbox.spaces.before.comma"), SPACES_OTHER);