summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form3
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java14
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java3
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java4
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
5 files changed, 18 insertions, 8 deletions
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
index 6111871..43f33c2 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.form
@@ -314,7 +314,8 @@
<SubComponents>
<Component class="javax.swing.JCheckBox" name="chkRememberPass">
<Properties>
- <Property name="text" type="java.lang.String" value="Remember password"/>
+ <Property name="text" type="java.lang.String" value="Login Automatically"/>
+ <Property name="actionCommand" type="java.lang.String" value="Login Auto"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="chkRememberPassActionPerformed"/>
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
index 34adf2b..b60cc97 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java
@@ -116,6 +116,10 @@ public class LoginDialog extends JDialog {
String savedPassword = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_PASSWORD);
password.setText(savedPassword);
chkRememberPass.setSelected(true);
+
+ String gsi = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_USER_AUTO_GSI);
+ boolean autoGsi = "true".equals(gsi);
+ chkProxyLogin.setSelected(autoGsi);
loginTrialSuccesful = !processLogin();
}
@@ -298,6 +302,11 @@ public class LoginDialog extends JDialog {
idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_PROXY_LOCATION, txtProxy.getText());
idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_CERTIFICATES_LOCATION, txtCerts.getText());
+ if(chkProxyLogin.isSelected()){
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_AUTO_GSI,"true");
+ }else{
+ idropCore.getIdropConfigurationService().updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_AUTO_GSI,"false");
+ }
//todo save proxy path and certificates location
} catch (IdropException ex) {
@@ -612,7 +621,8 @@ public class LoginDialog extends JDialog {
pnlToolbar.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.RIGHT, 2, 5));
- chkRememberPass.setText("Remember password");
+ chkRememberPass.setText("Login Automatically");
+ chkRememberPass.setActionCommand("Login Auto");
chkRememberPass.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
chkRememberPassActionPerformed(evt);
@@ -793,7 +803,6 @@ public class LoginDialog extends JDialog {
lblCerts.setVisible(true);
txtCerts.setVisible(true);
btnCerts.setVisible(true);
- chkRememberPass.setVisible(false);//??
}
private void hideProxyLoginFields(){
@@ -803,7 +812,6 @@ public class LoginDialog extends JDialog {
lblCerts.setVisible(false);
txtCerts.setVisible(false);
btnCerts.setVisible(false);
- chkRememberPass.setVisible(true);//??
}
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
index a83ff17..1558152 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationService.java
@@ -34,12 +34,13 @@ public static final String ACCOUNT_CACHE_ZONE = "irods.account.zone";
public static final String ACCOUNT_CACHE_RESOURCE = "irods.account.resource";
public static final String ACCOUNT_CACHE_USER_NAME = "irods.account.user";
public static final String ACCOUNT_CACHE_USER_PASSWORD = "irods.account.password";
-public static final String ACCOUNT_CACHE_USER_SAVE_PASS = "irods.account.savepassword";
+public static final String ACCOUNT_CACHE_USER_SAVE_PASS = "irods.account.savepassword";
public static final String ACCOUNT_CACHE_ROOT_DIR = "irods.account.root.dir";
public static final String ACCOUNT_CACHE_LOGIN_MODE = "irods.account.login.mode";
// for GSI
public static final String ACCOUNT_CACHE_PROXY_LOCATION = "irods.account.gsi.proxy.location";
public static final String ACCOUNT_CACHE_CERTIFICATES_LOCATION = "irods.account.gsi.certificates.location";
+public static final String ACCOUNT_CACHE_USER_AUTO_GSI = "irods.account.autogsi";
// /for GSI
public static final String POLICY_AWARE_PROPERTY = "policy.aware";
public static final String LOOK_AND_FEEL = "idrop.lookandfeel";
diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
index 342e24a..264f361 100644
--- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
+++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/services/IdropConfigurationServiceImpl.java
@@ -276,12 +276,12 @@ public class IdropConfigurationServiceImpl implements IdropConfigurationService
updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_PASSWORD,
irodsAccount.getPassword());
updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_SAVE_PASS,
- "true");
+ "true");
}else{
updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_PASSWORD,
"");
updateConfig(IdropConfigurationService.ACCOUNT_CACHE_USER_SAVE_PASS,
- "false");
+ "false");
}
log.info("config updated");
}
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 a8fcf87..74c34cc 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.1-SNAPSHOT";
- public static String BUILD_TIME="20130806-1316";
+ public static String BUILD_TIME="20130809-1603";
}