summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Conway <mikeconway@mid-campus-02363.wireless.unc.edu>2011-08-31 16:04:04 (GMT)
committer Mike Conway <mikeconway@mid-campus-02363.wireless.unc.edu>2011-08-31 16:04:04 (GMT)
commit1e0a6ee537ceb9ae299df6ecd361786911a70f75 (patch)
treeeb33e685c75f1c5df646fb36d20d9d48ba361daa
parent3de4848310178ba07cd6836a71b2f87224164043 (diff)
downloadQCG-Data-1e0a6ee537ceb9ae299df6ecd361786911a70f75.zip
QCG-Data-1e0a6ee537ceb9ae299df6ecd361786911a70f75.tar.gz
QCG-Data-1e0a6ee537ceb9ae299df6ecd361786911a70f75.tar.bz2
pwd
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ChangePasswordDialog.java7
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java2
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/iDrop.java2
-rw-r--r--idrop-swing/src/main/resources/idrop.properties4
-rw-r--r--idrop-swing/src/main/resources/log4j.properties2
5 files changed, 9 insertions, 8 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ChangePasswordDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ChangePasswordDialog.java
index 51e79b4..bd00af8 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ChangePasswordDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/ChangePasswordDialog.java
@@ -9,6 +9,7 @@ import java.awt.Color;
import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import javax.swing.JDialog;
import javax.swing.JOptionPane;
@@ -30,8 +31,8 @@ public class ChangePasswordDialog extends javax.swing.JDialog {
public static org.slf4j.Logger log = LoggerFactory.getLogger(ChangePasswordDialog.class);
/** Creates new form PreferencesDialog */
- public ChangePasswordDialog(final iDrop idrop, final boolean modal) {
- super(idrop, modal);
+ public ChangePasswordDialog(final iDrop idrop, final JDialog parent, final boolean modal) {
+ super(parent, modal);
this.idrop = idrop;
initComponents();
setUpPasswordPanel();
@@ -251,7 +252,7 @@ public class ChangePasswordDialog extends javax.swing.JDialog {
} else {
passwdNewPassword.setBackground(Color.red);
passwdConfirmPassword.setBackground(Color.red);
- JOptionPane.showMessageDialog(idrop,
+ JOptionPane.showMessageDialog(this,
"New and confirm password do not match");
return;
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
index ff799e9..b56a85b 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/IDROPConfigurationPanel.java
@@ -1151,7 +1151,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
}
private void btnChangePasswordActionPerformed(java.awt.event.ActionEvent evt) {
- ChangePasswordDialog changePasswordDialog = new ChangePasswordDialog((iDrop) this.getParent(), true);
+ ChangePasswordDialog changePasswordDialog = new ChangePasswordDialog((iDrop) this.getParent(), this, true);
changePasswordDialog.setLocationRelativeTo(this);
changePasswordDialog.setVisible(true);
}
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 737906a..8a6cc0b 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
@@ -624,7 +624,7 @@ public class iDrop extends javax.swing.JFrame implements ActionListener,
} else if (e.getActionCommand().equals("Change Password")) {
if (changePasswordDialog == null) {
- changePasswordDialog = new ChangePasswordDialog(this, true);
+ changePasswordDialog = new ChangePasswordDialog(this, null, true);
int x = (toolkit.getScreenSize().width - changePasswordDialog.getWidth()) / 2;
int y = (toolkit.getScreenSize().height - changePasswordDialog.getHeight()) / 2;
changePasswordDialog.setLocation(x, y);
diff --git a/idrop-swing/src/main/resources/idrop.properties b/idrop-swing/src/main/resources/idrop.properties
index 32d7f19..24c6e71 100644
--- a/idrop-swing/src/main/resources/idrop.properties
+++ b/idrop-swing/src/main/resources/idrop.properties
@@ -32,9 +32,9 @@ idrop.verify.checksum=true
# receive and display intra-file transfer progress (slight performance penalty)
idrop.intra.file.status.callbacks=true
# time-out for main iRODS connection (0 if not specified, otherwise, in seconds)
-idrop.irods.timeout=0
+idrop.irods.timeout=120
# time-out for iRODS connection during parallel transfers (0 if not specified, otherwise, in seconds)
-idrop.irods.parallel.timeout=0
+idrop.irods.parallel.timeout=60
# maximum threads allowed for parallel transfer
idrop.parallel.transfer.max.threads=4
# use executor pool for parallel transfers (true to use pool, false to use normal th
diff --git a/idrop-swing/src/main/resources/log4j.properties b/idrop-swing/src/main/resources/log4j.properties
index 5246469..ddc3daa 100644
--- a/idrop-swing/src/main/resources/log4j.properties
+++ b/idrop-swing/src/main/resources/log4j.properties
@@ -1,6 +1,6 @@
# Set root logger level to DEBUG and its only appender to A1.
#log4j.rootCategory=WARN, A1
-log4j.category.org.irods.jargon.idrop=WARN, A1
+log4j.category.org.irods.jargon.idrop=INFO, A1
log4j.category.org.irods.jargon.core= INFO, A1
log4j.categor.org.irods.jargon.usertagging=ERROR,A1
log4j.category.org.irods.jargon.transfer=INFO, A1