files = PathManagerFactory
.getPathManager().getTieredLocalizationFile(
- LocalizationType.COMMON_STATIC,
+ LocalizationType.CAVE_STATIC,
NcPathConstants.LOCKED_CMAP_TBL);
File locCmapFile = null;
diff --git a/ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/SpfsManager.java b/ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/SpfsManager.java
index 4e78ea1368..516d4a732b 100644
--- a/ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/SpfsManager.java
+++ b/ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/SpfsManager.java
@@ -7,6 +7,7 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.io.File;
+import javax.xml.bind.JAXBException;
import com.raytheon.uf.common.localization.FileUpdatedMessage;
import com.raytheon.uf.common.localization.ILocalizationAdapter;
@@ -56,6 +57,7 @@ import gov.noaa.nws.ncep.viz.resources.AbstractNatlCntrsRequestableResourceData;
* 07/22/12 #568 Greg Hull return Rbds and rbdNames sorted by seq num.
* 02/10/13 #972 Greg Hull changed to work with AbstractRbds
* 05/19/13 #1001 Greg Hull getRbdsFromSpf(), trap RBD errors
+ * 03/06/14 ? B. Yin Replaced SerializationUtil with JAXBManager.
*
*
*
@@ -451,7 +453,7 @@ public class SpfsManager implements ILocalizationFileObserver {
// group and spf
//
try {
- SerializationUtil.jaxbMarshalToXmlFile( rbd, rbdFile.getAbsolutePath() );
+ AbstractRBD.getJaxbManager().marshalToXmlFile( rbd, rbdFile.getAbsolutePath() );
rbd.setLocalizationFile( lFile );
@@ -463,6 +465,8 @@ public class SpfsManager implements ILocalizationFileObserver {
} catch (LocalizationOpFailedException e) {
throw new VizException(e);
+ } catch (JAXBException e) {
+ throw new VizException(e);
} catch (SerializationException e) {
throw new VizException(e);
} finally {
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
index 59acefe95c..a0de2a7525 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotImageCreator.java
@@ -71,6 +71,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 05/20/2013 988 Archana.S Initial creation.
+ * 02/26/2014 1061 B. Hebbard Relax tolerance for extent/zoom compare to avoid infinite loop.
*/
public class NcPlotImageCreator {
@@ -219,9 +220,11 @@ public class NcPlotImageCreator {
private RGB defaultColor;
- private static double TOLERANCE = 0.000000000000000000000001;
+ private static double TOLERANCE = 1E-04; // 1E-24; //
+ // 0.000000000000000000000001;
- private static double ZOOM_TOLERANCE = 0.0000000000000000000001;
+ private static double ZOOM_TOLERANCE = 1E-04; // 1E-22; //
+ // 0.0000000000000000000001;
private static Amount WIND_SPD_3KNOTS = new Amount(3, NonSI.KNOT);
diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
index c6619a5d93..5a80e78f63 100644
--- a/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
+++ b/ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/NcPlotModelHdf5DataRequestor.java
@@ -52,6 +52,19 @@ import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.jobs.JobPool;
import com.raytheon.viz.pointdata.PointDataRequest;
+/**
+ *
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * 05/20/2013?? 988 Archana.S Initial creation.
+ * 02/26/2014 1061 B. Hebbard Don't block on JobPool cancel, so CAVE doesn't freeze if resource unloaded during long retrieval
+ */
+
public class NcPlotModelHdf5DataRequestor {
StringBuffer sb = new StringBuffer();
@@ -136,6 +149,10 @@ public class NcPlotModelHdf5DataRequestor {
Map