From acfb85e3fd6b068e3ef7c8d1a56b3342d9c5549e Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 26 Aug 2013 12:03:22 +0400 Subject: [PATCH] Useless generic parameter removed --- .../intentions/AbstractCodeTransformationIntention.java | 6 +++--- .../intentions/EliminateWhenSubjectIntention.java | 2 +- .../intentions/FlattenWhenIntention.java | 2 +- .../intentions/FoldBranchedExpressionIntention.java | 2 +- .../intentions/IfToWhenIntention.java | 2 +- .../intentions/IntroduceWhenSubjectIntention.java | 2 +- .../intentions/UnfoldBranchedExpressionIntention.java | 2 +- .../intentions/WhenToIfIntention.java | 2 +- .../declarations/SplitPropertyDeclarationIntention.java | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java index 5990e926e7f..79590b441aa 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/AbstractCodeTransformationIntention.java @@ -30,11 +30,11 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiUtil; import org.jetbrains.jet.plugin.JetBundle; -public abstract class AbstractCodeTransformationIntention extends BaseIntentionAction { - private final T transformer; +public abstract class AbstractCodeTransformationIntention extends BaseIntentionAction { + private final Transformer transformer; private final Predicate isApplicable; - protected AbstractCodeTransformationIntention(@NotNull T transformer, @NotNull Predicate isApplicable) { + protected AbstractCodeTransformationIntention(@NotNull Transformer transformer, @NotNull Predicate isApplicable) { this.transformer = transformer; this.isApplicable = isApplicable; setText(JetBundle.message(transformer.getKey())); diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java index 84b31f0a872..2105305379e 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/EliminateWhenSubjectIntention.java @@ -11,7 +11,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.branchedTransformations.WhenUtils; import org.jetbrains.jet.plugin.intentions.Transformer; -public class EliminateWhenSubjectIntention extends AbstractCodeTransformationIntention { +public class EliminateWhenSubjectIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { @NotNull @Override diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java index 4dc17519b5b..dc20a784a5b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FlattenWhenIntention.java @@ -11,7 +11,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.branchedTransformations.WhenUtils; import org.jetbrains.jet.plugin.intentions.Transformer; -public class FlattenWhenIntention extends AbstractCodeTransformationIntention { +public class FlattenWhenIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { @NotNull @Override diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java index 152ae94e32b..6436088b465 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/FoldBranchedExpressionIntention.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.branchedTransformations.BranchedFoldingUtils; import org.jetbrains.jet.plugin.intentions.branchedTransformations.FoldableKind; -public abstract class FoldBranchedExpressionIntention extends AbstractCodeTransformationIntention { +public abstract class FoldBranchedExpressionIntention extends AbstractCodeTransformationIntention { protected FoldBranchedExpressionIntention(@NotNull final FoldableKind foldableKind) { super( foldableKind, diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java index 25ebc93c548..8db947d1a5c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IfToWhenIntention.java @@ -11,7 +11,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.branchedTransformations.IfWhenUtils; import org.jetbrains.jet.plugin.intentions.Transformer; -public class IfToWhenIntention extends AbstractCodeTransformationIntention { +public class IfToWhenIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { @NotNull @Override diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java index 96989b42600..1291cb42c52 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.java @@ -11,7 +11,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.branchedTransformations.WhenUtils; import org.jetbrains.jet.plugin.intentions.Transformer; -public class IntroduceWhenSubjectIntention extends AbstractCodeTransformationIntention { +public class IntroduceWhenSubjectIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { @NotNull @Override diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java index d90c5f90378..84f505241b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/UnfoldBranchedExpressionIntention.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.psi.JetExpression; import org.jetbrains.jet.plugin.intentions.branchedTransformations.*; import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; -public abstract class UnfoldBranchedExpressionIntention extends AbstractCodeTransformationIntention { +public abstract class UnfoldBranchedExpressionIntention extends AbstractCodeTransformationIntention { protected UnfoldBranchedExpressionIntention(@NotNull final UnfoldableKind unfoldableKind) { super( unfoldableKind, diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java index 081b0588c92..a79cfeac34b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/intentions/WhenToIfIntention.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.branchedTransformations.IfWhenUtils; import org.jetbrains.jet.plugin.intentions.Transformer; -public class WhenToIfIntention extends AbstractCodeTransformationIntention { +public class WhenToIfIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { @NotNull @Override diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java index b582f6c9cd0..e059ef65252 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/SplitPropertyDeclarationIntention.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.JetProperty; import org.jetbrains.jet.plugin.intentions.AbstractCodeTransformationIntention; import org.jetbrains.jet.plugin.intentions.Transformer; -public class SplitPropertyDeclarationIntention extends AbstractCodeTransformationIntention { +public class SplitPropertyDeclarationIntention extends AbstractCodeTransformationIntention { private static final Transformer TRANSFORMER = new Transformer() { @NotNull @Override