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

thinclient connectivity pref dialog cleanup

Browse source 
Former-commit-id: a4a197ca7c [formerly 02f98aec8d]
Former-commit-id: 0fa91b64e9
This commit is contained in:
AWIPS User 2015-07-09 19:34:02 -06:00
parent e0837c9e05
commit 12fe0b0efd
1 changed files with 1 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,7 +149,7 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
private String proxyAddress;
public ThinClientConnectivityDialog(boolean checkAlertViz) {
super(checkAlertViz, "Thin Client Connectivity Preferences");
super(checkAlertViz, "AWIPS II Connectivity Preferences");
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
useProxy = store
.getBoolean(ThinClientPreferenceConstants.P_USE_PROXIES);
@ -162,95 +162,7 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
@Override
protected void createTextBoxes(Composite textBoxComp) {
super.createTextBoxes(textBoxComp);
Label label = new Label(textBoxComp, SWT.RIGHT);
label.setText("Use Proxy Server:");
GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, true);
gd.horizontalIndent = 20;
label.setLayoutData(gd);
Composite proxyComp = new Composite(textBoxComp, SWT.NONE);
GridLayout gl = new GridLayout(2, false);
gl.marginHeight = 0;
gl.marginWidth = 0;
proxyComp.setLayout(gl);
gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
proxyComp.setLayoutData(gd);
useProxyCheck = new Button(proxyComp, SWT.CHECK | SWT.LEFT);
useProxyCheck.setSelection(useProxy);
useProxyCheck.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
updateProxyEnabled();
}
});
IPreferenceStore thinPrefs = Activator.getDefault()
.getPreferenceStore();
String[] proxyOptions = ServerRemembrance.getServerOptions(thinPrefs,
ThinClientPreferenceConstants.P_PROXY_SERVER_OPTIONS);
proxySrv = new TextOrCombo(proxyComp, SWT.BORDER, proxyOptions);
gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
proxySrv.widget.setLayoutData(gd);
proxySrv.setText(proxyAddress == null ? "" : proxyAddress);
proxySrv.widget.setBackground(getTextColor(servicesGood && pypiesGood));
proxySrv.addSelectionListener(new SelectionListener() {
@Override
public void widgetSelected(SelectionEvent e) {
// user clicked an option
validate();
}
@Override
public void widgetDefaultSelected(SelectionEvent e) {
// user hit Enter
performOk();
}
});
new Label(textBoxComp, SWT.NONE);
Composite jmsComp = new Composite(textBoxComp, SWT.NONE);
gl = new GridLayout(2, false);
gl.marginHeight = 0;
gl.marginWidth = 0;
jmsComp.setLayout(gl);
disableJmsCheck = new Button(jmsComp, SWT.CHECK | SWT.LEFT);
disableJmsCheck.setSelection(disableJms);
disableJmsCheck.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
disableJms = disableJmsCheck.getSelection();
validate();
}
});
disableJmsCheck.setText("Disable JMS");
jmsErrorLabel = new Label(jmsComp, SWT.LEFT);
jmsErrorLabel.setText("Error connecting to JMS");
jmsErrorLabel.setForeground(display.getSystemColor(SWT.COLOR_RED));
jmsErrorLabel.setVisible(true);
new Label(textBoxComp, SWT.NONE);
alwaysPrompt = LocalizationManager
.getInstance()
.getLocalizationStore()
.getBoolean(
LocalizationConstants.P_LOCALIZATION_PROMPT_ON_STARTUP);
alwaysPromptCheck = new Button(textBoxComp, SWT.CHECK | SWT.LEFT);
alwaysPromptCheck.setText("Prompt for settings on startup");
alwaysPromptCheck.setSelection(alwaysPrompt);
alwaysPromptCheck.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
alwaysPrompt = alwaysPromptCheck.getSelection();
}
});
updateProxyEnabled();
}
@Override
@ -378,22 +290,6 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
pypiesCallback);
}
private void updateProxyEnabled() {
useProxy = useProxyCheck.getSelection();
proxySrv.widget.setEnabled(useProxy);
super.setLocalizationEnabled(!useProxy);
if (useProxy) {
if (localizationSrv != null && !localizationSrv.widget.isDisposed()) {
localizationSrv.widget.setBackground(getTextColor(true));
}
} else {
if (proxySrv != null && !proxySrv.widget.isDisposed()) {
proxySrv.widget.setBackground(getTextColor(true));
}
}
validate();
}
/**
* Validates that a connection to JMS works.
*