Changeset 11059

Timestamp:

2006-01-17T17:21:57+13:00 (18 years ago)

Author:

mdewsnip

Message:

Made sure the import progress bar never goes beyond the maximum.

File:

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

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

@@ -92 +92 @@
     /** The fixed portion of the progress bar used for extracted metadata. */
     static final private int EXTRACTED = 200000;
-    /** The minimum value for this progress bar. */
-    static final private int MIN = 0;
     /** The fixed portion of the progress bar used for processed documents. */
     static final private int PROCESSED = 750000;
+    /** The maximum value for this progress bar. */
+    static final private int MAXIMUM = CALCULATION + EXTRACTED + PROCESSED;
+    /** The minimum value for this progress bar. */
+    static final private int MINIMUM = 0;
     /** The element name of a file detected message. */
     static final private String FILE_ELEMENT = "File";
@@ -116 +118 @@
     progress_bar = new JProgressBar();
     progress_bar.setIndeterminate(false);
-    progress_bar.setMaximum(CALCULATION + PROCESSED + EXTRACTED);
-    progress_bar.setMinimum(MIN);
+    progress_bar.setMaximum(MAXIMUM);
+    progress_bar.setMinimum(MINIMUM);
     progress_bar.setString(null);
     progress_bar.setStringPainted(true);
@@ -123 +125 @@
     shared_progress_bar = new JProgressBar();
     shared_progress_bar.setIndeterminate(false);
-    shared_progress_bar.setMaximum((CALCULATION + PROCESSED + EXTRACTED) * 2);
-    shared_progress_bar.setMinimum(MIN);
+    shared_progress_bar.setMaximum(MAXIMUM * 2);
+    shared_progress_bar.setMinimum(MINIMUM);
     shared_progress_bar.setString(null); // Default string
     shared_progress_bar.setStringPainted(true);
-    setValue(MIN);
+    setValue(MINIMUM);
     }
 
@@ -135 +137 @@
     public void addProgressBar(JProgressBar progress_bar) {
     this.progress_bar = progress_bar;
-    progress_bar.setMaximum(CALCULATION + PROCESSED + EXTRACTED);
-    progress_bar.setMinimum(MIN);
-    setValue(MIN);
+    progress_bar.setMaximum(MAXIMUM);
+    progress_bar.setMinimum(MINIMUM);
+    setValue(MINIMUM);
     next_progress_value = CALCULATION;
     }
@@ -404 +406 @@
 
     public void reset() {
-    setValue(MIN);
+    setValue(MINIMUM);
     progress_bar.setString(null);
     progress_bar.updateUI();
@@ -425 +427 @@
     public void start() {
     stop = false;
-    setValue(MIN);
+    setValue(MINIMUM);
     progress_bar.setString(Dictionary.get("FileActions.Calculating_Size"));
     showing_string = true;
@@ -438 +440 @@
      */
     public void stop() {
-    setValue(CALCULATION + PROCESSED + EXTRACTED);
+    setValue(MAXIMUM);
     }
 
     int previous_value = -1;
-    private void setValue(int value) {
+
+    private void setValue(int value)
+    {
+    // Don't let the value go higher than the maximum
+    if (value > MAXIMUM) {
+        DebugStream.println("Error: Tried to set progress bar higher than maximum!\n");
+        return;
+    }
+    // Don't let the value go backwards
+    if (value != 0 && value < previous_value) {
+        DebugStream.println("Error: Tried to set progress bar smaller than previous!\n");
+        return;
+    }
+
     progress_bar.setValue(value);
     shared_progress_bar.setValue(value);
-    if(value != 0 && value < previous_value) {
-        DebugStream.println("Progress is decreasing! " + previous_value + " -> " + value);
-    }
     previous_value = value;
     }