[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6732] trunk/sql12

[<ger...@us...>]

Revision: 6732
          http://sourceforge.net/p/squirrel-sql/code/6732
Author:   gerdwagner
Date:     2013-01-08 11:16:13 +0000 (Tue, 08 Jan 2013)
Log Message:
-----------
#1009 FileNotFoundException when trying to save write protected file. (Thanks to Johnathan James for the patch.)

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
    trunk/sql12/doc/src/main/resources/changes.txt

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java	2013-01-06 21:56:47 UTC (rev 6731)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/session/FileManager.java	2013-01-08 11:16:13 UTC (rev 6732)
@@ -220,6 +220,17 @@
    private boolean saveScript(Frame frame, File file, boolean askReplace)
    {
       boolean doSave = false;
+
+      if (file.exists() && !file.canWrite())
+      {
+          // i18n[FileManager.error.cannotwritefile=File {0} \ncannot be written to.]
+          String msg = 
+              s_stringMgr.getString("FileManager.error.cannotwritefile", 
+                                    file.getAbsolutePath());
+         Dialogs.showOk(frame, msg);
+         return false;
+      }
+      
       if (askReplace && file.exists())
       {
           // i18n[FileManager.confirm.filereplace={0} \nalready exists. Do you want to replace it?]
@@ -233,15 +244,7 @@
          {
             return false;
          }
-         if (!file.canWrite())
-         {
-             // i18n[FileManager.error.cannotwritefile=File {0} \ncannot be written to.]
-             String msg = 
-                 s_stringMgr.getString("FileManager.error.cannotwritefile", 
-                                       file.getAbsolutePath());
-            Dialogs.showOk(frame, msg);
-            return false;
-         }
+
          file.delete();
       }
       else

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2013-01-06 21:56:47 UTC (rev 6731)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2013-01-08 11:16:13 UTC (rev 6732)
@@ -48,6 +48,8 @@
 
 Bug fixes:
 
+#1009 FileNotFoundException when trying to save write protected file. (Thanks to Johnathan James for the patch.)
+
 #1060  When more result tabs than the maximum defined in Session properties are in execution, SQuirreL freezes.
 
 Fixed bug in logging: Log level could not be set in log4j.properties file.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.