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

[jswordcvs at crosswire.org]

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

Modified Files:
	IndexResolver.java SitePane.properties SitePane.java 
Log Message:
Removed the ability to try to download an index. Also remove the ability to create an index at download time.

Index: IndexResolver.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/IndexResolver.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IndexResolver.java	17 May 2005 00:44:31 -0000	1.6
--- IndexResolver.java	8 Jun 2005 20:13:20 -0000	1.7
***************
*** 56,68 ****
      }
  
!     /**
!      * The options that we show to the user for how to get a search index
!      */
!     private static Object[] options = new Object[]
!     {
!         Msg.OPTION_DOWNLOAD,
!         Msg.OPTION_GENERATE,
!         Msg.OPTION_CANCEL,
!     };
  
      /**
--- 56,68 ----
      }
  
! //    /**
! //     * The options that we show to the user for how to get a search index
! //     */
! //    private static Object[] options = new Object[]
! //    {
! //        Msg.OPTION_DOWNLOAD,
! //        Msg.OPTION_GENERATE,
! //        Msg.OPTION_CANCEL,
! //    };
  
      /**
***************
*** 72,78 ****
      public static void scheduleIndex(Book book, Component parent)
      {
!         String title = Msg.HOW_MESSAGE_TITLE.toString();
!         Msg msg = Msg.HOW_MESSAGE;
!         int choice = JOptionPane.showOptionDialog(parent, msg, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
  
          switch (choice)
--- 72,81 ----
      public static void scheduleIndex(Book book, Component parent)
      {
!         // LATER(DMS): Enable this when we have indexes to download
! //        String title = Msg.HOW_MESSAGE_TITLE.toString();
! //        Msg msg = Msg.HOW_MESSAGE;
! //        int choice = JOptionPane.showOptionDialog(parent, msg, title, JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE, null, options, options[0]);
! 
!         int choice = 1;
  
          switch (choice)

Index: SitePane.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/SitePane.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SitePane.properties	22 Mar 2005 12:39:56 -0000	1.3
--- SitePane.properties	8 Jun 2005 20:13:20 -0000	1.4
***************
*** 37,43 ****
  
  Unindex.Enabled=false
! Unindex.Name=Remove Index
  Unindex.ShortDescription=Unindex a book.
! Unindex.LongDescription=Remove the index of the selected book
  Unindex.MnemonicKey=R
  
--- 37,43 ----
  
  Unindex.Enabled=false
! Unindex.Name=Remove Search Index
  Unindex.ShortDescription=Unindex a book.
! Unindex.LongDescription=Remove the search index of the selected book
  Unindex.MnemonicKey=R
  

Index: SitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/install/SitePane.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SitePane.java	17 May 2005 00:44:31 -0000	1.11
--- SitePane.java	8 Jun 2005 20:13:20 -0000	1.12
***************
*** 265,269 ****
          {
              panel.add(new JButton(actions.getAction(INSTALL)));
!             panel.add(new JButton(actions.getAction(INSTALL_SEARCH)));
              panel.add(new JButton(actions.getAction(REFRESH)));
          }
--- 265,270 ----
          {
              panel.add(new JButton(actions.getAction(INSTALL)));
!             // LATER(DMS): Put back when this works
!             //panel.add(new JButton(actions.getAction(INSTALL_SEARCH)));
              panel.add(new JButton(actions.getAction(REFRESH)));
          }