From cbc104f52e3cfd983ae587f873eecbc4dabf664d Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Tue, 22 May 2012 11:54:03 +0400 Subject: [PATCH] IDEA-19061 Integrate the Rearranger-plugin into core-IDEA Direct settings properties setup is covered by the test dsl now --- .../com/wrq/rearranger/RearrangerTest.groovy | 159 ++++++++---------- .../util/AbstractRuleBuilder.groovy | 6 - .../rearranger/util/CommentRuleBuilder.groovy | 10 +- .../rearranger/util/RearrangerTestDsl.java | 12 ++ .../rearranger/util/RearrangerTestUtil.groovy | 19 +++ .../util/SettingsConfigurationBuilder.groovy | 59 +++++++ .../util/java/JavaMethodRuleBuilder.groovy | 9 +- .../wrq/rearranger/util/java/MethodType.java | 2 +- 8 files changed, 172 insertions(+), 104 deletions(-) create mode 100644 plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestUtil.groovy create mode 100644 plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy index 47f437e26fda..e5004e54e25f 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy +++ b/plugins/rearranger/test/src/com/wrq/rearranger/RearrangerTest.groovy @@ -33,17 +33,19 @@ import com.wrq.rearranger.util.CommentRuleBuilder import org.jetbrains.annotations.NotNull import org.jetbrains.annotations.Nullable import com.wrq.rearranger.util.java.* +import com.wrq.rearranger.util.SettingsConfigurationBuilder /** JUnit tests for the rearranger plugin. */ class RearrangerTest extends LightCodeInsightFixtureTestCase { - private RearrangerSettings mySettings - private JavaClassRuleBuilder classRule - private JavaInnerClassRuleBuilder innerClassRule - private JavaFieldRuleBuilder fieldRule - private JavaMethodRuleBuilder methodRule - private CommentRuleBuilder commentRule - private JavaSpacingRule spacingRule + private RearrangerSettings mySettings + private SettingsConfigurationBuilder settings + private JavaClassRuleBuilder classRule + private JavaInnerClassRuleBuilder innerClassRule + private JavaFieldRuleBuilder fieldRule + private JavaMethodRuleBuilder methodRule + private CommentRuleBuilder commentRule + private JavaSpacingRule spacingRule @Override protected String getBasePath() { @@ -60,7 +62,8 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { mySettings.showParameterTypes = true mySettings.showRules = true mySettings.rearrangeInnerClasses = true - + + settings = new SettingsConfigurationBuilder(settings: mySettings) classRule = new JavaClassRuleBuilder(settings: mySettings) innerClassRule = new JavaInnerClassRuleBuilder(settings: mySettings) fieldRule = new JavaFieldRuleBuilder(settings: mySettings) @@ -299,7 +302,7 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { public final void testReturnTypeMatch() throws Exception { doTest('RearrangementTest12', 'RearrangementResult12') { methodRule.create { returnType( 'void' ) } - fieldRule.create { type( 'int' ) } + fieldRule.create { type( 'int' ) } methodRule.create { returnType( '.*je.*' ) } methodRule.create { returnType( /Integer\[\]/) } methodRule.create { returnType( 'int' ) } @@ -307,52 +310,37 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { public final void testRelatedMethodsDepthOriginal() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13DO') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER + settings.extractedMethods( depthFirstOrder: true, order: RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER ) } } public final void testRelatedMethodsDepthAlphabetical() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13DA') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.ALPHABETICAL_ORDER + settings.extractedMethods( depthFirstOrder: true, order: RelatedMethodsSettings.ALPHABETICAL_ORDER ) } } public final void testRelatedMethodsDepthInvocation() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13DI') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER + settings.extractedMethods( depthFirstOrder: true, order: RelatedMethodsSettings.INVOCATION_ORDER ) } } public final void testRelatedMethodsBreadthOriginal() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13BO') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = false - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER + settings.extractedMethods( depthFirstOrder: false, order: RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER ) } } public final void testRelatedMethodsBreadthAlphabetical() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13BA') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = false - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.ALPHABETICAL_ORDER + settings.extractedMethods( depthFirstOrder: false, order: RelatedMethodsSettings.ALPHABETICAL_ORDER) } } public final void testRelatedMethodsBreadthInvocation() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13BI') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = false - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER + settings.extractedMethods( depthFirstOrder: false, order: RelatedMethodsSettings.INVOCATION_ORDER) } } private void doTestEmitComments(args) { doTest(args.initial?: 'RearrangementTest13', args.expected) { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = args.depthFirst - mySettings.extractedMethodsSettings.ordering = args.orderType - mySettings.extractedMethodsSettings.commentType = args.commentType + settings.extractedMethods( depthFirstOrder: args.depthFirst, order: args.orderType, commentType: args.commentType ) def precedingCommentRule = new CommentRule() precedingCommentRule.commentText = '''\ @@ -373,98 +361,97 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { public final void testEmitTLCommentsRelatedMethodsBreadthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13BITLC', - depthFirst: false, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL + expected: 'RearrangementResult13BITLC', + depthFirst: false, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL ) } public final void testEmitEMCommentsRelatedMethodsBreadthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13BIEMC', - depthFirst: false, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD + expected: 'RearrangementResult13BIEMC', + depthFirst: false, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD ) } public final void testEmitELCommentsRelatedMethodsBreadthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13BIELC', - depthFirst: false, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL + expected: 'RearrangementResult13BIELC', + depthFirst: false, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL ) } public final void testEmitNFCommentsRelatedMethodsBreadthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13BINFC', - depthFirst: false, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY + expected: 'RearrangementResult13BINFC', + depthFirst: false, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY ) } public final void testEmitTLCommentsRelatedMethodsDepthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13DITLC', - depthFirst: true, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL + expected: 'RearrangementResult13DITLC', + depthFirst: true, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_TOP_LEVEL ) } public final void testEmitEMCommentsRelatedMethodsDepthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13DIEMC', - depthFirst: true, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD + expected: 'RearrangementResult13DIEMC', + depthFirst: true, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_METHOD ) } public final void testEmitELCommentsRelatedMethodsDepthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13BIELC', - depthFirst: false, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL + expected: 'RearrangementResult13BIELC', + depthFirst: false, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_EACH_LEVEL ) } public final void testEmitNFCommentsRelatedMethodsDepthInvocation() throws Exception { doTestEmitComments( - expected: 'RearrangementResult13DINFC', - depthFirst: true, - orderType: RelatedMethodsSettings.INVOCATION_ORDER, - commentType: RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY + expected: 'RearrangementResult13DINFC', + depthFirst: true, + orderType: RelatedMethodsSettings.INVOCATION_ORDER, + commentType: RelatedMethodsSettings.COMMENT_TYPE_NEW_FAMILY ) } public final void testRelatedMethodsException() throws Exception { doTest('RearrangementTest13', 'RearrangementResult13Ex') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER + settings.extractedMethods( depthFirstOrder: true, order: RelatedMethodsSettings.RETAIN_ORIGINAL_ORDER ) methodRule.create { name('GF') } } } public final void testKeepOverloadedMethodsTogether() throws Exception { doTest('RearrangementTest14', 'RearrangementResult14') { - mySettings.extractedMethodsSettings.moveExtractedMethods = true - mySettings.extractedMethodsSettings.depthFirstOrdering = false - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.INVOCATION_ORDER - mySettings.keepOverloadedMethodsTogether = true - } } + settings.configure { + extractedMethods( depthFirstOrder: false, order: RelatedMethodsSettings.INVOCATION_ORDER ) + keepTogether( 'overloaded' ) + } } } public final void testXML() throws Exception { doTest('RearrangementTest17', 'RearrangementTest17', 'xml') } public final void testKeepGSTogether() throws Exception { doTest('RearrangementTest18', 'RearrangementResult18') { - mySettings.keepGettersSettersTogether = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.ALPHABETICAL_ORDER + settings.configure { + extractedMethods( order: RelatedMethodsSettings.INVOCATION_ORDER ) + keepTogether( 'getters and setters' ) + } fieldRule.create {} methodRule.create { target( MethodType.CONSTRUCTOR ) } methodRule.create { @@ -474,9 +461,10 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { public final void testKeepGSWithProperty() throws Exception { doTest('RearrangementTest18', 'RearrangementResult18A') { - mySettings.keepGettersSettersTogether = true - mySettings.keepGettersSettersWithProperty = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.ALPHABETICAL_ORDER + settings.configure { + extractedMethods( order: RelatedMethodsSettings.ALPHABETICAL_ORDER ) + keepTogether([ 'getters and setters', 'getters and setters with property' ]) + } fieldRule.create { } methodRule.create { target(MethodType.CONSTRUCTOR) } methodRule.create { @@ -486,9 +474,10 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { public final void testKeepGSWithPropertyElseTogether() throws Exception { doTest('RearrangementTest18B', 'RearrangementResult18B') { - mySettings.keepGettersSettersTogether = true - mySettings.keepGettersSettersWithProperty = true - mySettings.extractedMethodsSettings.ordering = RelatedMethodsSettings.ALPHABETICAL_ORDER + settings.configure { + extractedMethods( order: RelatedMethodsSettings.ALPHABETICAL_ORDER ) + keepTogether([ 'getters and setters', 'getters and setters with property' ]) + } fieldRule.create { } commentRule.create { comment('// Getters/Setters', condition: CommentRule.EMIT_ALWAYS) @@ -511,23 +500,17 @@ class RearrangerTest extends LightCodeInsightFixtureTestCase { public final void testKeepOverloadsTogetherOriginalOrder() throws Exception { doTest('RearrangementTest19', 'RearrangementResult19A') { - mySettings.extractedMethodsSettings.moveExtractedMethods = false - mySettings.keepOverloadedMethodsTogether = true - mySettings.overloadedOrder = RearrangerSettings.OVERLOADED_ORDER_RETAIN_ORIGINAL + settings.overloadedMethods( keepTogether: true, order: RearrangerSettings.OVERLOADED_ORDER_RETAIN_ORIGINAL ) } } public final void testKeepOverloadsTogetherAscendingOrder() throws Exception { doTest('RearrangementTest19', 'RearrangementResult19B') { - mySettings.extractedMethodsSettings.moveExtractedMethods = false - mySettings.keepOverloadedMethodsTogether = true - mySettings.overloadedOrder = RearrangerSettings.OVERLOADED_ORDER_ASCENDING_PARAMETERS + settings.overloadedMethods( keepTogether: true, order: RearrangerSettings.OVERLOADED_ORDER_ASCENDING_PARAMETERS ) } } public final void testKeepOverloadsTogetherDescendingOrder() throws Exception { doTest('RearrangementTest19', 'RearrangementResult19C') { - mySettings.extractedMethodsSettings.moveExtractedMethods = false - mySettings.keepOverloadedMethodsTogether = true - mySettings.overloadedOrder = RearrangerSettings.OVERLOADED_ORDER_DESCENDING_PARAMETERS + settings.overloadedMethods( keepTogether: true, order: RearrangerSettings.OVERLOADED_ORDER_DESCENDING_PARAMETERS ) } } public final void testInnerClassReferenceToChild() throws Exception { diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/AbstractRuleBuilder.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/util/AbstractRuleBuilder.groovy index 2b3452f0fe91..41241e6f333b 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/AbstractRuleBuilder.groovy +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/AbstractRuleBuilder.groovy @@ -143,10 +143,4 @@ public abstract class AbstractRuleBuilder extends BuilderSupport { rule."$propertyName".expression = value } } - - protected static void setIf(@NotNull RearrangerTestDsl dslProperty, map, rulePropertyName, rule) { - if (map.containsKey(dslProperty.value)) { - rule."$rulePropertyName" = map[dslProperty.value] - } - } } diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/CommentRuleBuilder.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/util/CommentRuleBuilder.groovy index 80f06617fc57..868238943cc7 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/CommentRuleBuilder.groovy +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/CommentRuleBuilder.groovy @@ -13,11 +13,11 @@ class CommentRuleBuilder extends AbstractRuleBuilder { { registerHandler(RearrangerTestDsl.COMMENT, { data, attributes, rule -> rule.commentText = data - setIf(RearrangerTestDsl.CONDITION, attributes, 'emitCondition', rule) - setIf(RearrangerTestDsl.ALL_SUBSEQUENT, attributes, 'allSubsequentRules', rule) - setIf(RearrangerTestDsl.ALL_PRECEDING, attributes, 'allPrecedingRules', rule) - setIf(RearrangerTestDsl.SUBSEQUENT_RULES_TO_MATCH, attributes, 'NSubsequentRulesToMatch', rule) - setIf(RearrangerTestDsl.PRECEDING_RULES_TO_MATCH, attributes, 'NPrecedingRulesToMatch', rule) + RearrangerTestUtil.setIf(RearrangerTestDsl.CONDITION, attributes, 'emitCondition', rule) + RearrangerTestUtil.setIf(RearrangerTestDsl.ALL_SUBSEQUENT, attributes, 'allSubsequentRules', rule) + RearrangerTestUtil.setIf(RearrangerTestDsl.ALL_PRECEDING, attributes, 'allPrecedingRules', rule) + RearrangerTestUtil.setIf(RearrangerTestDsl.SUBSEQUENT_RULES_TO_MATCH, attributes, 'NSubsequentRulesToMatch', rule) + RearrangerTestUtil.setIf(RearrangerTestDsl.PRECEDING_RULES_TO_MATCH, attributes, 'NPrecedingRulesToMatch', rule) }) } diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java b/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java index c6a46cbeb636..c3d31d77a99a 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestDsl.java @@ -9,7 +9,19 @@ import org.jetbrains.annotations.NotNull; * @since 5/17/12 12:57 PM */ public enum RearrangerTestDsl { + + // Settings + EXTRACTED_METHODS("extractedMethods"), + OVERLOADED_METHODS("overloadedMethods"), + DEPTH_FIRST_ORDER("depthFirstOrder"), + ORDER, + COMMENT_TYPE("commentType"), + KEEP_TOGETHER("keepTogether"), + OVERLOADED, + GETTERS_SETTERS("getters and setters"), + GETTERS_SETTERS_WITH_PROPERTY("getters and setters with property"), + // Rules NAME, MODIFIER, /** Field initializer type. */ diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestUtil.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestUtil.groovy new file mode 100644 index 000000000000..64e0dc28f6e3 --- /dev/null +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/RearrangerTestUtil.groovy @@ -0,0 +1,19 @@ +package com.wrq.rearranger.util + +import org.jetbrains.annotations.NotNull; + +/** + * @author Denis Zhdanov + * @since 5/22/12 11:11 AM + */ +public class RearrangerTestUtil { + + private RearrangerTestUtil() { + } + + public static void setIf(@NotNull RearrangerTestDsl dslProperty, map, rulePropertyName, rule) { + if (map.containsKey(dslProperty.value)) { + rule."$rulePropertyName" = map[dslProperty.value] + } + } +} diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy new file mode 100644 index 000000000000..0ce422b239fb --- /dev/null +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/SettingsConfigurationBuilder.groovy @@ -0,0 +1,59 @@ +package com.wrq.rearranger.util + +import com.wrq.rearranger.settings.RearrangerSettings + +import static com.wrq.rearranger.util.RearrangerTestUtil.setIf + +/** + * @author Denis Zhdanov + * @since 5/22/12 11:07 AM + */ +class SettingsConfigurationBuilder extends BuilderSupport { + + def RearrangerSettings settings + + @Override + protected void setParent(Object parent, Object child) { + } + + @Override + protected Object createNode(Object name) { + createNode(name, [:], []) + } + + @Override + protected Object createNode(Object name, Object value) { + createNode(name, [:], value) + } + + @Override + protected Object createNode(Object name, Map attributes) { + createNode(name, attributes, []) + } + + @Override + protected Object createNode(Object name, Map attributes, Object value) { + switch (name) { + case RearrangerTestDsl.EXTRACTED_METHODS.value: + settings.extractedMethodsSettings.moveExtractedMethods = true + setIf(RearrangerTestDsl.DEPTH_FIRST_ORDER, attributes, 'depthFirstOrdering', settings.extractedMethodsSettings) + setIf(RearrangerTestDsl.ORDER, attributes, 'ordering', settings.extractedMethodsSettings) + setIf(RearrangerTestDsl.COMMENT_TYPE, attributes, 'commentType', settings.extractedMethodsSettings) + break + case RearrangerTestDsl.KEEP_TOGETHER.value: + def m = [ + (RearrangerTestDsl.OVERLOADED.value) : 'keepOverloadedMethodsTogether', + (RearrangerTestDsl.GETTERS_SETTERS.value) : 'keepGettersSettersTogether', + (RearrangerTestDsl.GETTERS_SETTERS_WITH_PROPERTY.value) : 'keepGettersSettersWithProperty' + ] + for (i in [value].flatten()) { + settings."${m[i]}" = true + } + break + case RearrangerTestDsl.OVERLOADED_METHODS.value: + setIf(RearrangerTestDsl.ORDER, attributes, 'overloadedOrder', settings) + setIf(RearrangerTestDsl.KEEP_TOGETHER, attributes, 'keepOverloadedMethodsTogether', settings) + } + settings + } +} diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/java/JavaMethodRuleBuilder.groovy b/plugins/rearranger/test/src/com/wrq/rearranger/util/java/JavaMethodRuleBuilder.groovy index c83323449342..8b7c40b76d67 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/java/JavaMethodRuleBuilder.groovy +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/java/JavaMethodRuleBuilder.groovy @@ -4,6 +4,7 @@ import com.wrq.rearranger.settings.RearrangerSettings import com.wrq.rearranger.settings.attributeGroups.MethodAttributes import org.jetbrains.annotations.NotNull import com.wrq.rearranger.util.RearrangerTestDsl +import com.wrq.rearranger.util.RearrangerTestUtil /** * @author Denis Zhdanov @@ -20,12 +21,12 @@ class JavaMethodRuleBuilder extends AbstractJavaRuleBuilder { registerHandler(RearrangerTestDsl.TARGET, { data, attributes, rule -> handlers[data](attributes, rule) }) registerHandler(RearrangerTestDsl.RETURN_TYPE, createStringAttributeHandler('returnTypeAttr')) registerHandler(RearrangerTestDsl.GETTER_CRITERIA, { data, attributes, rule -> - setIf(RearrangerTestDsl.NAME, attributes, 'getterNameCriterion', rule.getterSetterDefinition) - setIf(RearrangerTestDsl.BODY, attributes, 'getterBodyCriterion', rule.getterSetterDefinition) + RearrangerTestUtil.setIf(RearrangerTestDsl.NAME, attributes, 'getterNameCriterion', rule.getterSetterDefinition) + RearrangerTestUtil.setIf(RearrangerTestDsl.BODY, attributes, 'getterBodyCriterion', rule.getterSetterDefinition) }) registerHandler(RearrangerTestDsl.SETTER_CRITERIA, { data, attributes, rule -> - setIf(RearrangerTestDsl.NAME, attributes, 'setterNameCriterion', rule.getterSetterDefinition) - setIf(RearrangerTestDsl.BODY, attributes, 'setterBodyCriterion', rule.getterSetterDefinition) + RearrangerTestUtil.setIf(RearrangerTestDsl.NAME, attributes, 'setterNameCriterion', rule.getterSetterDefinition) + RearrangerTestUtil.setIf(RearrangerTestDsl.BODY, attributes, 'setterBodyCriterion', rule.getterSetterDefinition) }) } diff --git a/plugins/rearranger/test/src/com/wrq/rearranger/util/java/MethodType.java b/plugins/rearranger/test/src/com/wrq/rearranger/util/java/MethodType.java index f31690cb7248..d02eb8148d04 100644 --- a/plugins/rearranger/test/src/com/wrq/rearranger/util/java/MethodType.java +++ b/plugins/rearranger/test/src/com/wrq/rearranger/util/java/MethodType.java @@ -5,5 +5,5 @@ package com.wrq.rearranger.util.java; * @since 5/17/12 11:05 AM */ public enum MethodType { - CONSTRUCTOR, GETTER_OR_SETTER, OTHER + CONSTRUCTOR, GETTER_OR_SETTER, OVERLOADED, OTHER }