[jsword-svn] r2310 - in trunk/bibledesktop: etc/eclipse src/main/java/org/crosswire/bibledesktop/book src/main/java/org/crosswire/bibledesktop/book/install src/main/java/org/crosswire/bibledesktop/display/basic src/main/java/org/crosswire/bibledesktop/passage src/main/java/org/crosswire/common/swing src/main/java/org/crosswire/common/swing/desktop
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Apr 3 07:37:06 MST 2014
Author: dmsmith
Date: 2014-04-03 07:37:06 -0700 (Thu, 03 Apr 2014)
New Revision: 2310
Removed:
trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch
Modified:
trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java
trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
Log:
Keeping BibleDesktop in sync with JSword.
Modified: trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/etc/eclipse/BD-app-jdk16.launch 2014-04-03 14:37:06 UTC (rev 2310)
@@ -7,12 +7,15 @@
<listEntry value="1"/>
</listAttribute>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/bibledesktop/src/main/resources" path="3" type="2"/> "/>
@@ -20,7 +23,6 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="bibledesktop"/> </runtimeClasspathEntry> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.crosswire.bibledesktop.desktop.Desktop"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -ea"/>
Deleted: trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch 2014-04-03 14:37:06 UTC (rev 2310)
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/jsword/src/test/java/JSwordAllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
-<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="jsword" path="1" type="4"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/jsword/src/main/resources" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/jsword/src/test/resources" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry id="org.eclipse.jdt.launching.classpathentry.defaultClasspath"> <memento exportedEntriesOnly="false" project="jsword"/> </runtimeClasspathEntry> "/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="JSwordAllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -ea"/>
-</launchConfiguration>
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2014-04-03 14:37:06 UTC (rev 2310)
@@ -221,7 +221,7 @@
try {
// AV11N(DMS): Is this right?
Versification v11n = Versifications.instance().getDefaultVersification();
- Passage temp = (Passage) keyf.getKey(v11n, refstr);
+ Passage temp = keyf.getKey(v11n, refstr);
ref.clear();
ref.addAll(temp);
model.setPassage(ref);
@@ -283,7 +283,7 @@
try {
// AV11N(DMS): Is this right?
Versification v11n = Versifications.instance().getDefaultVersification();
- ref = (Passage) keyf.getKey(v11n, refstr);
+ ref = keyf.getKey(v11n, refstr);
txtDisplay.setText(refstr);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2014-04-03 14:37:06 UTC (rev 2310)
@@ -469,7 +469,7 @@
final Book name = getBook(last);
// Is the book already installed? Then nothing to do.
- Book book = Books.installed().getBook(name.getName());
+ Book book = Books.installed().getBook(name.getInitials());
if (book != null && !installer.isNewer(name)) {
// TRANSLATOR: Popup message indicating that the book is already installed.
// {0} is a placeholder for the name of the book.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipMgr.java 2014-04-03 14:37:06 UTC (rev 2310)
@@ -30,7 +30,6 @@
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
import java.net.URI;
import java.util.Locale;
@@ -81,7 +80,7 @@
* The copyright to this program is held by it's authors.
* @author Yingjie Lan [lanyjie at yahoo dot com]
*/
-public class URITipMgr extends MouseAdapter implements ActionListener, URIEventListener, MouseMotionListener {
+public class URITipMgr extends MouseAdapter implements ActionListener, URIEventListener {
private Component owner;
private JTextPane txtView;
@@ -323,12 +322,14 @@
/**
* @param e
*/
+ @Override
public void mouseDragged(MouseEvent e) {
}
/* (non-Javadoc)
* @see java.awt.event.MouseMotionListener#mouseMoved(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseMoved(MouseEvent e) {
lastx = e.getX();
lasty = e.getY();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/RangeListModel.java 2014-04-03 14:37:06 UTC (rev 2310)
@@ -30,6 +30,7 @@
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.RestrictionType;
+import org.crosswire.jsword.passage.VerseRange;
/**
* The RangeListModel class gives access to a Passage as a list of ranges via a
@@ -119,7 +120,7 @@
private void refresh() {
ranges.clear();
if (ref != null) {
- Iterator<Key> iter = ref.rangeIterator(restrict);
+ Iterator<VerseRange> iter = ref.rangeIterator(restrict);
while (iter.hasNext()) {
ranges.add(iter.next());
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/CWAction.java 2014-04-03 14:37:06 UTC (rev 2310)
@@ -236,7 +236,7 @@
private KeyStroke getKeyStroke(String acceleratorSpec) throws NumberFormatException {
int keyModifier = 0;
int key = 0;
- String[] parts = StringUtil.split(acceleratorSpec, ',');
+ String[] parts = StringUtil.splitAll(acceleratorSpec, ',');
for (int j = 0; j < parts.length; j++) {
String part = parts[j].trim();
if ("ctrl".equalsIgnoreCase(part)) {
Modified: trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java 2014-01-28 16:21:39 UTC (rev 2309)
+++ trunk/bibledesktop/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java 2014-04-03 14:37:06 UTC (rev 2310)
@@ -117,7 +117,7 @@
* the window to persist
*/
public synchronized void restoreLayout(Window window) {
- String[] parts = StringUtil.split(settings.get(window.getName()), '_');
+ String[] parts = StringUtil.splitAll(settings.get(window.getName()), '_');
// If our window did not have saved settings do nothing.
if (parts == null || parts.length == 0) {
More information about the jsword-svn
mailing list