From 54e1ebb9a9d75d3365169d417b39b7ff09d7fa2e Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 12 May 2014 15:07:46 -0500 Subject: [PATCH 1/2] Omaha #3133 remove some unnecessary edex dependencies Change-Id: I91f10fb36ecadf8e2fc830b135b5d245830417a2 Former-commit-id: 15329c6b03183f61a46542231da276430c5a5016 [formerly 15329c6b03183f61a46542231da276430c5a5016 [formerly 846003056f07ef205f59c7b043a31a4fa66e5977]] Former-commit-id: 54dbc0ef71e7fb0c7d149009aec63b7fc5cc22b3 Former-commit-id: 2bb07cddf04d17483f531b95ab68836437dc7b08 --- .../META-INF/MANIFEST.MF | 5 ++--- .../uf/common/dataplugin/bufrncwf/NCWFFeature.java | 8 ++++---- .../META-INF/MANIFEST.MF | 5 ++--- .../uf/common/dataplugin/bufrssmi/SSMIScanData.java | 5 +++-- .../META-INF/MANIFEST.MF | 3 +-- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF index b1694c1c2d..acbfd2a736 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Ncwf Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrncwf -Bundle-Version: 1.12.1174.qualifier +Bundle-Version: 1.14.0.qualifier Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -14,5 +14,4 @@ Require-Bundle: com.raytheon.uf.common.serialization, com.raytheon.uf.common.geospatial Import-Package: com.raytheon.uf.common.pointdata, com.raytheon.uf.common.pointdata.spatial, - com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.core + com.raytheon.uf.common.status diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/NCWFFeature.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/NCWFFeature.java index 47907c45e9..9c0fe54f8e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/NCWFFeature.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrncwf/src/com/raytheon/uf/common/dataplugin/bufrncwf/NCWFFeature.java @@ -25,7 +25,6 @@ import java.util.List; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import com.raytheon.uf.edex.decodertools.core.DecoderTools; import com.vividsolutions.jts.geom.Coordinate; /** @@ -38,6 +37,7 @@ import com.vividsolutions.jts.geom.Coordinate; * ------------ ---------- ----------- -------------------------- * --/--/---- jkorman Initial creation * Oct 15, 2013 2361 njensen Remove XML annotations + * May 12, 2014 3133 njensen Remove dependency on DecoderTools * * * @@ -66,7 +66,7 @@ public class NCWFFeature implements Serializable { * Feature centroid longitude. */ public NCWFFeature(Double lat, Double lon) { - centroidLocation = DecoderTools.createCoordinate(lat, lon); + centroidLocation = new Coordinate(lon, lat); } /** @@ -81,7 +81,7 @@ public class NCWFFeature implements Serializable { * @return */ public double getCentroidLatitude() { - return DecoderTools.getCoordinateLatitude(centroidLocation); + return centroidLocation.y; } /** @@ -89,7 +89,7 @@ public class NCWFFeature implements Serializable { * @return */ public double getCentroidLongitude() { - return DecoderTools.getCoordinateLongitude(centroidLocation); + return centroidLocation.x; } /** diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF index d60ddb0465..07e65bda34 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Bufrssmi Plug-in Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrssmi -Bundle-Version: 1.12.1174.qualifier +Bundle-Version: 1.14.0.qualifier Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 @@ -15,5 +15,4 @@ Require-Bundle: com.raytheon.uf.common.serialization, com.raytheon.uf.common.dataplugin Import-Package: com.raytheon.uf.common.dataplugin.bufrssmi, com.raytheon.uf.common.pointdata, - com.raytheon.uf.common.status, - com.raytheon.uf.edex.decodertools.time + com.raytheon.uf.common.status diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java index 16eaed9154..e67577437c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrssmi/src/com/raytheon/uf/common/dataplugin/bufrssmi/SSMIScanData.java @@ -42,7 +42,7 @@ import com.raytheon.uf.common.pointdata.PointDataView; import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import com.raytheon.uf.edex.decodertools.time.TimeTools; +import com.raytheon.uf.common.time.util.TimeUtil; import com.vividsolutions.jts.geom.Geometry; /** @@ -62,6 +62,7 @@ import com.vividsolutions.jts.geom.Geometry; * May 17, 2013 1869 bsteffen Remove DataURI column from sat plot * types. * Aug 30, 2013 2298 rjpeter Make getPluginName abstract + * May 12, 2014 3133 njensen Use TimeUtil instead of TimeTools * * * @@ -315,7 +316,7 @@ public class SSMIScanData extends PersistablePluginDataObject implements SSMIScanData obs = new SSMIScanData(); obs.dataTime = dataTime.clone(); - obs.timeObs = TimeTools.copy(timeObs); + obs.timeObs = TimeUtil.newCalendar(timeObs); obs.orbitNumber = orbitNumber; obs.satId = satId; obs.scanNumber = scanNumber; diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF index df64d6079a..c8c18c71d9 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.text/META-INF/MANIFEST.MF @@ -8,8 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization Require-Bundle: com.raytheon.uf.common.serialization, org.hibernate, - com.raytheon.uf.common.localization;bundle-version="1.12.1174", - com.raytheon.edex.common;bundle-version="1.12.1174" + com.raytheon.uf.common.localization;bundle-version="1.12.1174" Import-Package: com.raytheon.uf.common.dataplugin.persist, com.raytheon.uf.common.serialization, com.raytheon.uf.common.serialization.annotations, From bec02c3322e1134ee5595a64c8d06d2a40fcad27 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Mon, 12 May 2014 15:19:25 -0500 Subject: [PATCH 2/2] Omaha #3133 remove incorrect dependencies Change-Id: Iadccd506bb3fd1f009efeda82193138088a2895f Former-commit-id: 2d32999655de2804049b125260160e4df406f7fc [formerly 2d32999655de2804049b125260160e4df406f7fc [formerly 6db290e14df962d91174727b027b0c5afc1ed0ce]] Former-commit-id: d2f86668df027dec5fbf6388afbc314dee07cc1a Former-commit-id: 559993eaf9abee3b376cc2c72bb390e976760ec8 --- .../com.raytheon.uf.edex.archive.feeder/META-INF/MANIFEST.MF | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/edexOsgi/com.raytheon.uf.edex.archive.feeder/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.edex.archive.feeder/META-INF/MANIFEST.MF index f00382758c..3105e39b47 100644 --- a/edexOsgi/com.raytheon.uf.edex.archive.feeder/META-INF/MANIFEST.MF +++ b/edexOsgi/com.raytheon.uf.edex.archive.feeder/META-INF/MANIFEST.MF @@ -2,14 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Utility Bundle-SymbolicName: com.raytheon.uf.edex.archive.feeder -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.raytheon.uf.edex.archive.feeder.Activator +Bundle-Version: 1.14.0.qualifier Bundle-Vendor: RAYTHEON Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174", com.raytheon.edex.common;bundle-version="1.12.1174", com.raytheon.uf.edex.database;bundle-version="1.0.0", - org.eclipse.ui, - org.eclipse.core.runtime, com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", com.raytheon.uf.common.status;bundle-version="1.12.1174", org.apache.camel;bundle-version="1.0.0",