[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Nov 28 14:36:06 MST 2004
Update of /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book
In directory www.crosswire.org:/tmp/cvs-serv11205/java/main/org/crosswire/bibledesktop/book
Modified Files:
InstallManagerComboBoxModel.java
InstallerFactoryComboBoxModel.java PassageSelectionPane.java
SidebarPane.java EditSitePane.java SitePane.java
BibleComboBoxModel.java BooksTreeModel.java
DriversComboBoxModel.java AdvancedSearchPane.java
BookMetaDataTableModel.java CommentaryPane.java SitesPane.java
BooksListModel.java DriversListModel.java
DisplaySelectEvent.java BookListCellRenderer.java
Log Message:
intellij refactor - safe
Index: BooksListModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BooksListModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BooksListModel.java 9 Sep 2004 20:15:57 -0000 1.5
--- BooksListModel.java 28 Nov 2004 21:36:04 -0000 1.6
***************
*** 21,25 ****
* because that is a protected method and the inner class is neither
* in the same package or a sub class.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 21,25 ----
* because that is a protected method and the inner class is neither
* in the same package or a sub class.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 145,149 ****
* Setup the data-stores of the current Bibles and drivers
*/
! protected synchronized void cacheData()
{
bmds = new ArrayList();
--- 145,149 ----
* Setup the data-stores of the current Bibles and drivers
*/
! protected final synchronized void cacheData()
{
bmds = new ArrayList();
Index: DriversComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DriversComboBoxModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DriversComboBoxModel.java 20 Apr 2004 20:53:39 -0000 1.1
--- DriversComboBoxModel.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 1,3 ****
-
package org.crosswire.bibledesktop.book;
--- 1,2 ----
***************
*** 9,13 ****
* The DriverModels class implements ComboBoxModel by extending the
* DriverListModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 8,12 ----
* The DriverModels class implements ComboBoxModel by extending the
* DriverListModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 33,45 ****
public class DriversComboBoxModel extends DriversListModel implements ComboBoxModel
{
! /**
* Basic Constructor
*/
! public DriversComboBoxModel(boolean include_ro)
{
! super(include_ro);
if (drivers.length > 0)
current = drivers[0];
}
--- 32,46 ----
public class DriversComboBoxModel extends DriversListModel implements ComboBoxModel
{
! /**
* Basic Constructor
*/
! public DriversComboBoxModel(boolean includeRo)
{
! super(includeRo);
if (drivers.length > 0)
+ {
current = drivers[0];
+ }
}
***************
*** 74,76 ****
--- 75,82 ----
*/
protected Object current;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3689068456540910136L;
}
Index: BooksTreeModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BooksTreeModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BooksTreeModel.java 30 Aug 2004 09:26:13 -0000 1.3
--- BooksTreeModel.java 28 Nov 2004 21:36:04 -0000 1.4
***************
*** 23,32 ****
* The children of the root node are "Bibles", "Commentaries" and
* "Dictionaries". the children of those nodes are the Books themselves.
! *
* <p>I briefly considered making this mode generic by having a set of named
* BookFilters, however whilst more generic I'm not sure how often this would
* be used, and it stops me extending this class to deal with uninstalled
* Books.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 23,32 ----
* The children of the root node are "Bibles", "Commentaries" and
* "Dictionaries". the children of those nodes are the Books themselves.
! *
* <p>I briefly considered making this mode generic by having a set of named
* BookFilters, however whilst more generic I'm not sure how often this would
* be used, and it stops me extending this class to deal with uninstalled
* Books.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 299,303 ****
* Regenerate the cache of bibles, commentaries and dictionaries
*/
! protected void cacheBooks()
{
bibles = new ArrayList();
--- 299,303 ----
* Regenerate the cache of bibles, commentaries and dictionaries
*/
! protected final void cacheBooks()
{
bibles = new ArrayList();
Index: SitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SitePane.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SitePane.java 15 Oct 2004 23:28:22 -0000 1.13
--- SitePane.java 28 Nov 2004 21:36:04 -0000 1.14
***************
*** 34,38 ****
* A panel for use within a SitesPane to display one set of Books that are
* installed or could be installed.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 34,38 ----
* A panel for use within a SitesPane to display one set of Books that are
* installed or could be installed.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 110,126 ****
/**
! *
*/
private void updateDescription()
{
- String desc = "#ERROR#"; //$NON-NLS-1$
-
if (installer == null)
{
int bookCount = Books.installed().getBookMetaDatas().size();
! desc = Msg.INSTALLED_DESC.toString(new Object[]
! {
! new Integer(bookCount)
! });
}
else
--- 110,121 ----
/**
! *
*/
private void updateDescription()
{
if (installer == null)
{
int bookCount = Books.installed().getBookMetaDatas().size();
! lblDesc.setText(Msg.INSTALLED_DESC.toString(new Object[] { new Integer(bookCount) }));
}
else
***************
*** 129,148 ****
if (bookCount == 0)
{
! desc = Msg.NONE_AVAILABLE_DESC.toString();
}
else
{
! desc = Msg.AVAILABLE_DESC.toString(new Object[]
! {
! new Integer(bookCount)
! });
}
}
-
- lblDesc.setText(desc);
}
/**
! *
*/
private Component createSplitPane(Component left, Component right)
--- 124,138 ----
if (bookCount == 0)
{
! lblDesc.setText(Msg.NONE_AVAILABLE_DESC.toString());
}
else
{
! lblDesc.setText(Msg.AVAILABLE_DESC.toString(new Object[] { new Integer(bookCount) }));
}
}
}
/**
! *
*/
private Component createSplitPane(Component left, Component right)
***************
*** 160,164 ****
/**
! *
*/
private Component createAvailablePanel(String labelAcronymn, BookList books)
--- 150,154 ----
/**
! *
*/
private Component createAvailablePanel(String labelAcronymn, BookList books)
***************
*** 179,183 ****
/**
! *
*/
private Component createSelectedPanel()
--- 169,173 ----
/**
! *
*/
private Component createSelectedPanel()
***************
*** 198,202 ****
/**
! *
*/
private Component createScrolledTree(BookList books)
--- 188,192 ----
/**
! *
*/
private Component createScrolledTree(BookList books)
***************
*** 223,227 ****
/**
! *
*/
private Component createPanelActions()
--- 213,217 ----
/**
! *
*/
private Component createPanelActions()
***************
*** 291,295 ****
}
! float size = NetUtil.getSize(installer.toRemoteURL(name)) / 1024;
if (JOptionPane.showConfirmDialog(this, Msg.SIZE.toString(new Object[] {name.getName(), new Float(size)}),
Msg.CONFIRMATION_TITLE.toString(),
--- 281,285 ----
}
! float size = NetUtil.getSize(installer.toRemoteURL(name)) / 1024.0F;
if (JOptionPane.showConfirmDialog(this, Msg.SIZE.toString(new Object[] {name.getName(), new Float(size)}),
Msg.CONFIRMATION_TITLE.toString(),
Index: SidebarPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SidebarPane.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SidebarPane.java 2 Sep 2004 17:44:46 -0000 1.5
--- SidebarPane.java 28 Nov 2004 21:36:04 -0000 1.6
***************
*** 11,15 ****
/**
* SidebarPane builds a panel containing a set of books in tabbed dialogs.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 11,15 ----
/**
* SidebarPane builds a panel containing a set of books in tabbed dialogs.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 35,44 ****
public class SidebarPane extends JPanel
{
! /**
* Simple ctor
*/
public SidebarPane()
{
! jbInit();
}
--- 35,44 ----
public class SidebarPane extends JPanel
{
! /**
* Simple ctor
*/
public SidebarPane()
{
! init();
}
***************
*** 46,50 ****
* GUI initializer.
*/
! private void jbInit()
{
split.setOrientation(JSplitPane.VERTICAL_SPLIT);
--- 46,50 ----
* GUI initializer.
*/
! private void init()
{
split.setOrientation(JSplitPane.VERTICAL_SPLIT);
***************
*** 53,57 ****
split.setBorder(null);
// Make resizing affect the right only
! split.setResizeWeight(0);
split.setTopComponent(comments);
split.setBottomComponent(dicts);
--- 53,57 ----
split.setBorder(null);
// Make resizing affect the right only
! split.setResizeWeight(0.0);
split.setTopComponent(comments);
split.setBottomComponent(dicts);
***************
*** 98,100 ****
--- 98,105 ----
private JSplitPane split = new FixedSplitPane();
private DictionaryPane dicts = new DictionaryPane();
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256727294637521206L;
}
Index: InstallerFactoryComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/InstallerFactoryComboBoxModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstallerFactoryComboBoxModel.java 20 Apr 2004 20:53:39 -0000 1.1
--- InstallerFactoryComboBoxModel.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 37,41 ****
public class InstallerFactoryComboBoxModel extends AbstractListModel implements ComboBoxModel
{
! /**
* Simple ctor
*/
--- 37,41 ----
public class InstallerFactoryComboBoxModel extends AbstractListModel implements ComboBoxModel
{
! /**
* Simple ctor
*/
***************
*** 89,91 ****
--- 89,96 ----
*/
private Object selection;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258134643734885174L;
}
Index: InstallManagerComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/InstallManagerComboBoxModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InstallManagerComboBoxModel.java 10 Oct 2004 22:12:11 -0000 1.1
--- InstallManagerComboBoxModel.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 39,43 ****
public class InstallManagerComboBoxModel extends AbstractListModel implements ComboBoxModel
{
! /**
* Simple ctor
*/
--- 39,43 ----
public class InstallManagerComboBoxModel extends AbstractListModel implements ComboBoxModel
{
! /**
* Simple ctor
*/
***************
*** 79,83 ****
* @see javax.swing.ListModel#getElementAt(int)
*/
! public Object getElementAt(int index)
{
return names.get(index);
--- 79,83 ----
* @see javax.swing.ListModel#getElementAt(int)
*/
! public final Object getElementAt(int index)
{
return names.get(index);
***************
*** 109,113 ****
* Simple way to avoid eclipse private/protected warning
*/
! protected void update(InstallerEvent ev)
{
int oldmax = names.size();
--- 109,113 ----
* Simple way to avoid eclipse private/protected warning
*/
! protected final void update(InstallerEvent ev)
{
int oldmax = names.size();
***************
*** 137,139 ****
--- 137,144 ----
*/
private InstallManager imanager;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256725082729756980L;
}
Index: DriversListModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DriversListModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DriversListModel.java 8 Sep 2004 19:57:58 -0000 1.3
--- DriversListModel.java 28 Nov 2004 21:36:04 -0000 1.4
***************
*** 18,25 ****
/**
* A ListModel that shows the regestered BookDrivers.
! *
* <p>DriversListModel can be set to read-only mode where it will display only
* the BookDrivers that can receive new Book data.</p>
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 18,25 ----
/**
* A ListModel that shows the regestered BookDrivers.
! *
* <p>DriversListModel can be set to read-only mode where it will display only
* the BookDrivers that can receive new Book data.</p>
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 45,54 ****
public class DriversListModel extends AbstractListModel
{
! /**
* Basic constructor
*/
! public DriversListModel(boolean include_ro)
{
! if (include_ro)
{
drivers = Books.installed().getDrivers();
--- 45,54 ----
public class DriversListModel extends AbstractListModel
{
! /**
* Basic constructor
*/
! public DriversListModel(boolean includeRo)
{
! if (includeRo)
{
drivers = Books.installed().getDrivers();
***************
*** 145,148 ****
--- 145,153 ----
/**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3689068456540910136L;
+
+ /**
* Create a BookListCellRenderer
*/
***************
*** 158,162 ****
public static class BibleListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
--- 163,167 ----
public static class BibleListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
***************
*** 198,201 ****
--- 203,211 ----
return this;
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256722892245971512L;
}
}
Index: AdvancedSearchPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/AdvancedSearchPane.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AdvancedSearchPane.java 9 Oct 2004 21:45:24 -0000 1.1
--- AdvancedSearchPane.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 45,49 ****
/**
* An advanced search dialog.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 45,49 ----
/**
* An advanced search dialog.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 69,73 ****
public class AdvancedSearchPane extends JPanel implements DocumentListener
{
! /**
* This is the default constructor
*/
--- 69,73 ----
public class AdvancedSearchPane extends JPanel implements DocumentListener
{
! /**
* This is the default constructor
*/
***************
*** 347,351 ****
/**
! *
*/
public void doRestrictSelect()
--- 347,351 ----
/**
! *
*/
public void doRestrictSelect()
***************
*** 374,378 ****
/**
! *
*/
public void updatePreset()
--- 374,378 ----
/**
! *
*/
public void updatePreset()
***************
*** 469,473 ****
boolean match = false;
ComboBoxModel model = cboPresets.getModel();
! String find = PRESET_START + restrict + PRESET_END;
for (int i = 0; !match && i < model.getSize(); i++)
{
--- 469,473 ----
boolean match = false;
ComboBoxModel model = cboPresets.getModel();
! String find = PRESET_START + restrict + PRESET_END;
for (int i = 0; !match && i < model.getSize(); i++)
{
***************
*** 560,569 ****
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout;
/**
* The ActionFactory holding the actions used by this Component.
*/
! private ActionFactory actions;
/**
--- 560,569 ----
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout = false;
/**
* The ActionFactory holding the actions used by this Component.
*/
! private ActionFactory actions = null;
/**
***************
*** 580,584 ****
* GUI Components
*/
! private PassageSelectionPane dlgSelect;
private JLabel lblPhrase = null;
private JLabel lblIncludes = null;
--- 580,584 ----
* GUI Components
*/
! private PassageSelectionPane dlgSelect = null;
private JLabel lblPhrase = null;
private JLabel lblIncludes = null;
***************
*** 619,621 ****
--- 619,626 ----
*/
private static final Logger log = Logger.getLogger(AdvancedSearchPane.class);
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3977303234983245108L;
}
Index: DisplaySelectEvent.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/DisplaySelectEvent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DisplaySelectEvent.java 8 Sep 2004 19:57:58 -0000 1.4
--- DisplaySelectEvent.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 32,36 ****
public class DisplaySelectEvent extends EventObject
{
! /**
* For when a command has been made
* @param source The thing that started this off
--- 32,36 ----
public class DisplaySelectEvent extends EventObject
{
! /**
* For when a command has been made
* @param source The thing that started this off
***************
*** 73,75 ****
--- 73,80 ----
*/
private Book book;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3689068456540910136L;
}
Index: BookMetaDataTableModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BookMetaDataTableModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BookMetaDataTableModel.java 8 Sep 2004 19:57:58 -0000 1.2
--- BookMetaDataTableModel.java 28 Nov 2004 21:36:04 -0000 1.3
***************
*** 6,10 ****
/**
* A TableModel that displays the data in a BookMetaData object.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 6,10 ----
/**
* A TableModel that displays the data in a BookMetaData object.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 30,34 ****
public class BookMetaDataTableModel extends MapTableModel
{
! /**
* Simple ctor
*/
--- 30,34 ----
public class BookMetaDataTableModel extends MapTableModel
{
! /**
* Simple ctor
*/
***************
*** 57,61 ****
* @param bmd The BookMetaData to set.
*/
! public void setBookMetaData(BookMetaData bmd)
{
if (bmd != this.bmd)
--- 57,61 ----
* @param bmd The BookMetaData to set.
*/
! public final void setBookMetaData(BookMetaData bmd)
{
if (bmd != this.bmd)
***************
*** 78,80 ****
--- 78,85 ----
*/
private BookMetaData bmd;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3257566222043460664L;
}
Index: EditSitePane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/EditSitePane.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EditSitePane.java 10 Oct 2004 22:12:11 -0000 1.9
--- EditSitePane.java 28 Nov 2004 21:36:04 -0000 1.10
***************
*** 46,50 ****
/**
* An editor for the list of available update sites.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 46,50 ----
/**
* An editor for the list of available update sites.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 186,190 ****
sptMain.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
// Make resizing affect the right only
! sptMain.setResizeWeight(0);
sptMain.setLeftComponent(pnlSite);
sptMain.setRightComponent(pnlMain);
--- 186,190 ----
sptMain.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
// Make resizing affect the right only
! sptMain.setResizeWeight(0.0D);
sptMain.setLeftComponent(pnlSite);
sptMain.setRightComponent(pnlMain);
***************
*** 288,292 ****
* Someone has picked a new installer
*/
! protected void select()
{
String name = (String) lstSite.getSelectedValue();
--- 288,292 ----
* Someone has picked a new installer
*/
! protected final void select()
{
String name = (String) lstSite.getSelectedValue();
Index: PassageSelectionPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/PassageSelectionPane.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PassageSelectionPane.java 2 Oct 2004 23:51:06 -0000 1.12
--- PassageSelectionPane.java 28 Nov 2004 21:36:04 -0000 1.13
***************
*** 49,53 ****
/**
* A JPanel (or dialog) that presents a interactive GUI way to select passages.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 49,53 ----
/**
* A JPanel (or dialog) that presents a interactive GUI way to select passages.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 109,113 ****
/**
! *
*/
private Component createScrolledTree(JLabel label)
--- 109,113 ----
/**
! *
*/
private Component createScrolledTree(JLabel label)
***************
*** 131,135 ****
/**
! *
*/
private Component createScrolledList(JLabel label)
--- 131,135 ----
/**
! *
*/
private Component createScrolledList(JLabel label)
***************
*** 150,154 ****
/**
! *
*/
private Component createDisplayPanel()
--- 150,154 ----
/**
! *
*/
private Component createDisplayPanel()
***************
*** 168,172 ****
/**
! *
*/
private Component createMessageLabel()
--- 168,172 ----
/**
! *
*/
private Component createMessageLabel()
***************
*** 205,212 ****
changing = true;
String refstr = txtDisplay.getText();
! Passage temp = null;
try
{
! temp = (Passage) keyf.getKey(refstr);
ref.clear();
ref.addAll(temp);
--- 205,212 ----
changing = true;
String refstr = txtDisplay.getText();
!
try
{
! Passage temp = (Passage) keyf.getKey(refstr);
ref.clear();
ref.addAll(temp);
***************
*** 399,413 ****
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout;
/**
* Prevent us getting in an event cascade loop
*/
! private boolean changing;
/**
* The passage we are editing
*/
! private Passage ref;
/**
--- 399,413 ----
* If escape was pressed we don't want to update the parent
*/
! protected boolean bailout = false;
/**
* Prevent us getting in an event cascade loop
*/
! private boolean changing = false;
/**
* The passage we are editing
*/
! private Passage ref = null;
/**
***************
*** 419,429 ****
* GUI Components
*/
! private Icon icoGood;
! private Icon icoBad;
! private JTree treAll;
! private JList lstSel;
! private JTextField txtDisplay;
! private JLabel lblMessage;
! protected JDialog dlgMain;
/**
--- 419,429 ----
* GUI Components
*/
! private Icon icoGood = null;
! private Icon icoBad = null;
! private JTree treAll = null;
! private JList lstSel = null;
! private JTextField txtDisplay = null;
! private JLabel lblMessage = null;
! protected JDialog dlgMain = null;
/**
Index: CommentaryPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/CommentaryPane.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CommentaryPane.java 8 Sep 2004 19:57:58 -0000 1.8
--- CommentaryPane.java 28 Nov 2004 21:36:04 -0000 1.9
***************
*** 51,55 ****
public class CommentaryPane extends JPanel implements BookDataDisplay
{
! /**
* Simple constructor that uses all the Books
*/
--- 51,55 ----
public class CommentaryPane extends JPanel implements BookDataDisplay
{
! /**
* Simple constructor that uses all the Books
*/
***************
*** 238,240 ****
--- 238,245 ----
private JPanel pnlSelect = new JPanel();
private JPanel pnlTop = new JPanel();
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3258411737760804915L;
}
Index: BibleComboBoxModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BibleComboBoxModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BibleComboBoxModel.java 30 Aug 2004 09:26:13 -0000 1.4
--- BibleComboBoxModel.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 11,15 ****
/**
* A ComboBoxModel for selecting book/chapter/verse.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 11,15 ----
/**
* A ComboBoxModel for selecting book/chapter/verse.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 273,282 ****
* What is currently selected?
*/
! private Object selected;
/**
* Are we a book, chapter or verse selector
*/
! protected int level;
/**
--- 273,282 ----
* What is currently selected?
*/
! private Object selected = null;
/**
* Are we a book, chapter or verse selector
*/
! protected int level = 0;
/**
Index: SitesPane.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/SitesPane.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SitesPane.java 15 Oct 2004 23:28:22 -0000 1.9
--- SitesPane.java 28 Nov 2004 21:36:04 -0000 1.10
***************
*** 116,120 ****
* Re-create the list of installers
*/
! protected void addAllInstallers()
{
// Now add panels for book installation sites
--- 116,120 ----
* Re-create the list of installers
*/
! protected final void addAllInstallers()
{
// Now add panels for book installation sites
Index: BookListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/book/BookListCellRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BookListCellRenderer.java 2 Sep 2004 17:44:46 -0000 1.4
--- BookListCellRenderer.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 19,23 ****
* This was a simple modification of DefaultListCellRenderer however something
* has made us implement ListCellRenderer directory and I'm not sure what.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 19,23 ----
* This was a simple modification of DefaultListCellRenderer however something
* has made us implement ListCellRenderer directory and I'm not sure what.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 43,47 ****
public class BookListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
--- 43,47 ----
public class BookListCellRenderer extends JLabel implements ListCellRenderer
{
! /**
* Constructs a default renderer object for an item in a list.
*/
***************
*** 149,153 ****
* border if we do not have focus
*/
! private static Border noFocus;
/**
--- 149,153 ----
* border if we do not have focus
*/
! private static Border noFocus = null;
/**
***************
*** 155,157 ****
--- 155,162 ----
*/
public static final String PROTOTYPE_BOOK_NAME = "012345678901234567890123456789"; //$NON-NLS-1$
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3978138859576308017L;
}
More information about the jsword-svn
mailing list