Changeset 11073 for trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

Timestamp:

2006-01-20T10:52:24+13:00 (18 years ago)

Author:

mdewsnip

Message:

Renamed LongProgressBar to GProgressBar, and tidied up a great deal. Removed the BigInteger sillyness and used longs instead, so should be slightly more efficient. This will now be used for all progress bars in the GLI, as it sets indeterminate/string/value safely (should avoid NPEs when setting indeterminate).

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java (modified) (7 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileQueue.java

@@ -37 +37 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.collection.CollectionTreeNode;
-import org.greenstone.gatherer.gui.LongProgressBar;
+import org.greenstone.gatherer.gui.GProgressBar;
 import org.greenstone.gatherer.gui.tree.DragTree;
 import org.greenstone.gatherer.metadata.MetadataValue;
@@ -64 +64 @@
     private ArrayList queue = null;
     /** A progress bar which shows how many bytes, out of the total size of bytes, has been moved. */
-    private LongProgressBar progress = null;
+    private GProgressBar progress = null;
 
 
@@ -74 +74 @@
     file_status = new JLabel();
     Dictionary.setText(file_status, "FileActions.No_Activity");
-    progress = new LongProgressBar();
+    progress = new GProgressBar();
     progress.setBackground(Configuration.getColor("coloring.collection_tree_background", false));
     progress.setForeground(Configuration.getColor("coloring.collection_tree_foreground", false));
@@ -200 +200 @@
 
     /** Access to the progress bar. */
-    public LongProgressBar getProgressBar() {
+    public GProgressBar getProgressBar() {
     return progress;
     }
@@ -210 +210 @@
      * @see org.greenstone.gatherer.file.FileJob
      * @see org.greenstone.gatherer.file.FileNode
-     * @see org.greenstone.gatherer.gui.LongProgressBar
+     * @see org.greenstone.gatherer.gui.GProgressBar
      * @see org.greenstone.gatherer.util.Utility
      */
@@ -583 +583 @@
      * @see org.greenstone.gatherer.Gatherer
      */
-    public void copyDirectoryContents(File source, File destination, LongProgressBar progress) 
+    public void copyDirectoryContents(File source, File destination, GProgressBar progress) 
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException
     {
@@ -610 +610 @@
      * @see org.greenstone.gatherer.Gatherer
      */
-    public void copyFile(File source, File destination, LongProgressBar progress)
+    public void copyFile(File source, File destination, GProgressBar progress)
     throws FileAlreadyExistsException, FileNotFoundException, InsufficientSpaceException, IOException, ReadNotPermittedException, UnknownFileErrorException, WriteNotPermittedException {
     if(source.isDirectory()) {