Sync with BitBucket.

Author: yccheok

src/org/yccheok/jstock/gui/SaveToCloudJDialog.java

@@ -385,7 +385,9 @@ protected Boolean doInBackground() {
 
                 JStock.instance().commitBeforeSaveToCloud();
 
-                final File zipFile = getJStockZipFile();
+                // Passing null. The file will be deleted automatically when the
+                // app quit.
+                final File zipFile = getJStockZipFile(null);
 
                 // Place isCancelled check after time consuming operation.
                 // Not the best way, but perhaps the easiest way to cancel
@@ -577,17 +579,18 @@ private static List<String> getExtensions(String name) {
         return java.util.Collections.unmodifiableList(extensions);
     }
 
-    private File getJStockZipFile() {
+    // filename can be null, to indicate temp file.
+    private File getJStockZipFile(final String filename) {
         // Look for "user-defined-database.xml" for all countries.
         final List<File> files = getUserDefinedDatabaseFiles();
         final List<FileEx> fileExs = new ArrayList<>();
         for (File file : files) {
-            final String filename = file.getAbsolutePath();
-            final int index = filename.indexOf(Utils.getApplicationVersionString());
+            final String absolutePath = file.getAbsolutePath();
+            final int index = absolutePath.indexOf(Utils.getApplicationVersionString());
             if (index < 0) {
                 continue;
             }
-            final String output = filename.substring(index + Utils.getApplicationVersionString().length() + File.separator.length());
+            final String output = absolutePath.substring(index + Utils.getApplicationVersionString().length() + File.separator.length());
             fileExs.add(FileEx.newInstance(file, output));
         }
 
@@ -636,13 +639,21 @@ private File getJStockZipFile() {
 
         ZipOutputStream out = null;
         File temp = null;
-        
+
+        boolean exceptionOccur = false;
+
         try {
 
-            // Create the ZIP file
-            temp = File.createTempFile(Utils.getJStockUUID(), ".zip");
-            // Delete temp file when program exits.
-            temp.deleteOnExit();
+            if (Utils.isNullOrEmpty(filename)) {
+                // Create the ZIP file
+                temp = File.createTempFile(Utils.getJStockUUID(), ".zip");
+
+                // Delete temp file when program exits.
+                temp.deleteOnExit();
+            } else {
+                temp = new File(filename);
+            }
+
             out = new ZipOutputStream(new FileOutputStream(temp));
 
             // Compress the files
@@ -659,26 +670,29 @@ private File getJStockZipFile() {
                     while ((len = in.read(buf)) > 0) {
                         out.write(buf, 0, len);
                     }
-                }
-                catch (IOException exp) {
-                    log.error(null, exp);
-                    // Should we return null? As the saved information is not complete.
-                    continue;
-                }
-                finally {
+                } finally {
                     // Complete the entry
                     Utils.closeEntry(out);
                     Utils.close(in);
                 }
             }
-        } 
-        catch (IOException exp) {
+        } catch (IOException exp) {
             log.error(null, exp);
+
+            exceptionOccur = true;
+
             return null;
-        }
-        finally {
+        } finally {
             Utils.close(out);
+
+            // Deletion should be performed after Utils.close to free up resource.
+            if (exceptionOccur) {
+                if (temp != null) {
+                    temp.delete();
+                }
+            }
         }
+        
         return temp;
     }
 

src/org/yccheok/jstock/gui/Utils.java

@@ -849,7 +849,7 @@ public static String getHistoryDirectory() {
     }
 
     public static String getHistoryDirectory(Country country) {
-        return Utils.getUserDataDirectory() + country + File.separator + "history";
+        return Utils.getUserDataDirectory() + country + File.separator + "history" + File.separator;
     }
 
     public static AlphaComposite makeComposite(float alpha) {