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

Omaha #3356 fix thin client startup when localization caching is

Browse source 
disabled

Change-Id: I38a9299d9cc50c3e6f1b5d781c0754c2af70d478

Former-commit-id: b3a72a66c7 [formerly 62f1088e05] [formerly 6173ea452d] [formerly b3a72a66c7 [formerly 62f1088e05] [formerly 6173ea452d] [formerly 9c79b4851f [formerly 6173ea452d [formerly b4817236399d6084da219892d97b6db38d44d64a]]]]
Former-commit-id: 9c79b4851f
Former-commit-id: 03882e82a9 [formerly 88d5fa6edb] [formerly 694a6d6f5b262bf739353a45a969ddc0691324b7 [formerly 2c08bc1e38]]
Former-commit-id: 9e04f3e1903b43776c937d621eeab19a43bd0ee6 [formerly e87243e0ee]
Former-commit-id: a5f86aeaf3
This commit is contained in:
Nate Jensen 2014-11-06 16:48:11 -06:00
parent 418b45320b
commit ede2580f12
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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
*
* </pre>
*
@ -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) {

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

@ -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
*
* </pre>
*
@ -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(),