[jsword-svn] r2238 - in trunk/jsword: . etc/osis jar src/main/java/org/crosswire/common/util src/main/java/org/crosswire/jsword/book/basic src/main/java/org/crosswire/jsword/passage src/main/java/org/crosswire/jsword/versification
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Mar 29 06:35:27 MST 2012
Author: dmsmith
Date: 2012-03-29 06:35:27 -0700 (Thu, 29 Mar 2012)
New Revision: 2238
Removed:
trunk/jsword/jar/commons-codec-1.4/
trunk/jsword/jar/commons-logging-1.1.1/
trunk/jsword/jar/commons-net-2.2/
trunk/jsword/jar/httpcomponents-client-4.1-beta1/
trunk/jsword/jar/httpcomponents-core-4.1/
trunk/jsword/jar/icu4j-4.6/
trunk/jsword/jar/jaf-1.1/
trunk/jsword/jar/javatar-2.5/
trunk/jsword/jar/jdom-1.1.1/
trunk/jsword/jar/junit-3.8.1/
trunk/jsword/jar/lucene-3.0.3/
trunk/jsword/jar/xalan-2.7.1/
trunk/jsword/jar/xerces-2.11.0/
Modified:
trunk/jsword/
trunk/jsword/.classpath
trunk/jsword/build.xml
trunk/jsword/core.xml
trunk/jsword/etc/osis/links.txt
trunk/jsword/ivy.xml
trunk/jsword/jar/HOWTO-UPGRADE.txt
trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java
trunk/jsword/src/main/java/org/crosswire/common/util/Version.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java
Log:
JS-140 Migrate jar management to ivy, a thin veneer over maven. Feel free to improve.
Property changes on: trunk/jsword
___________________________________________________________________
Modified: svn:ignore
- buildlog.txt
target
bin
crosswire.keystore
ivyjars
lib
ivy
+ buildlog.txt
target
bin
crosswire.keystore
ivyjars
lib
ivy
testconfig.conf
Modified: trunk/jsword/.classpath
===================================================================
--- trunk/jsword/.classpath 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/.classpath 2012-03-29 13:35:27 UTC (rev 2238)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry exported="true" kind="lib" path="jar/commons-logging-1.1.1/commons-logging-1.1.1.jar" sourcepath="jar/commons-logging-1.1.1/commons-logging-1.1.1-src.zip"/>
- <classpathentry exported="true" kind="lib" path="jar/jaf-1.1/activation.jar"/>
- <classpathentry exported="true" kind="lib" path="jar/javatar-2.5/javatar-2.5.jar"/>
- <classpathentry exported="true" kind="lib" path="jar/junit-3.8.1/junit.jar" sourcepath="jar/junit-3.8.1/junit-3.8.1-src.jar"/>
- <classpathentry exported="true" kind="lib" path="jar/jdom-1.1.1/jdom-1.1.1.jar" sourcepath="jar/jdom-1.1.1/jdom-1.1.1-src.zip"/>
- <classpathentry exported="true" kind="lib" path="jar/commons-codec-1.4/commons-codec-1.4.jar" sourcepath="jar/commons-codec-1.4/commons-codec-1.4-src.zip"/>
- <classpathentry exported="true" kind="lib" path="jar/commons-net-2.2/commons-net-2.2.jar" sourcepath="jar/commons-net-2.2/commons-net-2.2-src.zip"/>
- <classpathentry exported="true" kind="lib" path="jar/httpcomponents-core-4.1/httpcore-4.1.jar" sourcepath="jar/httpcomponents-core-4.1/httpcomponents-core-4.1-src.zip"/>
- <classpathentry exported="true" kind="lib" path="jar/httpcomponents-client-4.1-beta1/httpclient-4.1-beta1.jar" sourcepath="jar/httpcomponents-client-4.1-beta1/httpcomponents-client-4.1-beta1-src.zip"/>
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="lib" path="jar/lucene-3.0.3/lucene-analyzers-3.0.3.jar" sourcepath="jar/lucene-3.0.3/lucene-3.0.3-src.zip"/>
- <classpathentry kind="lib" path="jar/lucene-3.0.3/lucene-core-3.0.3.jar" sourcepath="jar/lucene-3.0.3/lucene-3.0.3-src.zip"/>
- <classpathentry kind="lib" path="jar/lucene-3.0.3/lucene-smartcn-3.0.3.jar" sourcepath="jar/lucene-3.0.3/lucene-3.0.3-src.zip"/>
- <classpathentry kind="lib" path="jar/lucene-3.0.3/lucene-snowball-3.0.3.jar" sourcepath="jar/lucene-3.0.3/lucene-3.0.3-src.zip"/>
- <classpathentry kind="lib" path="jar/icu4j-4.6/icu4j-4_6.jar" sourcepath="jar/icu4j-4.6/icu4j-4_6-src.jar"/>
- <classpathentry kind="lib" path="jar/icu4j-4.6/icu4j-charsets-4_6.jar" sourcepath="jar/icu4j-4.6/icu4j-4_6-src.jar"/>
+ <classpathentry kind="src" path="src/test/resources"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.6.jar" sourcepath="lib/commons-codec-1.6-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar" sourcepath="lib/commons-logging-1.1.1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-net-3.0.jar" sourcepath="lib/commons-net-3.0-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/httpclient-4.2-beta1.jar" sourcepath="lib/httpclient-4.2-beta1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/httpcore-4.2-beta1.jar" sourcepath="lib/httpcore-4.2-beta1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/icu4j-4.8.1.1.jar" sourcepath="lib/icu4j-4.8.1.1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/javatar-2.5.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar" sourcepath="lib/jdom-1.1.3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/lucene-core-3.0.3.jar" sourcepath="lib/lucene-3.0.3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/lucene-smartcn-3.0.3.jar" sourcepath="lib/lucene-3.0.3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/lucene-snowball-3.0.3.jar" sourcepath="lib/lucene-3.0.3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-3.0.3.jar" sourcepath="lib/lucene-analyzers-3.0.3-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar" sourcepath="lib/activation-1.1.1-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/junit-3.8.1.jar" sourcepath="lib/junit-3.8.1-sources.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/jsword/build.xml
===================================================================
--- trunk/jsword/build.xml 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/build.xml 2012-03-29 13:35:27 UTC (rev 2238)
@@ -1,8 +1,78 @@
-<project name="jsword" default="all">
+<project xmlns:ivy="antlib:org.apache.ivy.ant"
+ name="jsword"
+ default="all">
<!-- This build uses the core build targets -->
<import file="../jsword/core.xml"/>
+ <!--=======================================================================
+ == Use ivy to manage external jars.
+ == These are properties related to ivy.
+ =========================================================================-->
+ <property name="ivy.install.version" value="2.2.0" />
+ <property name="ivy.jar.dir" value="${basedir}/tools/ivy" />
+ <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" />
+ <property name="ivy.default.ivy.user.dir" value="${basedir}/ivy"/>
+ <available file="${ivy.jar.file}" type="file" property="ivy.present"/>
+
+ <!--=======================================================================
+ == Get ivy from the maven repository
+ =========================================================================-->
+ <target name="ivy.download" unless="ivy.present">
+ <mkdir dir="${ivy.jar.dir}"/>
+ <!-- download Ivy from web site so that it can be used even without any special installation -->
+ <echo message="installing ivy..."/>
+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+ dest="${ivy.jar.file}" usetimestamp="true"/>
+ </target>
+
+ <!--=======================================================================
+ == Make ivy visible to ant
+ =========================================================================-->
+ <target name="ivy" depends="ivy.download" description="Make ivy visible to Ant">
+ <!-- try to load ivy here from local ivy dir, in case the user has not already dropped
+ it into ant's lib dir (note that the latter copy will always take precedence).
+ We will not fail as long as local lib dir exists (it may be empty) and
+ ivy is in at least one of ant's lib dir or the local lib dir. -->
+ <path id="ivy.lib.path">
+ <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+ </path>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+ </target>
+
+ <!--=======================================================================
+ target: ivy.clean
+ =========================================================================-->
+ <target name="ivy.clean" description="Remove the ivy installation">
+ <delete dir="${ivy.jar.dir}"/>
+ </target>
+
+ <!--=======================================================================
+ == target: ivy.clean-cache
+ =========================================================================-->
+ <target name="ivy.clean-cache" depends="ivy"
+ description="Remove dependent jars that ivy manages">
+ <ivy:cleancache />
+ </target>
+
+ <!--=======================================================================
+ == Get all the dependencies that have been registered in ivy.xml
+ =========================================================================-->
+ <target name="ivy.resolve" depends="ivy" description="Retrieve dependencies with ivy">
+ <ivy:retrieve />
+ </target>
+
+ <!--=======================================================================
+ == Use the prepare.extra hook to get dependency jars.
+ =========================================================================-->
+ <target name="prepare.extra" depends="ivy.resolve"
+ description="Prepare extras files.">
+ <echo message="Done getting 3-rd Party dependencies."/>
+ </target>
+
+ <!--=======================================================================
+ == When we clean jsword, we also have to delete the keystore file.
+ =========================================================================-->
<target name="clean.extra" description="Extra stuff to do after calling clean">
<delete dir="${keystore.file}"/>
</target>
Modified: trunk/jsword/core.xml
===================================================================
--- trunk/jsword/core.xml 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/core.xml 2012-03-29 13:35:27 UTC (rev 2238)
@@ -19,7 +19,7 @@
<property name="source.test" value="${source.root}/test"/>
<property name="target.root" value="target"/>
<property name="target.classes" value="${target.root}/classes"/>
- <property name="target.jar" value="${target.root}/jar"/>
+ <property name="target.jar" value="lib"/>
<property name="target.installed" value="${target.root}/installed"/> <!-- override -->
<property name="test.root" value="${target.root}/test"/>
<property name="test.classes" value="${test.root}/classes"/>
@@ -47,26 +47,16 @@
<!--=======================================================================
== These jars are necessary for Bible Desktop to be compiled and run.
== The version numbers in jar files is replaced w/ *.
+ == Note: This only includes files not managed via ivy/maven.
== This way we can upgrade without impacting this ant build file.
=========================================================================-->
<patternset id="external.runtime.jars">
- <exclude name="**/*-src.jar"/>
- <include name="**/jdom-*.jar"/>
- <include name="**/commons-codec-*.jar"/>
- <include name="**/httpcore-*.jar"/>
- <include name="**/httpclient-*.jar"/>
- <include name="**/commons-logging-*.jar"/>
- <include name="**/commons-net-*.jar"/>
- <include name="**/lucene-core-*.jar"/>
- <include name="**/lucene-analyzers-*.jar"/>
- <include name="**/lucene-smartcn-*.jar"/>
- <include name="**/lucene-snowball-*.jar"/>
+ <exclude name="**/*-src.jar"/>
+ <exclude name="**/*-source.jar"/>
<include name="**/jlfgr-*.jar"/>
<include name="**/jsword-common-aqua-*.jar"/>
- <include name="**/javatar-*.jar"/>
<!-- Exclude ICU4J for now.
<exclude name="**/icu4j-charsets-*.jar"/>
- <exclude name="**/icu4j-*-src.jar"/>
<include name="**/icu4j-*.jar"/> -->
<!--
<include name="**/activation.jar"/>
@@ -174,6 +164,7 @@
depends="init, clean.dependency"
description="Remove the target directory">
<delete dir="${target.root}"/>
+ <delete dir="${target.jar}"/>
<antcall target="clean.extra"/>
</target>
@@ -293,9 +284,7 @@
description="Prepare the build by copying needed jars and files.">
<!-- Copy the jars from the std location to the target jar directory -->
<antcall target="prepare.dependency"/>
-<!-- Not currently needed.
<antcall target="prepare.extra"/>
--->
</target>
<!--=======================================================================
Modified: trunk/jsword/etc/osis/links.txt
===================================================================
--- trunk/jsword/etc/osis/links.txt 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/etc/osis/links.txt 2012-03-29 13:35:27 UTC (rev 2238)
@@ -1,5 +1,5 @@
-some links in understandinf OSIS
+some links in understanding OSIS
OSIS 1.5 user guide: http://www.bibletechnologies.net/osistext/
OSIS 2.0 user guide: http://www.bibletechnologies.net/OSISTools.dsp
Modified: trunk/jsword/ivy.xml
===================================================================
--- trunk/jsword/ivy.xml 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/ivy.xml 2012-03-29 13:35:27 UTC (rev 2238)
@@ -1,20 +1,20 @@
<ivy-module version="2.0">
<info organisation="org.crosswire" module="jsword"/>
<dependencies>
- <dependency org="commons-codec" name="commons-codec" rev="1.4" conf="default->master,sources" />
+ <dependency org="commons-codec" name="commons-codec" rev="1.6" conf="default->master,sources" />
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="default->master,sources" />
- <dependency org="commons-net" name="commons-net" rev="2.2" conf="default->master,sources" />
- <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1" conf="default->master,sources" />
- <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1-beta1" conf="default->master,sources" />
- <dependency org="javatar" name="javatar" rev="2.5" />
- <!-- dependency org="org.jdom" name="jdom" rev="1.1.1" conf="default->master,sources" /> Should be rev="1.1.1" -->
+ <dependency org="commons-net" name="commons-net" rev="3.0" conf="default->master,sources" />
+ <dependency org="org.apache.httpcomponents" name="httpcore" rev="4.2-beta1" conf="default->master,sources" />
+ <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.2-beta1" conf="default->master,sources" />
+ <dependency org="javatar" name="javatar" rev="2.5" conf="default->master,sources" />
+ <dependency org="org.jdom" name="jdom" rev="1.1.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-core" rev="3.0.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-analyzers" rev="3.0.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-smartcn" rev="3.0.3" conf="default->master,sources" />
<dependency org="org.apache.lucene" name="lucene-snowball" rev="3.0.3" conf="default->master,sources" />
- <!-- dependency org="junit" name="junit" rev="3.8.1" / -->
- <!-- dependency org="com.ibm.icu" name="icu4j" rev="4.6" / -->
- <!-- dependency org="jaf" name="activation" rev="1.1" / -->
+ <dependency org="junit" name="junit" rev="3.8.1" conf="default->master,sources" />
+ <dependency org="com.ibm.icu" name="icu4j" rev="4.8.1.1" conf="default->master,sources" />
+ <dependency org="javax.activation" name="activation" rev="1.1.1" conf="default->master,sources" />
<!-- dependency org="xalan" name="xalan" rev="2.7.1" / -->
<!-- dependency org="xalan" name="serializer" rev="2.7.1" / -->
<!-- dependency org="xerces" name="xercesImpl" rev="2.11.0" / -->
Modified: trunk/jsword/jar/HOWTO-UPGRADE.txt
===================================================================
--- trunk/jsword/jar/HOWTO-UPGRADE.txt 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/jar/HOWTO-UPGRADE.txt 2012-03-29 13:35:27 UTC (rev 2238)
@@ -1,3 +1,5 @@
+This is obsolete. Now using ivy over maven for dependencies.
+
Instructions on how to upgrade Lucene from one version to another.
Obtain the most recent version of Lucene from
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java 2012-03-29 13:35:27 UTC (rev 2238)
@@ -396,7 +396,6 @@
return new URI(orig.getScheme(), orig.getUserInfo(), orig.getHost(), orig.getPort(), path.toString(), orig.getQuery(), orig.getFragment());
} catch (URISyntaxException ex) {
-// assert false : ex;
return null;
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/Version.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/Version.java 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/Version.java 2012-03-29 13:35:27 UTC (rev 2238)
@@ -103,6 +103,7 @@
* @param object The <code>Version</code> object to be compared.
* @return true if the two objects are equal.
*/
+ @Override
public boolean equals(Object object) {
if (!(object instanceof Version)) {
return false;
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java 2012-03-29 13:35:27 UTC (rev 2238)
@@ -42,29 +42,30 @@
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
+/**
+ *
+ *
+ * @see gnu.lgpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at yahoo dot com]
+ */
public abstract class AbstractBookMetaData implements BookMetaData {
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getKeyType()
*/
public KeyType getKeyType() {
return KeyType.LIST;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getDriver()
*/
public BookDriver getDriver() {
return driver;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getDriverName()
*/
public String getDriverName() {
@@ -75,83 +76,63 @@
return getDriver().getDriverName();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.jsword.book.BookMetaData#hasFeature(org.crosswire.jsword
- * .book.FeatureType)
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#hasFeature(org.crosswire.jsword.book.FeatureType)
*/
public boolean hasFeature(FeatureType feature) {
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see org.crosswire.jsword.book.BookMetaData#getFullName()
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#getOsisID()
*/
public String getOsisID() {
return getBookCategory().getName() + '.' + getInitials();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#isSupported()
*/
public boolean isSupported() {
return true;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#isEnciphered()
*/
public boolean isEnciphered() {
return false;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#isLocked()
*/
public boolean isLocked() {
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see org.crosswire.jsword.book.BookMetaData#unlock(String)
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#unlock(java.lang.String)
*/
public boolean unlock(String unlockKey) {
return false;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getUnlockKey()
*/
public String getUnlockKey() {
return null;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#isQuestionable()
*/
public boolean isQuestionable() {
return false;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getLanguage()
*/
public Language getLanguage() {
@@ -166,9 +147,7 @@
putProperty(KEY_XML_LANG, language);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getLibrary()
*/
public URI getLibrary() {
@@ -184,27 +163,21 @@
}
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#setLibrary(java.net.URI)
*/
public void setLibrary(URI library) {
putProperty(KEY_LIBRARY_URI, library.toString());
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#setLocation(java.net.URI)
*/
public void setLocation(URI location) {
putProperty(KEY_LOCATION_URI, location.toString());
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getLocation()
*/
public URI getLocation() {
@@ -220,9 +193,7 @@
}
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getProperties()
*/
public Map<String, Object> getProperties() {
@@ -236,48 +207,36 @@
prop = newProperties;
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getProperty(java.lang.String)
*/
public Object getProperty(String key) {
return prop.get(key);
}
- /*
- * (non-Javadoc)
- *
- * @see org.crosswire.jsword.book.BookMetaData#putProperty(java.lang.String,
- * java.lang.Object)
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#putProperty(java.lang.String, java.lang.Object)
*/
public void putProperty(String key, Object value) {
prop.put(key, value);
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getIndexStatus()
*/
public IndexStatus getIndexStatus() {
return indexStatus;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.crosswire.jsword.book.BookMetaData#setIndexStatus(java.lang.String)
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#setIndexStatus(org.crosswire.jsword.index.IndexStatus)
*/
public void setIndexStatus(IndexStatus newValue) {
indexStatus = newValue;
prop.put(KEY_INDEXSTATUS, newValue.toString());
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#toOSIS()
*/
public Document toOSIS() {
@@ -292,11 +251,6 @@
this.driver = driver;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj) {
// Since this can not be null
@@ -319,19 +273,12 @@
return getBookCategory().equals(that.getBookCategory()) && getName().equals(that.getName());
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
return getName().hashCode();
}
- /*
- * (non-Javadoc)
- *
+ /* (non-Javadoc)
* @see java.lang.Comparable#compareTo(java.lang.Object)
*/
public int compareTo(BookMetaData obj) {
@@ -342,11 +289,6 @@
return result;
}
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
return getInitials();
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2012-03-29 13:35:27 UTC (rev 2238)
@@ -78,7 +78,6 @@
this.listeners = new ArrayList<PassageListener>();
}
- @Override
public Versification getVersification() {
return v11n;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java 2012-03-27 17:21:52 UTC (rev 2237)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java 2012-03-29 13:35:27 UTC (rev 2238)
@@ -103,12 +103,10 @@
private BibleBook nextBook = books[0];
- @Override
public boolean hasNext() {
return nextBook != null;
}
- @Override
public BibleBook next() {
if (nextBook == null) {
@@ -120,7 +118,6 @@
return current;
}
- @Override
public void remove() {
throw new UnsupportedOperationException();
}
More information about the jsword-svn
mailing list