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

13.1.2-16 baseline

Browse source 
Former-commit-id: ff1a6e936737641f85604ff89cc2903d4370bcb3
This commit is contained in:
Steve Harris 2013-02-06 12:01:12 -05:00
parent b188a5a06d
commit 8efdef4375
6 changed files with 84 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.sounding/META-INF/MANIFEST.MF
View file

@ -12,7 +12,8 @@ Require-Bundle: org.eclipse.core.runtime,
com.raytheon.uf.common.dataplugin.grid;bundle-version="1.0.0",
com.raytheon.uf.common.topo;bundle-version="1.12.1174",
com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.parameter;bundle-version="1.0.0"
com.raytheon.uf.common.parameter;bundle-version="1.0.0",
com.raytheon.uf.viz.acarssounding;bundle-version="1.12.1174"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.viz.sounding,

8
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java
View file

@ -51,6 +51,7 @@ import com.raytheon.uf.viz.core.IGraphicsTarget;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.drawables.ColorMapLoader;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters;
import com.raytheon.uf.viz.core.drawables.ColorMapParameters.PersistedParameters;
import com.raytheon.uf.viz.core.drawables.IRenderable;
import com.raytheon.uf.viz.core.drawables.PaintProperties;
import com.raytheon.uf.viz.core.exception.VizException;
@ -596,6 +597,13 @@ public abstract class AbstractGridResource<T extends AbstractResourceData>
// reuse the old parameters. This is useful when the resource is
// sharing capabilities, for example in an FFGVizGroupResource.
newParameters = oldParameters;
} else if (oldParameters != null) {
newParameters.setColorMapName(oldParameters.getColorMapName());
newParameters.setColorMap(oldParameters.getColorMap());
PersistedParameters persisted = oldParameters.getPersisted();
if (persisted != null) {
newParameters.applyPersistedParameters(persisted);
}
}
return newParameters;
}

4
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java vendored
View file

@ -196,7 +196,7 @@ public class D2DParmIdCache {
public List<ParmID> getParmIDs(DatabaseID dbId) {
List<ParmID> parms = Collections.emptyList();
synchronized (parmIds) {
if (parmIds.containsKey(dbId.toString())) {
if (parmIds.containsKey(dbId)) {
parms = new ArrayList<ParmID>(parmIds.get(dbId));
}
}
@ -255,7 +255,7 @@ public class D2DParmIdCache {
synchronized (this.parmIds) {
for (DatabaseID dbId : dbsToRemove) {
this.parmIds.remove(dbId.toString());
this.parmIds.remove(dbId);
if (UFStatus.getHandler().isPriorityEnabled(Priority.DEBUG)) {
statusHandler.handle(Priority.DEBUG,
"D2dParmIdCache Removed " + dbId);

6
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
View file

@ -33,7 +33,8 @@
<alias base="MMSP">mmsp</alias>
<alias base="DIRPW">dirpw</alias>
<alias base="PERPW">perpw</alias>
<alias base="PR">pr</alias>
<alias base="HTSGW">htsgw</alias>
<alias base="PR">pr</alias>
<alias base="CPOFP">cpofp</alias>
<alias base="CPOZP">cpozp</alias>
<alias base="PW">pw</alias>
@ -48,7 +49,8 @@
<alias base="SH">sh</alias>
<alias base="Heli">heli</alias>
<alias base="SLI">sli</alias>
<alias base="T">t</alias>
<alias base="BLI">bli</alias>
<alias base="T">t</alias>
<alias base="TCC">tcc</alias>
<alias base="ThP">thp</alias>
<alias base="TP">tp</alias>

61
edexOsgi/com.raytheon.uf.edex.ohd/res/spring/DPADecoder-spring.xml Normal file
View file

@ -0,0 +1,61 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="radarDecompressor" class="com.raytheon.edex.plugin.radar.RadarDecompressor"/>
<bean id="dpaDecodeSrv" class="com.raytheon.uf.edex.ohd.pproc.DecodeDpaSrv" />
<bean id="dpaDistRegistry" factory-bean="distributionSrv"
factory-method="register">
<constructor-arg value="dpa" />
<constructor-arg value="jms-dist:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
</bean>
<bean id="dpaRadarServerDistRegistry" factory-bean="radarserverDistributionSrv"
factory-method="register">
<constructor-arg value="dpa" />
<constructor-arg value="jms-dist:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
</bean>
<camelContext id="dpa-camel"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<!--
<endpoint id="dpaFileEndpoint" uri="file:${edex.home}/data/sbn/dpa?noop=true&amp;idempotent=false" />
<route id="dpaFileConsumerRoute">
<from ref="dpaFileEndpoint" />
<bean ref="fileToString" />
<setHeader headerName="pluginName">
<constant>dpa</constant>
</setHeader>
<to uri="jms-generic:queue:Ingest.dpa"/>
</route>
-->
<!-- Begin dpa Routes -->
<route id="dpaIngestRoute">
<from uri="jms-generic:queue:Ingest.dpa?destinationResolver=#qpidDurableResolver"/>
<setHeader headerName="pluginName">
<constant>dpa</constant>
</setHeader>
<doTry>
<pipeline>
<bean ref="stringToFile" />
<bean ref="radarDecompressor" method="decompressToFile" />
<bean ref="dpaDecodeSrv" method="process"/>
<!-- Uncomment when dpaDecodeSrv route properly handles only its own files
<bean ref="processUtil" method="log"/>
-->
</pipeline>
<doCatch>
<exception>java.lang.Throwable</exception>
<to uri="log:dpa?level=INFO&amp;showBody=false&amp;showCaughtException=true&amp;showStackTrace=true"/>
</doCatch>
</doTry>
</route>
</camelContext>
</beans>

7
hebbard_deletes.txt Normal file
View file

@ -0,0 +1,7 @@
cave/build/static/common/cave/etc/ncep/PgenXmlOverlayProducts
cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tAtl
cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tPac
cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tTpc
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/gov.noaa.nws.ncep.edex.plugin.convsigmet
ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/util