[jsword-svn]
bibledesktop/java/main/org/crosswire/bibledesktop/passage 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/passage
In directory www.crosswire.org:/tmp/cvs-serv11205/java/main/org/crosswire/bibledesktop/passage
Modified Files:
KeySidebar.java BibleTreeNode.java WholeBibleTreeModel.java
KeyListListModel.java ChapterTreeNode.java
PassageListCellRenderer.java KeyChangeEvent.java
BookTreeNode.java PassageTreeModel.java KeyTreeModel.java
PassageListModel.java VerseTreeNode.java
Log Message:
intellij refactor - safe
Index: BibleTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/BibleTreeNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BibleTreeNode.java 8 Sep 2004 19:57:58 -0000 1.4
--- BibleTreeNode.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 13,17 ****
/**
* BibleTreeNode.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 13,17 ----
/**
* BibleTreeNode.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 58,63 ****
kids = new BookTreeNode[ref.booksInPassage()];
! int current_book = 0;
! int book_count = 0;
Iterator it = ref.iterator();
--- 58,63 ----
kids = new BookTreeNode[ref.booksInPassage()];
! int currentBook = 0;
! int bookCount = 0;
Iterator it = ref.iterator();
***************
*** 65,74 ****
{
Verse verse = (Verse) it.next();
! if (current_book != verse.getBook())
{
! current_book = verse.getBook();
! BookTreeNode node = new BookTreeNode(this, current_book);
node.setPassage(ref, true);
! kids[book_count++] = node;
}
}
--- 65,74 ----
{
Verse verse = (Verse) it.next();
! if (currentBook != verse.getBook())
{
! currentBook = verse.getBook();
! BookTreeNode node = new BookTreeNode(this, currentBook);
node.setPassage(ref, true);
! kids[bookCount++] = node;
}
}
Index: ChapterTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/ChapterTreeNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChapterTreeNode.java 8 Sep 2004 19:57:58 -0000 1.4
--- ChapterTreeNode.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 12,16 ****
/**
* PassageTableModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 12,16 ----
/**
* PassageTableModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 128,135 ****
try
{
! String Passage_num = Integer.toString(chapter);
if (ref == null)
{
! return Passage_num;
}
--- 128,135 ----
try
{
! String chapNum = Integer.toString(chapter);
if (ref == null)
{
! return chapNum;
}
***************
*** 137,144 ****
if (verses == 0)
{
! return Passage_num;
}
! return Passage_num + " (" + verses + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
catch (NoSuchVerseException ex)
--- 137,144 ----
if (verses == 0)
{
! return chapNum;
}
! return chapNum + " (" + verses + ')'; //$NON-NLS-1$
}
catch (NoSuchVerseException ex)
Index: KeySidebar.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeySidebar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeySidebar.java 8 Sep 2004 19:57:58 -0000 1.2
--- KeySidebar.java 28 Nov 2004 21:36:04 -0000 1.3
***************
*** 51,55 ****
public class KeySidebar extends JPanel implements DisplaySelectListener, KeyChangeListener
{
! /**
* Initialize the SplitBookDataDisplay
*/
--- 51,55 ----
public class KeySidebar extends JPanel implements DisplaySelectListener, KeyChangeListener
{
! /**
* Initialize the SplitBookDataDisplay
*/
***************
*** 336,338 ****
--- 336,343 ----
private Action actBlur1;
private Action actBlur5;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3905241217179466036L;
}
Index: KeyChangeEvent.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeyChangeEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** KeyChangeEvent.java 2 Sep 2004 17:44:47 -0000 1.1
--- KeyChangeEvent.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 31,35 ****
public class KeyChangeEvent extends EventObject
{
! /**
* For when a key has been changed
* @param source The thing that started this off
--- 31,35 ----
public class KeyChangeEvent extends EventObject
{
! /**
* For when a key has been changed
* @param source The thing that started this off
***************
*** 57,59 ****
--- 57,63 ----
private Key key;
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3256725091319362361L;
}
Index: PassageTreeModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/PassageTreeModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PassageTreeModel.java 20 Apr 2004 20:53:39 -0000 1.1
--- PassageTreeModel.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 1,3 ****
-
package org.crosswire.bibledesktop.passage;
--- 1,2 ----
***************
*** 36,40 ****
public class PassageTreeModel extends DefaultTreeModel
{
! /**
* Basic constructor.
* At some stage when editing this and PassageTreeNode we should be able to
--- 35,39 ----
public class PassageTreeModel extends DefaultTreeModel
{
! /**
* Basic constructor.
* At some stage when editing this and PassageTreeNode we should be able to
***************
*** 45,47 ****
--- 44,51 ----
super(new PassageTreeNode(ref, tree));
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3546081345886434357L;
}
Index: WholeBibleTreeModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/WholeBibleTreeModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WholeBibleTreeModel.java 20 Apr 2004 20:53:39 -0000 1.1
--- WholeBibleTreeModel.java 28 Nov 2004 21:36:04 -0000 1.2
***************
*** 1,3 ****
-
package org.crosswire.bibledesktop.passage;
--- 1,2 ----
***************
*** 33,44 ****
public class WholeBibleTreeModel extends DefaultTreeModel
{
! /**
! * Basic constructor.
! * At some stage when editing this and PassageTreeNode we should be able to
! * remove the JTree param.
! */
public WholeBibleTreeModel()
{
super(WholeBibleTreeNode.getRootNode());
}
}
--- 32,48 ----
public class WholeBibleTreeModel extends DefaultTreeModel
{
! /**
! * Basic constructor.
! * At some stage when editing this and PassageTreeNode we should be able to
! * remove the JTree param.
! */
public WholeBibleTreeModel()
{
super(WholeBibleTreeNode.getRootNode());
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3688785881985004853L;
}
Index: PassageListCellRenderer.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/PassageListCellRenderer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PassageListCellRenderer.java 8 Sep 2004 19:57:58 -0000 1.6
--- PassageListCellRenderer.java 28 Nov 2004 21:36:04 -0000 1.7
***************
*** 3,7 ****
import java.awt.Component;
import java.io.Serializable;
! import java.util.Hashtable;
import javax.swing.JLabel;
--- 3,8 ----
import java.awt.Component;
import java.io.Serializable;
! import java.util.Map;
! import java.util.HashMap;
import javax.swing.JLabel;
***************
*** 20,24 ****
/**
* Renders a Passage in a JList.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 21,25 ----
/**
* Renders a Passage in a JList.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 128,132 ****
* A cache of Bible texts
*/
! private Hashtable hash = new Hashtable();
/**
--- 129,133 ----
* A cache of Bible texts
*/
! private Map hash = new HashMap();
/**
Index: VerseTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/VerseTreeNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VerseTreeNode.java 8 Sep 2004 19:57:58 -0000 1.3
--- VerseTreeNode.java 28 Nov 2004 21:36:04 -0000 1.4
***************
*** 9,13 ****
/**
* PassageTableModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 9,13 ----
/**
* PassageTableModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 36,42 ****
* This constructor is for when we are really a BookTreeNode
*/
! protected VerseTreeNode(TreeNode parent, int book, int Passage, int verse) throws NoSuchVerseException
{
! super(parent, book, Passage);
this.verse = verse;
}
--- 36,42 ----
* This constructor is for when we are really a BookTreeNode
*/
! protected VerseTreeNode(TreeNode parent, int book, int passage, int verse) throws NoSuchVerseException
{
! super(parent, book, passage);
this.verse = verse;
}
***************
*** 92,96 ****
}
! /** The Verse that this node referrs to */
protected int verse;
}
--- 92,98 ----
}
! /**
! * The Verse that this node referrs to
! */
protected int verse;
}
Index: BookTreeNode.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/BookTreeNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BookTreeNode.java 8 Sep 2004 19:57:58 -0000 1.4
--- BookTreeNode.java 28 Nov 2004 21:36:04 -0000 1.5
***************
*** 12,16 ****
/**
* PassageTableModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 12,16 ----
/**
* PassageTableModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 60,65 ****
kids = new ChapterTreeNode[ref.chaptersInPassage(book)];
! int current_Passage = 0;
! int Passage_count = 0;
Iterator it = ref.iterator();
--- 60,65 ----
kids = new ChapterTreeNode[ref.chaptersInPassage(book)];
! int currentRef = 0;
! int count = 0;
Iterator it = ref.iterator();
***************
*** 69,79 ****
if ((book == 0 || verse.getBook() == book)
! && current_Passage != verse.getChapter())
{
! current_Passage = verse.getChapter();
! ChapterTreeNode node = new ChapterTreeNode(this, book, current_Passage);
node.setPassage(ref, true);
! kids[Passage_count++] = node;
}
}
--- 69,79 ----
if ((book == 0 || verse.getBook() == book)
! && currentRef != verse.getChapter())
{
! currentRef = verse.getChapter();
! ChapterTreeNode node = new ChapterTreeNode(this, book, currentRef);
node.setPassage(ref, true);
! kids[count++] = node;
}
}
***************
*** 137,147 ****
try
{
! String book_name = BibleInfo.getLongBookName(book);
! if (ref == null) return book_name;
int chapters = ref.chaptersInPassage(book);
! if (chapters == 0) return book_name;
! return book_name + " (" + chapters + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
catch (NoSuchVerseException ex)
--- 137,153 ----
try
{
! String bookName = BibleInfo.getLongBookName(book);
! if (ref == null)
! {
! return bookName;
! }
int chapters = ref.chaptersInPassage(book);
! if (chapters == 0)
! {
! return bookName;
! }
! return bookName + " (" + chapters + ')'; //$NON-NLS-1$ //$NON-NLS-2$
}
catch (NoSuchVerseException ex)
***************
*** 160,164 ****
}
! /** The Book that this node referrs to */
protected int book;
--- 166,172 ----
}
! /**
! * The Book that this node referrs to
! */
protected int book;
Index: KeyListListModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeyListListModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** KeyListListModel.java 8 Sep 2004 19:57:58 -0000 1.5
--- KeyListListModel.java 28 Nov 2004 21:36:04 -0000 1.6
***************
*** 32,36 ****
public class KeyListListModel extends AbstractListModel implements ListModel
{
! /**
* Constructor for ListListModel.
*/
--- 32,36 ----
public class KeyListListModel extends AbstractListModel implements ListModel
{
! /**
* Constructor for ListListModel.
*/
***************
*** 58,60 ****
--- 58,65 ----
private Key keys;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3546356240990286645L;
}
Index: PassageListModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/PassageListModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PassageListModel.java 8 Sep 2004 19:57:58 -0000 1.8
--- PassageListModel.java 28 Nov 2004 21:36:04 -0000 1.9
***************
*** 12,16 ****
* The PassageListModel class gives access to a Passage via a
* ListModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 12,16 ----
* The PassageListModel class gives access to a Passage via a
* ListModel.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 79,83 ****
* @exception IllegalArgumentException If the mode is illegal
*/
! public void setMode(PassageListType mode)
{
this.mode = mode;
--- 79,83 ----
* @exception IllegalArgumentException If the mode is illegal
*/
! public final void setMode(PassageListType mode)
{
this.mode = mode;
***************
*** 191,195 ****
* Accessor for the current passage
*/
! public void setPassage(Passage newRef)
{
fireIntervalRemoved(this, 0, size);
--- 191,195 ----
* Accessor for the current passage
*/
! public final void setPassage(Passage newRef)
{
fireIntervalRemoved(this, 0, size);
Index: KeyTreeModel.java
===================================================================
RCS file: /cvs/jsword/bibledesktop/java/main/org/crosswire/bibledesktop/passage/KeyTreeModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** KeyTreeModel.java 16 Aug 2004 22:09:21 -0000 1.3
--- KeyTreeModel.java 28 Nov 2004 21:36:04 -0000 1.4
***************
*** 31,35 ****
public class KeyTreeModel extends DefaultTreeModel
{
! /**
* Simple ctor
* @param key The root TreeNode
--- 31,35 ----
public class KeyTreeModel extends DefaultTreeModel
{
! /**
* Simple ctor
* @param key The root TreeNode
***************
*** 63,65 ****
--- 63,70 ----
*/
private Key key;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3977303235050353714L;
}
More information about the jsword-svn
mailing list