[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Nov 28 14:36:48 MST 2004
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book
In directory www.crosswire.org:/tmp/cvs-serv11589/java/jsword/org/crosswire/jsword/book
Modified Files:
SentanceUtil.java DataPolice.java Strongs.java Defaults.java
Translation.java Books.java BooksEvent.java BookException.java
Log Message:
intellij refactor - safe
Index: Strongs.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Strongs.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Strongs.java 8 Sep 2004 19:55:07 -0000 1.7
--- Strongs.java 28 Nov 2004 21:36:46 -0000 1.8
***************
*** 77,80 ****
--- 77,82 ----
set(PARSING, Integer.parseInt(desc.substring(1, desc.length() - 1)));
}
+
+ throw new BookException(Msg.STRONGS_ERROR_PARSE, new Object[] { desc });
}
catch (NumberFormatException ex)
***************
*** 112,126 ****
if (lemma.charAt(0) == 'H')
{
! newtype = Strongs.HEBREW;
lemma = lemma.substring(1);
}
else if (lemma.charAt(0) == 'G')
{
! newtype = Strongs.GREEK;
lemma = lemma.substring(1);
}
else
{
! newtype = Strongs.PARSING;
}
--- 114,128 ----
if (lemma.charAt(0) == 'H')
{
! newtype = HEBREW;
lemma = lemma.substring(1);
}
else if (lemma.charAt(0) == 'G')
{
! newtype = GREEK;
lemma = lemma.substring(1);
}
else
{
! newtype = PARSING;
}
***************
*** 140,148 ****
{
case GREEK:
! return "<" + number + ">"; //$NON-NLS-1$ //$NON-NLS-2$
case HEBREW:
! return "<0" + number + ">"; //$NON-NLS-1$ //$NON-NLS-2$
case PARSING:
! return "(" + number + ")"; //$NON-NLS-1$ //$NON-NLS-2$
default:
assert false : type;
--- 142,150 ----
{
case GREEK:
! return "<" + number + '>'; //$NON-NLS-1$
case HEBREW:
! return "<0" + number + '>'; //$NON-NLS-1$
case PARSING:
! return "(" + number + ')'; //$NON-NLS-1$
default:
assert false : type;
Index: Translation.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Translation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Translation.java 8 Sep 2004 19:55:07 -0000 1.5
--- Translation.java 28 Nov 2004 21:36:46 -0000 1.6
***************
*** 1,5 ****
package org.crosswire.jsword.book;
! import org.crosswire.jsword.passage.Passage;
/**
--- 1,5 ----
package org.crosswire.jsword.book;
! import org.crosswire.jsword.passage.Key;
/**
***************
*** 8,12 ****
*
* <p>Perhpas we should consider linking to the Bible that translated the
! * original in the ways listed in the Passage?.</p>
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
--- 8,12 ----
*
* <p>Perhpas we should consider linking to the Bible that translated the
! * original in the ways listed in the Key?.</p>
*
* <p><table border='1' cellPadding='3' cellSpacing='0'>
***************
*** 38,45 ****
* @param strongs The original word.
*/
! public Translation(String word, Strongs strongs)
{
this.word = word;
this.strongs = strongs;
}
--- 38,46 ----
* @param strongs The original word.
*/
! public Translation(String word, Strongs strongs, Key key)
{
this.word = word;
this.strongs = strongs;
+ this.key = key;
}
***************
*** 61,69 ****
/**
! * Accessor for the passages that translate the word/number in this way.
*/
! public Passage getRef()
{
! return ref;
}
--- 62,70 ----
/**
! * Accessor for the Keys that translate the word/number in this way.
*/
! public Key getKey()
{
! return key;
}
***************
*** 81,84 ****
* The matching verses
*/
! private Passage ref;
}
--- 82,85 ----
* The matching verses
*/
! private Key key;
}
Index: Books.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Books.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Books.java 8 Sep 2004 19:55:07 -0000 1.36
--- Books.java 28 Nov 2004 21:36:46 -0000 1.37
***************
*** 51,54 ****
--- 51,55 ----
drivers = new ArrayList();
listeners = new EventListenerList();
+ threaded = false;
initialize(threaded);
***************
*** 411,415 ****
* So it just acts as a means of commenting out code.
*/
! private boolean threaded;
/**
--- 412,416 ----
* So it just acts as a means of commenting out code.
*/
! private boolean threaded = false;
/**
Index: Defaults.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Defaults.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Defaults.java 5 Oct 2004 22:03:09 -0000 1.23
--- Defaults.java 28 Nov 2004 21:36:46 -0000 1.24
***************
*** 50,64 ****
* The default Bible
*/
! private static BookMetaData bdeft;
/**
* The default Commentary
*/
! private static BookMetaData cdeft;
/**
* The default Dictionary
*/
! private static BookMetaData ddeft;
/**
--- 50,64 ----
* The default Bible
*/
! private static BookMetaData bdeft = null;
/**
* The default Commentary
*/
! private static BookMetaData cdeft = null;
/**
* The default Dictionary
*/
! private static BookMetaData ddeft = null;
/**
Index: SentanceUtil.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/SentanceUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SentanceUtil.java 21 Sep 2004 17:46:23 -0000 1.6
--- SentanceUtil.java 28 Nov 2004 21:36:46 -0000 1.7
***************
*** 3,6 ****
--- 3,7 ----
import java.util.ArrayList;
import java.util.Iterator;
+ import java.util.List;
import org.crosswire.common.util.StringUtil;
***************
*** 52,56 ****
public static String[] tokenize(String sentence)
{
! ArrayList tokens = new ArrayList();
int pos = 0;
--- 53,57 ----
public static String[] tokenize(String sentence)
{
! List tokens = new ArrayList();
int pos = 0;
***************
*** 86,90 ****
{
// The next separator is a space
! temp = sentence.substring(pos, nextSpace) + " "; //$NON-NLS-1$
pos = nextSpace + 1;
}
--- 87,91 ----
{
// The next separator is a space
! temp = sentence.substring(pos, nextSpace) + ' ';
pos = nextSpace + 1;
}
***************
*** 252,256 ****
* @return The offset of the first letter
*/
! public static final int firstLetter(String word)
{
int first;
--- 253,257 ----
* @return The offset of the first letter
*/
! public static int firstLetter(String word)
{
int first;
***************
*** 273,277 ****
* @return The offset of the last letter
*/
! public static final int lastLetter(String word)
{
int last;
--- 274,278 ----
* @return The offset of the last letter
*/
! public static int lastLetter(String word)
{
int last;
Index: DataPolice.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/DataPolice.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DataPolice.java 16 Aug 2004 22:08:43 -0000 1.6
--- DataPolice.java 28 Nov 2004 21:36:46 -0000 1.7
***************
*** 62,66 ****
if (bmd != null && key != null)
{
! log.debug(bmd.getInitials() + ":" + key.getName()); //$NON-NLS-1$
}
--- 62,66 ----
if (bmd != null && key != null)
{
! log.debug(bmd.getInitials() + ':' + key.getName());
}
***************
*** 71,80 ****
* the last known verse
*/
! private static Key key;
/**
* The last known Book
*/
! private static BookMetaData bmd;
/**
--- 71,80 ----
* the last known verse
*/
! private static Key key = null;
/**
* The last known Book
*/
! private static BookMetaData bmd = null;
/**
Index: BookException.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BookException.java 21 Sep 2004 17:46:23 -0000 1.7
--- BookException.java 28 Nov 2004 21:36:46 -0000 1.8
***************
*** 30,34 ****
public class BookException extends LucidException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
--- 30,34 ----
public class BookException extends LucidException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
***************
*** 69,71 ****
--- 69,76 ----
super(msg, ex, params);
}
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3977575883768738103L;
}
Index: BooksEvent.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BooksEvent.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** BooksEvent.java 4 Feb 2004 09:52:53 -0000 1.4
--- BooksEvent.java 28 Nov 2004 21:36:46 -0000 1.5
***************
*** 30,34 ****
public class BooksEvent extends EventObject
{
! /**
* Basic constructor
* @param bmd The meta-data of the changed Bible, or null if there is more than one change.
--- 30,34 ----
public class BooksEvent extends EventObject
{
! /**
* Basic constructor
* @param bmd The meta-data of the changed Bible, or null if there is more than one change.
***************
*** 69,71 ****
--- 69,76 ----
*/
private BookMetaData bmd;
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = 3834876879554819894L;
}
More information about the jsword-svn
mailing list