[jsword-svn] r1277 - trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-04-19 12:32:30 -0700 (Thu, 19 Apr 2007)
New Revision: 1277

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
Log:
Made closing Advanced Search actually perform the search.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2007-04-19 19:31:43 UTC (rev 1276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2007-04-19 19:32:30 UTC (rev 1277)
@@ -97,6 +97,14 @@
 
         actions = new ActionFactory(DisplaySelectPane.class, this);
 
+        isl = new IndexStatusListener()
+        {
+            public void statusChanged(IndexStatusEvent ev)
+            {
+                enableComponents();
+            }
+        };
+
         // search() and version() rely on this returning only Books indexed by verses
         mdlBible = new BooksComboBoxModel(BookFilters.getBibles());
         JComboBox cboBible = new JComboBox(mdlBible);
@@ -336,6 +344,7 @@
         if (reply != null)
         {
             txtSearch.setText(reply);
+            doSearchAction();
         }
     }
 
@@ -567,17 +576,6 @@
     }
 
     /**
-     * Keep the selection up to date with indexing.
-     */
-    private transient IndexStatusListener isl = new IndexStatusListener()
-    {
-        public void statusChanged(IndexStatusEvent ev)
-        {
-            enableComponents();
-        }
-    };
-
-    /**
      * Display a dialog indicating that no Bible is installed.
      */
     private void noBookInstalled()
@@ -785,6 +783,12 @@
 
 //    private static final ImageIcon ICON_MENU = GuiUtil.getIcon("toolbarButtonGraphics/general/Preferences16.gif"); //$NON-NLS-1$
 
+
+    /**
+     * Keep the selection up to date with indexing.
+     */
+    private transient IndexStatusListener isl;
+
     private static int base = 1;
 
     private String title;