From d37013f309e3b068c1291ad91c8c702daa55a6a3 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 13 Jan 2005 17:22:40 +0300 Subject: [PATCH] merged CVS and Subversion versions --- .../siyeh/ipp/conditional/FlipConditionalIntention.java | 6 ++---- .../siyeh/ipp/conditional/FlipConditionalPredicate.java | 3 ++- .../ipp/conditional/RemoveConditionalIntention.java | 9 +++------ .../ipp/conditional/RemoveConditionalPredicate.java | 2 +- .../conditional/ReplaceConditionalWithIfIntention.java | 5 ++--- .../conditional/ReplaceConditionalWithIfPredicate.java | 2 +- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalIntention.java index 73eea06c993c..2c4f9d5a9299 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalIntention.java @@ -5,14 +5,12 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.*; +import com.siyeh.ipp.base.Intention; +import com.siyeh.ipp.base.PsiElementPredicate; import com.siyeh.ipp.psiutils.BoolUtils; public class FlipConditionalIntention extends Intention { - public FlipConditionalIntention(Project project) - { - super(project); - } public String getText() { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java index 0643963daaf7..0d94b5319b93 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/FlipConditionalPredicate.java @@ -2,7 +2,8 @@ package com.siyeh.ipp.conditional; import com.intellij.psi.PsiConditionalExpression; import com.intellij.psi.PsiElement; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class FlipConditionalPredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalIntention.java index 271988722a1c..befd1a082873 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalIntention.java @@ -6,16 +6,13 @@ import com.intellij.psi.PsiConditionalExpression; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; -import com.siyeh.ipp.Intention; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.Intention; +import com.siyeh.ipp.base.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; import com.siyeh.ipp.psiutils.BoolUtils; public class RemoveConditionalIntention extends Intention { - public RemoveConditionalIntention(Project project) - { - super(project); - } public String getText() { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalPredicate.java index 41152f0f3e18..1a7c8cbb411b 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/RemoveConditionalPredicate.java @@ -1,7 +1,7 @@ package com.siyeh.ipp.conditional; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; import com.siyeh.ipp.psiutils.ParenthesesUtils; class RemoveConditionalPredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java index 8af384728bdc..7f33b8dcc073 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfIntention.java @@ -6,11 +6,10 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.*; +import com.siyeh.ipp.base.Intention; +import com.siyeh.ipp.base.PsiElementPredicate; public class ReplaceConditionalWithIfIntention extends Intention { - public ReplaceConditionalWithIfIntention(Project project) { - super(project); - } public String getText() { return "Replace ?: with if-else"; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfPredicate.java index ba69ddf74378..a75ecf6a8947 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/conditional/ReplaceConditionalWithIfPredicate.java @@ -1,7 +1,7 @@ package com.siyeh.ipp.conditional; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class ReplaceConditionalWithIfPredicate implements PsiElementPredicate { public boolean satisfiedBy(PsiElement element) {