[jsword-svn] common/java/config/org/crosswire/common/config s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/common/java/config/org/crosswire/common/config
In directory www.crosswire.org:/tmp/cvs-serv26740/java/config/org/crosswire/common/config

Modified Files:
	Config.java ConfigException.java StartupException.java 
	ConfigEvent.java 
Log Message:
Changes to satisfy CheckStyle

Index: StartupException.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/StartupException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** StartupException.java	28 Nov 2004 21:36:31 -0000	1.4
--- StartupException.java	6 Mar 2005 20:21:59 -0000	1.5
***************
*** 30,34 ****
  public class StartupException extends LucidException
  {
! 	/**
       * Construct the Exception with a message
       * @param msg The resource id to read
--- 30,34 ----
  public class StartupException extends LucidException
  {
!     /**
       * Construct the Exception with a message
       * @param msg The resource id to read

Index: Config.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/Config.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Config.java	17 Feb 2005 03:40:14 -0000	1.7
--- Config.java	6 Mar 2005 20:21:59 -0000	1.8
***************
*** 48,52 ****
   *     load data from disk to screen without involving the app.
   * </ul>
!  * 
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 48,52 ----
   *     load data from disk to screen without involving the app.
   * </ul>
!  *
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 269,276 ****
              String key = (String) it.next();
              Choice choice = getChoice(key);
!         
              String oldValue = choice.getString();
              String newValue = local.getProperty(key);
!                             
              // The new value shouldn't really be blank - obviously this
              // choice has just been added, substitute the default.
--- 269,276 ----
              String key = (String) it.next();
              Choice choice = getChoice(key);
! 
              String oldValue = choice.getString();
              String newValue = local.getProperty(key);
! 
              // The new value shouldn't really be blank - obviously this
              // choice has just been added, substitute the default.
***************
*** 283,288 ****
                  local.setProperty(key, oldValue);
                  newValue = oldValue;
!             }    
!     
              try
              {
--- 283,288 ----
                  local.setProperty(key, oldValue);
                  newValue = oldValue;
!             }
! 
              try
              {
***************
*** 299,303 ****
              {
                  log.warn("Failure setting " + key + "=" + newValue, ex);  //$NON-NLS-1$ //$NON-NLS-2$
!                 Reporter.informUser(this, new ConfigException(Msg.CONFIG_SETFAIL, ex, new Object[] { choice.getFullPath() } ));
              }
          }
--- 299,303 ----
              {
                  log.warn("Failure setting " + key + "=" + newValue, ex);  //$NON-NLS-1$ //$NON-NLS-2$
!                 Reporter.informUser(this, new ConfigException(Msg.CONFIG_SETFAIL, ex, new Object[] { choice.getFullPath() }));
              }
          }

Index: ConfigEvent.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/ConfigEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigEvent.java	28 Nov 2004 21:36:31 -0000	1.2
--- ConfigEvent.java	6 Mar 2005 20:21:59 -0000	1.3
***************
*** 29,33 ****
  public class ConfigEvent extends EventObject
  {
! 	/**
       * Constructs an ConfigEvent object.
       * @param source The event originator, or log stream
--- 29,33 ----
  public class ConfigEvent extends EventObject
  {
!     /**
       * Constructs an ConfigEvent object.
       * @param source The event originator, or log stream

Index: ConfigException.java
===================================================================
RCS file: /cvs/jsword/common/java/config/org/crosswire/common/config/ConfigException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConfigException.java	28 Nov 2004 21:36:31 -0000	1.2
--- ConfigException.java	6 Mar 2005 20:21:59 -0000	1.3
***************
*** 30,34 ****
  public class ConfigException extends LucidException
  {
! 	/**
       * Construct the Exception with a message
       * @param msg The resource id to read
--- 30,34 ----
  public class ConfigException extends LucidException
  {
!     /**
       * Construct the Exception with a message
       * @param msg The resource id to read