[jsword-svn] r2271 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/passage jsword-web
dmsmith at crosswire.org
dmsmith at crosswire.org
Tue Feb 19 10:15:34 MST 2013
Author: dmsmith
Date: 2013-02-19 10:15:34 -0700 (Tue, 19 Feb 2013)
New Revision: 2271
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
trunk/jsword-web/build.xml
Log:
Update to work with verse requiring a v11n.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2013-02-14 21:02:16 UTC (rev 2270)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2013-02-19 17:15:34 UTC (rev 2271)
@@ -176,7 +176,7 @@
chapter = Math.min(chapter, v11n.getLastChapter(book));
verse = Math.min(verse, v11n.getLastVerse(book, chapter));
- Verse update = new Verse(book, chapter, verse);
+ Verse update = new Verse(v11n, book, chapter, verse);
set.setVerse(update);
}
@@ -192,7 +192,7 @@
verse = Math.min(verse, v11n.getLastVerse(book, chapter));
- Verse update = new Verse(book, chapter, verse);
+ Verse update = new Verse(v11n, book, chapter, verse);
set.setVerse(update);
}
@@ -201,7 +201,7 @@
*/
public void setVerse(int verse) {
Verse old = set.getVerse();
- Verse update = new Verse(old.getBook(), old.getChapter(), verse);
+ Verse update = new Verse(v11n, old.getBook(), old.getChapter(), verse);
set.setVerse(update);
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2013-02-14 21:02:16 UTC (rev 2270)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2013-02-19 17:15:34 UTC (rev 2271)
@@ -138,7 +138,7 @@
BibleBook book = start.getBook();
int chapter = start.getChapter();
Versification v11n = KeyUtil.getPassage(key).getVersification();
- VerseRange range = new VerseRange(v11n, start, new Verse(book, chapter, v11n.getLastVerse(book, chapter)));
+ VerseRange range = new VerseRange(v11n, start, new Verse(v11n, book, chapter, v11n.getLastVerse(book, chapter)));
txtSearch.setText("");
txtKey.setText(range.getName());
doGoPassage();
@@ -282,7 +282,7 @@
int chapter = start.getChapter();
// AV11N(DMS): Is this right?
Versification v11n = Versifications.instance().getDefaultVersification();
- VerseRange range = new VerseRange(v11n, start, new Verse(book, chapter, v11n.getLastVerse(book, chapter)));
+ VerseRange range = new VerseRange(v11n, start, new Verse(v11n, book, chapter, v11n.getLastVerse(book, chapter)));
txtSearch.setText("");
txtKey.setText(range.getName());
doGoPassage();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2013-02-14 21:02:16 UTC (rev 2270)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2013-02-19 17:15:34 UTC (rev 2271)
@@ -66,16 +66,16 @@
thislevel = Level.BOOK;
int ec = v11n.getLastChapter(b);
int ev = v11n.getLastVerse(b, ec);
- start = new Verse(b, 0, 0);
- end = new Verse(b, ec, ev);
+ start = new Verse(v11n, b, 0, 0);
+ end = new Verse(v11n, b, ec, ev);
} else if (v == -1) {
thislevel = Level.CHAPTER;
int ev = v11n.getLastVerse(b, c);
- start = new Verse(b, c, 0);
- end = new Verse(b, c, ev);
+ start = new Verse(v11n, b, c, 0);
+ end = new Verse(v11n, b, c, ev);
} else {
thislevel = Level.VERSE;
- start = new Verse(b, c, v);
+ start = new Verse(v11n, b, c, v);
end = start;
}
Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml 2013-02-14 21:02:16 UTC (rev 2270)
+++ trunk/jsword-web/build.xml 2013-02-19 17:15:34 UTC (rev 2271)
@@ -43,17 +43,13 @@
</path>
<property name="support.tools" value="../jsword-support/tools"/>
- <import file="${support.tools}/checkstyle/build.xml"/>
<import file="${support.tools}/java2html/build.xml"/>
<import file="${support.tools}/javancss/build.xml"/>
<import file="${support.tools}/jcoverage/build.xml"/>
<import file="${support.tools}/jdepend/build.xml"/>
- <!-- import file="${support.tools}/findbugs/build.xml"/ -->
- <import file="${support.tools}/pmd/build.xml"/>
- <!-- ignored <import file="${support.tools}/tomcat/build.xml"/> -->
-
+ <import file="${support.tools}/pmd/build.xml"/>
- <target name="findbugs">
+ <target name="findbugs" depends="build,findbugs.task">
<mkdir dir="${target.web}/findbugs"/>
<findbugs home="${findbugs.home}"
projectName="JSword/BibleDesktop"
@@ -74,6 +70,27 @@
</findbugs>
</target>
+ <target name="checkstyle" depends="checkstyle.task">
+ <mkdir dir="${target.web}/checkstyle"/>
+ <copy file="${checkstyle.config}" overwrite="true"
+ tofile="${target.web}/checkstyle/custom.xml">
+ <filterset>
+ <filter token="source.java" value="${basedir}/${source.java}"/>
+ <filter token="target.checkstyle" value="${webapp.jsword}/checkstyle"/>
+ </filterset>
+ </copy>
+ <checkstyle config="${checkstyle.config}" failOnViolation="${checkstyle.fail}">
+ <fileset refid="fileset.alljava"/>
+ <formatter type="plain"/>
+ <formatter type="xml" toFile="${target.web}/checkstyle/checkstyle_errors.xml"/>
+ </checkstyle>
+ <xslt
+ in="${target.web}/checkstyle/checkstyle_errors.xml"
+ out="${target.web}/checkstyle/index.html"
+ style="${checkstyle.home}/contrib/checkstyle-simple.xsl">
+ <xmlcatalog refid="commonDTDs"/>
+ </xslt>
+ </target>
<target name="javadoc" description="Create JavaDoc">
<!-- This is not incremental. Empty it so it can remove unused docs. -->
More information about the jsword-svn
mailing list