[Squirrel-sql-commits] sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab UserGrantsTab.java,1.3,1.4

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

Update of /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10832/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab

Modified Files:
	UserGrantsTab.java 
Log Message:
Changes to prevent app from becoming unresponsive while creating a new session.
Most notably, the sessionStarted event thread is no longer the swing thread, but 
an app thread.  This requires ISessionPlugin implementers to make GUI changes on 
the Swing thread explicitly.  Also, this change adds a ProgressMonitor to the starting
session so that a dialog can be displayed if the session takes a while to start, indicating
what step in the load is taking a long time. Also, cache the database product name in 
in the ISession implementation so that getting it doesn't require consulting the DBMD 
each time we load a plugin.

Index: UserGrantsTab.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/plugins/mysql/src/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTab.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UserGrantsTab.java	29 Oct 2005 18:32:02 -0000	1.3
--- UserGrantsTab.java	24 Feb 2006 11:29:56 -0000	1.4
***************
*** 52,56 ****
  	{
  		final String db = getDatabaseObjectInfo().getQualifiedName();
! 		return "show grants for " + db;
  	}
  }
--- 52,82 ----
  	{
  		final String db = getDatabaseObjectInfo().getQualifiedName();
!         //String newdb = fixQuotes(db);
!         //System.out.println("show grants for "+newdb);
! 		//return "show grants for "+newdb;
!         return "show grants for " + db;
  	}
+     
+     private static String fixQuotes(String user) {
+         String[] parts = user.split("\\@");
+         String first = "";
+         if (parts[0].length() > 1) {
+             first = parts[0] + "'";
+         } else {
+             first = "'%'";
+         }
+         String last = "";
+         if (parts[1].length() > 1) {
+             last = "'" + parts[1];
+         } else {
+             last = "'%'";
+         }
+         return first + "@" + last;
+         
+     }
+     
+     public static void main(String[] args) {
+         String newString = fixQuotes("'root@'");
+         System.out.println("fixQuotes(@localhost)="+newString);
+     }
  }