IDEA-19061 Integrate the Rearranger-plugin into core-IDEA

'abstract' modifier is added
This commit is contained in:
Denis.Zhdanov
2012-08-27 17:10:24 +04:00
parent de3962c95e
commit f35ddb99c5
3 changed files with 7 additions and 4 deletions
@@ -45,7 +45,7 @@ public class JavaRearranger implements Rearranger<JavaElementArrangementEntry>,
// Modifier
@NotNull private static final Set<ArrangementModifier> 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<JavaElementArrangementEntry>,
Set<ArrangementModifier> 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));
}
@@ -25,5 +25,5 @@ public enum ArrangementModifier {
PUBLIC, PROTECTED, PRIVATE, PACKAGE_PRIVATE,
//endregion
STATIC, FINAL, TRANSIENT, VOLATILE, SYNCHRONIZED
STATIC, FINAL, TRANSIENT, VOLATILE, SYNCHRONIZED, ABSTRACT
}
@@ -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,