MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 21:11:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[test] IJ-CR-101785 Remove headless environment check in EncapsulateFieldsHandler

Browse Source 
GitOrigin-RevId: ab085c5464285dafd526efdb3c899296133712d2
This commit is contained in:
Bart van Helvert
2023-01-27 10:46:14 +01:00
committed by intellij-monorepo-bot
parent b0358d8e61
commit 9ab0a23b63
3 changed files with 2 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
java/java-impl-refactorings/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsHandler.java
View File

@@ -6,7 +6,6 @@ import com.intellij.codeInsight.intention.preview.IntentionPreviewInfo;
import com.intellij.java.refactoring.JavaRefactoringBundle;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.ScrollType;
@@ -116,62 +115,8 @@ public class EncapsulateFieldsHandler implements PreviewableRefactoringActionHan
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, aClass)) return;
if (ApplicationManager.getApplication().isHeadlessEnvironment()) {
PsiClass finalAClass = aClass;
new EncapsulateFieldsProcessor(project, new EncapsulateFieldsDescriptor() {
@Override
public FieldDescriptor[] getSelectedFields() {
return ContainerUtil.map(preselectedFields, field ->
new FieldDescriptorImpl(
field,
GenerateMembersUtil.suggestGetterName(field),
GenerateMembersUtil.suggestSetterName(field),
isToEncapsulateGet() ? GenerateMembersUtil.generateGetterPrototype(field) : null,
isToEncapsulateSet() ? GenerateMembersUtil.generateSetterPrototype(field) : null
)
).toArray(new FieldDescriptor[preselectedFields.size()]);
}
@Override
public boolean isToEncapsulateGet() {
return true;
}
@Override
public boolean isToEncapsulateSet() {
return true;
}
@Override
public boolean isToUseAccessorsWhenAccessible() {
return true;
}
@Override
public String getFieldsVisibility() {
return PsiModifier.PRIVATE;
}
@Override
public String getAccessorsVisibility() {
return PsiModifier.PUBLIC;
}
@Override
public int getJavadocPolicy() {
return DocCommentPolicy.MOVE;
}
@Override
public PsiClass getTargetClass() {
return finalAClass;
}
}).run();
} else {
EncapsulateFieldsDialog dialog = createDialog(project, aClass, preselectedFields);
dialog.show();
}
EncapsulateFieldsDialog dialog = createDialog(project, aClass, preselectedFields);
dialog.show();
}
protected EncapsulateFieldsDialog createDialog(Project project, PsiClass aClass, HashSet<PsiField> preselectedFields) {

18
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/afterSimple.java
View File

@@ -1,18 +0,0 @@
// "Encapsulate field" "true-preview"
class X {
private int x = 0;
public static int foo() {
X x = new X();
return x.getX();
}
public int getX() {
return x;
}
public void setX(int x) {
this.x = x;
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/encapsulateField/beforeSimple.java
View File

@@ -1,10 +0,0 @@
// "Encapsulate field" "true-preview"
class X {
public int x = 0;
public static int foo() {
X x = new X();
return x.<caret>x;
}
}