From 0cffb9ad15f01b07126aa0a98dbd40c01c0026f1 Mon Sep 17 00:00:00 2001 From: Mark Peters Date: Tue, 16 Sep 2014 16:37:45 -0500 Subject: [PATCH] Omaha #3628 Move bufr packages and classes from decodertools plugin to bufrtools plugin Change-Id: I129b1f21a1f79b891c5e07eed7bfe3fe52b3162e Former-commit-id: 87cc635b90fd4872ae5d8f005c2f75cee695a495 [formerly b50ab6a6235559165b9b8ff15af0a8cb4b44be36] Former-commit-id: cd7a4975675e9d514cb1976468363619de20ba34 --- .../bufrua/decoder/BUFRUAManLevelAdapter.java | 10 ++++--- .../bufrua/decoder/BUFRUASigLevelAdapter.java | 10 ++++--- .../decoder/GOESSoundingDataAdapter.java | 7 ++--- .../profiler/decoder/ProfilerDataAdapter.java | 10 ++++--- .../META-INF/MANIFEST.MF | 4 +-- .../impl/CompressedExecuteEngine.java | 12 ++++----- .../impl/NonCompressedExecuteEngine.java | 16 +++++++----- .../META-INF/MANIFEST.MF | 5 ++-- .../acars/decoder/ACARSDataAdapter.java | 17 ++++++------ .../decoder/MOSDescriptorDelegate.java | 26 +++++++------------ .../bufrncwf/decoder/BUFRncwfDataAdapter.java | 11 ++++---- .../bufrsigwx/decoder/SigWxDataAdapter.java | 11 ++++---- .../bufrssmi/decoder/SSMIDataAdapter.java | 10 ++++--- .../decoder/ModelSoundingDataAdapter.java | 10 ++++--- 14 files changed, 84 insertions(+), 75 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAManLevelAdapter.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAManLevelAdapter.java index 0d057d84ee..dee9a2f6e4 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAManLevelAdapter.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUAManLevelAdapter.java @@ -19,8 +19,6 @@ **/ package com.raytheon.edex.plugin.bufrua.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; - import java.util.Collections; import java.util.HashMap; import java.util.HashSet; @@ -34,6 +32,7 @@ import com.raytheon.uf.common.pointdata.Dimension; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; import com.raytheon.uf.edex.pointdata.PointDataPluginDao; @@ -48,6 +47,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao; * Mar 03, 2008 969 jkorman Initial implementation. * Dec 05, 2013 2612 bsteffen Fix max wind decoding. * Dec 17, 2013 2639 bsteffen Validate mandatory level heights. + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -131,7 +131,8 @@ public class BUFRUAManLevelAdapter extends AbstractBUFRUAAdapter { } if ((dataPoint instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(dataPoint.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(dataPoint + .getUnits()))) { List datList = (List) dataPoint .getValue(); int manIdx = 0; @@ -221,7 +222,8 @@ public class BUFRUAManLevelAdapter extends AbstractBUFRUAAdapter { } if ((dataPoint instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(dataPoint.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(dataPoint + .getUnits()))) { List datList = (List) dataPoint .getValue(); int maxWindIdx = 0; diff --git a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUASigLevelAdapter.java b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUASigLevelAdapter.java index 88dd6d823a..77ce3bb323 100644 --- a/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUASigLevelAdapter.java +++ b/edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/decoder/BUFRUASigLevelAdapter.java @@ -19,8 +19,6 @@ **/ package com.raytheon.edex.plugin.bufrua.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; - import java.util.List; import com.raytheon.edex.plugin.bufrua.util.SigWindHeightConversionManager; @@ -30,6 +28,7 @@ import com.raytheon.uf.common.pointdata.Dimension; import com.raytheon.uf.common.pointdata.PointDataDescription; import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; import com.raytheon.uf.edex.pointdata.PointDataPluginDao; @@ -45,6 +44,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao; * ------------- -------- ----------- -------------------------- * Jul 21, 2009 jkorman Initial creation * Dec 05, 2013 2612 bsteffen Convert heights for sig wind layers. + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -110,7 +110,8 @@ public class BUFRUASigLevelAdapter extends AbstractBUFRUAAdapter { IBUFRDataPacket dataPoint, PointDataView view) { if ((dataPoint instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(dataPoint.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(dataPoint + .getUnits()))) { List datList = (List) dataPoint .getValue(); int tempIdx = 0; @@ -173,7 +174,8 @@ public class BUFRUASigLevelAdapter extends AbstractBUFRUAAdapter { PointDataView view) { if ((dataPoint instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(dataPoint.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(dataPoint + .getUnits()))) { List datList = (List) dataPoint .getValue(); int windIdx = 0; diff --git a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java index 2e671de3bd..1e698ca919 100644 --- a/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java +++ b/edexOsgi/com.raytheon.edex.plugin.goessounding/src/com/raytheon/edex/plugin/goessounding/decoder/GOESSoundingDataAdapter.java @@ -19,8 +19,6 @@ **/ package com.raytheon.edex.plugin.goessounding.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; - import java.io.File; import java.util.Calendar; import java.util.List; @@ -47,6 +45,7 @@ import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; @@ -63,6 +62,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; * work without dataURI. * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage * Jul 23, 2014 3410 bclement location changed to floats + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -281,7 +281,8 @@ public class GOESSoundingDataAdapter { // get the replication sublist for the sounding data IBUFRDataPacket p = dataList.get(SAT_SOUNDERDATA_POS); if ((p instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(p.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(p + .getUnits()))) { List subList = (List) p .getValue(); diff --git a/edexOsgi/com.raytheon.edex.plugin.profiler/src/com/raytheon/edex/plugin/profiler/decoder/ProfilerDataAdapter.java b/edexOsgi/com.raytheon.edex.plugin.profiler/src/com/raytheon/edex/plugin/profiler/decoder/ProfilerDataAdapter.java index 6961165c4a..76b1fdf525 100644 --- a/edexOsgi/com.raytheon.edex.plugin.profiler/src/com/raytheon/edex/plugin/profiler/decoder/ProfilerDataAdapter.java +++ b/edexOsgi/com.raytheon.edex.plugin.profiler/src/com/raytheon/edex/plugin/profiler/decoder/ProfilerDataAdapter.java @@ -19,8 +19,6 @@ **/ package com.raytheon.edex.plugin.profiler.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; - import java.io.File; import java.util.Calendar; import java.util.Iterator; @@ -45,6 +43,7 @@ import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; @@ -63,6 +62,7 @@ import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage * added breaks/default to switch * Jul 23, 2014 3410 bclement location changed to floats + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -126,7 +126,8 @@ public class ProfilerDataAdapter { // get the replication sublist IBUFRDataPacket p = dataList.get(21); if ((p instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(p.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType() + .equals(p.getUnits()))) { List subList = (List) p .getValue(); @@ -145,7 +146,8 @@ public class ProfilerDataAdapter { hIncrement = getHeightIncrement(dataList, 22); p = dataList.get(23); if ((p instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(p.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType() + .equals(p.getUnits()))) { List subList = (List) p .getValue(); diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF index 59c320083c..09dd23e26f 100644 --- a/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/META-INF/MANIFEST.MF @@ -2,9 +2,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Bufrtools Plug-in Bundle-SymbolicName: com.raytheon.uf.edex.bufrtools -Bundle-Version: 1.12.1174.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", com.raytheon.uf.common.datastorage;bundle-version="1.12.1174", com.raytheon.uf.common.serialization;bundle-version="1.12.1174", diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java index b5adfee519..e7a32e96c5 100644 --- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java +++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/CompressedExecuteEngine.java @@ -19,9 +19,6 @@ **/ package com.raytheon.uf.edex.bufrtools.impl; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.SubSetList; - import java.util.ArrayList; import java.util.List; @@ -40,6 +37,7 @@ import com.raytheon.uf.edex.bufrtools.exceptions.BUFRDecoderException; import com.raytheon.uf.edex.bufrtools.io.BUFRBitInputStream; import com.raytheon.uf.edex.bufrtools.packets.BUFROperatorPacket; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; /** @@ -54,7 +52,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; * 20080214 862 jkorman BUFRMOS implementation changes. * 07/2009 55 T. Lee Added number of bits to skip for Table C * 04/2010 208 F. J. Yen Updated arguments for execute in processTableB - * 9/16/2014 #3628 mapeters Moved from uf.edex.decodertools plugin. + * 9/16/2014 #3628 mapeters Moved from uf.edex.decodertools plugin, replaced static imports. * * * @@ -138,7 +136,8 @@ public class CompressedExecuteEngine extends ExecuteEngine { } // for() // package all of the data into a SubListPacket BUFRSublistPacket p = new BUFRSublistPacket(packetData, - SubSetList.getPacketType(), new BUFRSublistDescriptor( + DataPacketTypes.SubSetList.getPacketType(), + new BUFRSublistDescriptor( BUFRSublistDescriptor.SUBSET_LIST_DESC, 0)); data.addPacket(p); @@ -288,7 +287,8 @@ public class CompressedExecuteEngine extends ExecuteEngine { sList.add(t.get(0)); } } - BUFRSublistPacket p = new BUFRSublistPacket(sList, RepSubList.getPacketType(), + BUFRSublistPacket p = new BUFRSublistPacket(sList, + DataPacketTypes.RepSubList.getPacketType(), new BUFRSublistDescriptor( BUFRSublistDescriptor.REP_SUBLIST_DESC, 0)); packets.add(p); diff --git a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java index 8eaf9f3060..6b01adac02 100644 --- a/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java +++ b/edexOsgi/com.raytheon.uf.edex.bufrtools/src/com/raytheon/uf/edex/bufrtools/impl/NonCompressedExecuteEngine.java @@ -19,9 +19,6 @@ **/ package com.raytheon.uf.edex.bufrtools.impl; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.SubSetList; - import java.util.ArrayList; import java.util.List; @@ -41,6 +38,7 @@ import com.raytheon.uf.edex.bufrtools.io.BUFRBitInputStream; import com.raytheon.uf.edex.bufrtools.packets.BUFRNumericPacket; import com.raytheon.uf.edex.bufrtools.packets.BUFROperatorPacket; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; /** @@ -55,7 +53,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; * 20080214 862 jkorman BUFRMOS implementation changes. * 07/2009 55 T. Lee Added number of bits to skip for Table C * 04/21/2010 208 F. J. Yen Updated arguments for execute in processTableB - * 9/16/2014 #3628 mapeters Moved from uf.edex.decodertools plugin. + * 9/16/2014 #3628 mapeters Moved from uf.edex.decodertools plugin, replaced static imports. * * * @@ -137,7 +135,8 @@ public class NonCompressedExecuteEngine extends ExecuteEngine { } } BUFRSublistPacket p = new BUFRSublistPacket(packetData, - SubSetList.getPacketType(), new BUFRSublistDescriptor( + DataPacketTypes.SubSetList.getPacketType(), + new BUFRSublistDescriptor( BUFRSublistDescriptor.SUBSET_LIST_DESC, i)); data.addPacket(p); } @@ -254,7 +253,9 @@ public class NonCompressedExecuteEngine extends ExecuteEngine { if (delayedCount == 0) { // Insert an empty sublist for the missing data. List d = new ArrayList(); - packets.add(new BUFRSublistPacket(d, RepSubList.getPacketType(), descriptor)); + packets.add(new BUFRSublistPacket(d, + DataPacketTypes.RepSubList.getPacketType(), + descriptor)); break; } processReplication(packets, subList, delayedCount); @@ -310,7 +311,8 @@ public class NonCompressedExecuteEngine extends ExecuteEngine { EngineData tdata = engine.descriptorExecutor(bitStream); BUFRSublistPacket p = new BUFRSublistPacket(tdata.getPacketData(), - RepSubList.getPacketType(), new BUFRSublistDescriptor( + DataPacketTypes.RepSubList.getPacketType(), + new BUFRSublistDescriptor( BUFRSublistDescriptor.REP_SUBLIST_DESC, 0)); packets.add(p); } diff --git a/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF index 3da671f40d..7d94063f31 100644 --- a/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.decodertools/META-INF/MANIFEST.MF @@ -2,13 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Decodertools Plug-in Bundle-SymbolicName: com.raytheon.uf.edex.decodertools -Bundle-Version: 1.12.1174.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: com.raytheon.edex.common;bundle-version="1.11.1", com.raytheon.uf.common.localization, com.raytheon.uf.common.pointdata, - javax.measure;bundle-version="1.0.0", org.geotools;bundle-version="2.5.2", com.raytheon.uf.common.site;bundle-version="1.12.1174", com.raytheon.uf.edex.ndm;bundle-version="1.0.0", diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java index 0704420dd4..651e4b46ea 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.acars/src/com/raytheon/uf/edex/plugin/acars/decoder/ACARSDataAdapter.java @@ -19,11 +19,6 @@ **/ package com.raytheon.uf.edex.plugin.acars.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.SubSetList; -import static com.raytheon.uf.edex.plugin.acars.common.ACARSConstants.NO_ICING; -import static com.raytheon.uf.edex.plugin.acars.common.ACARSConstants.RESERVE_13; - import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Calendar; @@ -42,7 +37,9 @@ import com.raytheon.uf.common.time.util.TimeUtil; import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.descriptors.BUFRDescriptor; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; +import com.raytheon.uf.edex.plugin.acars.common.ACARSConstants; /** * Adapter used to decode ACARS data in BUFR format. @@ -60,6 +57,7 @@ import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; * Jun 12, 2014 2061 bsteffen Generate unique stationid * Jul 22, 2014 3392 nabowle ACARSRecord has Float fields instead of Double * Jul 23, 2014 3410 bclement location changed to floats + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -281,7 +279,8 @@ public class ACARSDataAdapter { getFlightPhase(subList, rpt, 9); IBUFRDataPacket wxData = subList.get(10); - if (RepSubList.getPacketType().equals( + if (DataPacketTypes.RepSubList + .getPacketType().equals( wxData.getUnits())) { List dataList = (List) wxData .getValue(); @@ -640,7 +639,8 @@ public class ACARSDataAdapter { } Integer ice = record.getIcing(); - if ((ice != null) && (ice > NO_ICING) && (ice < RESERVE_13)) { + if ((ice != null) && (ice > ACARSConstants.NO_ICING) + && (ice < ACARSConstants.RESERVE_13)) { if (record.getIceBaseHgt() == null) { record.setIceBaseHgt(record.getFlightLevel()); } @@ -672,7 +672,8 @@ public class ACARSDataAdapter { List subList = null; IBUFRDataPacket packet = dataList.get(0); - if (SubSetList.getPacketType().equals(packet.getUnits())) { + if (DataPacketTypes.SubSetList.getPacketType() + .equals(packet.getUnits())) { subList = (List) packet.getValue(); if ((subList != null) && (subList.size() >= 6)) { packet = subList.get(0); // Height diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java index 7733fe8626..4b048ef3be 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrmos/src/com/raytheon/uf/edex/plugin/bufrmos/decoder/MOSDescriptorDelegate.java @@ -19,14 +19,6 @@ **/ package com.raytheon.uf.edex.plugin.bufrmos.decoder; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_AVN; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_ETA; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_GFS; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_HPC; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_LAMP; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_MRF; -import static com.raytheon.uf.edex.plugin.bufrmos.decoder.BUFRMOSStaticData.MODEL_NGM; - import java.util.HashMap; import java.util.Map; @@ -46,7 +38,8 @@ import com.raytheon.uf.edex.bufrtools.descriptors.IDescriptorFactorySelector; * * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * + * jkorman Initial creation. + * Sep 16, 2014 #3628 mapeters Replaced static imports. * * * @@ -62,19 +55,20 @@ public class MOSDescriptorDelegate implements IDescriptorFactoryDelegate { private static Map factories; static { factories = new HashMap(); - factories.put(MODEL_AVN, + factories.put(BUFRMOSStaticData.MODEL_AVN, createFactory("AVNBufrTableB", "AVNBufrTableD")); - factories.put(MODEL_ETA, + factories.put(BUFRMOSStaticData.MODEL_ETA, createFactory("ETABufrTableB", "ETABufrTableD")); - factories.put(MODEL_GFS, + factories.put(BUFRMOSStaticData.MODEL_GFS, createFactory("GFSBufrTableB", "GFSBufrTableD")); - factories.put(MODEL_HPC, + factories.put(BUFRMOSStaticData.MODEL_HPC, createFactory("HPCBufrTableB", "HPCBufrTableD")); - factories.put(MODEL_LAMP, createFactory("LAMPBufrTableB", + factories.put(BUFRMOSStaticData.MODEL_LAMP, + createFactory("LAMPBufrTableB", "LAMPBufrTableD")); - factories.put(MODEL_MRF, + factories.put(BUFRMOSStaticData.MODEL_MRF, createFactory("MRFBufrTableB", "MRFBufrTableD")); - factories.put(MODEL_NGM, + factories.put(BUFRMOSStaticData.MODEL_NGM, createFactory("NGMBufrTableB", "NGMBufrTableD")); } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/decoder/BUFRncwfDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/decoder/BUFRncwfDataAdapter.java index 17b64d1096..20e035883c 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/decoder/BUFRncwfDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrncwf/src/com/raytheon/uf/edex/plugin/bufrncwf/decoder/BUFRncwfDataAdapter.java @@ -19,9 +19,6 @@ **/ package com.raytheon.uf.edex.plugin.bufrncwf.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.SubSetList; - import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; @@ -39,6 +36,7 @@ import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.BUFRPointDataAdapter; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.DecoderTools; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; @@ -59,6 +57,7 @@ import com.vividsolutions.jts.geom.Coordinate; * Aug 30, 2013 2298 rjpeter Make getPluginName abstract * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage * Jul 23, 2014 3410 bclement location changed to floats + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -352,9 +351,11 @@ public class BUFRncwfDataAdapter extends BUFRPointDataAdapter { private static List getPacketSubList(IBUFRDataPacket packet) { List list = null; if (packet instanceof BUFRSublistPacket) { - if (RepSubList.getPacketType().equals(packet.getUnits())) { + if (DataPacketTypes.RepSubList.getPacketType().equals( + packet.getUnits())) { list = (List) packet.getValue(); - } else if (SubSetList.getPacketType().equals(packet.getUnits())) { + } else if (DataPacketTypes.SubSetList.getPacketType().equals( + packet.getUnits())) { list = (List) packet.getValue(); } } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java index 2b0c29f721..73a62d74b3 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrsigwx/src/com/raytheon/uf/edex/plugin/bufrsigwx/decoder/SigWxDataAdapter.java @@ -19,9 +19,6 @@ **/ package com.raytheon.uf.edex.plugin.bufrsigwx.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.SubSetList; - import java.util.Calendar; import java.util.Iterator; import java.util.List; @@ -39,6 +36,7 @@ import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.BUFRPointDataAdapter; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; import com.raytheon.uf.edex.pointdata.PointDataPluginDao; @@ -55,6 +53,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao; * Jul 06, 2009 2538 jsanchez Added latitude,longitude to point data. * Aug 30, 2013 2298 rjpeter Make getPluginName abstract * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -241,9 +240,11 @@ public abstract class SigWxDataAdapter extends BUFRPointDataAdapter { static List getPacketSubList(IBUFRDataPacket packet) { List list = null; if (packet instanceof BUFRSublistPacket) { - if (RepSubList.getPacketType().equals(packet.getUnits())) { + if (DataPacketTypes.RepSubList.getPacketType().equals( + packet.getUnits())) { list = (List) packet.getValue(); - } else if (SubSetList.getPacketType().equals(packet.getUnits())) { + } else if (DataPacketTypes.SubSetList.getPacketType().equals( + packet.getUnits())) { list = (List) packet.getValue(); } } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java index 7c301c1f6b..d08f6ba3c4 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.bufrssmi/src/com/raytheon/uf/edex/plugin/bufrssmi/decoder/SSMIDataAdapter.java @@ -19,8 +19,6 @@ **/ package com.raytheon.uf.edex.plugin.bufrssmi.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; - import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; @@ -37,6 +35,7 @@ import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.BUFRPointDataAdapter; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; import com.raytheon.uf.edex.pointdata.PointDataPluginDao; @@ -57,6 +56,7 @@ import com.raytheon.uf.edex.pointdata.PointDataPluginDao; * Oct 21, 2013 2379 bsteffen Fix a null pointer exception. * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage * Jul 23, 2014 3410 bclement location changed to floats + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -170,10 +170,12 @@ public class SSMIDataAdapter extends BUFRPointDataAdapter { List pointList = null; if ((p1 instanceof BUFRSublistPacket) && (p1 instanceof BUFRSublistPacket)) { - if (RepSubList.getPacketType().equals(p1.getUnits())) { + if (DataPacketTypes.RepSubList.getPacketType().equals( + p1.getUnits())) { locList = (List) p1.getValue(); } - if (RepSubList.getPacketType().equals(p2.getUnits())) { + if (DataPacketTypes.RepSubList.getPacketType().equals( + p2.getUnits())) { pointList = (List) p2.getValue(); } } diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.modelsounding/src/com/raytheon/uf/edex/plugin/modelsounding/decoder/ModelSoundingDataAdapter.java b/edexOsgi/com.raytheon.uf.edex.plugin.modelsounding/src/com/raytheon/uf/edex/plugin/modelsounding/decoder/ModelSoundingDataAdapter.java index 3961a4d35e..178e4a9bd7 100644 --- a/edexOsgi/com.raytheon.uf.edex.plugin.modelsounding/src/com/raytheon/uf/edex/plugin/modelsounding/decoder/ModelSoundingDataAdapter.java +++ b/edexOsgi/com.raytheon.uf.edex.plugin.modelsounding/src/com/raytheon/uf/edex/plugin/modelsounding/decoder/ModelSoundingDataAdapter.java @@ -19,8 +19,6 @@ **/ package com.raytheon.uf.edex.plugin.modelsounding.decoder; -import static com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes.RepSubList; - import java.io.File; import java.util.Calendar; import java.util.List; @@ -45,6 +43,7 @@ import com.raytheon.uf.common.wmo.WMOHeader; import com.raytheon.uf.edex.bufrtools.BUFRDataDocument; import com.raytheon.uf.edex.bufrtools.descriptors.BUFRDescriptor; import com.raytheon.uf.edex.bufrtools.packets.BUFRSublistPacket; +import com.raytheon.uf.edex.bufrtools.packets.DataPacketTypes; import com.raytheon.uf.edex.bufrtools.packets.IBUFRDataPacket; import com.raytheon.uf.edex.decodertools.core.IDecoderConstants; import com.raytheon.uf.edex.plugin.modelsounding.SoundingModelTemporalData; @@ -65,6 +64,7 @@ import com.raytheon.uf.edex.plugin.modelsounding.common.SoundingModels; * temporal information into its own function. * Dec 02, 2013 2537 bsteffen Use SoundingSite setters instead of view. * Jul 23, 2014 3410 bclement location changed to floats + * Sep 16, 2014 3628 mapeters Replaced static imports. * * * @@ -304,7 +304,8 @@ public class ModelSoundingDataAdapter { // get the replication sublist for the sounding data IBUFRDataPacket p = dataList.get(5); if ((p instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(p.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(p + .getUnits()))) { List subList = (List) p .getValue(); @@ -391,7 +392,8 @@ public class ModelSoundingDataAdapter { // get the replication sublist for the sounding data IBUFRDataPacket p = dataList.get(7); if ((p instanceof BUFRSublistPacket) - && (RepSubList.getPacketType().equals(p.getUnits()))) { + && (DataPacketTypes.RepSubList.getPacketType().equals(p + .getUnits()))) { List subList = (List) p .getValue();