Changeset 22831 for main/trunk/gli/src/org/greenstone/gatherer/gui

Timestamp:

2010-09-01T16:20:27+12:00 (14 years ago)

Author:

ak19

Message:

For ticket 152 (moveable collectdir): busy cursor when changing a collectdir takes some time to finish.

Location:

main/trunk/gli/src/org/greenstone/gatherer/gui

Files:

• NewCollectionDetailsPrompt.java (modified) (2 diffs)
• OpenCollectionDialog.java (modified) (1 diff)
• Preferences.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

@@ -541 +541 @@
             }
         }
-        }
-
-        // going through with collection creation
-        if(collectDirChanged) {     
-        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), newCollectPath); 
-        // will tell the server that the collect directory has changed and that
-        // the workspace needs to be refreshed (Documents in Greenstone Collections)
-        }
-
+        }       
         description_final = description.getText();
 
@@ -557 +549 @@
         
         cancelled = false;
+        
+        self.dispose();
         
-        self.dispose();
+        // going through with collection creation
+        if(collectDirChanged) {     
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
+                newCollectPath, Gatherer.g_man.getContentPane()); 
+        // will tell the server that the collect directory has changed and that
+        // the workspace needs to be refreshed (Documents in Greenstone Collections)
+        }
     }
     }

main/trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

@@ -424 +424 @@
         }
 
-        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), newCollectPath); 
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
+                newCollectPath, Gatherer.g_man.getContentPane()); 
             // will tell the server that the collect directory has changed and that
-        // the workspace needs to be refreshed (Documents in Greenstone Collections)
+            // the workspace needs to be refreshed (Documents in Greenstone Collections)
     }
     }

main/trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -863 +863 @@
         Configuration.setSiteAndServlet(new_site, (String)servlet_combobox.getSelectedItem());
         }
-
-        // collect directory change
-        String newCollectPath = collect_dir_field.getText();
-        if(!newCollectPath.endsWith(File.separator)) {
-        newCollectPath += File.separator;
-        }
-        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), newCollectPath);
-        // will tell the server that the collect directory has changed and that
-        // the workspace needs to be refreshed (Documents in Greenstone Collections)
-
-       
+        
         Configuration.set("general.use_proxy", true, use_proxy_checkbox.isSelected());
         Configuration.setString("general.proxy_host", true, proxy_host_field.getText());
@@ -984 +974 @@
         }
 
+        // collect directory change
+        String newCollectPath = collect_dir_field.getText();
+        if(!newCollectPath.endsWith(File.separator)) {
+        newCollectPath += File.separator;
+        }
+        // wait cursor will display while changing the collect directory, need to work out what component to
+        // display it on: main GLI frame or Preferences window, depending on if OK or Apply was pressed
+        Container container = close ? Gatherer.g_man.getContentPane() : Preferences.this.getContentPane();
+        Gatherer.collectDirectoryHasChanged(Gatherer.getCollectDirectoryPath(), 
+                newCollectPath, container);
+            // will tell the server that the collect directory has changed and that
+            // the workspace needs to be refreshed (Documents in Greenstone Collections)       
+        
         if (restart_required) {
           if (keep_collection_open) {