From 18980e6a8cdd75a755fcb26d7c6556b3a6107c25 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Fri, 21 Feb 2014 17:37:19 -0600 Subject: [PATCH] Issue #2817 Fix image reproject. Remove deprecated mesh reproject. Former-commit-id: 152980350c73a0fd117e39885750bd354d61325f [formerly 780dc19facf70c2df29a5ca3fcc909e10e9def5d] [formerly 70ae37230346caa727104189f036b47b27bd22b9] [formerly 152980350c73a0fd117e39885750bd354d61325f [formerly 780dc19facf70c2df29a5ca3fcc909e10e9def5d] [formerly 70ae37230346caa727104189f036b47b27bd22b9] [formerly e08d4f77c3bc3647d48f0f234f7d793d3827fad9 [formerly 70ae37230346caa727104189f036b47b27bd22b9 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]] Former-commit-id: e08d4f77c3bc3647d48f0f234f7d793d3827fad9 Former-commit-id: d27c21b9f6479aebce357b1fc9f3aed50cd2ed96 [formerly 7aca322faa566f785189f145c3caad9faa716647] [formerly c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf8965936fe41630f4eb9a41fe982ecd78ed51]] Former-commit-id: 38003672caef259cf47e8867a401b32fc9add635 [formerly 7e29aa25a916e1116328fafeb5b2d45cc27bf394] Former-commit-id: 07ffe9f7115e74eced83306e591ad81ea6842b50 --- .../rendering/ImagingRenderingHandler.java | 16 +++++---- .../META-INF/MANIFEST.MF | 11 +++--- .../src/com/raytheon/uf/viz/core/IMesh.java | 17 ++------- .../META-INF/MANIFEST.MF | 6 ++-- .../viz/kml/export/graphics/ext/KmlMesh.java | 18 +++++----- .../META-INF/MANIFEST.MF | 22 ++++++------ .../events/imagery/PaintImageEvent.java | 15 ++++---- ...jectMeshEvent.java => CloneMeshEvent.java} | 28 +++++++++++---- .../graphics/objects/DispatchingMesh.java | 31 ++++++++-------- .../META-INF/MANIFEST.MF | 35 ++++++------------- .../raytheon/viz/core/gl/AbstractGLMesh.java | 19 +++------- 11 files changed, 96 insertions(+), 122 deletions(-) rename cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/{ReprojectMeshEvent.java => CloneMeshEvent.java} (66%) diff --git a/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ImagingRenderingHandler.java b/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ImagingRenderingHandler.java index f9e2087b61..33dcaf107f 100644 --- a/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ImagingRenderingHandler.java +++ b/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ImagingRenderingHandler.java @@ -61,8 +61,8 @@ import com.raytheon.uf.viz.remote.graphics.events.imagery.PaintImagesEvent; import com.raytheon.uf.viz.remote.graphics.events.imagery.RenderedImageEvent; import com.raytheon.uf.viz.remote.graphics.events.imagery.UpdateImageDataEvent; import com.raytheon.uf.viz.remote.graphics.events.imagery.UpdateSingleColorImage; +import com.raytheon.uf.viz.remote.graphics.events.mesh.CloneMeshEvent; import com.raytheon.uf.viz.remote.graphics.events.mesh.CreateMeshEvent; -import com.raytheon.uf.viz.remote.graphics.events.mesh.ReprojectMeshEvent; import com.raytheon.uf.viz.remote.graphics.events.mosaic.CreateMosaicImageEvent; import com.raytheon.uf.viz.remote.graphics.events.mosaic.UpdateImagesToMosaic; import com.raytheon.uf.viz.remote.graphics.events.mosaic.UpdateMosaicExtent; @@ -76,9 +76,10 @@ import com.raytheon.uf.viz.remote.graphics.extensions.DispatchingMosaicOrderedEx * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Apr 16, 2012 mschenke Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Apr 16, 2012 mschenke Initial creation + * Feb 21, 2014 2817 bsteffen Fix mesh cloning. * * * @@ -319,12 +320,13 @@ public class ImagingRenderingHandler extends CollaborationRenderingHandler { } @Subscribe - public void reprojectMesh(ReprojectMeshEvent event) { - IMesh mesh = dataManager.getRenderableObject(event.getObjectId(), + public void cloneMesh(CloneMeshEvent event) { + IMesh mesh = dataManager.getRenderableObject(event.getSourceObjectId(), IMesh.class); if (mesh != null) { try { - mesh.reproject(event.getTargetGeometry()); + mesh = mesh.clone(event.getTargetGeometry()); + dataManager.putRenderableObject(event.getObjectId(), mesh); } catch (VizException e) { Activator.statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e); diff --git a/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF index 8e38aa2417..777a170768 100644 --- a/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF @@ -1,13 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Core Plug-in +Bundle-Name: Viz Core Plug-in Bundle-SymbolicName: com.raytheon.uf.viz.core;singleton:=true -Bundle-Version: 1.14.0.qualifier +Bundle-Version: 1.14.1.qualifier Bundle-Activator: com.raytheon.uf.viz.core.Activator Bundle-Vendor: Raytheon Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.apache.commons.beanutils;bundle-version="1.6.1", org.apache.http;visibility:=reexport, com.raytheon.uf.common.localization;visibility:=reexport, com.raytheon.uf.common.serialization;visibility:=reexport, @@ -18,21 +17,19 @@ Require-Bundle: org.eclipse.ui, org.apache.commons.lang, javax.vecmath;bundle-version="1.3.1", javax.measure;bundle-version="1.0.0", - org.jep;bundle-version="1.0.0", com.raytheon.uf.common.datastorage;bundle-version="1.11.11", - org.apache.velocity;bundle-version="1.5.0", org.apache.qpid;bundle-version="0.18.0", javax.jms;bundle-version="1.0.0", org.apache.activemq, com.raytheon.uf.common.util;bundle-version="1.0.0", com.raytheon.uf.common.auth;bundle-version="1.0.0", com.raytheon.uf.common.dataplugin, - com.raytheon.uf.common.dataplugin.level, + com.raytheon.uf.common.dataplugin.level;bundle-version="1.14.0", com.raytheon.uf.common.dataquery;visibility:=reexport, com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", com.raytheon.uf.common.units;bundle-version="1.0.0", com.raytheon.uf.common.colormap;bundle-version="1.12.1174", - com.raytheon.uf.common.pointdata;bundle-version="1.12.1174", + com.raytheon.uf.common.pointdata;bundle-version="1.13.0", com.raytheon.uf.common.time;bundle-version="1.12.1174", com.raytheon.uf.common.comm;bundle-version="1.12.1174", com.raytheon.uf.common.message;bundle-version="1.12.1174", diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IMesh.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IMesh.java index ecbd8f3958..d3dc67b414 100644 --- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IMesh.java +++ b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IMesh.java @@ -29,9 +29,9 @@ import com.raytheon.uf.viz.core.exception.VizException; * * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Feb 21, 2014  2817     bsteffen    Remove Deprecated reproject.
  * 
  *
* @@ -53,17 +53,6 @@ public interface IMesh { */ public boolean intersects(IExtent extent); - /** - * use clone instead, this method will be removed in future version. - * - * @param targetGeometry - * @return - * @throws VizException - */ - @Deprecated - public IMesh reproject(GeneralGridGeometry targetGeometry) - throws VizException; - /** * Create a mesh identical to this mesh but for a different target geometry. * If this mesh is no longer in use than dispose should be called after diff --git a/cave/com.raytheon.uf.viz.kml.export/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.kml.export/META-INF/MANIFEST.MF index de6fdb97f1..b2b52de7ab 100644 --- a/cave/com.raytheon.uf.viz.kml.export/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.kml.export/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: KML Export Bundle-SymbolicName: com.raytheon.uf.viz.kml.export;singleton:=true -Bundle-Version: 1.14.0.qualifier +Bundle-Version: 1.14.1.qualifier Bundle-Vendor: RAYTHEON Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.core.runtime, - com.raytheon.uf.viz.core;bundle-version="1.14.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", + com.raytheon.uf.viz.core;bundle-version="1.14.1", com.raytheon.viz.ui;bundle-version="1.14.0", de.micromata.opengis.kml, com.raytheon.uf.common.geospatial, diff --git a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlMesh.java b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlMesh.java index 298b70f96f..cffefa286c 100644 --- a/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlMesh.java +++ b/cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlMesh.java @@ -39,9 +39,10 @@ import com.raytheon.uf.viz.core.exception.VizException; * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jun 1, 2012 bsteffen Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jun 01, 2012 bsteffen Initial creation + * Feb 21, 2014 2817 bsteffen Remove Deprecated reproject. * * * @@ -64,7 +65,10 @@ public class KmlMesh implements IMesh { @Override public void dispose() { - + /* + * Nothing to do because no resources are out of reach of the garbage + * collector. + */ } @Override @@ -72,12 +76,6 @@ public class KmlMesh implements IMesh { return false; } - @Override - public KmlMesh reproject(GeneralGridGeometry targetGeometry) - throws VizException { - return clone(targetGeometry); - } - @Override public KmlMesh clone(GeneralGridGeometry targetGeometry) throws VizException { diff --git a/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF index 0ce0fb6dde..3f6d00a262 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.uf.viz.remote.graphics/META-INF/MANIFEST.MF @@ -2,22 +2,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Remote Graphics Bundle-SymbolicName: com.raytheon.uf.viz.remote.graphics;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-Activator: com.raytheon.uf.viz.remote.graphics.Activator Bundle-Vendor: RAYTHEON -Eclipse-RegisterBuddy: com.raytheon.uf.viz.core -Eclipse-BuddyPolicy: dependent -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - com.raytheon.uf.viz.core;bundle-version="1.12.1174", - com.raytheon.uf.common.colormap;bundle-version="1.12.1174", - com.raytheon.viz.ui;bundle-version="1.12.1174", - com.raytheon.uf.common.util;bundle-version="1.12.1174", - com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", - javax.measure;bundle-version="1.0.0", - javax.vecmath;bundle-version="1.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy +Eclipse-RegisterBuddy: com.raytheon.uf.viz.core +Eclipse-BuddyPolicy: dependent +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0", + com.raytheon.uf.viz.core;bundle-version="1.14.1", + com.raytheon.uf.common.colormap, + com.raytheon.viz.ui;bundle-version="1.14.0", + com.raytheon.uf.common.util, + com.raytheon.uf.common.geospatial, + javax.measure Export-Package: com.raytheon.uf.viz.remote.graphics, com.raytheon.uf.viz.remote.graphics.events, com.raytheon.uf.viz.remote.graphics.events.clipping, diff --git a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/imagery/PaintImageEvent.java b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/imagery/PaintImageEvent.java index 0974da49b6..a70a7526c5 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/imagery/PaintImageEvent.java +++ b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/imagery/PaintImageEvent.java @@ -27,15 +27,16 @@ import com.raytheon.uf.viz.remote.graphics.events.rendering.IRenderEvent; import com.vividsolutions.jts.geom.Coordinate; /** - * TODO Add Description + * Event to indicate an image should be painted. * * 
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Mar 8, 2012            mschenke     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Mar 08, 2012           mschenke     Initial creation
+ * Feb 21, 2014  2817     bsteffen     Fix equals.
  * 
  *
* @@ -213,10 +214,10 @@ public class PaintImageEvent extends AbstractDispatchingObjectEvent implements if (getClass() != obj.getClass()) return false; PaintImageEvent other = (PaintImageEvent) obj; - if (meshId == other.meshId && meshId != -1) { + if (meshId != other.meshId) { // If meshes are set, compare them only - return true; - } else if (meshId == other.meshId) { + return false; + } else if (meshId == -1 && meshId == other.meshId) { // Compare extents if no meshes set (-1) if (ll == null) { if (other.ll != null) diff --git a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/ReprojectMeshEvent.java b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/CloneMeshEvent.java similarity index 66% rename from cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/ReprojectMeshEvent.java rename to cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/CloneMeshEvent.java index 47dac3dce8..aa2d5ae27c 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/ReprojectMeshEvent.java +++ b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/mesh/CloneMeshEvent.java @@ -22,29 +22,37 @@ package com.raytheon.uf.viz.remote.graphics.events.mesh; import org.geotools.coverage.grid.GeneralGridGeometry; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; +import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.viz.remote.graphics.events.AbstractDispatchingObjectEvent; +import com.raytheon.uf.viz.remote.graphics.events.ICreationEvent; /** - * TODO Add Description + * + * Event for cloning a mesh in a different projection * * 
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Mar 26, 2012            mschenke     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Feb 21, 2014  2817     bsteffen    Initial creation
  * 
  *
* - * @author mschenke + * @author bsteffen * @version 1.0 */ @DynamicSerialize -public class ReprojectMeshEvent extends AbstractDispatchingObjectEvent { +public class CloneMeshEvent extends AbstractDispatchingObjectEvent implements + ICreationEvent { + @DynamicSerializeElement private GeneralGridGeometry targetGeometry; + @DynamicSerializeElement + private int sourceObjectId; + /** * @return the targetGeometry */ @@ -60,4 +68,12 @@ public class ReprojectMeshEvent extends AbstractDispatchingObjectEvent { this.targetGeometry = targetGeometry; } + public int getSourceObjectId() { + return sourceObjectId; + } + + public void setSourceObjectId(int sourceObjectId) { + this.sourceObjectId = sourceObjectId; + } + } diff --git a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/objects/DispatchingMesh.java b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/objects/DispatchingMesh.java index 189ec00dee..201e43973b 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/objects/DispatchingMesh.java +++ b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/objects/DispatchingMesh.java @@ -28,6 +28,7 @@ import com.raytheon.uf.viz.remote.graphics.Dispatcher; import com.raytheon.uf.viz.remote.graphics.DispatchingObject; import com.raytheon.uf.viz.remote.graphics.events.DisposeObjectEvent; import com.raytheon.uf.viz.remote.graphics.events.RemoteGraphicsEventFactory; +import com.raytheon.uf.viz.remote.graphics.events.mesh.CloneMeshEvent; /** * Dispatching mesh object created from graphics mesh and forwards key events to @@ -37,9 +38,11 @@ import com.raytheon.uf.viz.remote.graphics.events.RemoteGraphicsEventFactory; * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Mar 5, 2012 mschenke Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Mar 05, 2012 mschenke Initial creation + * Feb 21, 2014 2817 bsteffen Fix clone. + * * * * @@ -82,22 +85,18 @@ public class DispatchingMesh extends DispatchingObject implements IMesh { return wrappedObject.intersects(extent); } - /* - * (non-Javadoc) - * - * @see com.raytheon.uf.viz.core.IMesh#reproject(org.geotools.coverage.grid. - * GeneralGridGeometry) - */ - @Override - public IMesh reproject(GeneralGridGeometry targetGeometry) - throws VizException { - return clone(targetGeometry); - } - @Override public IMesh clone(GeneralGridGeometry targetGeometry) throws VizException { - return new DispatchingMesh(wrappedObject.clone(targetGeometry), + IMesh newMesh = wrappedObject.clone(targetGeometry); + DispatchingMesh newDispatchingMesh = new DispatchingMesh(newMesh, getDispatcher()); + // Send event to dispose mesh + CloneMeshEvent event = RemoteGraphicsEventFactory.createEvent( + CloneMeshEvent.class, newDispatchingMesh); + event.setTargetGeometry(targetGeometry); + event.setSourceObjectId(this.getObjectId()); + dispatch(event); + return newDispatchingMesh; } } diff --git a/cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF index fc5ff1502f..fbd46edaa4 100644 --- a/cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF @@ -2,37 +2,22 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: OpenGL Rendering Plug-in Bundle-SymbolicName: com.raytheon.viz.core.gl;singleton:=true -Bundle-Version: 1.12.1174.qualifier +Bundle-Version: 1.14.0.qualifier Bundle-Activator: com.raytheon.viz.core.gl.Activator Bundle-Vendor: Raytheon -Eclipse-BuddyPolicy: ext, registered -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - javax.media.opengl;visibility:=reexport, - org.geotools, - javax.vecmath, - com.raytheon.uf.common.colormap;bundle-version="1.0.0", - com.raytheon.uf.viz.core, - com.raytheon.uf.common.util;bundle-version="1.0.0", - com.raytheon.uf.common.geospatial;bundle-version="1.12.1174", - javax.measure;bundle-version="1.0.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy +Require-Bundle: org.eclipse.ui;bundle-version="3.8.0", + org.eclipse.core.runtime;bundle-version="3.8.0", + javax.media.opengl;visibility:=reexport, + com.raytheon.uf.common.colormap, + com.raytheon.uf.viz.core;bundle-version="1.14.1", + com.raytheon.uf.common.util, + com.raytheon.uf.common.geospatial, + javax.measure Export-Package: com.raytheon.viz.core.gl, com.raytheon.viz.core.gl.dataformat, com.raytheon.viz.core.gl.ext, com.raytheon.viz.core.gl.ext.imaging, com.raytheon.viz.core.gl.glsl, com.raytheon.viz.core.gl.images -Import-Package: com.raytheon.uf.common.status, - com.raytheon.uf.viz.core, - com.raytheon.uf.viz.core.data, - com.raytheon.uf.viz.core.data.resp, - com.raytheon.uf.viz.core.drawables, - com.raytheon.uf.viz.core.exception, - com.raytheon.uf.viz.core.geom, - com.raytheon.uf.viz.core.map, - com.raytheon.uf.viz.core.preferences, - com.raytheon.uf.viz.core.rsc, - com.raytheon.uf.viz.core.rsc.hdf5, - com.raytheon.uf.viz.core.status -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 diff --git a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java index dd6fe229c9..620b5bd36c 100644 --- a/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java +++ b/cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java @@ -51,9 +51,10 @@ import com.raytheon.viz.core.gl.SharedCoordMap.SharedCoordinates; * 
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 1, 2010            mschenke     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Jul 01, 2010           mschenke    Initial creation
+ * Feb 21, 2014  2817     bsteffen    Remove Deprecated reproject.
  * 
  *
* @@ -235,18 +236,6 @@ public abstract class AbstractGLMesh implements IMesh { } } - /* - * (non-Javadoc) - * - * @see com.raytheon.uf.viz.core.IMesh#reproject(org.geotools.coverage.grid. - * GeneralGridGeometry) - */ - @Override - public final IMesh reproject(GeneralGridGeometry targetGeometry) - throws VizException { - return clone(targetGeometry); - } - private boolean calculateMesh() { key = generateKey(imageGeometry, imageCRSToLatLon); try {