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

Merge "Omaha #3217 Add always prompt option to thinclient connectivity dialog." into omaha_14.4.1

Browse source 
Former-commit-id: f66887ef57 [formerly 29a997ba9a] [formerly f7161d6a76] [formerly f7161d6a76 [formerly 041488064b]] [formerly f66887ef57 [formerly 29a997ba9a] [formerly f7161d6a76] [formerly f7161d6a76 [formerly 041488064b]] [formerly aaecd1edaa [formerly f7161d6a76 [formerly 041488064b] [formerly aaecd1edaa [formerly 607e2a8ec37798a3620d298077d038417d93007c]]]]]
Former-commit-id: aaecd1edaa
Former-commit-id: 007b28b76c [formerly d922671c72] [formerly 33b3bf61ee] [formerly a4dc205775b4c6974df4577c53a34bd80f327e60 [formerly 5aadd4a24240a77859fed3fb4d3ffa454e703288] [formerly 33b3bf61ee [formerly 817cff4701]]]
Former-commit-id: 4e0ff86ce206757b5cd9214d84033de3169ea35b [formerly 4a2ee5c25e6fb265c3ce45c7ad3219eafa01a6d8] [formerly 119d128dfd [formerly d0e77c1e5a]]
Former-commit-id: 48415f6de0ea81ab77923dd96f81bbed1249d82d [formerly 119d128dfd]
Former-commit-id: 7c06b6e9c4
This commit is contained in:
Lee Venable 2014-06-12 07:59:53 -05:00 • committed by Gerrit Code Review
commit 07d9f4bcf8
1 changed files with 78 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,14 +56,16 @@ import com.raytheon.uf.viz.thinclient.preferences.ThinClientPreferenceConstants;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Nov 23, 2011 bsteffen Initial creation
* Aug 02, 2013 2202 bsteffen Add edex specific connectivity checking.
* Feb 04, 2014 2704 njensen Refactored
* Feb 17, 2014 2704 njensen Added checks for alertviz connectivity
* Feb 20, 2014 2704 njensen Fix issues where settings are valid
* but dialog doesn't realize it
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Nov 23, 2011 bsteffen Initial creation
* Aug 02, 2013 2202 bsteffen Add edex specific connectivity checking.
* Feb 04, 2014 2704 njensen Refactored
* Feb 17, 2014 2704 njensen Added checks for alertviz connectivity
* Feb 20, 2014 2704 njensen Fix issues where settings are valid
* but dialog doesn't realize it
* Jun 03, 2014 3217 bsteffen Add option to always open startup dialog.
*
*
*
* </pre>
@ -127,10 +129,14 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
private Button disableJmsCheck;
private Button alwaysPromptCheck;
private boolean disableJms = false;
private boolean jmsGood = false;
private boolean alwaysPrompt;
private Label jmsErrorLabel;
private IConnectivityCallback jmsCallback = new JmsCallback();
@ -155,45 +161,17 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
super.createTextBoxes(textBoxComp);
Label label = new Label(textBoxComp, SWT.RIGHT);
label.setText("Disable JMS:");
GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, true, true);
gd.widthHint = 150;
label.setLayoutData(gd);
Composite jmsComp = new Composite(textBoxComp, SWT.NONE);
GridLayout gl = new GridLayout(2, false);
gl.marginHeight = 0;
gl.marginWidth = 0;
jmsComp.setLayout(gl);
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
jmsComp.setLayoutData(gd);
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();
}
});
jmsErrorLabel = new Label(jmsComp, SWT.LEFT);
jmsErrorLabel.setText("Error connecting to JMS");
jmsErrorLabel.setForeground(display.getSystemColor(SWT.COLOR_RED));
jmsErrorLabel.setVisible(false);
label = new Label(textBoxComp, SWT.RIGHT);
label.setText("Use Proxy Server:");
gd = new GridData(SWT.RIGHT, SWT.CENTER, true, true);
gd.widthHint = 150;
GridData gd = new GridData(SWT.RIGHT, SWT.CENTER, false, true);
gd.horizontalIndent = 20;
label.setLayoutData(gd);
Composite proxyComp = new Composite(textBoxComp, SWT.NONE);
gl = new GridLayout(2, false);
GridLayout gl = new GridLayout(2, false);
gl.marginHeight = 0;
gl.marginWidth = 0;
proxyComp.setLayout(gl);
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
gd = new GridData(SWT.FILL, SWT.CENTER, true, false);
proxyComp.setLayoutData(gd);
useProxyCheck = new Button(proxyComp, SWT.CHECK | SWT.LEFT);
@ -206,18 +184,66 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
});
proxyText = new Text(proxyComp, SWT.NONE | SWT.BORDER);
gd = new GridData(SWT.FILL, SWT.None, true, true);
gd = new GridData(SWT.FILL, SWT.CENTER, true, true);
proxyText.setLayoutData(gd);
proxyText.setText(proxyAddress == null ? "" : proxyAddress);
proxyText.setBackground(getTextColor(servicesGood && pypiesGood));
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
protected void applySettings() {
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
IPersistentPreferenceStore localStore = LocalizationManager
.getInstance()
.getLocalizationStore();
IPersistentPreferenceStore store = Activator.getDefault()
.getPreferenceStore();
store.setValue(ThinClientPreferenceConstants.P_DISABLE_JMS, disableJms);
localStore.setValue(
LocalizationConstants.P_LOCALIZATION_PROMPT_ON_STARTUP,
alwaysPrompt);
if (useProxy) {
store.setValue(ThinClientPreferenceConstants.P_USE_PROXIES,
useProxy);
@ -225,17 +251,20 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
proxyAddress);
if (getAlertVizServer() != null) {
LocalizationManager
.getInstance()
.getLocalizationStore()
.setValue(LocalizationConstants.P_ALERT_SERVER,
getAlertVizServer());
localStore.setValue(LocalizationConstants.P_ALERT_SERVER,
getAlertVizServer());
}
// setting the site will save the preference store
LocalizationManager.getInstance().setCurrentSite(getSite());
try {
((IPersistentPreferenceStore) store).save();
store.save();
} catch (IOException e) {
statusHandler.handle(Priority.SIGNIFICANT,
"Unable to persist thinclient localization preference store",
e);
}
try {
localStore.save();
} catch (IOException e) {
statusHandler.handle(Priority.SIGNIFICANT,
"Unable to persist localization preference store", e);