From 70216d11e4bf0bc39f1837a66434beb7f492cce6 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 25 Aug 2014 17:08:13 -0500 Subject: [PATCH] Omaha #3356 configure path manager factory before spring initialization Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44 Former-commit-id: dbbf012a34b2899acedad2167d9a1104374ca05b [formerly 263452a82aef4756492fe02156525137b5ca09ff] Former-commit-id: fdc4cc60b964f1040583a1f963afd3a32de4c603 --- .../uf/viz/product/alertviz/AlertVizApplication.java | 5 +++++ .../viz/ui/personalities/awips/AbstractCAVEComponent.java | 4 ++++ 2 files changed, 9 insertions(+) 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 e0c54c1a4c..f9d60054e5 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 @@ -31,6 +31,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.statushandlers.StatusAdapter; +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; @@ -40,6 +41,7 @@ import com.raytheon.uf.viz.alertviz.SystemStatusHandler; import com.raytheon.uf.viz.alertviz.ui.dialogs.AlertVisualization; import com.raytheon.uf.viz.application.component.IStandaloneComponent; import com.raytheon.uf.viz.core.ProgramArguments; +import com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter; import com.raytheon.uf.viz.core.localization.CAVELocalizationNotificationObserver; import com.raytheon.uf.viz.core.localization.LocalizationConstants; import com.raytheon.uf.viz.core.localization.LocalizationInitializer; @@ -57,6 +59,8 @@ import com.raytheon.uf.viz.core.notification.jobs.NotificationManagerJob; * Sep 29, 2008 #1433 chammack Initial creation * Jan 12, 2012 #27 rferrel Added createAlertVisualization * May 08, 2013 1939 rjpeter Updated to start NotificationManagerJob. + * Aug 26, 2014 3356 njensen Explicitly set localization adapter + * * * * @author chammack @@ -178,6 +182,7 @@ public class AlertVizApplication implements IStandaloneComponent { } protected void initializeLocalization() throws Exception { + PathManagerFactory.setAdapter(new CAVELocalizationAdapter()); new LocalizationInitializer(true, false).run(); } diff --git a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java index c52c9f472b..2f4fa187bf 100644 --- a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java +++ b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java @@ -39,6 +39,7 @@ import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.statushandlers.StatusAdapter; import com.raytheon.uf.common.datastorage.DataStoreFactory; +import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.pypies.PyPiesDataStoreFactory; import com.raytheon.uf.common.pypies.PypiesProperties; import com.raytheon.uf.common.status.IUFStatusHandler; @@ -53,6 +54,7 @@ import com.raytheon.uf.viz.application.component.IStandaloneComponent; import com.raytheon.uf.viz.core.ProgramArguments; import com.raytheon.uf.viz.core.RecordFactory; import com.raytheon.uf.viz.core.VizApp; +import com.raytheon.uf.viz.core.localization.CAVELocalizationAdapter; import com.raytheon.uf.viz.core.localization.CAVELocalizationNotificationObserver; import com.raytheon.uf.viz.core.localization.LocalizationConstants; import com.raytheon.uf.viz.core.localization.LocalizationInitializer; @@ -99,6 +101,7 @@ import com.raytheon.viz.core.units.UnitRegistrar; * startup * Dec 10, 2013 2602 bsteffen Start loading ProcedureXmlManager in * startComponent. + * Aug 26, 2014 3356 njensen Explicitly set localization adapter * * * @@ -414,6 +417,7 @@ public abstract class AbstractCAVEComponent implements IStandaloneComponent { } protected void initializeLocalization(boolean nonui) throws Exception { + PathManagerFactory.setAdapter(new CAVELocalizationAdapter()); new LocalizationInitializer(!nonui, !LocalizationManager.internalAlertServer).run(); }