From 083eca8d1c0d6f98f3d420a1a491c3eec3e55354 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Thu, 13 Jan 2005 17:22:26 +0300 Subject: [PATCH] merged CVS and Subversion versions --- .../siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java | 3 ++- .../ReplaceFullyQualifiedNameWithImportIntention.java | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java index 4f93658e5a3d..b8c54535ac76 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/FullyQualifiedNamePredicate.java @@ -1,7 +1,8 @@ package com.siyeh.ipp.fqnames; import com.intellij.psi.*; -import com.siyeh.ipp.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; +import com.siyeh.ipp.base.PsiElementPredicate; class FullyQualifiedNamePredicate implements PsiElementPredicate { diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/ReplaceFullyQualifiedNameWithImportIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/ReplaceFullyQualifiedNameWithImportIntention.java index ca3d63ee1d85..5cb3d9559511 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/ReplaceFullyQualifiedNameWithImportIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/fqnames/ReplaceFullyQualifiedNameWithImportIntention.java @@ -7,13 +7,12 @@ import com.intellij.psi.PsiJavaCodeReferenceElement; import com.intellij.psi.PsiManager; import com.intellij.psi.codeStyle.CodeStyleManager; 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.Intention; +import com.siyeh.ipp.base.PsiElementPredicate; public class ReplaceFullyQualifiedNameWithImportIntention extends Intention { - public ReplaceFullyQualifiedNameWithImportIntention(Project project) { - super(project); - } public String getText() { return "Replace qualified name with import";