[jsword-svn] bibledesktop/java/main/org/crosswire/bibledesktop/book/install s

jswordcvs at crosswire.org jswordcvs at crosswire.org
Mon May 16 17:44:33 MST 2005


Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install
In directory www.crosswire.org:/tmp/cvs-serv25025/java/main/org/crosswire/bibledesktop/book/install

Modified Files:
	InstallerFactoryComboBoxModel.java EditSitePane.java 
	InstallManagerComboBoxModel.java Msg.java 
	TextPaneBookMetaDataDisplay.java IndexResolver.java 
	SitePane.java SitesPane.java BookNode.java 
Log Message:
Added support for CheckStyle plugin.
Added a few more CheckStyle rules.
Fixed a spelling mistake.

Index: BookNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/BookNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BookNode.java	10 May 2005 02:40:12 -0000	1.4
--- BookNode.java	17 May 2005 00:44:31 -0000	1.5
***************
*** 33,37 ****
   * or the BookMetaData itself.
   * 
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author DM Smith [dmsmith555 at yahoo dot com]
--- 33,37 ----
   * or the BookMetaData itself.
   * 
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author DM Smith [dmsmith555 at yahoo dot com]

Index: SitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/SitePane.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SitePane.java	10 May 2005 02:40:12 -0000	1.10
--- SitePane.java	17 May 2005 00:44:31 -0000	1.11
***************
*** 64,68 ****
   * installed or could be installed.
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
--- 64,68 ----
   * installed or could be installed.
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
***************
*** 240,245 ****
  
      // provide for backward compatibility
!     private Book getBook(Object obj)
      {
          // new way
          if (obj instanceof DefaultMutableTreeNode)
--- 240,246 ----
  
      // provide for backward compatibility
!     private Book getBook(Object anObj)
      {
+         Object obj = anObj;
          // new way
          if (obj instanceof DefaultMutableTreeNode)

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/Msg.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msg.java	10 May 2005 02:40:12 -0000	1.5
--- Msg.java	17 May 2005 00:44:31 -0000	1.6
***************
*** 27,35 ****
   * Compile safe Msg resource settings.
   * 
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
   */
! class Msg extends MsgBase
  {
      static final Msg AVAILABLE_BOOKS = new Msg("SitesPane.AvailableBooks"); //$NON-NLS-1$
--- 27,35 ----
   * Compile safe Msg resource settings.
   * 
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
   */
! final class Msg extends MsgBase
  {
      static final Msg AVAILABLE_BOOKS = new Msg("SitesPane.AvailableBooks"); //$NON-NLS-1$

Index: InstallerFactoryComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/InstallerFactoryComboBoxModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstallerFactoryComboBoxModel.java	10 May 2005 02:40:12 -0000	1.4
--- InstallerFactoryComboBoxModel.java	17 May 2005 00:44:31 -0000	1.5
***************
*** 35,39 ****
   * A ComboBoxModel that displays all the known InstallerFactory names.
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
--- 35,39 ----
   * A ComboBoxModel that displays all the known InstallerFactory names.
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]

Index: InstallManagerComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/InstallManagerComboBoxModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstallManagerComboBoxModel.java	10 May 2005 02:40:12 -0000	1.5
--- InstallManagerComboBoxModel.java	17 May 2005 00:44:31 -0000	1.6
***************
*** 37,41 ****
   * InstallManager.
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
--- 37,41 ----
   * InstallManager.
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]

Index: TextPaneBookMetaDataDisplay.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TextPaneBookMetaDataDisplay.java	10 May 2005 02:40:12 -0000	1.6
--- TextPaneBookMetaDataDisplay.java	17 May 2005 00:44:31 -0000	1.7
***************
*** 41,45 ****
   * A JDK JTextPane implementation of an OSIS displayer.
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
--- 41,45 ----
   * A JDK JTextPane implementation of an OSIS displayer.
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]

Index: IndexResolver.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/IndexResolver.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IndexResolver.java	10 May 2005 02:40:12 -0000	1.5
--- IndexResolver.java	17 May 2005 00:44:31 -0000	1.6
***************
*** 43,51 ****
   * carry out the users wishes.
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
   */
! public class IndexResolver
  {
      /**
--- 43,51 ----
   * carry out the users wishes.
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
   */
! public final class IndexResolver
  {
      /**
***************
*** 78,112 ****
          switch (choice)
          {
!             case 0: // download
!                 Installer installer = selectInstaller(parent);
!                 if (installer != null)
                  {
!                     try
!                     {
!                         IndexDownloader.downloadIndex(book, installer);
!                     }
!                     catch (Exception ex)
!                     {
!                         log.error("index download failed: ", ex); //$NON-NLS-1$
!                         //Reporter.informUser(parent, ex);
  
!                         String gtitle = Msg.HOW_GENERATE_TITLE.toString();
!                         Msg gmsg = Msg.HOW_GENERATE;
!                         int yn = JOptionPane.showConfirmDialog(parent, gmsg, gtitle, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
  
!                         if (yn == JOptionPane.YES_OPTION)
!                         {
!                             IndexManagerFactory.getIndexManager().scheduleIndexCreation(book);
!                         }
                      }
                  }
!                 break;
  
!             case 1: // generate
!                 IndexManagerFactory.getIndexManager().scheduleIndexCreation(book);
!                 break;
  
!             default: // cancel
!                 break;
          }
      }
--- 78,112 ----
          switch (choice)
          {
!         case 0: // download
!             Installer installer = selectInstaller(parent);
!             if (installer != null)
!             {
!                 try
                  {
!                     IndexDownloader.downloadIndex(book, installer);
!                 }
!                 catch (Exception ex)
!                 {
!                     log.error("index download failed: ", ex); //$NON-NLS-1$
!                     //Reporter.informUser(parent, ex);
  
!                     String gtitle = Msg.HOW_GENERATE_TITLE.toString();
!                     Msg gmsg = Msg.HOW_GENERATE;
!                     int yn = JOptionPane.showConfirmDialog(parent, gmsg, gtitle, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
  
!                     if (yn == JOptionPane.YES_OPTION)
!                     {
!                         IndexManagerFactory.getIndexManager().scheduleIndexCreation(book);
                      }
                  }
!             }
!             break;
  
!         case 1: // generate
!             IndexManagerFactory.getIndexManager().scheduleIndexCreation(book);
!             break;
  
!         default: // cancel
!             break;
          }
      }

Index: EditSitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/EditSitePane.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** EditSitePane.java	10 May 2005 02:40:12 -0000	1.7
--- EditSitePane.java	17 May 2005 00:44:31 -0000	1.8
***************
*** 67,71 ****
   * An editor for the list of available update sites.
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
--- 67,71 ----
   * An editor for the list of available update sites.
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]

Index: SitesPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/SitesPane.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SitesPane.java	10 May 2005 02:40:12 -0000	1.4
--- SitesPane.java	17 May 2005 00:44:31 -0000	1.5
***************
*** 54,58 ****
   * </pre>
   *
!  * @see gnu.gpl.Licence for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]
--- 54,58 ----
   * </pre>
   *
!  * @see gnu.gpl.License for license details.
   *      The copyright to this program is held by it's authors.
   * @author Joe Walker [joe at eireneh dot com]



More information about the jsword-svn mailing list