summaryrefslogtreecommitdiffstats
path: root/idrop-swing
diff options
context:
space:
mode:
Diffstat (limited to 'idrop-swing')
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPDesktop.java (renamed from idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/StartupSequencer.java)22
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IRODSInfoDialog.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form5
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java21
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
5 files changed, 36 insertions, 16 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 5a9b3d4..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
@@ -311,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.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form
index 4cadb25..80dbbc7 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.form
@@ -10,7 +10,7 @@
</Container>
</NonVisualComponents>
<Properties>
- <Property name="defaultCloseOperation" type="int" value="3"/>
+ <Property name="defaultCloseOperation" type="int" value="0"/>
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[622, 158]"/>
</Property>
@@ -21,6 +21,9 @@
<SyntheticProperties>
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
</SyntheticProperties>
+ <Events>
+ <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/>
+ </Events>
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
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..732c987 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
@@ -1613,9 +1620,14 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
togglePauseTransfer = new javax.swing.JToggleButton();
progressIconImageLabel = new javax.swing.JLabel();
- setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+ setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
setMinimumSize(new java.awt.Dimension(622, 158));
setSize(new java.awt.Dimension(822, 158));
+ addWindowListener(new java.awt.event.WindowAdapter() {
+ public void windowClosing(java.awt.event.WindowEvent evt) {
+ formWindowClosing(evt);
+ }
+ });
pnlMain.setMinimumSize(new java.awt.Dimension(622, 158));
pnlMain.setPreferredSize(new java.awt.Dimension(730, 635));
@@ -2121,6 +2133,11 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
}
}
}//GEN-LAST:event_btnMainToolbarSyncActionPerformed
+
+ private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing
+ this.setVisible(false);
+ this.formShown = false;
+ }//GEN-LAST:event_formWindowClosing
/**
* @param args the command line arguments
*/
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 9882c22..3547cc8 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="20130117-1446";
+ public static String BUILD_TIME="20130207-1818";
}