From 6d6127913c18b8727afb67e2d2bab158203ad56b Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 18 May 2015 10:25:40 -0500 Subject: [PATCH] Omaha #4079 Update tcs and hpe manifests. Former-commit-id: 3b0dc2374f86355676144143f8a6628207fb2512 --- cave/com.raytheon.uf.viz.hpe/META-INF/MANIFEST.MF | 4 +++- cave/com.raytheon.uf.viz.tcs/META-INF/MANIFEST.MF | 15 ++++----------- .../com/raytheon/uf/viz/tcs/rsc/TCSResource.java | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/cave/com.raytheon.uf.viz.hpe/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.hpe/META-INF/MANIFEST.MF index 4a28e037d0..8f961ce1ca 100644 --- a/cave/com.raytheon.uf.viz.hpe/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.hpe/META-INF/MANIFEST.MF @@ -16,6 +16,8 @@ Require-Bundle: org.eclipse.core.runtime, com.raytheon.viz.grid;bundle-version="1.14.0", com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174", com.raytheon.uf.common.geospatial;bundle-version="1.14.0", - com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0" + com.raytheon.uf.viz.core.rsc;bundle-version="1.0.0", + com.raytheon.uf.viz.core.grid;bundle-version="1.15.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy +Import-Package: com.raytheon.viz.core.rsc diff --git a/cave/com.raytheon.uf.viz.tcs/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.tcs/META-INF/MANIFEST.MF index e250442cd0..e44a11f4da 100644 --- a/cave/com.raytheon.uf.viz.tcs/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.tcs/META-INF/MANIFEST.MF @@ -2,20 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tcs Plug-in Bundle-SymbolicName: com.raytheon.uf.viz.tcs -Bundle-Version: 1.14.0.qualifier +Bundle-Version: 1.15.0.qualifier Bundle-Vendor: RAYTHEON Require-Bundle: org.eclipse.ui, com.raytheon.uf.viz.core, - org.eclipse.core.runtime, - org.geotools;bundle-version="2.6.4" + com.raytheon.uf.viz.core.point;bundle-version="1.15.0", + com.raytheon.uf.common.geospatial;bundle-version="1.14.2" Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Import-Package: com.raytheon.uf.common.dataplugin, com.raytheon.uf.common.dataplugin.tcs, com.raytheon.uf.common.dataplugin.tcs.util, - com.raytheon.uf.common.geospatial, com.raytheon.uf.common.pointdata, - com.raytheon.uf.common.serialization, com.raytheon.uf.common.status, com.raytheon.uf.common.time, com.raytheon.uf.viz.core, @@ -24,14 +22,9 @@ Import-Package: com.raytheon.uf.common.dataplugin, com.raytheon.uf.viz.core.map, com.raytheon.uf.viz.core.rsc, com.raytheon.uf.viz.core.rsc.capabilities, - com.raytheon.uf.viz.core.status, com.raytheon.viz.pointdata, - com.raytheon.viz.pointdata.util, com.vividsolutions.jts.geom, javax.measure.converter, javax.measure.unit, - org.eclipse.core.runtime, - org.eclipse.swt.graphics, - org.eclipse.ui.plugin, - org.osgi.framework + org.eclipse.swt.graphics Export-Package: com.raytheon.uf.viz.tcs.rsc diff --git a/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java b/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java index bfc3b21823..cb62bc5960 100644 --- a/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java +++ b/cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java @@ -59,13 +59,13 @@ import com.raytheon.uf.viz.core.drawables.IWireframeShape; import com.raytheon.uf.viz.core.drawables.PaintProperties; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.map.MapDescriptor; +import com.raytheon.uf.viz.core.point.display.SymbolLoader; import com.raytheon.uf.viz.core.rsc.AbstractVizResource; import com.raytheon.uf.viz.core.rsc.IResourceDataChanged; import com.raytheon.uf.viz.core.rsc.LoadProperties; import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability; import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability; import com.raytheon.viz.pointdata.PointDataRequest; -import com.raytheon.viz.pointdata.util.SymbolLoader; import com.vividsolutions.jts.geom.Coordinate; /**