From f35ddb99c5ebd3583b3333242b06783e4b5ee22a Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Mon, 27 Aug 2012 17:10:07 +0400 Subject: [PATCH] IDEA-19061 Integrate the Rearranger-plugin into core-IDEA 'abstract' modifier is added --- .../intellij/psi/codeStyle/arrangement/JavaRearranger.java | 6 +++--- .../codeStyle/arrangement/match/ArrangementModifier.java | 2 +- .../DefaultArrangementSettingsRepresentationManager.java | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java index 550213ed6dd2..2467413da9f0 100644 --- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java +++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaRearranger.java @@ -45,7 +45,7 @@ public class JavaRearranger implements Rearranger, // Modifier @NotNull private static final Set SUPPORTED_MODIFIERS = EnumSet.of( - PUBLIC, PROTECTED, PACKAGE_PRIVATE, PRIVATE, STATIC, FINAL, VOLATILE, TRANSIENT, SYNCHRONIZED + PUBLIC, PROTECTED, PACKAGE_PRIVATE, PRIVATE, STATIC, FINAL, VOLATILE, TRANSIENT, SYNCHRONIZED, ABSTRACT ); @NotNull private static final Object NO_TYPE = new Object(); @@ -60,8 +60,8 @@ public class JavaRearranger implements Rearranger, Set commonModifiers = concat(visibilityModifiers, STATIC, FINAL); MODIFIERS_BY_TYPE.put(NO_TYPE, commonModifiers); - MODIFIERS_BY_TYPE.put(CLASS, commonModifiers); - MODIFIERS_BY_TYPE.put(METHOD, concat(commonModifiers, SYNCHRONIZED)); + MODIFIERS_BY_TYPE.put(CLASS, concat(commonModifiers, ABSTRACT)); + MODIFIERS_BY_TYPE.put(METHOD, concat(commonModifiers, SYNCHRONIZED, ABSTRACT)); MODIFIERS_BY_TYPE.put(FIELD, concat(commonModifiers, TRANSIENT, VOLATILE)); } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java index 9cb05d115324..0ac9a4466a1c 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/match/ArrangementModifier.java @@ -25,5 +25,5 @@ public enum ArrangementModifier { PUBLIC, PROTECTED, PRIVATE, PACKAGE_PRIVATE, //endregion - STATIC, FINAL, TRANSIENT, VOLATILE, SYNCHRONIZED + STATIC, FINAL, TRANSIENT, VOLATILE, SYNCHRONIZED, ABSTRACT } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java index 25a8cc5642b4..e274cfb3da49 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/settings/DefaultArrangementSettingsRepresentationManager.java @@ -45,6 +45,9 @@ public class DefaultArrangementSettingsRepresentationManager implements Arrangem // Other common modifiers. ArrangementModifier.STATIC, ArrangementModifier.FINAL, + // Semi-common modifiers. + ArrangementModifier.ABSTRACT, + // Method-specific modifiers. ArrangementModifier.SYNCHRONIZED,