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

Omaha #4343 Fix merge issues caused by Util->RcmUtil rename.

Browse source 
Change-Id: Id0d2778594875886ef13a4754786a3486051d3fa

Former-commit-id: 189311e801b8c507b5ccb1121da5511665d74d28
This commit is contained in:
Nathan Bowler 2015-07-20 13:35:04 -04:00
parent c9ca91f628
commit 8583f14fb2
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
RadarServer/com.raytheon.rcm.server.mq/src/com/raytheon/rcm/server/dataarchive/DataArchiveEndpoint.java
View file

@ -1,19 +1,19 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
@ -48,7 +48,7 @@ import org.itadaki.bzip2.BZip2InputStream;
import com.raytheon.rcm.config.EndpointConfig;
import com.raytheon.rcm.config.RadarConfig;
import com.raytheon.rcm.config.RadarType;
import com.raytheon.rcm.config.Util;
import com.raytheon.rcm.config.RcmUtil;
import com.raytheon.rcm.config.awips1.Awips1ProdDistInfoBuilder;
import com.raytheon.rcm.event.ConfigEvent;
import com.raytheon.rcm.event.ConfigEvent.Category;
@ -59,8 +59,8 @@ import com.raytheon.rcm.message.GraphicProduct.PDB;
import com.raytheon.rcm.message.Message;
import com.raytheon.rcm.message.MessageFormatException;
import com.raytheon.rcm.products.ProductInfo;
import com.raytheon.rcm.products.RadarProduct;
import com.raytheon.rcm.products.ProductInfo.Selector;
import com.raytheon.rcm.products.RadarProduct;
import com.raytheon.rcm.products.RadarProduct.Param;
import com.raytheon.rcm.server.Log;
import com.raytheon.rcm.server.RadarServer;
@ -76,6 +76,7 @@ import com.raytheon.rcm.server.RadarServer;
* ...
* 2014-02-03 DR 14762 D. Friedman Refactor config events.
* 2015-07-13 DR 17672 D. Friedman Only decompress products documented to support compression
* 2015-07-20 4343 nabowle Util is now RcmUtil.
* </pre>
*
*/
@ -672,8 +673,8 @@ public class DataArchiveEndpoint extends RadarEventAdapter {
try {
int code = Message.messageCodeOf(msg);
RadarType radarType = radarConfig != null ?
Util.getRadarType(radarConfig) : null;
RadarType radarType = radarConfig != null ? RcmUtil
.getRadarType(radarConfig) : null;
RadarProduct rp = ProductInfo.getInstance().selectOne(
new Selector(radarType, null, code, null));
if (rp != null && rp.compressionAllowed && !noDecompressList.contains(code)) {

21
RadarServer/com.raytheon.rcm.server/src/com/raytheon/rcm/server/Awips2Endpoint.java
View file

@ -1,19 +1,19 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
@ -31,7 +31,7 @@ import org.itadaki.bzip2.BZip2InputStream;
import com.raytheon.rcm.config.RadarConfig;
import com.raytheon.rcm.config.RadarType;
import com.raytheon.rcm.config.Util;
import com.raytheon.rcm.config.RcmUtil;
import com.raytheon.rcm.event.ConfigEvent;
import com.raytheon.rcm.event.ConfigEvent.Category;
import com.raytheon.rcm.event.RadarEvent;
@ -45,10 +45,12 @@ import com.raytheon.rcm.products.ProductInfo.Selector;
import com.raytheon.rcm.products.RadarProduct;
/**
* <p>A radar server component that delivers radar products to an EDEX file
* <p>
* A radar server component that delivers radar products to an EDEX file
* endpoint.
*
* <p>This class is obsoleted by DataArchiveEndpoint.
* <p>
* This class is obsoleted by DataArchiveEndpoint.
*
* <pre>
*
@ -58,8 +60,9 @@ import com.raytheon.rcm.products.RadarProduct;
* ...
* 2014-02-03 DR 14762 D. Friedman Refactor config events.
* 2015-07-13 DR 17672 D. Friedman Only decompress products documented to support compression
* 2015-07-20 4343 nabowle Util is now RcmUtil.
* </pre>
*/
*/
public class Awips2Endpoint extends RadarEventAdapter {
RadarServer radarServer;
@ -185,8 +188,8 @@ public class Awips2Endpoint extends RadarEventAdapter {
try {
int code = Message.messageCodeOf(msg);
RadarType radarType = radarConfig != null ?
Util.getRadarType(radarConfig) : null;
RadarType radarType = radarConfig != null ? RcmUtil
.getRadarType(radarConfig) : null;
RadarProduct rp = ProductInfo.getInstance().selectOne(
new Selector(radarType, null, code, null));
if (rp != null && rp.compressionAllowed) {