Changeset 4324

Timestamp:

2003-05-23T17:03:11+12:00 (21 years ago)

Author:

jmt12

Message:

Accidently has 'String url = ...' twice

File:

• trunk/gli/src/org/greenstone/gatherer/gui/PreviewPane.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/PreviewPane.java

@@ -135 +135 @@
      public void gainFocus() {
           if(Gatherer.c_man.ready() && Gatherer.c_man.built()) {
-                String url = Gatherer.config.exec_path + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName();
-                if(page_showing != null && page_showing.equals(url)) {
-                     view.reloadDocument();
-                }
-                else {
-                     String url = Gatherer.config.exec_address + "?a=config&cmd=add-collection&c=" + Gatherer.c_man.getCollection().getName();
-
-                     Gatherer.println("Loading " + url);
-                     args = new String[1];
-                     args[0] = url;
-                     status.setText(get("Loading", args));
-                     args = null;
-                     view.showHTMLDocument((new GURL(url)).getURL());
-                     page_showing = url;
-                     homepage = (new GURL(url)).getURL();
-                }
+                // First we ask the server to register our collection, just in case its changed. Wait until the 'page' has loaded to be safe.
+                String url = Gatherer.config.exec_address + "?a=config&cmd=add-collection&c=" + Gatherer.c_man.getCollection().getName();
+                view.setLoadSynchronously(true);
+                view.showHTMLDocument((new GURL(url)).getURL());
+                view.setLoadSynchronously(false);
+                // Now load the collection
+                url = Gatherer.config.exec_path + "?a=p&p=about&c=" + Gatherer.c_man.getCollection().getName();
+                Gatherer.println("Loading " + url);
+                args = new String[1];
+                args[0] = url;
+                status.setText(get("Loading", args));
+                args = null;
+                view.showHTMLDocument((new GURL(url)).getURL());
+                page_showing = url;
+                homepage = (new GURL(url)).getURL();
           }
           validate();
@@ -188 +187 @@
           }
           reload.setEnabled(true);
-     }
-
-     /** This method performs nominally the same as a showHTMLDocument call expect that it blocks until some final loading state is reached, good or bad. */
-     private void showAndWait(URL url) {
-          try {
-                // Send url to CalPane
-                
-                // Wait until state is preconnect
-                while(observer.state != CalCons.PRE_CONNECT) {
-                     wait(100); // 10th of a second
-                }
-                // Now wait until state is final state
-                while(observer.state != CalCons.DOC_LOADED) {
-                     wait(100); // 10th of a second
-                }
-          }
-          catch (InterruptedException error) {
-          }
      }