[Squirrel-sql-commits] sql12/fw/src/net/sourceforge/squirrel_sql/fw/util TaskThreadPool.java, 1.3, 1.4 I18NStrings.properties, 1.2, 1.3

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

Update of /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12031/fw/src/net/sourceforge/squirrel_sql/fw/util

Modified Files:
	TaskThreadPool.java I18NStrings.properties 
Log Message:
Fix hard-coded I18N-able strings.

Index: TaskThreadPool.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/TaskThreadPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TaskThreadPool.java	21 Apr 2005 16:10:32 -0000	1.3
--- TaskThreadPool.java	23 Sep 2006 21:06:31 -0000	1.4
***************
*** 24,32 ****
  import java.util.List;
  
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  
- import javax.swing.*;
- 
  public class TaskThreadPool
  {
--- 24,34 ----
  import java.util.List;
  
+ import javax.swing.JFrame;
+ import javax.swing.JOptionPane;
+ import javax.swing.SwingUtilities;
+ 
  import net.sourceforge.squirrel_sql.fw.util.log.ILogger;
  import net.sourceforge.squirrel_sql.fw.util.log.LoggerController;
  
  public class TaskThreadPool
  {
***************
*** 35,38 ****
--- 37,44 ----
  		LoggerController.createLogger(TaskThreadPool.class);
  
+     /** Internationalized strings for this class. */
+     private static final StringManager s_stringMgr =
+         StringManagerFactory.getStringManager(TaskThreadPool.class);
+     
  	// Count of available or free threads.
  	private int _iFree;
***************
*** 115,119 ****
              public void run()
              {
!                JOptionPane.showMessageDialog(_parentForMessages, "Error ocured during task execution:\n" + th.getMessage());
                 throw new RuntimeException(th);
              }
--- 121,132 ----
              public void run()
              {
!                //i18n[TaskThreadPool.errorDuringTaskExecMsg=Error ocured during task execution:]
!                StringBuffer msg = 
!                    new StringBuffer(
!                        s_stringMgr.getString(
!                                       "TaskThreadPool.errorDuringTaskExecMsg"));
!                msg.append("\n");
!                msg.append(th.getMessage());
!                JOptionPane.showMessageDialog(_parentForMessages, msg.toString());
                 throw new RuntimeException(th);
              }

Index: I18NStrings.properties
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/fw/src/net/sourceforge/squirrel_sql/fw/util/I18NStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** I18NStrings.properties	30 Oct 2005 13:06:07 -0000	1.2
--- I18NStrings.properties	23 Sep 2006 21:06:31 -0000	1.3
***************
*** 4,6 ****
  MyURLClassLoader.errorLoadingFile=Error occured trying to load file {0}
  
! MyURLClassLoader.noAssignCheck=Failed to load {0} to check if it is assignable to {1}. Reason: {2}
\ No newline at end of file
--- 4,8 ----
  MyURLClassLoader.errorLoadingFile=Error occured trying to load file {0}
  
! MyURLClassLoader.noAssignCheck=Failed to load {0} to check if it is assignable to {1}. Reason: {2}
! 
! TaskThreadPool.errorDuringTaskExecMsg=Error ocured during task execution:
\ No newline at end of file