From 7033856042e1bf613ba64d1152e32146ea9e59d9 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 21 Mar 2011 20:06:12 +0100 Subject: [PATCH] Usages of deprecated API removed --- .../GenerateVisitorByHierarchyAction.java | 2 +- .../ChangeClassSignatureDialog.java | 7 ++----- .../changeSignature/ExceptionsTableModel.java | 5 ++--- .../JavaChangeSignatureDialog.java | 6 +++--- .../JavaParameterTableModel.java | 2 +- .../intellij/ui/JavaReferenceEditorUtil.java | 19 ++++++++++++------- .../GrChangeSignatureDialog.java | 3 ++- .../changeSignature/GrTableParameterInfo.java | 14 ++++++-------- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java b/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java index e3354cb78d73..fa06274c6e95 100644 --- a/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java +++ b/java/java-impl/src/com/intellij/internal/GenerateVisitorByHierarchyAction.java @@ -98,7 +98,7 @@ public class GenerateVisitorByHierarchyAction extends AnAction { final JPanel panel = new JPanel(new BorderLayout()); panel.add(new JLabel("Hierarchy Base Class"), BorderLayout.WEST); final PsiElementFactory factory = psiFacade.getElementFactory(); - final PsiTypeCodeFragment codeFragment = factory.createTypeCodeFragment("", null, true, true); + final PsiTypeCodeFragment codeFragment = factory.createTypeCodeFragment("", null, true, PsiElementFactory.ALLOW_VOID); final Document document = PsiDocumentManager.getInstance(project).getDocument(codeFragment); final EditorTextField editorTextField = new EditorTextField(document, project, StdFileTypes.JAVA); editorTextField.addDocumentListener(new com.intellij.openapi.editor.event.DocumentAdapter() { diff --git a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java index 486c51a586eb..ad34bda72b1b 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java @@ -72,11 +72,8 @@ public class ChangeClassSignatureDialog extends RefactoringDialog { } private PsiTypeCodeFragment createValueCodeFragment() { - return JavaPsiFacade.getInstance(myManager.getProject()).getElementFactory().createTypeCodeFragment( - "", - myClass.getLBrace(), - false, true, false - ); + final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myManager.getProject()).getElementFactory(); + return elementFactory.createTypeCodeFragment("", myClass.getLBrace(), true); } protected JComponent createNorthPanel() { diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java index 5cf631ded664..aeed79f58716 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/ExceptionsTableModel.java @@ -113,9 +113,8 @@ public class ExceptionsTableModel extends AbstractTableModel implements RowEdita } public PsiTypeCodeFragment createParameterTypeCodeFragment(final String typeText, PsiElement context) { - return JavaPsiFacade.getInstance(myContext.getProject()).getElementFactory().createTypeCodeFragment( - typeText, context, false, true, true - ); + final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myContext.getProject()).getElementFactory(); + return elementFactory.createTypeCodeFragment(typeText, context, true, PsiElementFactory.ALLOW_ELLIPSIS); } public PsiTypeCodeFragment[] getTypeCodeFragments() { diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java index f21e38819c01..0127d3bc33f6 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureDialog.java @@ -212,9 +212,9 @@ public class JavaChangeSignatureDialog extends ChangeSignatureDialogBase() { + new NullableFunction() { public Document fun(final String s) { return createDocument(s, manager, toAcceptClasses); } }, text); } + @Nullable public static Document createDocument(final String text, PsiManager manager, boolean isClassesAccepted) { - PsiPackage defaultPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(""); - final JavaCodeFragment fragment = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createReferenceCodeFragment(text, defaultPackage, true, isClassesAccepted); + final PsiPackage defaultPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(""); + final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory(); + final JavaCodeFragment fragment = elementFactory.createReferenceCodeFragment(text, defaultPackage, true, isClassesAccepted); fragment.setVisibilityChecker(JavaCodeFragment.VisibilityChecker.EVERYTHING_VISIBLE); return PsiDocumentManager.getInstance(manager.getProject()).getDocument(fragment); } + @Nullable public static Document createTypeDocument(final String text, PsiManager manager) { - PsiPackage defaultPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(""); - final JavaCodeFragment fragment = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory().createTypeCodeFragment(text, defaultPackage, false, true, false); + final PsiPackage defaultPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(""); + final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory(); + final JavaCodeFragment fragment = elementFactory.createTypeCodeFragment(text, defaultPackage, true); fragment.setVisibilityChecker(JavaCodeFragment.VisibilityChecker.EVERYTHING_VISIBLE); return PsiDocumentManager.getInstance(manager.getProject()).getDocument(fragment); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.java index 3d927757f3a4..d05d2afc16ff 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureDialog.java @@ -136,7 +136,8 @@ public class GrChangeSignatureDialog extends RefactoringDialog { myNameField = new EditorTextField(PsiDocumentManager.getInstance(myProject).getDocument(myNameCodeFragment), myProject, myNameCodeFragment.getFileType()); - myReturnTypeCodeFragment = JavaPsiFacade.getInstance(myProject).getElementFactory().createTypeCodeFragment("", myMethod, true, true); + final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory(); + myReturnTypeCodeFragment = elementFactory.createTypeCodeFragment("", myMethod, true, PsiElementFactory.ALLOW_VOID); final Document document = PsiDocumentManager.getInstance(myProject).getDocument(myReturnTypeCodeFragment); myReturnTypeField = new EditorTextField(document, myProject, myReturnTypeCodeFragment.getFileType()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrTableParameterInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrTableParameterInfo.java index 7c9003c83753..7ec2f9a99041 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrTableParameterInfo.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrTableParameterInfo.java @@ -16,10 +16,7 @@ package org.jetbrains.plugins.groovy.refactoring.changeSignature; import com.intellij.openapi.project.Project; -import com.intellij.psi.JavaPsiFacade; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiType; -import com.intellij.psi.PsiTypeCodeFragment; +import com.intellij.psi.*; import org.jetbrains.plugins.groovy.debugger.fragments.GroovyCodeFragment; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; @@ -39,13 +36,14 @@ public class GrTableParameterInfo { final Project project = parameter.getProject(); myName = new GroovyCodeFragment(project, parameter.getName()); final PsiType type = parameter.getDeclaredType(); + final PsiElementFactory factory = JavaPsiFacade.getElementFactory(project); if (type != null) { String typeText = type.getCanonicalText(); if (typeText == null) typeText = type.getPresentableText(); - myType = JavaPsiFacade.getElementFactory(project).createTypeCodeFragment(typeText, parameter, true, true, true); + myType = factory.createTypeCodeFragment(typeText, parameter, true, PsiElementFactory.ALLOW_VOID | PsiElementFactory.ALLOW_ELLIPSIS); } else { - myType = JavaPsiFacade.getElementFactory(project).createTypeCodeFragment("", parameter, true, true, true); + myType = factory.createTypeCodeFragment("", parameter, true, PsiElementFactory.ALLOW_VOID | PsiElementFactory.ALLOW_ELLIPSIS); } final GrExpression defaultInitializer = parameter.getDefaultInitializer(); if (defaultInitializer != null) { @@ -61,7 +59,7 @@ public class GrTableParameterInfo { this.myPosition = -1; myName = new GroovyCodeFragment(project, ""); myDefaultValue = new GroovyCodeFragment(project, ""); - myType = JavaPsiFacade.getElementFactory(project).createTypeCodeFragment("", context, true, true); + myType = JavaPsiFacade.getElementFactory(project).createTypeCodeFragment("", context, true, PsiElementFactory.ALLOW_VOID); myDefaultInitializer = new GroovyCodeFragment(project, ""); } @@ -74,7 +72,7 @@ public class GrTableParameterInfo { this.myPosition = -1; myName = new GroovyCodeFragment(project, name); myDefaultValue = new GroovyCodeFragment(project, defaultValue); - myType = JavaPsiFacade.getElementFactory(project).createTypeCodeFragment(type, context, true, true); + myType = JavaPsiFacade.getElementFactory(project).createTypeCodeFragment(type, context, true, PsiElementFactory.ALLOW_VOID); myDefaultInitializer = new GroovyCodeFragment(project, defaultInitializer); }