From 9c79b4851fad5a3c3d2d4e8e635ed699e1cb6205 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Thu, 6 Nov 2014 16:48:11 -0600 Subject: [PATCH] Omaha #3356 fix thin client startup when localization caching is disabled Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478 Former-commit-id: b4817236399d6084da219892d97b6db38d44d64a --- .../thinclient/alertviz/ThinAlertVizComponent.java | 12 +++++++++++- .../uf/viz/thinclient/cave/ThinClientComponent.java | 11 +++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) 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 0a0d78a69d..9148ce6d0e 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 @@ -27,8 +27,10 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.MessageBox; import com.raytheon.uf.common.comm.HttpClient; +import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.viz.alertviz.ui.dialogs.AlertVisualization; import com.raytheon.uf.viz.core.jobs.StatsJob; +import com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter; import com.raytheon.uf.viz.product.alertviz.AlertVizApplication; import com.raytheon.uf.viz.thinclient.Activator; import com.raytheon.uf.viz.thinclient.IThinClientComponent; @@ -48,6 +50,8 @@ import com.raytheon.uf.viz.thinclient.localization.ThinClientLocalizationInitial * ------------ ---------- ----------- -------------------------- * Nov 29, 2011 mschenke Initial creation * Jan 12, 2012 27 rferrel Added exit option + * Nov 06, 2014 3356 njensen Always initialize ILocalizationAdapter + * in case cache preference is not enabled * * * @@ -83,6 +87,12 @@ public class ThinAlertVizComponent extends AlertVizApplication implements @Override protected void initializeLocalization() throws Exception { + /* + * Set the normal adapter first, based on cache preference settings the + * next few lines may replace it with the thin client localization + * adapter + */ + PathManagerFactory.setAdapter(new CAVELocalizationAdapter()); cacheManager = new ThinClientCacheManager( new LocalizationCachePersistence()); cacheManager.restoreCaches(); @@ -91,10 +101,10 @@ public class ThinAlertVizComponent extends AlertVizApplication implements @Override protected void initializeObservers() { - ; // don't do this. ThinClientNotificationManagerJob.getInstance(); } + @Override protected AlertVisualization createAlertVisualization( boolean runningStandalone, final Display display) { return new AlertVisualization(runningStandalone, display) { 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 760019b578..aa05189115 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 @@ -30,11 +30,13 @@ import org.osgi.framework.Bundle; import com.raytheon.uf.common.comm.HttpClient; import com.raytheon.uf.common.datastorage.DataStoreFactory; +import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.viz.core.jobs.StatsJob; import com.raytheon.uf.viz.core.localization.BundleScanner; +import com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter; import com.raytheon.uf.viz.core.localization.LocalizationManager; import com.raytheon.uf.viz.thinclient.Activator; import com.raytheon.uf.viz.thinclient.IThinClientComponent; @@ -67,6 +69,8 @@ import com.raytheon.viz.ui.personalities.awips.CAVE; * Aug 4, 2011 njensen Initial creation * Apr 23, 2013 1939 randerso Return null from initializeSerialization * Nov 14, 2013 2361 njensen Remove initializeSerialization() + * Nov 06, 2014 3356 njensen Always initialize ILocalizationAdapter + * in case cache preference is not enabled * * * @@ -75,6 +79,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE; */ public class ThinClientComponent extends CAVE implements IThinClientComponent { + private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(AbstractAWIPSComponent.class, "ThinClient"); @@ -160,6 +165,12 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent { */ @Override protected void initializeLocalization() throws Exception { + /* + * Set the normal adapter first, based on cache preference settings the + * next few lines may replace it with the thin client localization + * adapter + */ + PathManagerFactory.setAdapter(new CAVELocalizationAdapter()); cacheManager = new ThinClientCacheManager( new GeometryCachePersistence(), new LocalizationCachePersistence(),