[Squirrel-sql-commits] sql12/app/src/net/sourceforge/squirrel_sql/client/gui HelpViewerWindow.java,1.11,1.12

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

Update of /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28312/sql12/app/src/net/sourceforge/squirrel_sql/client/gui

Modified Files:
	HelpViewerWindow.java 
Log Message:
i18n

Index: HelpViewerWindow.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/src/net/sourceforge/squirrel_sql/client/gui/HelpViewerWindow.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HelpViewerWindow.java	16 Aug 2004 07:07:38 -0000	1.11
--- HelpViewerWindow.java	18 Oct 2005 20:54:28 -0000	1.12
***************
*** 104,107 ****
--- 104,108 ----
  		throws IllegalArgumentException, BaseException
  	{
+         // i18n[HelpViewerWindow.title=SQuirreL SQL Client Help]
  		super(s_stringMgr.getString("HelpViewerWindow.title"));
  		if (app == null)
***************
*** 130,138 ****
  		{
  			_detailPnl.gotoURL(url);
  			_statusBar.setText(s_stringMgr.getString("HelpViewerWindow.pageloaded"));
  		}
  		catch (IOException ex)
  		{
! 			s_log.error("Error displaying document", ex);
  			_statusBar.setText(ex.toString());
  		}
--- 131,141 ----
  		{
  			_detailPnl.gotoURL(url);
+             // i18n[HelpViewerWindow.pageloaded=Page loaded.]
  			_statusBar.setText(s_stringMgr.getString("HelpViewerWindow.pageloaded"));
  		}
  		catch (IOException ex)
  		{
!             // i18n[HelpViewerWindow.error.displaydocument=Error displaying document]
! 			s_log.error(s_stringMgr.getString("HelpViewerWindow.error.displaydocument"), ex);
  			_statusBar.setText(ex.toString());
  		}
***************
*** 235,238 ****
--- 238,242 ----
  	{
  		final ApplicationFiles appFiles = new ApplicationFiles();
+         // i18n[HelpViewerWindow.help=Help]
  		final FolderNode root = new FolderNode(s_stringMgr.getString("HelpViewerWindow.help"));
  		_tree = new JTree(new DefaultTreeModel(root));
***************
*** 252,255 ****
--- 256,260 ----
   		try
   		{
+             // i18n[HelpViewerWindow.welcome=Welcome]
   			DocumentNode dn = new DocumentNode(s_stringMgr.getString("HelpViewerWindow.welcome"), file);
   			root.add(dn);
***************
*** 258,274 ****
   		catch (MalformedURLException ex)
   		{
!  			StringBuffer msg = new StringBuffer();
!  			msg.append("Error retrieving Welcome file URL for ")
!  				.append(file.getAbsolutePath());
!  			s_log.error(msg.toString(), ex);
   		}
  
  		// Add Help, Licence and Change Log nodes to the tree.
  		final FolderNode helpRoot = new FolderNode(s_stringMgr.getString("HelpViewerWindow.help"));
  		root.add(helpRoot);
  		_nodes.put(helpRoot.getURL().toString(), helpRoot);
  		final FolderNode licenceRoot = new FolderNode(s_stringMgr.getString("HelpViewerWindow.licences"));
  		root.add(licenceRoot);
  		_nodes.put(licenceRoot.getURL().toString(), licenceRoot);
  		final FolderNode changeLogRoot = new FolderNode(s_stringMgr.getString("HelpViewerWindow.changelogs"));
  		root.add(changeLogRoot);
--- 263,283 ----
   		catch (MalformedURLException ex)
   		{
!             // i18n[HelpViewerWindow.error.loadwelcomefile=Error retrieving Welcome file URL for {0}]
!  		    String msg = 
!  		        s_stringMgr.getString("HelpViewerWindow.error.loadwelcomefile",
!                                       file.getAbsolutePath());
!  			s_log.error(msg, ex);
   		}
  
  		// Add Help, Licence and Change Log nodes to the tree.
+         // i18n[HelpViewerWindow.help=Help]
  		final FolderNode helpRoot = new FolderNode(s_stringMgr.getString("HelpViewerWindow.help"));
  		root.add(helpRoot);
  		_nodes.put(helpRoot.getURL().toString(), helpRoot);
+         // i18n[HelpViewerWindow.licences=Licences]
  		final FolderNode licenceRoot = new FolderNode(s_stringMgr.getString("HelpViewerWindow.licences"));
  		root.add(licenceRoot);
  		_nodes.put(licenceRoot.getURL().toString(), licenceRoot);
+         // i18n[HelpViewerWindow.changelogs=Change Logs]
  		final FolderNode changeLogRoot = new FolderNode(s_stringMgr.getString("HelpViewerWindow.changelogs"));
  		root.add(changeLogRoot);
***************
*** 279,282 ****
--- 288,292 ----
  		try
  		{
+             // i18n[HelpViewerWindow.squirrel=SQuirreL]
  			DocumentNode dn = new DocumentNode(s_stringMgr.getString("HelpViewerWindow.squirrel"), file);
  			helpRoot.add(dn);
***************
*** 286,293 ****
  		catch (MalformedURLException ex)
  		{
! 			StringBuffer msg = new StringBuffer();
! 			msg.append("Error retrieving Help file URL for ")
! 				.append(file.getAbsolutePath());
! 			s_log.error(msg.toString(), ex);
  		}
  
--- 296,304 ----
  		catch (MalformedURLException ex)
  		{
!             // i18n[HelpViewerWindow.error.loadwelcomefile=Error retrieving Help file URL for {0}]
!             String msg = 
!                 s_stringMgr.getString("HelpViewerWindow.error.loadhelpfile",
!                                       file.getAbsolutePath());
! 			s_log.error(msg, ex);
  		}
  
***************
*** 296,299 ****
--- 307,311 ----
  		try
  		{
+             // i18n[HelpViewerWindow.squirrel=SQuirreL]
  			DocumentNode dn = new DocumentNode(s_stringMgr.getString("HelpViewerWindow.squirrel"), file);
  			licenceRoot.add(dn);
***************
*** 302,309 ****
  		catch (MalformedURLException ex)
  		{
! 			StringBuffer msg = new StringBuffer();
! 			msg.append("Error retrieving Licence file URL for ")
! 				.append(file.getAbsolutePath());
! 			s_log.error(msg.toString(), ex);
  		}
  
--- 314,322 ----
  		catch (MalformedURLException ex)
  		{
!             // i18n[HelpViewerWindow.error.loadlicencefile=Error retrieving Licence file URL for {0}]
!             String msg = 
!                 s_stringMgr.getString("HelpViewerWindow.error.loadlicencefile",
!                                       file.getAbsolutePath());
! 			s_log.error(msg, ex);
  		}
  
***************
*** 312,315 ****
--- 325,329 ----
  		try
  		{
+             // i18n[HelpViewerWindow.squirrel=SQuirreL]
  			DocumentNode dn = new DocumentNode(s_stringMgr.getString("HelpViewerWindow.squirrel"), file);
  			changeLogRoot.add(dn);
***************
*** 318,325 ****
  		catch (MalformedURLException ex)
  		{
! 			StringBuffer msg = new StringBuffer();
! 			msg.append("Error retrieving Change Log file URL for ")
! 				.append(file.getAbsolutePath());
! 			s_log.error(msg.toString(), ex);
  		}
  
--- 332,340 ----
  		catch (MalformedURLException ex)
  		{
!             // i18n[HelpViewerWindow.error.loadchangelogfile=Error retrieving Change Log file URL for {0}]
!             String msg = 
!                 s_stringMgr.getString("HelpViewerWindow.error.loadchangelogfile",
!                                       file.getAbsolutePath());
! 			s_log.error(msg, ex);
  		}
  
***************
*** 346,351 ****
  				catch (IOException ex)
  				{
! 					s_log.error("Error generating Help entry for plugin"
! 										+ pi[i].getDescriptiveName(), ex);
  				}
  
--- 361,369 ----
  				catch (IOException ex)
  				{
!                     // i18n[HelpViewerWindow.error.loadpluginhelp=Error generating Help entry for plugin {0}]
!                     String msg = 
!                         s_stringMgr.getString("HelpViewerWindow.error.loadpluginhelp",
!                                               pi[i].getDescriptiveName());
! 					s_log.error(msg, ex);
  				}
  
***************
*** 363,368 ****
  				catch (IOException ex)
  				{
! 					s_log.error("Error generating Licence entry for plugin"
! 										+ pi[i].getDescriptiveName(), ex);
  				}
  
--- 381,389 ----
  				catch (IOException ex)
  				{
!                     // i18n[HelpViewerWindow.error.loadpluginlicence=Error generating Licence entry for plugin {0}]
!                     String msg = 
!                         s_stringMgr.getString("HelpViewerWindow.error.loadpluginlicence",
!                                               pi[i].getDescriptiveName());
! 					s_log.error(msg, ex);
  				}
  
***************
*** 380,391 ****
  				catch (IOException ex)
  				{
! 					s_log.error("Error generating Change Log entry for plugin"
! 										+ pi[i].getDescriptiveName(), ex);
  				}
  			}
  			catch (IOException ex)
  			{
! 				s_log.error("Error retrieving app settings folder for plugin"
! 									+ pi[i].getDescriptiveName(), ex);
  			}
  		}
--- 401,418 ----
  				catch (IOException ex)
  				{
!                     // i18n[HelpViewerWindow.error.loadchangelog=Error generating Change Log entry for plugin {0}]
!                     String msg = 
!                         s_stringMgr.getString("HelpViewerWindow.error.loadchangelog",
!                                               pi[i].getDescriptiveName());
! 					s_log.error(msg, ex);
  				}
  			}
  			catch (IOException ex)
  			{
!                 // i18n[HelpViewerWindow.error.loadpluginsettings=Error retrieving app settings folder for plugin {0}]
!                 String msg = 
!                     s_stringMgr.getString("HelpViewerWindow.error.loadpluginsettings",
!                                           pi[i].getDescriptiveName());
! 				s_log.error(msg, ex);
  			}
  		}
***************
*** 395,398 ****
--- 422,426 ----
  		try
  		{
+             // i18n[HelpViewerWindow.faq=FAQ]
  			DocumentNode dn = new DocumentNode(s_stringMgr.getString("HelpViewerWindow.faq"), file);
  			root.add(dn);
***************
*** 401,408 ****
  		catch (MalformedURLException ex)
  		{
! 			StringBuffer msg = new StringBuffer();
! 			msg.append("Error retrieving FAQ URL for ")
! 				.append(file.getAbsolutePath());
! 			s_log.error(msg.toString(), ex);
  		}
  
--- 429,437 ----
  		catch (MalformedURLException ex)
  		{
!             // i18n[HelpViewerWindow.error.loadfaqfile=Error retrieving FAQ from URL = {0}]
!             String msg = 
!                 s_stringMgr.getString("HelpViewerWindow.error.loadfaqfile",
!                                       file.getAbsolutePath());
! 			s_log.error(msg, ex);
  		}
  
***************
*** 518,521 ****
--- 547,551 ----
  			catch (IOException ex)
  			{
+                 // i18n[HelpViewerWindow.error.congen=Error generating Contents file]
  				String msg = s_stringMgr.getString("HelpViewerWindow.error.congen");
  				s_log.error(msg, ex);