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

ASM #605 - Cherry-pick Omaha Issue #2954 from 14.3.1 into 14.2.2 to fix CAVE not starting if scale bundle is missing.

Browse source 
Change-Id: I3f7159b7a48e74fc9ad7a4220d6c30b67240aca1

Former-commit-id: 81ab64d7ff [formerly 7fe0dae041cb68aba968e22d5895cce22a210ee6]
Former-commit-id: 39173c380c
This commit is contained in:
Mike Duff 2014-03-24 16:07:46 -05:00 • committed by Brian.Dyke
parent 445d58699a
commit b880d171d4
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
View file

@ -61,6 +61,7 @@ import com.raytheon.viz.ui.actions.LoadSerializedXml;
* Oct 08, 2013 mschenke Initial creation * Oct 08, 2013 mschenke Initial creation
* Oct 22, 2013 2491 bsteffen Change from SerializationUtil to * Oct 22, 2013 2491 bsteffen Change from SerializationUtil to
* ProcedureXmlManager * ProcedureXmlManager
* Mar 24, 2014 2954 mpduff Check for missing map scale files and handle the situation.
* *
* </pre> * </pre>
* *
@ -99,16 +100,22 @@ public class MapScalesManager {
private String bundleXml; private String bundleXml;
private boolean isCustom; private final boolean isCustom;
private ManagedMapScale(String baseDir, MapScale scale) private ManagedMapScale(String baseDir, MapScale scale)
throws SerializationException { throws SerializationException {
this.isCustom = false; this.isCustom = false;
this.scaleFile = new AutoUpdatingLocalizationFile( LocalizationFile file = PathManagerFactory.getPathManager()
PathManagerFactory.getPathManager()
.getStaticLocalizationFile( .getStaticLocalizationFile(
baseDir + IPathManager.SEPARATOR baseDir + IPathManager.SEPARATOR
+ scale.getFileName())); + scale.getFileName());
if (file == null || !file.exists()) {
throw new IllegalStateException(
"scalesInfo.xml references missing file "
+ scale.getFileName());
}
this.scaleFile = new AutoUpdatingLocalizationFile(file);
this.scaleFile.addListener(listener); this.scaleFile.addListener(listener);
this.partIds = scale.getPartIds(); this.partIds = scale.getPartIds();
this.displayName = scale.getDisplayName(); this.displayName = scale.getDisplayName();
@ -200,7 +207,7 @@ public class MapScalesManager {
// TODO: Need to figure out best way to create custom scales (depends on // TODO: Need to figure out best way to create custom scales (depends on
// maps loaded so it can't be at the projection dialog level) // maps loaded so it can't be at the projection dialog level)
private Collection<ManagedMapScale> customScales = new ArrayList<ManagedMapScale>(); private final Collection<ManagedMapScale> customScales = new ArrayList<ManagedMapScale>();
/** /**
* Construct a MapScalesManager for the given scales file. File must be * Construct a MapScalesManager for the given scales file. File must be