[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Feb 27 19:21:42 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book
In directory www.crosswire.org:/tmp/cvs-serv26368/java/jsword/org/crosswire/jsword/book
Modified Files:
BookMetaData.java Defaults.java BookType.java OSISUtil.java
Log Message:
Fixed the display of the conf (BD-16, 17 & 18)
Index: OSISUtil.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/OSISUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** OSISUtil.java 2 Sep 2004 17:43:11 -0000 1.9
--- OSISUtil.java 28 Feb 2005 02:21:40 -0000 1.10
***************
*** 122,125 ****
--- 122,129 ----
public static final String OSIS_ELEMENT_OSISTEXT = "osisText"; //$NON-NLS-1$
public static final String OSIS_ELEMENT_SEG = "seg"; //$NON-NLS-1$
+ public static final String OSIS_ELEMENT_LG = "lg"; //$NON-NLS-1$
+ public static final String OSIS_ELEMENT_L = "l"; //$NON-NLS-1$
+ public static final String OSIS_ELEMENT_LB = "lb"; //$NON-NLS-1$
+ public static final String OSIS_ELEMENT_HI = "hi"; //$NON-NLS-1$
public static final String ATTRIBUTE_TEXT_OSISIDWORK = "osisIDWork"; //$NON-NLS-1$
***************
*** 343,346 ****
--- 347,378 ----
return new Element(OSIS_ELEMENT_TITLE);
}
+ /**
+ * Line Group
+ */
+ public Element createLG()
+ {
+ return new Element(OSIS_ELEMENT_LG);
+ }
+ /**
+ * Line
+ */
+ public Element createL()
+ {
+ return new Element(OSIS_ELEMENT_L);
+ }
+ /**
+ * Line Break
+ */
+ public Element createLB()
+ {
+ return new Element(OSIS_ELEMENT_LB);
+ }
+ /**
+ * Highlight
+ */
+ public Element createHI()
+ {
+ return new Element(OSIS_ELEMENT_HI);
+ }
}
Index: BookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookMetaData.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** BookMetaData.java 9 Oct 2004 21:45:05 -0000 1.22
--- BookMetaData.java 28 Feb 2005 02:21:40 -0000 1.23
***************
*** 4,7 ****
--- 4,9 ----
import java.util.Map;
+ import org.jdom.Document;
+
/**
* A BookMetaData represents a method of translating the Bible. All Books with
***************
*** 125,129 ****
*/
public Map getProperties();
!
/**
* Has anyone generated a search index for this Book?
--- 127,131 ----
*/
public Map getProperties();
!
/**
* Has anyone generated a search index for this Book?
***************
*** 140,143 ****
--- 142,150 ----
/**
+ * Get an OSIS representation of information concerning this Book.
+ */
+ public Document toOSIS();
+
+ /**
* Adds a <code>PropertyChangeListener</code> to the listener list.
* The listener is registered for all properties. However the only one likely
Index: BookType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookType.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BookType.java 24 Jan 2005 23:26:59 -0000 1.8
--- BookType.java 28 Feb 2005 02:21:40 -0000 1.9
***************
*** 72,78 ****
}
}
! // cannot get here
! assert false;
! return null;
}
--- 72,76 ----
}
}
! return OTHER;
}
Index: Defaults.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Defaults.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Defaults.java 28 Nov 2004 21:36:46 -0000 1.24
--- Defaults.java 28 Feb 2005 02:21:40 -0000 1.25
***************
*** 117,123 ****
* against AV (BarDriver).
* @param name The version to use as default.
- * @exception BookException If the name is not valid
*/
! public static void setBibleByName(String name) throws BookException
{
if (name == null || name.length() == 0)
--- 117,122 ----
* against AV (BarDriver).
* @param name The version to use as default.
*/
! public static void setBibleByName(String name)
{
if (name == null || name.length() == 0)
***************
*** 139,143 ****
}
! throw new BookException(Msg.BIBLE_NOTFOUND, new Object[] { name });
}
--- 138,146 ----
}
! // This is thrown while the splash screen is up.
! // It only occurs if the book has been deleted, but the reference
! // has not changed.
! // This happens if the user manually deletes the entry.
! //throw new BookException(Msg.BIBLE_NOTFOUND, new Object[] { name });
}
***************
*** 199,205 ****
* against AV (BarDriver).
* @param name The version to use as default.
- * @exception BookException If the name is not valid
*/
! public static void setCommentaryByName(String name) throws BookException
{
if (name == null || name.length() == 0)
--- 202,207 ----
* against AV (BarDriver).
* @param name The version to use as default.
*/
! public static void setCommentaryByName(String name)
{
if (name == null || name.length() == 0)
***************
*** 221,225 ****
}
! throw new BookException(Msg.COMMENTARY_NOTFOUND, new Object[] { name });
}
--- 223,231 ----
}
! // This is thrown while the splash screen is up.
! // It only occurs if the book has been deleted, but the reference
! // has not changed.
! // This happens if the user manually deletes the entry.
! //throw new BookException(Msg.COMMENTARY_NOTFOUND, new Object[] { name });
}
***************
*** 281,287 ****
* against AV (BarDriver).
* @param name The version to use as default.
- * @exception BookException If the name is not valid
*/
! public static void setDictionaryByName(String name) throws BookException
{
if (name == null || name.length() == 0)
--- 287,292 ----
* against AV (BarDriver).
* @param name The version to use as default.
*/
! public static void setDictionaryByName(String name)
{
if (name == null || name.length() == 0)
***************
*** 303,307 ****
}
! throw new BookException(Msg.DICTIONARY_NOTFOUND, new Object[] { name });
}
--- 308,316 ----
}
! // This is thrown while the splash screen is up.
! // It only occurs if the book has been deleted, but the reference
! // has not changed.
! // This happens if the user manually deletes the entry.
! //throw new BookException(Msg.DICTIONARY_NOTFOUND, new Object[] { name });
}
More information about the jsword-svn
mailing list