[jsword-svn] r996 - in trunk/jsword-limbo/src:
main/java/org/crosswire/bibledesktop/desktop
main/java/org/crosswire/common/io
main/java/org/crosswire/common/swing
main/java/org/crosswire/common/util
main/java/org/crosswire/jsword/book
main/java/org/crosswire/jsword/book/basic
main/java/org/crosswire/jsword/book/search/parse
main/java/org/crosswire/jsword/book/search/ser
test/java/org/crosswire/jsword/book/search/parse
dmsmith at crosswire.org
dmsmith at crosswire.org
Wed Jan 25 16:45:18 MST 2006
Author: dmsmith
Date: 2006-01-25 16:44:42 -0700 (Wed, 25 Jan 2006)
New Revision: 996
Modified:
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/CompareResultsPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedInputStream.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedReader.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DeckLayout.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowTableModel.java
trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/IndexSearcher.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndexManager.java
trunk/jsword-limbo/src/test/java/org/crosswire/jsword/book/search/parse/FixtureParamWord.java
Log:
Fixed "limbo" problems related to refactoring.
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/CompareResultsPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/CompareResultsPane.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/CompareResultsPane.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -340,5 +340,12 @@
}
});
}
+
+ /* (non-Javadoc)
+ * @see org.crosswire.common.progress.WorkListener#workStateChanged(org.crosswire.common.progress.WorkEvent)
+ */
+ public void workStateChanged(WorkEvent ev)
+ {
+ }
}
}
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/GeneratorPane.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -398,5 +398,12 @@
}
});
}
+
+ /* (non-Javadoc)
+ * @see org.crosswire.common.progress.WorkListener#workStateChanged(org.crosswire.common.progress.WorkEvent)
+ */
+ public void workStateChanged(WorkEvent ev)
+ {
+ }
}
}
\ No newline at end of file
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedInputStream.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedInputStream.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedInputStream.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -117,8 +117,11 @@
*/
public int size()
{
- if (current == null) return 0;
- else return list.size() + 1;
+ if (current == null)
+ {
+ return 0;
+ }
+ return list.size() + 1;
}
/**
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedReader.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedReader.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/io/StackedReader.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -136,8 +136,11 @@
*/
public int size()
{
- if (current == null) return 0;
- else return list.size() + 1;
+ if (current == null)
+ {
+ return 0;
+ }
+ return list.size() + 1;
}
/**
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DeckLayout.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DeckLayout.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/DeckLayout.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -401,7 +401,7 @@
/**
* @param name
- * @return
+ * @return return the named component
*/
public Component getComponent(String name)
{
@@ -411,7 +411,7 @@
/**
* @param parent
* @param index
- * @return
+ * @return return the name of the component
*/
public String getName(Container parent, int index)
{
@@ -434,7 +434,7 @@
/**
* @param parent
* @param name
- * @return
+ * @return the index of the component
*/
public int getIndex(Container parent, String name)
{
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowTableModel.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowTableModel.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/RowTableModel.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -21,8 +21,8 @@
*/
package org.crosswire.common.swing;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import javax.swing.table.AbstractTableModel;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Stopwatch.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -1,6 +1,10 @@
package org.crosswire.common.util;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
/**
* A Little performance tool
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/StudyTool.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -27,7 +27,7 @@
import java.util.Map;
import org.crosswire.common.util.Logger;
-import org.crosswire.jsword.book.search.basic.DefaultSearchRequest;
+import org.crosswire.jsword.index.search.DefaultSearchRequest;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.jdom.Element;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -30,7 +30,7 @@
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookData;
import org.crosswire.jsword.book.BookException;
-import org.crosswire.jsword.book.search.basic.DefaultSearchRequest;
+import org.crosswire.jsword.index.search.DefaultSearchRequest;
import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/IndexSearcher.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/IndexSearcher.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/IndexSearcher.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -31,11 +31,11 @@
import org.crosswire.common.util.Logger;
import org.crosswire.common.util.ResourceUtil;
import org.crosswire.jsword.book.BookException;
-import org.crosswire.jsword.book.query.Query;
-import org.crosswire.jsword.book.search.Index;
-import org.crosswire.jsword.book.search.SearchRequest;
-import org.crosswire.jsword.book.search.Searcher;
-import org.crosswire.jsword.book.search.basic.DefaultSearchRequest;
+import org.crosswire.jsword.index.Index;
+import org.crosswire.jsword.index.query.Query;
+import org.crosswire.jsword.index.search.DefaultSearchRequest;
+import org.crosswire.jsword.index.search.SearchRequest;
+import org.crosswire.jsword.index.search.Searcher;
import org.crosswire.jsword.passage.Key;
/**
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -24,7 +24,7 @@
import java.util.Iterator;
import org.crosswire.jsword.book.BookException;
-import org.crosswire.jsword.book.search.Index;
+import org.crosswire.jsword.index.Index;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchKeyException;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -49,7 +49,7 @@
import org.crosswire.jsword.book.SentenceUtil;
import org.crosswire.jsword.book.search.Grammar;
import org.crosswire.jsword.book.search.Thesaurus;
-import org.crosswire.jsword.book.search.basic.AbstractIndex;
+import org.crosswire.jsword.index.AbstractIndex;
import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndexManager.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndexManager.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndexManager.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -34,8 +34,8 @@
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.book.BookMetaData;
-import org.crosswire.jsword.book.search.Index;
-import org.crosswire.jsword.book.search.IndexManager;
+import org.crosswire.jsword.index.Index;
+import org.crosswire.jsword.index.IndexManager;
import org.crosswire.jsword.util.Project;
/**
Modified: trunk/jsword-limbo/src/test/java/org/crosswire/jsword/book/search/parse/FixtureParamWord.java
===================================================================
--- trunk/jsword-limbo/src/test/java/org/crosswire/jsword/book/search/parse/FixtureParamWord.java 2006-01-23 23:02:52 UTC (rev 995)
+++ trunk/jsword-limbo/src/test/java/org/crosswire/jsword/book/search/parse/FixtureParamWord.java 2006-01-25 23:44:42 UTC (rev 996)
@@ -23,7 +23,7 @@
import org.crosswire.common.util.MsgBase;
import org.crosswire.jsword.book.BookException;
-import org.crosswire.jsword.book.search.Index;
+import org.crosswire.jsword.index.Index;
import org.crosswire.jsword.passage.Key;
/**
More information about the jsword-svn
mailing list