summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgosiaw <magnolia1973@gazeta.pl>2013-10-07 11:13:51 (GMT)
committer gosiaw <magnolia1973@gazeta.pl>2013-10-07 11:13:51 (GMT)
commit2e60a4b6f987f1337abca3adf35efdb3fd1b988f (patch)
tree593de6083727feb2bf3a2cfa700ed55cef19d339
parent4136c5e284313f71075f130916ffafadaff322c7 (diff)
downloadQCG-Data-2e60a4b6f987f1337abca3adf35efdb3fd1b988f.zip
QCG-Data-2e60a4b6f987f1337abca3adf35efdb3fd1b988f.tar.gz
QCG-Data-2e60a4b6f987f1337abca3adf35efdb3fd1b988f.tar.bz2
Recovering Kalina's changes 2origin/plgrid
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java2
-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/LoginDialog.java20
-rw-r--r--idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/utils/Version.java2
4 files changed, 16 insertions, 10 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
index 4305d1c..25cc18e 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/Version.java
@@ -1,5 +1,5 @@
package org.irods.jargon.idrop.lite;
public final class Version {
public static String VERSION="2.0.1-SNAPSHOT";
- public static String BUILD_TIME="20130723-1452";
+ public static String BUILD_TIME="20131007-1259";
}
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 85b5010..d284634 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
@@ -95,7 +95,7 @@ public class IDROPConfigurationPanel extends javax.swing.JDialog {
// default value of publicLinkService url
String publicLinkDef = "http://elder10.man.poznan.pl:8080/gdrop-web/register";
String publicLinkAddress = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.IDROP_PUBLIC_LINK_SERVICE);
- if(publicLinkAddress == null){
+ if(publicLinkAddress == null || publicLinkAddress.isEmpty()){
publicLinkAddress = publicLinkDef;
}
txtPublicLinks.setText(publicLinkAddress);
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 bf5e687..38db821 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
@@ -152,15 +152,18 @@ public class LoginDialog extends JDialog {
// predispose based on preferences
String host = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_HOST);
- if (host != null) {
- txtHost.setText(host);
+ if (host == null || host.isEmpty()) {
+ host = "elder10.man.poznan.pl";
}
+ txtHost.setText(host);
+
String port = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_PORT);
if (port == null || port.isEmpty()) {
port = "1247";
}
-
+ txtPort.setText(port);
+
String mode = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_LOGIN_MODE);
if (mode == null || mode.isEmpty()) {
@@ -170,13 +173,11 @@ public class LoginDialog extends JDialog {
}
String proxy = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_PROXY_LOCATION);
-
if (proxy != null) {
txtProxy.setText(proxy);
}
String certificates = idropCore.getIdropConfig().getPropertyForKey(IdropConfigurationService.ACCOUNT_CACHE_CERTIFICATES_LOCATION);
-
if (certificates != null) {
txtCerts.setText(certificates);
} else if (CAfilesConfigured) {
@@ -200,10 +201,14 @@ public class LoginDialog extends JDialog {
txtKeyLocation.setText(keyLoc);
}
- txtPort.setText(port);
+
String zone = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_ZONE);
+ if (zone == null || zone.isEmpty()) {
+ zone = "testZone";
+ }
txtZone.setText(zone);
+
String resource = idropCore.getIdropConfig().getPropertyForKey(
IdropConfigurationService.ACCOUNT_CACHE_RESOURCE);
txtResource.setText(resource);
@@ -250,7 +255,8 @@ public class LoginDialog extends JDialog {
}
hideAdvancedViewFields();
//if location not set - show field to set it
-/* if (!CAfilesConfigured || txtCerts.getText() == null || "".equals(txtCerts.getText())) {
+/*
+ if (!CAfilesConfigured || txtCerts.getText() == null || "".equals(txtCerts.getText())) {
txtCerts.setVisible(true);
lblCerts.setVisible(true);
btnCerts.setVisible(true);
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 af57e3c..4ca3ba1 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="20131007-1222";
+ public static String BUILD_TIME="20131007-1307";
}