Changeset 9674 in josm for trunk/src/org/openstreetmap/josm/gui/widgets

Timestamp:

2016-01-29T21:47:58+01:00 (8 years ago)

Author:

Don-vip

Message:

code style (checkstyle, sonar)

File:

• trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/widgets/FileChooserManager.java

@@ -284 +284 @@
      */
     public FileChooserManager doCreateFileChooser() {
-        File file = new File(curDir);
+        File f = new File(curDir);
         // Use native dialog is preference is set, unless an unsupported selection mode is specifically wanted
         if (PROP_USE_NATIVE_FILE_DIALOG.get() && NativeFileChooser.supportsSelectionMode(selectionMode)) {
-            fc = new NativeFileChooser(file);
+            fc = new NativeFileChooser(f);
         } else {
-            fc = new SwingFileChooser(file);
+            fc = new SwingFileChooser(f);
         }
 
@@ -332 +332 @@
      */
     public AbstractFileChooser openFileChooser(Component parent) {
-        if (fc == null) doCreateFileChooser();
+        if (fc == null)
+            doCreateFileChooser();
 
         if (parent == null) {
@@ -347 +348 @@
         }
 
-        if (!open) {
-            File file = fc.getSelectedFile();
-            if (!SaveActionBase.confirmOverwrite(file)) {
-                return null;
-            }
+        if (!open && !SaveActionBase.confirmOverwrite(fc.getSelectedFile())) {
+            return null;
         }
         return fc;
@@ -357 +355 @@
 
     /**
-     * Opens the file chooser dialog, then checks if filename has the given extension. If not, adds the extension and asks for overwrite if filename exists.
+     * Opens the file chooser dialog, then checks if filename has the given extension.
+     * If not, adds the extension and asks for overwrite if filename exists.
      *
      * @return the {@code File} or {@code null} if the user cancelled the dialog.