MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

Java: extracted enum should have final value field and constructor sorted before method

Browse Source 
GitOrigin-RevId: daaf348e0b0905a4cc200d5816a7e0310246eef8
This commit is contained in:
Bas Leijdekkers
2023-03-15 17:01:25 +01:00
committed by intellij-monorepo-bot
parent ffc7e4630a
commit fd5d7ebeeb
15 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java-impl-refactorings/src/com/intellij/refactoring/extractclass/ExtractedClassBuilder.java
View File

@@ -140,11 +140,12 @@ class ExtractedClassBuilder {
outputFieldsAndInitializers(out, normalizeDeclaration);
if (hasEnumConstants()) {
final String fieldName = getValueFieldName();
out.append("\n").append("private ").append(myEnumParameterType.getCanonicalText()).append(" ").append(fieldName).append(";\n");
out.append("private final ").append(myEnumParameterType.getCanonicalText()).append(" ").append(fieldName).append(";\n");
outputConstructor(out);
out.append("public ").append(myEnumParameterType.getCanonicalText()).append(" ")
.append(getterName()).append("(){\nreturn ").append(fieldName).append(";\n}\n");
}
if (hasEnumConstants() || needConstructor() || requiresBackPointer) {
else if (needConstructor() || requiresBackPointer) {
outputConstructor(out);
}
outputMethods(out);

10
java/java-tests/testData/refactoring/extractEnum/changeMethodParameter/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO(0), BAR(1);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/changeMethodParameterAndReplaceOtherUsages/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO(0), BAR(1);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/changeReturnType/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO(0), BAR(1);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/condition/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
STATE_STARTED(0), STATE_STOPPED(1);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/constructorCall/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
STATE_STARTED(0), STATE_STOPPED(1);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/dependantConstants/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO("foo"), BAR(FOO.getValue());
private String value;
public String getValue() {
return value;
}
private final String value;
EEnum(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/nestedClass/after/Test.java
View File

@@ -17,14 +17,14 @@ public class Test {
public enum EEnum {
ONE(1), TWO(2), THREE(3);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}
}

10
java/java-tests/testData/refactoring/extractEnum/normalize/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO(0), BAR(2);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/oneConstant/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO("foo");
private String value;
public String getValue() {
return value;
}
private final String value;
EEnum(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/referencesOnEnumConstantElsewhere/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO(0), BAR(2);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/referencesOnEnumConstantInEnum/after/EEnum.java
View File

@@ -1,15 +1,15 @@
public enum EEnum {
FOO("foo");
private String value;
public String getValue() {
return value;
}
private final String value;
EEnum(String value) {
this.value = value;
}
public String getValue() {
return value;
}
void foo() {
System.out.println(FOO.getValue());
}

10
java/java-tests/testData/refactoring/extractEnum/referencesOnEnumConstantInOriginal/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO("foo");
private String value;
public String getValue() {
return value;
}
private final String value;
EEnum(String value) {
this.value = value;
}
public String getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/usageInVariableInitializer/after/EEnum.java
View File

@@ -1,12 +1,12 @@
public enum EEnum {
FOO(0);
private int value;
public int getValue() {
return value;
}
private final int value;
EEnum(int value) {
this.value = value;
}
public int getValue() {
return value;
}
}

10
java/java-tests/testData/refactoring/extractEnum/valueNameConflict/after/EEnum.java
View File

@@ -1,13 +1,13 @@
public enum EEnum {
FOO("foo");
public int value = 0;
private String value1;
public String getValue() {
return value1;
}
private final String value1;
EEnum(String value) {
value1 = value;
}
public String getValue() {
return value1;
}
}