Skip to content

Commit 483ae86

Browse files
committed
Remove annotation option. It doesn't make sense anymore!
1 parent ae4264c commit 483ae86

File tree

3 files changed

+6
-53
lines changed

3 files changed

+6
-53
lines changed

src/main/java/com/github/junkfactory/innerbuilder/generators/InnerBuilderGenerator.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.github.junkfactory.innerbuilder.ui.JavaInnerBuilderOption;
44
import com.intellij.codeInsight.generation.PsiFieldMember;
5-
import com.intellij.ide.util.PropertiesComponent;
65
import com.intellij.psi.PsiClass;
76
import com.intellij.psi.PsiField;
87
import com.intellij.psi.PsiJavaFile;
@@ -164,21 +163,11 @@ private PsiClass findOrCreateBuilderClass(final PsiClass targetClass) {
164163

165164
@NotNull
166165
private PsiClass createBuilderClass(final PsiClass targetClass) {
167-
var classDef = new StringBuilder();
168-
if (generatorParams.options().contains(JavaInnerBuilderOption.WITH_BUILDER_CLASS_ANNOTATIONS)) {
169-
var propertiesComponent = PropertiesComponent.getInstance();
170-
var annotationOptions =
171-
propertiesComponent.getList(JavaInnerBuilderOption.WITH_BUILDER_CLASS_ANNOTATIONS.getProperty());
172-
if (annotationOptions != null) {
173-
annotationOptions.forEach(a -> classDef.append('@').append(a).append(System.lineSeparator()));
174-
generationResult.set(GenerationResult.Code.ANNOTATIONS_ADDED);
175-
}
176-
}
177-
classDef.append("public static final class ")
178-
.append(BUILDER_CLASS_NAME)
179-
.append(" {}")
180-
.append(System.lineSeparator());
181-
return generatorParams.psi().factory().createClassFromText(classDef.toString(), targetClass)
166+
String classDef = "public static final class " +
167+
BUILDER_CLASS_NAME +
168+
" {}" +
169+
System.lineSeparator();
170+
return generatorParams.psi().factory().createClassFromText(classDef, targetClass)
182171
.getInnerClasses()[0];
183172
}
184173

src/main/java/com/github/junkfactory/innerbuilder/ui/JavaInnerBuilderOption.java

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
11
package com.github.junkfactory.innerbuilder.ui;
22

3-
import com.github.junkfactory.innerbuilder.generators.Utils;
43
import com.intellij.openapi.Disposable;
5-
import com.intellij.openapi.ui.ComponentValidator;
64
import com.intellij.openapi.ui.LabeledComponent;
7-
import com.intellij.openapi.ui.ValidationInfo;
85
import com.intellij.psi.PsiManager;
9-
import com.intellij.psi.util.ClassUtil;
10-
import com.intellij.ui.JBColor;
11-
import com.intellij.ui.border.CustomLineBorder;
12-
import com.intellij.util.ui.JBUI;
136

147
import javax.swing.JComponent;
15-
import javax.swing.JTextArea;
168
import java.util.Arrays;
179
import java.util.Objects;
1810
import java.util.Optional;
@@ -23,29 +15,7 @@ public enum JavaInnerBuilderOption {
2315
Type.BOOLEAN),
2416
WITH_VALIDATE_METHOD("JavaInnerBuilderOption.validate",
2517
"Generate 'validate()' method",
26-
Type.BOOLEAN),
27-
WITH_BUILDER_CLASS_ANNOTATIONS("JavaInnerBuilderOption.builderClassAnnotations",
28-
"Generate annotations for the builder class",
29-
Type.LIST,
30-
(p, d, j) -> new ComponentValidator(d).withValidator(() -> {
31-
if (j instanceof JTextArea textArea) {
32-
var errors = new StringBuilder();
33-
var annotations = Utils.stringToList(textArea.getText());
34-
for (var annotationText : annotations) {
35-
var annotation = Utils.parseType(annotationText);
36-
if (ClassUtil.findPsiClass(p, annotation) == null) {
37-
errors.append(" - ").append(annotation).append("\n");
38-
}
39-
}
40-
if (!errors.isEmpty()) {
41-
textArea.setBorder(new CustomLineBorder(JBColor.RED, JBUI.insets(1)));
42-
return new ValidationInfo(errors.insert(0, "Annotations not found")
43-
.append(System.lineSeparator()).toString(), textArea);
44-
}
45-
textArea.setBorder(new CustomLineBorder(JBColor.border(), JBUI.insets(1)));
46-
}
47-
return null;
48-
}).installOn(j));
18+
Type.BOOLEAN);
4919

5020
private final String property;
5121
private final String description;

src/main/java/com/github/junkfactory/innerbuilder/ui/JavaInnerBuilderOptionSelector.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,6 @@ private List<SelectorOption> createGeneratorOptions() {
4646
JavaInnerBuilderOption.WITH_VALIDATE_METHOD,
4747
'v'
4848
));
49-
options.add(new TextAreaOption(
50-
JavaInnerBuilderOption.WITH_BUILDER_CLASS_ANNOTATIONS,
51-
5,
52-
40,
53-
"Use fully qualified class names separated by new lines."
54-
));
5549
return options;
5650
}
5751

0 commit comments

Comments
 (0)