diff options
| author | Jose <jose@zeroc.com> | 2012-11-27 22:27:14 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-11-27 22:27:14 +0100 |
| commit | c0b1b248d7020e569d11831acb194236e512f01b (patch) | |
| tree | 10b84e9f6f19cdcadc9fa7a079fb09b7fae8bcdb /java/src/IceGridGUI/SessionKeeper.java | |
| parent | ICE-5002 no IceGrid Admin shortcut in windows installer (diff) | |
| download | ice-c0b1b248d7020e569d11831acb194236e512f01b.tar.bz2 ice-c0b1b248d7020e569d11831acb194236e512f01b.tar.xz ice-c0b1b248d7020e569d11831acb194236e512f01b.zip | |
Fixed (ICE-5008) - IceGrid GUI: can't avoid X.509 certificate for SSL connection
Diffstat (limited to 'java/src/IceGridGUI/SessionKeeper.java')
| -rw-r--r-- | java/src/IceGridGUI/SessionKeeper.java | 105 |
1 files changed, 52 insertions, 53 deletions
diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java index cc766c9da7b..1eb441356a1 100644 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/SessionKeeper.java @@ -1846,6 +1846,19 @@ public class SessionKeeper _cardLayout.show(_cardPanel, WizardStep.DirectUsernamePasswordCredentialsStep.toString()); _wizardSteps.push(WizardStep.DirectUsernamePasswordCredentialsStep); } + if(_conf == null) + { + if(_directDefaultEndpointSSL.isSelected()) + { + _x509CertificateYesButton.setSelected(true); + _certificateAuthButton.setSelected(true); + } + else + { + _x509CertificateNoButton.setSelected(true); + _usernamePasswordAuthButton.setSelected(true); + } + } break; } case RoutedDefaultEndpointStep: @@ -1860,6 +1873,19 @@ public class SessionKeeper _cardLayout.show(_cardPanel, WizardStep.RoutedUsernamePasswordCredentialsStep.toString()); _wizardSteps.push(WizardStep.RoutedUsernamePasswordCredentialsStep); } + if(_conf == null) + { + if(_routedDefaultEndpointSSL.isSelected()) + { + _x509CertificateYesButton.setSelected(true); + _certificateAuthButton.setSelected(true); + } + else + { + _x509CertificateNoButton.setSelected(true); + _usernamePasswordAuthButton.setSelected(true); + } + } break; } case DirectCustomEnpointStep: @@ -1902,6 +1928,19 @@ public class SessionKeeper JOptionPane.ERROR_MESSAGE); return; } + if(_conf == null) + { + if(hasSecureEndpoints(_directCustomEndpointValue.getText())) + { + _x509CertificateYesButton.setSelected(true); + _certificateAuthButton.setSelected(true); + } + else + { + _x509CertificateNoButton.setSelected(true); + _usernamePasswordAuthButton.setSelected(true); + } + } break; } case RoutedCustomEnpointStep: @@ -1944,6 +1983,19 @@ public class SessionKeeper JOptionPane.ERROR_MESSAGE); return; } + if(_conf == null) + { + if(hasSecureEndpoints(_routedCustomEndpointValue.getText())) + { + _x509CertificateYesButton.setSelected(true); + _certificateAuthButton.setSelected(true); + } + else + { + _x509CertificateNoButton.setSelected(true); + _usernamePasswordAuthButton.setSelected(true); + } + } break; } case X509CertificateStep: @@ -2471,39 +2523,12 @@ public class SessionKeeper JOptionPane.ERROR_MESSAGE); } } - - if(_conf == null && validated) - { - if(_directDefaultEndpointSSL.isSelected()) - { - _x509CertificateYesButton.setSelected(true); - _certificateAuthButton.setSelected(true); - } - else - { - _x509CertificateNoButton.setSelected(true); - _usernamePasswordAuthButton.setSelected(true); - } - } break; } case DirectCustomEnpointStep: { validated = _directCustomEndpointValue.getText() != null && _directCustomEndpointValue.getText().length() > 0; - if(_conf == null && validated) - { - if(hasSecureEndpoints(_directCustomEndpointValue.getText())) - { - _x509CertificateYesButton.setSelected(true); - _certificateAuthButton.setSelected(true); - } - else - { - _x509CertificateNoButton.setSelected(true); - _usernamePasswordAuthButton.setSelected(true); - } - } break; } case RoutedInstanceStep: @@ -2532,38 +2557,12 @@ public class SessionKeeper JOptionPane.ERROR_MESSAGE); } } - if(_conf == null && validated) - { - if(_routedDefaultEndpointSSL.isSelected()) - { - _x509CertificateYesButton.setSelected(true); - _certificateAuthButton.setSelected(true); - } - else - { - _x509CertificateNoButton.setSelected(true); - _usernamePasswordAuthButton.setSelected(true); - } - } break; } case RoutedCustomEnpointStep: { validated = _routedCustomEndpointValue.getText() != null && _routedCustomEndpointValue.getText().length() > 0; - if(_conf == null && validated) - { - if(hasSecureEndpoints(_routedCustomEndpointValue.getText())) - { - _x509CertificateYesButton.setSelected(true); - _certificateAuthButton.setSelected(true); - } - else - { - _x509CertificateNoButton.setSelected(true); - _usernamePasswordAuthButton.setSelected(true); - } - } break; } case DirectX509CredentialsStep: |