squirrel-sql-commits

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26335/app/src/net/sourceforge/squirrel_sql/client/session

Modified Files:
      Tag: squirrel_3_0_branch
	FileManager.java 
Log Message:
Merged from trunk: Bug fix 2853329: Ctrl-S overwrites existing file on 2nd try

Index: FileManager.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/session/FileManager.java,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** FileManager.java	25 Dec 2008 19:09:31 -0000	1.17
--- FileManager.java	18 Nov 2009 01:45:33 -0000	1.17.2.1
***************
*** 11,17 ****
  import javax.swing.JFrame;
  
- import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
- import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ISessionWidget;
  import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.SessionTabWidget;
  import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
  import net.sourceforge.squirrel_sql.fw.gui.ChooserPreviewer;
--- 11,16 ----
  import javax.swing.JFrame;
  
  import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.SessionTabWidget;
+ import net.sourceforge.squirrel_sql.client.gui.mainframe.MainFrame;
  import net.sourceforge.squirrel_sql.client.preferences.SquirrelPreferences;
  import net.sourceforge.squirrel_sql.fw.gui.ChooserPreviewer;
***************
*** 193,197 ****
              if (!_toSaveTo.exists() && null != fileAppenixes.get(chooser.getFileFilter()))
              {
!                if (!_toSaveTo.getAbsolutePath().endsWith(fileAppenixes.get(chooser.getFileFilter()).toString()))
                 {
                    _toSaveTo = new File(_toSaveTo.getAbsolutePath() + fileAppenixes.get(chooser.getFileFilter()));
--- 192,196 ----
              if (!_toSaveTo.exists() && null != fileAppenixes.get(chooser.getFileFilter()))
              {
!                if (!_toSaveTo.getAbsolutePath().endsWith(fileAppenixes.get(chooser.getFileFilter())))
                 {
                    _toSaveTo = new File(_toSaveTo.getAbsolutePath() + fileAppenixes.get(chooser.getFileFilter()));
***************
*** 203,209 ****
                 result = true;
                 break;
!             } else {
!                 result = false;
!                 break;
              }
           }
--- 202,211 ----
                 result = true;
                 break;
!             }
!             else
!             {
!                _toSaveTo = null;
!                result = false;
!                break;
              }
           }