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

Revert "remove alertviz check from osx client"

Browse source 
This reverts commit 6411aff2e7.
This commit is contained in:
Michael James 2017-10-23 11:35:09 -06:00
parent 24be7c877f
commit 98d454a06b
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java
View file

@ -220,7 +220,7 @@ public class AlertVizApplication implements IStandaloneComponent {
protected void initializeLocalization() throws Exception {
PathManagerFactory.setAdapter(new CAVELocalizationAdapter());
new LocalizationInitializer(true).run();
new LocalizationInitializer(true, false).run();
AlertVizLocalizationConfigurer.registerExtraLevels();
}

2
cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java
View file

@ -89,7 +89,7 @@ public class ThinAlertVizComponent extends AlertVizApplication implements
cacheManager = new ThinClientCacheManager(
new LocalizationCachePersistence());
cacheManager.restoreCaches();
new ThinClientLocalizationInitializer(true).run();
new ThinClientLocalizationInitializer(true, false).run();
}
@Override

3
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
View file

@ -144,7 +144,8 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
new MapQueryCachePersistence());
cacheManager.restoreCaches();
try {
new ThinClientLocalizationInitializer(!isNonUIComponent()).run();
new ThinClientLocalizationInitializer(!isNonUIComponent(),
!LocalizationManager.internalAlertServer).run();
} catch (Exception e1) {
e1.printStackTrace();
statusHandler.handle(Priority.CRITICAL,

8
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
View file

@ -80,8 +80,9 @@ public class ThinClientLocalizationInitializer extends LocalizationInitializer {
* @param promptUI
* @param checkAlertViz
*/
public ThinClientLocalizationInitializer(boolean promptUI) {
super(promptUI);
public ThinClientLocalizationInitializer(boolean promptUI,
boolean checkAlertViz) {
super(promptUI, checkAlertViz);
}
@Override
@ -92,7 +93,8 @@ public class ThinClientLocalizationInitializer extends LocalizationInitializer {
confBuilder.setGzipEnabled(true);
HttpClient.configureGlobalInstance(confBuilder.build());
if (promptUI) {
ThinClientConnectivityDialog dlg = new ThinClientConnectivityDialog();
ThinClientConnectivityDialog dlg = new ThinClientConnectivityDialog(
checkAlertviz);
if (dlg.open() == true) {
System.exit(0);
}

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

@ -92,8 +92,8 @@ public class ThinClientConnectivityDialog extends ConnectivityPreferenceDialog {
private String proxyAddress;
public ThinClientConnectivityDialog() {
super("Unidata AWIPS");
public ThinClientConnectivityDialog(boolean checkAlertViz) {
super(checkAlertViz, "Unidata AWIPS");
IPreferenceStore store = Activator.getDefault().getPreferenceStore();
dataRefreshMethod = store
.getString(ThinClientPreferenceConstants.P_DATA_REFRESH_METHOD);

3
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java
View file

@ -198,7 +198,8 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
*/
@Override
protected void initializeLocalization() throws Exception {
initializeLocalization(!isNonUIComponent());
initializeLocalization(!isNonUIComponent(),
!LocalizationManager.internalAlertServer);
}
/*