Merge branch 'master' of git@git.labs.intellij.net:idea/community

This commit is contained in:
Kirill Kalishev
2010-08-27 16:58:09 +04:00
@@ -757,10 +757,29 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable {
*/
public boolean SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE = false;
/**
* "} else", "if()foo(); else"
* or
* "}else","if()foo();else"
*/
public boolean SPACE_BEFORE_ELSE_KEYWORD = true;
/**
* "} while", "do foo(); while"
* or
* "}while","do foo();while"
*/
public boolean SPACE_BEFORE_WHILE_KEYWORD = true;
/**
* "} catch"
* or
* "}catch"
*/
public boolean SPACE_BEFORE_CATCH_KEYWORD = true;
/**
* "} finally"
* or
* "}finally"
*/
public boolean SPACE_BEFORE_FINALLY_KEYWORD = true;
public boolean SPACE_BEFORE_QUEST = true;