From 98d454a06b9db730b965fd22535893c9051d4327 Mon Sep 17 00:00:00 2001 From: Michael James Date: Mon, 23 Oct 2017 11:35:09 -0600 Subject: [PATCH] Revert "remove alertviz check from osx client" This reverts commit 6411aff2e78c1992cf7886dac79ce77bc2755469. --- .../uf/viz/product/alertviz/AlertVizApplication.java | 2 +- .../uf/viz/thinclient/alertviz/ThinAlertVizComponent.java | 2 +- .../uf/viz/thinclient/cave/ThinClientComponent.java | 3 ++- .../localization/ThinClientLocalizationInitializer.java | 8 +++++--- .../viz/thinclient/ui/ThinClientConnectivityDialog.java | 4 ++-- .../ui/personalities/awips/AbstractAWIPSComponent.java | 3 ++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java b/cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java index 01991d2059..ace138dcf7 100644 --- a/cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java +++ b/cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java @@ -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(); } diff --git a/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java b/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java index 7e6593ffc4..920ed75887 100644 --- a/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java +++ b/cave/com.raytheon.uf.viz.thinclient.alertviz/src/com/raytheon/uf/viz/thinclient/alertviz/ThinAlertVizComponent.java @@ -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 diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java index 50eb9ba832..ebbb3dcc7f 100644 --- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java +++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java @@ -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, diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java index 1935820809..df07ba6e9e 100644 --- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java +++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java @@ -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); } diff --git a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java index cdb7cbd7b4..46603d2e24 100644 --- a/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java +++ b/cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/ui/ThinClientConnectivityDialog.java @@ -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); diff --git a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java index 5cb4901424..ee9d3ab916 100644 --- a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java +++ b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java @@ -198,7 +198,8 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication { */ @Override protected void initializeLocalization() throws Exception { - initializeLocalization(!isNonUIComponent()); + initializeLocalization(!isNonUIComponent(), + !LocalizationManager.internalAlertServer); } /*