devttl/show-comment
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(Setting): Separate skip setting and Java setting

Browse Source
This commit is contained in:
林万程
2024-12-03 07:30:04 +08:00
parent 08a106cd72
commit 4583a12b3e
4 changed files with 46 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/io/github/linwancen/plugin/show/settings/AbstractSettingsState.java
View File

@@ -102,6 +102,7 @@ public abstract class AbstractSettingsState {
}
@NotNull
public String getAnnoDoc() {
return Arrays.stream(annoDoc)
.map(a -> String.join("#", a))

59
src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsComponent.java
View File

@@ -18,7 +18,6 @@ public class AppSettingsComponent {
private final JBCheckBox showTreeComment = new JBCheckBox(ShowBundle.message("show.tree.comment"));
private final JBCheckBox compact = new JBCheckBox(ShowBundle.message("compact"));
private final JBCheckBox treeCache = new JBCheckBox(ShowBundle.message("tree.cache"));
private final JBTextField treeTags = new JBTextField();
private final JBCheckBox showLineEndComment = new JBCheckBox(ShowBundle.message("show.line.end.comment"));
private final JBCheckBox lineEndCache = new JBCheckBox(ShowBundle.message("line.end.cache"));
private final JBCheckBox showLineEndCommentJava = new JBCheckBox(" Java ");
@@ -44,14 +43,15 @@ public class AppSettingsComponent {
private final JBCheckBox showLineEndCommentSql = new JBCheckBox(" SQL ");
private final JBCheckBox showLineEndCommentJson = new JBCheckBox(" JSON ");
private final JBCheckBox showLineEndCommentYaml = new JBCheckBox(" YAML ");
private final JBTextField treeTags = new JBTextField();
private final JBTextField lineTags = new JBTextField();
private final JBCheckBox skipAscii = new JBCheckBox(ShowBundle.message("skip.english"));
private final JBCheckBox skipBlank = new JBCheckBox(ShowBundle.message("skip.blank"));
private final JBCheckBox skipAnnotation = new JBCheckBox(ShowBundle.message("skip.anno"));
private final JBCheckBox getToSet = new JBCheckBox("get --> set ");
private final JBCheckBox fromNew = new JBCheckBox("java new ");
private final JBCheckBox fromParam = new JBCheckBox("java @param ");
private final JBCheckBox enumDoc = new JBCheckBox("java enum ");
private final JBCheckBox skipAnnotation = new JBCheckBox(ShowBundle.message("skip.anno"));
private final JBCheckBox skipAscii = new JBCheckBox(ShowBundle.message("skip.english"));
private final JBCheckBox skipBlank = new JBCheckBox(ShowBundle.message("skip.blank"));
private final ColorPanel lineEndColor = new ColorPanel();
private final ColorPanel lineEndJsonColor = new ColorPanel();
private final JBTextField lineEndPrefix = new JBTextField();
@@ -118,7 +118,8 @@ public class AppSettingsComponent {
new JBLabel(ShowBundle.message("prefix")), lineEndPrefix);
FormBuilder formBuilder = FormBuilder.createFormBuilder()
.addSeparator()
.addComponent(JPanelFactory.of(fromNew, fromParam, enumDoc, getToSet, skipAnnotation, skipAscii, skipBlank), 1)
.addComponent(JPanelFactory.of(skipAscii, skipBlank, skipAnnotation, getToSet), 1)
.addComponent(JPanelFactory.of(fromNew, fromParam, enumDoc), 1)
.addSeparator()
.addComponent(text)
.addSeparator();
@@ -380,6 +381,30 @@ public class AppSettingsComponent {
lineTags.setText(newText);
}
public boolean getSkipAscii() {
return skipAscii.isSelected();
}
public void setSkipAscii(boolean newStatus) {
skipAscii.setSelected(newStatus);
}
public boolean getSkipBlank() {
return skipBlank.isSelected();
}
public void setSkipBlank(boolean newStatus) {
skipBlank.setSelected(newStatus);
}
public boolean getSkipAnnotation() {
return skipAnnotation.isSelected();
}
public void setSkipAnnotation(boolean newStatus) {
skipAnnotation.setSelected(newStatus);
}
public boolean getGetToSet() {
return getToSet.isSelected();
}
@@ -412,30 +437,6 @@ public class AppSettingsComponent {
enumDoc.setSelected(newStatus);
}
public boolean getSkipAnnotation() {
return skipAnnotation.isSelected();
}
public void setSkipAnnotation(boolean newStatus) {
skipAnnotation.setSelected(newStatus);
}
public boolean getSkipAscii() {
return skipAscii.isSelected();
}
public void setSkipAscii(boolean newStatus) {
skipAscii.setSelected(newStatus);
}
public boolean getSkipBlank() {
return skipBlank.isSelected();
}
public void setSkipBlank(boolean newStatus) {
skipBlank.setSelected(newStatus);
}
@Nullable
public Color getLineEndColor() {
return lineEndColor.getSelectedColor();

21
src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsConfigurable.java
View File

@@ -72,13 +72,14 @@ public class AppSettingsConfigurable implements Configurable {
modified |= !settings.lineEndJsonTextAttr.getForegroundColor().equals(mySettingsComponent.getLineEndJsonColor());
modified |= !mySettingsComponent.getLineEndPrefix().equals(settings.lineEndPrefix);
modified |= mySettingsComponent.getSkipAscii() != settings.skipAscii;
modified |= mySettingsComponent.getSkipBlank() != settings.skipBlank;
modified |= mySettingsComponent.getSkipAnnotation() != settings.skipAnnotation;
modified |= mySettingsComponent.getGetToSet() != settings.getToSet;
modified |= mySettingsComponent.getFromNew() != settings.fromNew;
modified |= mySettingsComponent.getFromParam() != settings.fromParam;
modified |= mySettingsComponent.getEnumDoc() != settings.enumDoc;
modified |= mySettingsComponent.getSkipAnnotation() != settings.skipAnnotation;
modified |= mySettingsComponent.getSkipAscii() != settings.skipAscii;
modified |= mySettingsComponent.getSkipBlank() != settings.skipBlank;
return modified;
}
@@ -122,13 +123,14 @@ public class AppSettingsConfigurable implements Configurable {
settings.lineEndJsonTextAttr.setForegroundColor(mySettingsComponent.getLineEndJsonColor());
settings.lineEndPrefix = mySettingsComponent.getLineEndPrefix();
settings.skipAscii = mySettingsComponent.getSkipAscii();
settings.skipBlank = mySettingsComponent.getSkipBlank();
settings.skipAnnotation = mySettingsComponent.getSkipAnnotation();
settings.getToSet = mySettingsComponent.getGetToSet();
settings.fromNew = mySettingsComponent.getFromNew();
settings.fromParam = mySettingsComponent.getFromParam();
settings.enumDoc = mySettingsComponent.getEnumDoc();
settings.skipAnnotation = mySettingsComponent.getSkipAnnotation();
settings.skipAscii = mySettingsComponent.getSkipAscii();
settings.skipBlank = mySettingsComponent.getSkipBlank();
}
@Override
@@ -175,13 +177,14 @@ public class AppSettingsConfigurable implements Configurable {
mySettingsComponent.setLineEndJsonColor(settings.lineEndJsonTextAttr.getForegroundColor());
mySettingsComponent.setLineEndPrefix(settings.lineEndPrefix);
mySettingsComponent.setSkipAscii(settings.skipAscii);
mySettingsComponent.setSkipBlank(settings.skipBlank);
mySettingsComponent.setSkipAnnotation(settings.skipAnnotation);
mySettingsComponent.setGetToSet(settings.getToSet);
mySettingsComponent.setFromNew(settings.fromNew);
mySettingsComponent.setFromParam(settings.fromParam);
mySettingsComponent.setEnumDoc(settings.enumDoc);
mySettingsComponent.setSkipAnnotation(settings.skipAnnotation);
mySettingsComponent.setSkipAscii(settings.skipAscii);
mySettingsComponent.setSkipBlank(settings.skipBlank);
}
@Override

6
src/main/java/io/github/linwancen/plugin/show/settings/AppSettingsState.java
View File

@@ -66,13 +66,13 @@ public class AppSettingsState implements PersistentStateComponent<AppSettingsSta
@NotNull
public String lineEndPrefix = " // ";
public boolean skipAscii = !"en".equals(Locale.getDefault().getLanguage());
public boolean skipBlank = true;
public boolean skipAnnotation = true;
public boolean getToSet = true;
public boolean fromNew = true;
public boolean fromParam = false;
public boolean enumDoc = true;
public boolean skipAnnotation = true;
public boolean skipAscii = !"en".equals(Locale.getDefault().getLanguage());
public boolean skipBlank = true;
@NotNull
public static AppSettingsState getInstance() {