From 60e2b2cbad03a689e0a226fa4b43f9bbb05faf46 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 13 Jan 2005 17:22:18 +0300 Subject: [PATCH] merged CVS and Subversion versions --- .../com/siyeh/ipp/junit/AssertEqualsLiteralPredicate.java | 3 ++- .../siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java | 2 +- .../src/com/siyeh/ipp/junit/AssertLiteralPredicate.java | 2 +- .../src/com/siyeh/ipp/junit/AssertTrueEqualsPredicate.java | 2 +- .../com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java | 3 ++- .../com/siyeh/ipp/junit/FlipAssertLiteralIntention.java | 7 ++----- .../ReplaceAssertEqualsWithAssertLiteralIntention.java | 6 ++---- .../ReplaceAssertLiteralWithAssertEqualsIntention.java | 7 ++----- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsLiteralPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsLiteralPredicate.java index a97fb6c20a1d..253813e096e8 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsLiteralPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsLiteralPredicate.java @@ -1,7 +1,8 @@ package com.siyeh.ipp.junit; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class AssertEqualsLiteralPredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java index 67cc3269d3f1..001d6b6d64f3 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertEqualsWithLiteralPredicate.java @@ -1,7 +1,7 @@ package com.siyeh.ipp.junit; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class AssertEqualsWithLiteralPredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java index 2e4f0adc00f5..88021ea8d6ce 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertLiteralPredicate.java @@ -1,7 +1,7 @@ package com.siyeh.ipp.junit; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class AssertLiteralPredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueEqualsPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueEqualsPredicate.java index 6549b811a22e..b7d268374b70 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueEqualsPredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueEqualsPredicate.java @@ -1,7 +1,7 @@ package com.siyeh.ipp.junit; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class AssertTrueEqualsPredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java index f2e823c3582e..00a795311099 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/AssertTrueOrFalsePredicate.java @@ -1,7 +1,8 @@ package com.siyeh.ipp.junit; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class AssertTrueOrFalsePredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/FlipAssertLiteralIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/FlipAssertLiteralIntention.java index c49463ac6c52..277c24b0c262 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/FlipAssertLiteralIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/FlipAssertLiteralIntention.java @@ -5,16 +5,13 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.*; +import com.siyeh.ipp.base.MutablyNamedIntention; +import com.siyeh.ipp.base.PsiElementPredicate; import com.siyeh.ipp.psiutils.BoolUtils; public class FlipAssertLiteralIntention extends MutablyNamedIntention { - public FlipAssertLiteralIntention(Project project) - { - super(project); - } - protected String getTextForElement(PsiElement element) { final PsiMethodCallExpression call = (PsiMethodCallExpression)element; final PsiReferenceExpression methodExpression = call.getMethodExpression(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertEqualsWithAssertLiteralIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertEqualsWithAssertLiteralIntention.java index 42f54376c043..b040f64bda9c 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertEqualsWithAssertLiteralIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertEqualsWithAssertLiteralIntention.java @@ -5,13 +5,11 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; import com.siyeh.ipp.*; +import com.siyeh.ipp.base.MutablyNamedIntention; +import com.siyeh.ipp.base.PsiElementPredicate; public class ReplaceAssertEqualsWithAssertLiteralIntention extends MutablyNamedIntention { - public ReplaceAssertEqualsWithAssertLiteralIntention(Project project) { - super(project); - } - protected String getTextForElement(PsiElement element) { final PsiMethodCallExpression call = (PsiMethodCallExpression)element; diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java index c02621453ec3..b7ab7cacaaa0 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/ReplaceAssertLiteralWithAssertEqualsIntention.java @@ -5,15 +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.MutablyNamedIntention; +import com.siyeh.ipp.base.PsiElementPredicate; public class ReplaceAssertLiteralWithAssertEqualsIntention extends MutablyNamedIntention { - public ReplaceAssertLiteralWithAssertEqualsIntention(Project project) - { - super(project); - } - protected String getTextForElement(PsiElement element) { final PsiMethodCallExpression call = (PsiMethodCallExpression)element;