xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #5281: Fix errors with empty caveData dir

Browse source 
Change-Id: Icf3093e8c4191aeb1ba80a7f34e23eed0b90544c

Former-commit-id: 336db2ff7ce99e0eca28763e61131a123d792ee5
This commit is contained in:
Tim Jensen 2016-02-15 16:09:06 -06:00
parent 4ce5ebe0c8
commit d77ceb8459
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java
View file

@ -68,9 +68,8 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
* Jun 03, 2014 3217 bsteffen Add option to always open startup dialog.
* Jun 24, 2014 3236 njensen Add ability to remember multiple servers
* Oct 08, 2015 4891 njensen Added tooltip to useProxyCheck
* Feb 08, 2016, 5281 tjensen Reworked interface to simply options
*
*
* Feb 08, 2016 5281 tjensen Reworked interface to simply options
* Feb 15, 2016 5281 tjensen Added check for null in validate method
*
* </pre>
*
@ -295,43 +294,46 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
status = null;
details = null;
// validate proxy
proxyAddress = localizationSrv.getText();
// If we don't have a localizationSrv yet, fail validation gracefully.
if (localizationSrv != null) {
// validate proxy
proxyAddress = localizationSrv.getText();
if (proxyAddress != null && proxyAddress.length() > 0) {
validateServices();
validatePypies();
} else {
servicesGood = false;
pypiesGood = false;
status = "Please enter a thin client proxy server address";
}
if (localizationSrv != null && !localizationSrv.widget.isDisposed()) {
localizationSrv.widget.setBackground(getTextColor(servicesGood
&& pypiesGood));
}
validateJms(servicesGood);
// validate site
if (siteText != null && !siteText.isDisposed()) {
super.setSite(siteText.getText());
}
super.validateSite();
if (siteText != null && !siteText.isDisposed()) {
siteText.setBackground(getTextColor(isSiteGood()));
}
// validate alertviz
// apparently alertvizserver == null means it's alertviz itself
if (alertVizServer != null) {
if (alertVizText != null && !alertVizText.isDisposed()) {
setAlertVizServer(alertVizText.getText());
if (proxyAddress != null && proxyAddress.length() > 0) {
validateServices();
validatePypies();
} else {
servicesGood = false;
pypiesGood = false;
status = "Please enter a thin client proxy server address";
}
super.validateAlertviz();
if (alertVizText != null && !alertVizText.isDisposed()) {
alertVizText.setBackground(getTextColor(isAlertVizGood()));
if (localizationSrv != null && !localizationSrv.widget.isDisposed()) {
localizationSrv.widget.setBackground(getTextColor(servicesGood
&& pypiesGood));
}
validateJms(servicesGood);
// validate site
if (siteText != null && !siteText.isDisposed()) {
super.setSite(siteText.getText());
}
super.validateSite();
if (siteText != null && !siteText.isDisposed()) {
siteText.setBackground(getTextColor(isSiteGood()));
}
// validate alertviz
// apparently alertvizserver == null means it's alertviz itself
if (alertVizServer != null) {
if (alertVizText != null && !alertVizText.isDisposed()) {
setAlertVizServer(alertVizText.getText());
}
super.validateAlertviz();
if (alertVizText != null && !alertVizText.isDisposed()) {
alertVizText.setBackground(getTextColor(isAlertVizGood()));
}
}
}