Usages of deprecated API removed

This commit is contained in:
Roman Shevchenko
2011-03-21 20:19:47 +01:00
parent a865fb416a
commit 7033856042
8 changed files with 29 additions and 29 deletions
@@ -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() {
@@ -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() {
@@ -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() {
@@ -212,9 +212,9 @@ public class JavaChangeSignatureDialog extends ChangeSignatureDialogBase<Paramet
@Override
protected PsiCodeFragment createReturnTypeCodeFragment() {
String returnTypeText = StringUtil.notNullize(myMethod.getReturnTypeText());
return JavaPsiFacade.getInstance(myProject).getElementFactory()
.createTypeCodeFragment(returnTypeText, myMethod.getMethod(), true, true);
final String returnTypeText = StringUtil.notNullize(myMethod.getReturnTypeText());
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myProject).getElementFactory();
return elementFactory.createTypeCodeFragment(returnTypeText, myMethod.getMethod(), true, PsiElementFactory.ALLOW_VOID);
}
@Override
@@ -74,7 +74,7 @@ public class JavaParameterTableModel extends ParameterTableModelBase<ParameterIn
}
PsiElementFactory f = JavaPsiFacade.getInstance(myProject).getElementFactory();
final PsiTypeCodeFragment paramTypeCodeFragment =
f.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext, false, true, true);
f.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext, true, PsiElementFactory.ALLOW_ELLIPSIS);
final CanonicalTypes.Type paramType = parameterInfo.getTypeWrapper();
if (paramType != null) {
paramType.addImportsTo(paramTypeCodeFragment);
@@ -15,9 +15,10 @@
*/
package com.intellij.ui;
import com.intellij.psi.*;
import com.intellij.openapi.editor.Document;
import com.intellij.util.Function;
import com.intellij.psi.*;
import com.intellij.util.NullableFunction;
import org.jetbrains.annotations.Nullable;
import java.awt.event.ActionListener;
@@ -33,23 +34,27 @@ public class JavaReferenceEditorUtil {
final PsiManager manager,
final boolean toAcceptClasses) {
return new ReferenceEditorWithBrowseButton(browseActionListener, manager.getProject(),
new Function<String,Document>() {
new NullableFunction<String,Document>() {
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);
}