merged CVS and Subversion versions

This commit is contained in:
Eugene Zhuravlev
2005-01-13 17:22:40 +03:00
parent f6f4ffce38
commit d37013f309
6 changed files with 11 additions and 16 deletions
@@ -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()
{
@@ -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
{
@@ -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()
{
@@ -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 {
@@ -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";
@@ -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) {