Changeset 5306 for trunk/gli/src/org/greenstone/gatherer/shell

Timestamp:

2003-08-27T15:52:37+12:00 (21 years ago)

Author:

mdewsnip

Message:

Removed the indeterminate progress bar at the start. Instead, the progress bar starts off 5% full.

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GImportProgressMonitor.java

@@ -67 +67 @@
     public GImportProgressMonitor() {
     progress_bar = new JProgressBar();
+    progress_bar.setIndeterminate(false);
     progress_bar.setMaximum(MAX);
     progress_bar.setMinimum(MIN);
@@ -119 +120 @@
         progress_bar.setValue(progress_bar.getValue() + ((MAX / 5) / num_docs));
     }
-    else {
-        progress_bar.setIndeterminate(true);
-    }
+    // else {
+    // progress_bar.setIndeterminate(true);
+    // }
     }
 
@@ -135 +136 @@
         ///ystem.err.println("Done " + file_num + " of " + num_files + "...");
         if (num_files > 0) {
-        progress_bar.setValue((4 * MAX * file_num) / (5 * num_files));
+        int base_val = MAX / 10;
+        progress_bar.setValue(((((7 * MAX) / 10) * file_num) / num_files) + base_val);
         }
     }
@@ -154 +156 @@
 
     public void saving() {
-    progress_bar.setIndeterminate(true);
     progress_bar.setString(Gatherer.dictionary.get("SaveProgressDialog.Title", (String)null));
+    progress_bar.setValue(MAX / (10 * 2));
     }
 
@@ -163 +165 @@
     public void setStop(boolean state) {
     stop = state;
-    progress_bar.setIndeterminate(false);
     }
 
@@ -170 +171 @@
      */
     public void start() {
-    progress_bar.setIndeterminate(true);
     progress_bar.setString(Gatherer.dictionary.get("FileActions.Calculating_Size", (String)null));
-    progress_bar.setIndeterminate(false);
-    progress_bar.setValue(MIN);
+    progress_bar.setValue(MAX / 10);
     num_files = Gatherer.c_man.getCollection().getDocumentCount();
     ///ystem.err.println("Number of files: " + num_files);
@@ -183 +182 @@
      */
     public void stop() {
-    progress_bar.setIndeterminate(false);
     progress_bar.setValue(MAX);
     }