From 99979196c652785fcabcc2c0f0993cde4dc7dd07 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@jetbrains.com>
Date: Thu, 13 Jan 2005 17:22:21 +0300
Subject: [PATCH] merged CVS and Subversion versions

---
 .../src/com/siyeh/ipp/switchtoif/IfToSwitchPredicate.java   | 3 ++-
 .../siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java  | 6 ++----
 .../siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java  | 6 ++----
 .../src/com/siyeh/ipp/switchtoif/SwitchPredicate.java       | 2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/IfToSwitchPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/IfToSwitchPredicate.java
index cf8a514dc588..298d5fc3fdbc 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/IfToSwitchPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/IfToSwitchPredicate.java
@@ -1,7 +1,8 @@
 package com.siyeh.ipp.switchtoif;
 
 import com.intellij.psi.*;
-import com.siyeh.ipp.PsiElementPredicate;
+import com.siyeh.ipp.base.PsiElementPredicate;
+import com.siyeh.ipp.base.PsiElementPredicate;
 
 class IfToSwitchPredicate implements PsiElementPredicate
 {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java
index 3574af4f9889..f56a20503a72 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceIfWithSwitchIntention.java
@@ -5,16 +5,14 @@ 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.*;
 
 import java.util.*;
 
 public class ReplaceIfWithSwitchIntention extends Intention
 {
-    public ReplaceIfWithSwitchIntention(Project project)
-    {
-        super(project);
-    }
 
     public String getText()
     {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java
index e66127e608cb..85e530a33d4b 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/ReplaceSwitchWithIfIntention.java
@@ -6,6 +6,8 @@ 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;
 import com.siyeh.ipp.psiutils.ControlFlowUtils;
 import com.siyeh.ipp.psiutils.SideEffectChecker;
 
@@ -13,10 +15,6 @@ import java.util.*;
 
 public class ReplaceSwitchWithIfIntention extends Intention
 {
-    public ReplaceSwitchWithIfIntention(Project project)
-    {
-        super(project);
-    }
 
     public String getText()
     {
diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java
index 8c4f527e32f7..3a4b3cb70d17 100644
--- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java
+++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/switchtoif/SwitchPredicate.java
@@ -3,7 +3,7 @@ package com.siyeh.ipp.switchtoif;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiJavaToken;
 import com.intellij.psi.JavaTokenType;
-import com.siyeh.ipp.PsiElementPredicate;
+import com.siyeh.ipp.base.PsiElementPredicate;
 
 class SwitchPredicate implements PsiElementPredicate
 {