[jsword-svn] r1980 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic common common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/desktop jsword jsword/src/main/java/org/crosswire/jsword/index/lucene jsword/src/test/java/org/crosswire/jsword/book
dmsmith at crosswire.org
dmsmith at crosswire.org
Sun Feb 21 08:24:21 MST 2010
Author: dmsmith
Date: 2010-02-21 08:24:21 -0700 (Sun, 21 Feb 2010)
New Revision: 1980
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
trunk/common/.project
trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/VerseCollector.java
trunk/jsword/src/test/java/org/crosswire/jsword/book/ReadEverything.java
trunk/jsword/tags.txt
Log:
Reverted Java 1.5 and Java 1.6 stuff to maintain Java 1.4.2 compatibility.
Removed redundant "implements"
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2010-02-21 15:24:21 UTC (rev 1980)
@@ -25,7 +25,6 @@
import java.awt.Component;
import java.awt.event.MouseListener;
import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
import java.net.MalformedURLException;
import java.net.URI;
import java.text.MessageFormat;
@@ -76,7 +75,7 @@
* @author Joe Walker [joe at eireneh dot com]
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public class TextPaneBookDataDisplay implements BookDataDisplay, HyperlinkListener, PropertyChangeListener {
+public class TextPaneBookDataDisplay implements BookDataDisplay, HyperlinkListener {
/**
* Simple ctor
Modified: trunk/common/.project
===================================================================
--- trunk/common/.project 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/common/.project 2010-02-21 15:24:21 UTC (rev 1980)
@@ -10,16 +10,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.sse.core.structuredbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/AntiAliasedTextPane.java 2010-02-21 15:24:21 UTC (rev 1980)
@@ -28,8 +28,8 @@
import javax.swing.JTextPane;
/**
- * An extension of JTextPane that does Anti-Aliasing. JDK15(joe): we will need
- * to take a bit of care not clashing with J2SE5 AA
+ * An extension of JTextPane that does Anti-Aliasing.
+ * JDK15(joe): we will need to take a bit of care not clashing with J2SE5 AA
*
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/AbstractViewLayout.java 2010-02-21 15:24:21 UTC (rev 1980)
@@ -34,7 +34,6 @@
import org.crosswire.common.swing.GuiUtil;
import org.crosswire.common.swing.desktop.event.ViewEvent;
import org.crosswire.common.swing.desktop.event.ViewEventListener;
-import org.crosswire.common.util.Iterable;
/**
* Abstract manager of how we layout views.
@@ -44,7 +43,7 @@
* @author Joe Walker [joe at eireneh dot com]
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
-public abstract class AbstractViewLayout implements Viewable, Iterable {
+public abstract class AbstractViewLayout implements Viewable {
/**
* This constructor is protected because it only needs to be seen by the sub
* classes
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/VerseCollector.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/VerseCollector.java 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/VerseCollector.java 2010-02-21 15:24:21 UTC (rev 1980)
@@ -72,7 +72,11 @@
} catch (NoSuchVerseException e) {
// Wrap the NoSuchVerseException in an IOException so it can be
// gotten.
- throw new IOException(e);
+ IOException ioe = new IOException();
+ ioe.initCause(e);
+ throw ioe;
+ // JDK6: Change to:
+ // throw new IOException(e);
}
}
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/book/ReadEverything.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/book/ReadEverything.java 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/book/ReadEverything.java 2010-02-21 15:24:21 UTC (rev 1980)
@@ -84,7 +84,7 @@
// skip the root of a TreeKey as it often is not addressable.
if (first) {
first = false;
- if (set instanceof TreeKey && key.getName().isEmpty()) {
+ if (set instanceof TreeKey && key.getName().length() == 0) {
continue;
}
}
Modified: trunk/jsword/tags.txt
===================================================================
--- trunk/jsword/tags.txt 2010-01-19 02:04:50 UTC (rev 1979)
+++ trunk/jsword/tags.txt 2010-02-21 15:24:21 UTC (rev 1980)
@@ -9,6 +9,8 @@
SPEEDUP: When we need to optimize - there is something that we could do here
I18N: Take note of this when we complete internationalization
JDK14: Things to change when we move to JDK1.4
+JDK15: Things to change when we move to JDK1.5
+JDK6: Things to change when we move to JDK6
NOWARN: code inserted to stop eclipse (or something else) warning
PARANOIA: code that shouldn't need to be there and perhaps could be removed to make things faster
BORROWED: This code is copied from somewhere else, maybe we need to keep the 2 in sync
More information about the jsword-svn
mailing list