svn commit: r1893282 - /pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/FileOpenSaveDialog.java

[tilman]

Author: tilman
Date: Sun Sep 12 16:04:42 2021
New Revision: 1893282

URL: http://svn.apache.org/viewvc?rev=1893282&view=rev
Log:
PDFBOX-4892: use java conventions; use jdk7 method

Modified:
    
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/FileOpenSaveDialog.java

Modified: 
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/FileOpenSaveDialog.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/FileOpenSaveDialog.java?rev=1893282&r1=1893281&r2=1893282&view=diff
==============================================================================
--- 
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/FileOpenSaveDialog.java
 (original)
+++ 
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/FileOpenSaveDialog.java
 Sun Sep 12 16:04:42 2021
@@ -22,8 +22,9 @@ import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileFilter;
 import java.awt.Component;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import org.apache.pdfbox.pdmodel.PDDocument;
 
 /**
@@ -33,7 +34,9 @@ import org.apache.pdfbox.pdmodel.PDDocum
  */
 public class FileOpenSaveDialog
 {
-    private static final JFileChooser fileChooser = new JFileChooser()
+    private final Component mainUI;
+
+    private static final JFileChooser FILE_CHOOSER = new JFileChooser()
     {
         @Override
         public void approveSelection()
@@ -54,7 +57,6 @@ public class FileOpenSaveDialog
             super.approveSelection();
         }
     };
-    private final Component mainUI;
 
     /**
      * Constructor.
@@ -64,8 +66,8 @@ public class FileOpenSaveDialog
     public FileOpenSaveDialog(Component parentUI, FileFilter fileFilter)
     {
         mainUI = parentUI;
-        fileChooser.resetChoosableFileFilters();
-        fileChooser.setFileFilter(fileFilter);
+        FILE_CHOOSER.resetChoosableFileFilters();
+        FILE_CHOOSER.setFileFilter(fileFilter);
     }
 
     /**
@@ -78,19 +80,15 @@ public class FileOpenSaveDialog
      */
     public boolean saveFile(byte[] bytes, String extension) throws IOException
     {
-        int result = fileChooser.showSaveDialog(mainUI);
+        int result = FILE_CHOOSER.showSaveDialog(mainUI);
         if (result == JFileChooser.APPROVE_OPTION)
         {
-            String filename = fileChooser.getSelectedFile().getAbsolutePath();
+            String filename = FILE_CHOOSER.getSelectedFile().getAbsolutePath();
             if (extension != null && !filename.endsWith(extension))
             {
                 filename += "." + extension;
             }
-
-            try (FileOutputStream outputStream = new 
FileOutputStream(filename))
-            {
-                outputStream.write(bytes);
-            }
+            Files.write(Paths.get(filename), bytes);
             return true;
         }
         return false;
@@ -106,10 +104,10 @@ public class FileOpenSaveDialog
      */
     public boolean saveDocument(PDDocument document, String extension) throws 
IOException
     {
-        int result = fileChooser.showSaveDialog(mainUI);
+        int result = FILE_CHOOSER.showSaveDialog(mainUI);
         if (result == JFileChooser.APPROVE_OPTION)
         {
-            String filename = fileChooser.getSelectedFile().getAbsolutePath();
+            String filename = FILE_CHOOSER.getSelectedFile().getAbsolutePath();
             if (!filename.endsWith(extension))
             {
                 filename += "." + extension;
@@ -128,10 +126,10 @@ public class FileOpenSaveDialog
      */
     public File openFile() throws IOException
     {
-        int result = fileChooser.showOpenDialog(mainUI);
+        int result = FILE_CHOOSER.showOpenDialog(mainUI);
         if (result == JFileChooser.APPROVE_OPTION)
         {
-            return fileChooser.getSelectedFile();
+            return FILE_CHOOSER.getSelectedFile();
         }
         return null;
     }