Checkstyle

Author: oowekyala

src/main/java/net/sourceforge/pmd/util/fxdesigner/DesignerStarter.java

@@ -94,6 +94,7 @@ private static String getHelpText(JCommander jCommander) {
         return sb.toString();
     }
 
+    @SuppressWarnings("PMD.AvoidCatchingThrowable")
     private static void launchGui(String[] args) {
         String message = null;
         if (!isJavaFxAvailable()) {

src/main/java/net/sourceforge/pmd/util/fxdesigner/model/testing/TestXmlParser.java

@@ -33,8 +33,8 @@
 
 import net.sourceforge.pmd.lang.LanguageVersion;
 import net.sourceforge.pmd.util.fxdesigner.model.ObservableRuleBuilder;
-import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 import net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry;
+import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 import net.sourceforge.pmd.util.fxdesigner.util.codearea.PmdCoordinatesSystem.TextRange;
 
 public class TestXmlParser {

src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/ExportXPathWizardController.java

@@ -8,8 +8,8 @@
 import static com.github.oowekyala.rxstring.ItemRenderer.indented;
 import static com.github.oowekyala.rxstring.ItemRenderer.surrounded;
 import static com.github.oowekyala.rxstring.ItemRenderer.wrapped;
-import static net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil.stringConverter;
 import static net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry.getSupportedLanguageVersions;
+import static net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil.stringConverter;
 import static net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil.rewireInit;
 
 import java.net.URL;

src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/SimplePopups.java

@@ -7,14 +7,8 @@
 import static java.lang.Double.max;
 import static java.lang.Math.min;
 
-import java.io.BufferedWriter;
-import java.io.File;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
 import java.util.Locale;
 import java.util.stream.Collectors;
 
@@ -28,9 +22,7 @@
 import net.sourceforge.pmd.PMDVersion;
 import net.sourceforge.pmd.lang.Language;
 import net.sourceforge.pmd.util.fxdesigner.Designer;
-import net.sourceforge.pmd.util.fxdesigner.app.ApplicationComponent;
 import net.sourceforge.pmd.util.fxdesigner.app.DesignerRoot;
-import net.sourceforge.pmd.util.fxdesigner.app.services.LogEntry.Category;
 import net.sourceforge.pmd.util.fxdesigner.util.AuxLanguageRegistry;
 import net.sourceforge.pmd.util.fxdesigner.util.DesignerUtil;
 
@@ -41,14 +33,11 @@
 import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.control.TextArea;
 import javafx.scene.layout.StackPane;
-import javafx.stage.FileChooser;
 import javafx.stage.Popup;
-import javafx.stage.Stage;
 import javafx.util.Duration;
 
 

src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/TestExportWizardController.java

@@ -94,6 +94,6 @@ protected void beforeParentInit() {
 
 
         ControlUtil.copyToClipboardButton(copyResultButton, exportResultArea::getText);
-        ControlUtil.saveToFileButton(saveToFileButton, myPopupStage, exportResultArea::getText, this);
+        ControlUtil.saveToFileButton(saveToFileButton, myPopupStage, exportResultArea::getText, this, () -> originalFile);
     }
 }

src/main/java/net/sourceforge/pmd/util/fxdesigner/popups/TreeExportWizardController.java

@@ -25,7 +25,6 @@
 import net.sourceforge.pmd.util.fxdesigner.util.controls.DynamicWidthChoicebox;
 import net.sourceforge.pmd.util.fxdesigner.util.controls.PopOverWrapper;
 import net.sourceforge.pmd.util.fxdesigner.util.controls.PropertyMapView;
-import net.sourceforge.pmd.util.fxdesigner.util.controls.RippleButton;
 import net.sourceforge.pmd.util.fxdesigner.util.controls.ToolbarTitledPane;
 import net.sourceforge.pmd.util.fxdesigner.util.reactfx.ReactfxUtil;
 
@@ -45,7 +44,7 @@ public final class TreeExportWizardController extends AbstractController {
     private final Stage myPopupStage;
     private final PopOverWrapper<LiveTreeRenderer> propertiesPopover;
     @FXML
-    private RippleButton propertiesMapButton;
+    private Button propertiesMapButton;
     @FXML
     private DynamicWidthChoicebox<LiveTreeRenderer> rendererChoicebox;
     @FXML
@@ -116,7 +115,7 @@ protected void beforeParentInit() {
         exportResultArea.setSyntaxHighlighter(AvailableSyntaxHighlighters.XML);
 
         ControlUtil.copyToClipboardButton(copyResultButton, exportResultArea::getText);
-        ControlUtil.saveToFileButton(saveToFileButton, myPopupStage, exportResultArea::getText, this);
+        ControlUtil.saveToFileButton(saveToFileButton, myPopupStage, exportResultArea::getText, this, () -> null);
 
 
         TreeRendererRegistry rendererRegistry = getService(DesignerRoot.TREE_RENDERER_REGISTRY);

src/main/java/net/sourceforge/pmd/util/fxdesigner/util/TextTreeRenderer.java

@@ -19,13 +19,13 @@ public class TextTreeRenderer implements TreeRenderer {
 
     public static final TreeRendererDescriptor DESCRIPTOR = new TreeRendererDescriptor() {
 
-        private final PropertyDescriptor<Boolean> ONLY_ASCII =
+        private final PropertyDescriptor<Boolean> onlyAscii =
             PropertyFactory.booleanProperty("onlyAsciiChars")
                            .defaultValue(false)
                            .desc("Use only ASCII characters in the structure")
                            .build();
 
-        private final PropertyDescriptor<Integer> MAX_LEVEL =
+        private final PropertyDescriptor<Integer> maxLevel =
             PropertyFactory.intProperty("maxLevel")
                            .defaultValue(-1)
                            .desc("Max level on which to recurse. Negative means unbounded")
@@ -46,8 +46,8 @@ public String getName() {
                 }
             };
 
-            bundle.definePropertyDescriptor(ONLY_ASCII);
-            bundle.definePropertyDescriptor(MAX_LEVEL);
+            bundle.definePropertyDescriptor(onlyAscii);
+            bundle.definePropertyDescriptor(maxLevel);
 
             return bundle;
         }
@@ -65,9 +65,9 @@ public String description() {
         @Override
         public TreeRenderer produceRenderer(PropertySource properties) {
 
-            Strings str = properties.getProperty(ONLY_ASCII) ? ASCII : UNICODE;
+            Strings str = properties.getProperty(onlyAscii) ? ASCII : UNICODE;
 
-            return new TextTreeRenderer(str, properties.getProperty(MAX_LEVEL));
+            return new TextTreeRenderer(str, properties.getProperty(maxLevel));
         }
     };
 
@@ -103,7 +103,7 @@ private String childPrefix(String prefix, boolean isTail) {
 
 
     protected void appendIndent(Appendable out, String prefix, boolean isTail) throws IOException {
-        out.append(prefix).append((isTail) ? str.tailFork : str.fork);
+        out.append(prefix).append(isTail ? str.tailFork : str.fork);
     }
 
 

src/main/java/net/sourceforge/pmd/util/fxdesigner/util/controls/ControlUtil.java

@@ -233,10 +233,11 @@ public static void copyToClipboardButton(Button button, Supplier<String> copiedT
         });
     }
 
-    public static void saveToFileButton(Button button, Stage popupStage, Supplier<String> content, ApplicationComponent owner) {
+    public static void saveToFileButton(Button button, Stage popupStage, Supplier<String> content, ApplicationComponent owner, Supplier<String> initialFileName) {
         button.setOnAction(e -> {
 
             FileChooser chooser = new FileChooser();
+            chooser.setInitialFileName(initialFileName.get());
             chooser.setTitle("Write to a file");
             File file = chooser.showSaveDialog(popupStage);