[#1183] fix progress bars for more consistent messages

4 files changed, 25 insertions, 21 deletions

diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java
index bfd9dfd..72feca9 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java
@@ -28,14 +28,14 @@ import org.slf4j.LoggerFactory;
  *
  * @author Mike Conway - DICE (www.irods.org)
  */
-public class StartupSequencer {
+public class IDROPDesktop {
 
     /**
      * NOTE this class is in transition!!!!!!
      */
     private iDrop idrop;
     private IDROPCore idropCore;
-    private static final org.slf4j.Logger log = LoggerFactory.getLogger(StartupSequencer.class);
+    private static final org.slf4j.Logger log = LoggerFactory.getLogger(IDROPDesktop.class);
     public static final int STARTUP_SEQUENCE_PAUSE_INTERVAL = 1000;
 
     public void doStartupSequence() {
@@ -55,7 +55,7 @@ public class StartupSequencer {
         try {
             idropCore.setIrodsFileSystem(IRODSFileSystem.instance());
         } catch (JargonException ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
         }
 
@@ -133,7 +133,7 @@ public class StartupSequencer {
                     JOptionPane.OK_OPTION);
             System.exit(1);
         } catch (IdropException ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
             throw new IdropRuntimeException(ex);
         }
@@ -142,7 +142,7 @@ public class StartupSequencer {
         try {
             idropCore.getIdropConfigurationService().pushIDROPConfigToJargonAndTransfer();
         } catch (Exception ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
             throw new IdropRuntimeException(ex);
         }
@@ -179,7 +179,7 @@ public class StartupSequencer {
             idropCore.setTransferManager(new TransferManagerImpl(idropCore.getIrodsFileSystem(), idrop));
             idropCore.getIdropConfigurationService().updateTransferOptions();
         } catch (JargonException ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
             throw new IdropRuntimeException("error creating transferManager",
                     ex);
@@ -200,7 +200,7 @@ public class StartupSequencer {
                 idropSplashWindow.toFront();
             }
         } catch (JargonException ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
             throw new IdropRuntimeException("error evaluating current queue",
                     ex);
@@ -257,7 +257,7 @@ public class StartupSequencer {
             idropCore.setQueueTimer(timer);
 
         } catch (IdropException ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
         }
 
@@ -271,7 +271,7 @@ public class StartupSequencer {
             idropSplashWindow.setVisible(false);
             idropSplashWindow = null;
         } catch (Exception e) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, e);
 
             throw new IdropRuntimeException("error starting idrop gui", e);
@@ -313,7 +313,7 @@ public class StartupSequencer {
             idropPreBootstrapperService.storePriorVersion(derivedConfigHomeDirectory, currentVersion);
 
         } catch (IdropException ex) {
-            Logger.getLogger(StartupSequencer.class.getName()).log(
+            Logger.getLogger(IDROPDesktop.class.getName()).log(
                     Level.SEVERE, null, ex);
             throw new IdropRuntimeException(ex);
         }
@@ -337,7 +337,7 @@ public class StartupSequencer {
      * @param args the command line arguments
      */
     public static void main(final String args[]) throws InterruptedException {
-        StartupSequencer startupSequencer = new StartupSequencer();
+        IDROPDesktop startupSequencer = new IDROPDesktop();
         try {
             startupSequencer.doStartupSequence();
         } catch (Exception e) {
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IRODSInfoDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IRODSInfoDialog.java
index 745c861..3891b1f 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IRODSInfoDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IRODSInfoDialog.java
@@ -18,8 +18,6 @@ import java.util.logging.Logger;
 import javax.swing.DefaultCellEditor;
 import javax.swing.JOptionPane;
 import javax.swing.ListSelectionModel;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
@@ -29,7 +27,6 @@ import org.irods.jargon.core.connection.IRODSAccount;
 import org.irods.jargon.core.exception.JargonException;
 import org.irods.jargon.core.protovalues.FilePermissionEnum;
 import org.irods.jargon.core.pub.CollectionAO;
-import org.irods.jargon.core.pub.CollectionAndDataObjectListAndSearchAO;
 import org.irods.jargon.core.pub.CollectionAndDataObjectListAndSearchAOImpl;
 import org.irods.jargon.core.pub.DataObjectAO;
 import org.irods.jargon.core.pub.IRODSFileSystem;
@@ -48,11 +45,11 @@ import org.irods.jargon.idrop.desktop.systraygui.viscomponents.IRODSTree;
 import org.irods.jargon.idrop.desktop.systraygui.viscomponents.MetadataTableModel;
 import org.irods.jargon.idrop.desktop.systraygui.viscomponents.PermissionsTableModel;
 import org.irods.jargon.idrop.exceptions.IdropException;
-import org.irods.jargon.usertagging.FreeTaggingService;
-import org.irods.jargon.usertagging.IRODSTaggingService;
-import org.irods.jargon.usertagging.TaggingServiceFactory;
-import org.irods.jargon.usertagging.TaggingServiceFactoryImpl;
 import org.irods.jargon.usertagging.domain.IRODSTagValue;
+import org.irods.jargon.usertagging.tags.FreeTaggingService;
+import org.irods.jargon.usertagging.tags.IRODSTaggingService;
+import org.irods.jargon.usertagging.tags.TaggingServiceFactory;
+import org.irods.jargon.usertagging.tags.TaggingServiceFactoryImpl;
 import org.openide.util.Exceptions;
 import org.slf4j.LoggerFactory;
 
@@ -314,7 +311,7 @@ public class IRODSInfoDialog extends javax.swing.JDialog implements
                             lblInfoObjectVersion.setText(Integer.toString(dataObject.getDataVersion()));
                         } else {
                             lblInfoObjectVersion.setText("");
-                        }
+                        }  
                         
                         // now populate tags and comments for data object
                         txtInfoTags.setText(freeTaggingService.getTagsForDataObjectInFreeTagForm(
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
index a40c623..1f31285 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java
@@ -1515,7 +1515,10 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
                 } else if (ts.getTransferState() == TransferStatus.TransferState.OVERALL_INITIATION) {
                     // initiation not within a synch
                     lblTransferMessage.setText("Processing a " + ts.getTransferType().name() + " operation");
-                }
+                 } else if (ts.getTransferState() == TransferStatus.TransferState.OVERALL_COMPLETION) {
+                    // initiation not within a synch
+                    lblTransferMessage.setText("Completed a " + ts.getTransferType().name() + " operation");
+                } 
             }
         });
     }
@@ -1531,6 +1534,10 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
         transferStatusProgressBar.setValue(0);
         transferStatusProgressBar.setString("");
         progressIntraFile.setString("");
+        progressIntraFile.setMinimum(0);
+        progressIntraFile.setMaximum(0);
+        progressIntraFile.setValue(0);
+        progressIntraFile.setString("");
     }
 
     @Override
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
index 786933c..237dd59 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java
@@ -1,5 +1,5 @@
 package org.irods.jargon.idrop.desktop.systraygui.utils;
 public final class Version {
  public static String VERSION="2.0.0-SNAPSHOT";
- public static String BUILD_TIME="20130108-1016";
+ public static String BUILD_TIME="20130205-1549";
 }