[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6640] trunk/sql12/app/src/main/java/net/ sourceforge/squirrel_sql/client/gui

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

Revision: 6640
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6640&view=rev
Author:   gerdwagner
Date:     2012-07-04 18:58:16 +0000 (Wed, 04 Jul 2012)
Log Message:
-----------
Instead of displaying the file paths in Session tabs a small button is displayed when an open file exists.
  Clicking the button will open a popup menu that gives access to several information and functions concerning the file.
  
  --> Clean up

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java	2012-07-03 21:56:59 UTC (rev 6639)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/SessionTabWidget.java	2012-07-04 18:58:16 UTC (rev 6640)
@@ -76,7 +76,13 @@
    {
       _titleWithoutFile = title;
 
+      if(null == _titleFileHandler) // happens when method is called in boostrap
+      {
+         super.setTitle(_titleWithoutFile);
+         return;
+      }
 
+
       if (_titleFileHandler.hasFile())
       {
          String compositetitle = _titleWithoutFile + _titleFileHandler.getSqlFile();

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java	2012-07-03 21:56:59 UTC (rev 6639)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/desktopcontainer/TitleFilePathHandler.java	2012-07-04 18:58:16 UTC (rev 6640)
@@ -150,7 +150,7 @@
          if(hasFile())
          {
             Desktop desktop = Desktop.getDesktop();
-            desktop.open(_sqlFile);
+            desktop.open(_sqlFile.getParentFile());
          }
       }
       catch (IOException e)

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java	2012-07-03 21:56:59 UTC (rev 6639)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/gui/session/SessionPanel.java	2012-07-04 18:58:16 UTC (rev 6640)
@@ -576,9 +576,6 @@
          add(actions.get(PreviousSqlAction.class));
          add(actions.get(NextSqlAction.class));
          add(actions.get(SelectSqlAction.class));
-         addSeparator();
-         add(actions.get(FormatSQLAction.class));
-
       }
    }
 

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