[jsword-svn] r982 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install jsword/src/main/java/org/crosswire/jsword/book/index/basic jsword/src/main/java/org/crosswire/jsword/book/search/basic

dmsmith at crosswire.org dmsmith at crosswire.org
Mon Jan 23 12:01:16 MST 2006


Author: dmsmith
Date: 2006-01-23 12:00:56 -0700 (Mon, 23 Jan 2006)
New Revision: 982

Added:
   trunk/jsword/src/main/java/org/crosswire/jsword/book/index/basic/AbstractIndex.java
Removed:
   trunk/jsword/src/main/java/org/crosswire/jsword/book/search/basic/AbstractIndex.java
Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
Log:
new home for index interface

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2006-01-23 18:56:36 UTC (rev 981)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2006-01-23 19:00:56 UTC (rev 982)
@@ -32,8 +32,6 @@
 import java.awt.event.ItemListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.ImageIcon;
@@ -56,7 +54,9 @@
 import org.crosswire.common.util.Reporter;
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.BookFilters;
-import org.crosswire.jsword.book.IndexStatus;
+import org.crosswire.jsword.book.index.IndexStatus;
+import org.crosswire.jsword.book.index.IndexStatusEvent;
+import org.crosswire.jsword.book.index.IndexStatusListener;
 import org.crosswire.jsword.book.search.basic.DefaultSearchModifier;
 import org.crosswire.jsword.book.search.basic.DefaultSearchRequest;
 import org.crosswire.jsword.passage.Key;
@@ -102,7 +102,7 @@
         selected = mdlBible.getSelectedBook();
         if (selected != null)
         {
-            selected.addPropertyChangeListener(pcl);
+            selected.addIndexStatusListener(isl);
             cboBible.setToolTipText(selected.toString());
             key = selected.createEmptyKeyList();
         }
@@ -516,8 +516,8 @@
 
         if (selected != null && selected != newSelected)
         {
-            selected.removePropertyChangeListener(pcl);
-            newSelected.addPropertyChangeListener(pcl);
+            selected.removeIndexStatusListener(isl);
+            newSelected.addIndexStatusListener(isl);
         }
 
         selected = newSelected;
@@ -563,9 +563,9 @@
     /**
      * Keep the selection up to date with indexing.
      */
-    private PropertyChangeListener pcl = new PropertyChangeListener()
+    private IndexStatusListener isl = new IndexStatusListener()
     {
-        public void propertyChange(PropertyChangeEvent ev)
+        public void statusChanged(IndexStatusEvent ev)
         {
             enableComponents();
         }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java	2006-01-23 18:56:36 UTC (rev 981)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java	2006-01-23 19:00:56 UTC (rev 982)
@@ -33,9 +33,9 @@
 
 import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.book.Book;
+import org.crosswire.jsword.book.index.IndexManagerFactory;
 import org.crosswire.jsword.book.install.InstallManager;
 import org.crosswire.jsword.book.install.Installer;
-import org.crosswire.jsword.book.search.IndexManagerFactory;
 import org.crosswire.jsword.util.IndexDownloader;
 
 /**

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	2006-01-23 18:56:36 UTC (rev 981)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java	2006-01-23 19:00:56 UTC (rev 982)
@@ -54,10 +54,10 @@
 import org.crosswire.jsword.book.Books;
 import org.crosswire.jsword.book.BooksEvent;
 import org.crosswire.jsword.book.BooksListener;
+import org.crosswire.jsword.book.index.IndexManager;
+import org.crosswire.jsword.book.index.IndexManagerFactory;
 import org.crosswire.jsword.book.install.InstallException;
 import org.crosswire.jsword.book.install.Installer;
-import org.crosswire.jsword.book.search.IndexManager;
-import org.crosswire.jsword.book.search.IndexManagerFactory;
 
 /**
  * A panel for use within a SitesPane to display one set of Books that are

Copied: trunk/jsword/src/main/java/org/crosswire/jsword/book/index/basic/AbstractIndex.java (from rev 976, trunk/jsword/src/main/java/org/crosswire/jsword/book/search/basic/AbstractIndex.java)
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/search/basic/AbstractIndex.java	2006-01-23 18:47:47 UTC (rev 976)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/index/basic/AbstractIndex.java	2006-01-23 19:00:56 UTC (rev 982)
@@ -0,0 +1,59 @@
+/**
+ * Distribution License:
+ * JSword is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
+ * the Free Software Foundation. This program is distributed in the hope
+ * that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * The License is available on the internet at:
+ *       http://www.gnu.org/copyleft/lgpl.html
+ * or by writing to:
+ *      Free Software Foundation, Inc.
+ *      59 Temple Place - Suite 330
+ *      Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2005
+ *     The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.jsword.book.index.basic;
+
+import org.crosswire.jsword.book.index.Index;
+import org.crosswire.jsword.book.search.SearchModifier;
+
+/**
+ * A simple implementation of an Index that provides the
+ * set/get for SearchModifier.
+ * 
+ * @see gnu.lgpl.License for license details.
+ *      The copyright to this program is held by it's authors.
+ * @author DM Smith [dmsmith555 at gmail dot com]
+ */
+
+public abstract class AbstractIndex implements Index
+{
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.book.search.Index#setSearchModifier(org.crosswire.jsword.book.search.SearchModifier)
+     */
+    public void setSearchModifier(SearchModifier theModifier)
+    {
+        modifier = theModifier;
+    }
+
+    /* (non-Javadoc)
+     * @see org.crosswire.jsword.book.search.Index#getSearchModifier()
+     */
+    public SearchModifier getSearchModifier()
+    {
+        return modifier;
+    }
+
+    /**
+     * How the search is to be modified.
+     */
+    private SearchModifier modifier;
+}


Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/book/index/basic/AbstractIndex.java
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Deleted: trunk/jsword/src/main/java/org/crosswire/jsword/book/search/basic/AbstractIndex.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/search/basic/AbstractIndex.java	2006-01-23 18:56:36 UTC (rev 981)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/search/basic/AbstractIndex.java	2006-01-23 19:00:56 UTC (rev 982)
@@ -1,59 +0,0 @@
-/**
- * Distribution License:
- * JSword is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License, version 2.1 as published by
- * the Free Software Foundation. This program is distributed in the hope
- * that it will be useful, but WITHOUT ANY WARRANTY; without even the
- * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * The License is available on the internet at:
- *       http://www.gnu.org/copyleft/lgpl.html
- * or by writing to:
- *      Free Software Foundation, Inc.
- *      59 Temple Place - Suite 330
- *      Boston, MA 02111-1307, USA
- *
- * Copyright: 2005
- *     The copyright to this program is held by it's authors.
- *
- * ID: $Id$
- */
-package org.crosswire.jsword.book.search.basic;
-
-import org.crosswire.jsword.book.search.Index;
-import org.crosswire.jsword.book.search.SearchModifier;
-
-/**
- * A simple implementation of an Index that provides the
- * set/get for SearchModifier.
- * 
- * @see gnu.lgpl.License for license details.
- *      The copyright to this program is held by it's authors.
- * @author DM Smith [dmsmith555 at gmail dot com]
- */
-
-public abstract class AbstractIndex implements Index
-{
-
-    /* (non-Javadoc)
-     * @see org.crosswire.jsword.book.search.Index#setSearchModifier(org.crosswire.jsword.book.search.SearchModifier)
-     */
-    public void setSearchModifier(SearchModifier theModifier)
-    {
-        modifier = theModifier;
-    }
-
-    /* (non-Javadoc)
-     * @see org.crosswire.jsword.book.search.Index#getSearchModifier()
-     */
-    public SearchModifier getSearchModifier()
-    {
-        return modifier;
-    }
-
-    /**
-     * How the search is to be modified.
-     */
-    private SearchModifier modifier;
-}



More information about the jsword-svn mailing list