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

jswordcvs at crosswire.org jswordcvs at crosswire.org
Mon Feb 14 19:09:01 MST 2005 

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

Modified Files:
	DisplaySelectPane.java Msg.properties Msg.java 
Removed Files:
	InstallManagerComboBoxModel.java EditSitePane.properties 
	InstallerFactoryComboBoxModel.java EditSitePane.java 
	SitePane.java IndexResolver.java SitesPane.properties 
	BooksTreeModel.java BookMetaDataTableModel.java 
	SitePane.properties SitesPane.java BookNode.java 
Log Message:
Refactored the installer to a new package.
Fixed a bug in the indexer to use OSIS names.
Fixed a bug in the English names.
Did some optimizing.

--- SitePane.properties DELETED ---

--- BooksTreeModel.java DELETED ---

--- SitePane.java DELETED ---

Index: Msg.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Msg.java	15 Oct 2004 23:28:22 -0000	1.13
--- Msg.java	15 Feb 2005 02:08:59 -0000	1.14
***************
*** 52,73 ****
      static final Msg HELP_TITLE = new Msg("DisplaySelectPane.HelpTitle"); //$NON-NLS-1$
  
-     static final Msg AVAILABLE_BOOKS = new Msg("SitesPane.AvailableBooks"); //$NON-NLS-1$
-     static final Msg LOCAL_BOOKS = new Msg("SitesPane.Local"); //$NON-NLS-1$
- 
-     static final Msg SIZE = new Msg("SitePane.Size"); //$NON-NLS-1$
-     static final Msg CONFIRMATION_TITLE = new Msg("SitePane.ConfirmationTitle"); //$NON-NLS-1$
-     static final Msg INSTALLED = new Msg("SitePane.Installed"); //$NON-NLS-1$
-     static final Msg INSTALLED_DESC = new Msg("SitePane.InstalledDesc"); //$NON-NLS-1$
-     static final Msg AVAILABLE_DESC = new Msg("SitePane.AvailableDesc"); //$NON-NLS-1$
-     static final Msg NONE_AVAILABLE_DESC = new Msg("SitePane.NoneAvailableDesc"); //$NON-NLS-1$
- 
-     static final Msg EDIT_SITE_TITLE = new Msg("EditSitePane.EditSitesTitle"); //$NON-NLS-1$
-     static final Msg MISSING_SITE = new Msg("EditSitePane.MissingSite"); //$NON-NLS-1$
-     static final Msg DUPLICATE_SITE = new Msg("EditSitePane.DuplicateSite"); //$NON-NLS-1$
-     static final Msg NO_SELECTED_SITE = new Msg("EditSitePane.NoSelectedSite"); //$NON-NLS-1$
-     static final Msg NO_SITE = new Msg("EditSitePane.NoSite"); //$NON-NLS-1$
-     static final Msg CONFIRM_DELETE_SITE = new Msg("EditSitePane.ConfirmDeleteSite"); //$NON-NLS-1$
-     static final Msg DELETE_SITE = new Msg("EditSitePane.DeleteSite"); //$NON-NLS-1$
- 
      static final Msg ERROR = new Msg("PassageSelectionPane.Error"); //$NON-NLS-1$
      static final Msg SUMMARY = new Msg("PassageSelectionPane.Summary"); //$NON-NLS-1$
--- 52,55 ----
***************
*** 76,89 ****
      static final Msg ADVANCED_SELECT_TITLE = new Msg("AdvancedSearchPane.SelectPassageTitle"); //$NON-NLS-1$
  
-     static final Msg HOW_MESSAGE_TITLE = new Msg("IndexResolver.HowMessageTitle"); //$NON-NLS-1$
-     static final Msg HOW_MESSAGE = new Msg("IndexResolver.HowMessage"); //$NON-NLS-1$
-     static final Msg HOW_GENERATE_TITLE = new Msg("IndexResolver.HowGenerateTitle"); //$NON-NLS-1$
-     static final Msg HOW_GENERATE = new Msg("IndexResolver.HowGenerate"); //$NON-NLS-1$
-     static final Msg HOW_SITE_TITLE = new Msg("IndexResolver.HowSiteTitle"); //$NON-NLS-1$
-     static final Msg HOW_SITE = new Msg("IndexResolver.HowSite"); //$NON-NLS-1$
-     static final Msg OPTION_DOWNLOAD = new Msg("IndexResolver.OptionDownload"); //$NON-NLS-1$
-     static final Msg OPTION_GENERATE = new Msg("IndexResolver.OptionGenerate"); //$NON-NLS-1$
-     static final Msg OPTION_CANCEL = new Msg("IndexResolver.OptionCancel"); //$NON-NLS-1$
- 
      /**
       * Passthrough ctor
--- 58,61 ----

Index: DisplaySelectPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectPane.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DisplaySelectPane.java	24 Jan 2005 23:24:19 -0000	1.18
--- DisplaySelectPane.java	15 Feb 2005 02:08:59 -0000	1.19
***************
*** 27,30 ****
--- 27,31 ----
  import javax.swing.JTextField;
  
+ import org.crosswire.bibledesktop.book.install.IndexResolver;
  import org.crosswire.bibledesktop.passage.KeyChangeEvent;
  import org.crosswire.bibledesktop.passage.KeyChangeListener;

--- InstallerFactoryComboBoxModel.java DELETED ---

--- EditSitePane.properties DELETED ---

--- InstallManagerComboBoxModel.java DELETED ---

--- IndexResolver.java DELETED ---

--- BookNode.java DELETED ---

Index: Msg.properties
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/Msg.properties,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Msg.properties	15 Oct 2004 23:28:22 -0000	1.11
--- Msg.properties	15 Feb 2005 02:08:59 -0000	1.12
***************
*** 36,57 ****
  DisplaySelectPane.AdvancedTitle=Advanced Search
  
- SitesPane.AvailableBooks=Available Books
- SitesPane.Local=Installed Books
- 
- SitePane.Size={0} is {1,number,###,###,###.#}KB. Continue?
- SitePane.ConfirmationTitle=Download Book
- SitePane.Installed=Book already installed: {0}
- SitePane.InstalledDesc={0} books installed.
- SitePane.AvailableDesc={0} books available for download.
- SitePane.NoneAvailableDesc=<html><b>Click ''Update Available Books'' to download an up to date book list.</b>
- 
- EditSitePane.EditSitesTitle=Edit Update Sites
- EditSitePane.MissingSite=Missing site name
- EditSitePane.DuplicateSite=Duplicate site name
- EditSitePane.NoSelectedSite=No selected site to edit
- EditSitePane.NoSite=No Site
- EditSitePane.ConfirmDeleteSite=Are you sure you want to delete {0}
- EditSitePane.DeleteSite=Delete Site?
- 
  PassageSelectionPane.Error=Error: {0}
  PassageSelectionPane.Summary=Summary: {0}
--- 36,39 ----
***************
*** 73,87 ****
  AdvancedSearchPane.SelectPassageTitle=Select Passages to Restrict Search to
  
- IndexResolver.HowMessageTitle=Download or generate?
- IndexResolver.HowMessage=Do you wish to try to download and index or generate one for yourself?\n\
- 	Downloading (2-3Mb) will take around 10 mins on a modem or 1 min on broadband.\n\
- 	Generating an index will take around 5 mins on an average computer.\n\
- 	Not all books have indexes so download may not be possible.
- IndexResolver.HowSiteTitle=Which download site?
- IndexResolver.HowSite=Which download site do you wish to use?
- IndexResolver.HowGenerateTitle=Generate an index anyway?
- IndexResolver.HowGenerate=Downloading failed.\n\
- 	Do you wish to generate an index anyway?
- IndexResolver.OptionDownload=Download
- IndexResolver.OptionGenerate=Generate
- IndexResolver.OptionCancel=Cancel
--- 55,56 ----

--- SitesPane.properties DELETED ---

--- BookMetaDataTableModel.java DELETED ---

--- EditSitePane.java DELETED ---

--- SitesPane.java DELETED ---

More information about the jsword-svn mailing list