From 8e7d6964c6b48b6ac1688b7e4a769c75f0f9307c Mon Sep 17 00:00:00 2001 From: Mark Peters Date: Wed, 13 Aug 2014 12:19:48 -0500 Subject: [PATCH] Omaha #3492 Replace Raytheon plugin calls to deprecated IGraphicsTarget.createWireframeShape() Change-Id: Ie521a2041586825b9fb995a675e5caa550fa5313 Former-commit-id: 0df04ef8a5b4eee4398a411fc02baba22f719eaf --- .../display/rsc/rendering/ShapeRenderingHandler.java | 9 ++------- .../uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java | 6 +++--- .../viz/remote/graphics/DispatchGraphicsTarget.java | 11 ++++------- .../events/shapes/CreateWireframeShapeEvent.java | 5 +++++ .../src/com/raytheon/viz/bcd/BCDResource.java | 4 ++-- .../rsc/geometry/GenericGeometryResource.java | 3 ++- .../raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java | 7 ++++--- .../viz/gfe/ui/zoneselector/ZoneSelectorResource.java | 6 +++--- .../viz/mpe/ui/rsc/PlotMeanAreaFreezeResource.java | 7 ++++--- .../viz/mpe/ui/rsc/PlotMeanAreaPrecipResource.java | 9 +++++---- .../viz/mpe/ui/rsc/PlotMeanAreaTempResource.java | 7 ++++--- 11 files changed, 38 insertions(+), 36 deletions(-) diff --git a/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ShapeRenderingHandler.java b/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ShapeRenderingHandler.java index 3cf3e37121..67e598a038 100644 --- a/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ShapeRenderingHandler.java +++ b/cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/rsc/rendering/ShapeRenderingHandler.java @@ -82,13 +82,8 @@ public class ShapeRenderingHandler extends CollaborationRenderingHandler { IGraphicsTarget target = getGraphicsTarget(); int shapeId = event.getObjectId(); IWireframeShape shape = null; - if (event.getSimplificationLevel() != null) { - shape = target.createWireframeShape(event.isMutable(), - event.getGridGeometry(), event.getSimplificationLevel()); - } else { - shape = target.createWireframeShape(event.isMutable(), - event.getGridGeometry()); - } + shape = target.createWireframeShape(event.isMutable(), + event.getGridGeometry()); dataManager.putRenderableObject(shapeId, shape); } diff --git a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java index 692dfe9803..3f59a5a708 100644 --- a/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java +++ b/cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java @@ -193,6 +193,7 @@ import com.vividsolutions.jts.geom.Point; * May 05, 2014 3026 mpduff Display Hpe bias source. * May 19, 2014 DR 16096 gzhang Make getBasin() protected for FFMPDataGenerator. * 06/24/2016 mnash Make FFMPResource implement Interrogatable + * Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls. * * * @author dhladky @@ -2803,7 +2804,7 @@ public class FFMPResource extends // create the frames/shaded shapes here localWireframeShape = req.target.createWireframeShape(false, - descriptor, 0.0f); + descriptor); localShadedShape = req.target.createShadedShape(false, descriptor.getGridGeometry(), true); @@ -2870,8 +2871,7 @@ public class FFMPResource extends // create the frames/shaded shapes here try { // read in geometries - basinShape = req.target.createWireframeShape(false, descriptor, - 0.0f); + basinShape = req.target.createWireframeShape(false, descriptor); JTSCompiler jtsCompiler3 = new JTSCompiler(null, basinShape, descriptor, PointStyle.CROSS); RGB color = getCapability(ColorableCapability.class).getColor(); diff --git a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java index c73e2ca8f3..b21fa3dafb 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java +++ b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/DispatchGraphicsTarget.java @@ -754,7 +754,7 @@ public class DispatchGraphicsTarget extends DispatchingObject IDescriptor descriptor, float simplificationLevel) { // Create original IWireframeShape targetShape = wrappedObject.createWireframeShape( - mutable, descriptor, simplificationLevel); + mutable, descriptor); // Create wrapped DispatchingWireframeShape dispatching = new DispatchingWireframeShape( targetShape, getDispatcher(), descriptor.getGridGeometry()); @@ -776,7 +776,7 @@ public class DispatchGraphicsTarget extends DispatchingObject GeneralGridGeometry geom, float simplificationLevel) { // Create original IWireframeShape targetShape = wrappedObject.createWireframeShape( - mutable, geom, simplificationLevel); + mutable, geom); // Create wrapped DispatchingWireframeShape dispatching = new DispatchingWireframeShape( targetShape, getDispatcher(), geom); @@ -803,7 +803,7 @@ public class DispatchGraphicsTarget extends DispatchingObject boolean spatialChopFlag, IExtent extent) { // Create original IWireframeShape targetShape = wrappedObject.createWireframeShape( - mutable, descriptor, simplificationLevel); + mutable, descriptor); // Create wrapped DispatchingWireframeShape dispatching = new DispatchingWireframeShape( targetShape, getDispatcher(), descriptor.getGridGeometry()); @@ -853,7 +853,7 @@ public class DispatchGraphicsTarget extends DispatchingObject boolean spatialChopFlag, IExtent extent) { // Create original IWireframeShape targetShape = wrappedObject.createWireframeShape( - mutable, geom, simplificationLevel); + mutable, geom); // Create wrapped DispatchingWireframeShape dispatching = new DispatchingWireframeShape( targetShape, getDispatcher(), geom); @@ -871,9 +871,6 @@ public class DispatchGraphicsTarget extends DispatchingObject .createEvent(CreateWireframeShapeEvent.class, shape); event.setGridGeometry(geom); event.setMutable(mutable); - event.setIExtent(extent); - event.setSimplificationLevel(simplificationLevel); - event.setSpatialChopFlag(spatialChopFlag); dispatch(event); } diff --git a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/shapes/CreateWireframeShapeEvent.java b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/shapes/CreateWireframeShapeEvent.java index 13463b2fdb..bbab42442f 100644 --- a/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/shapes/CreateWireframeShapeEvent.java +++ b/cave/com.raytheon.uf.viz.remote.graphics/src/com/raytheon/uf/viz/remote/graphics/events/shapes/CreateWireframeShapeEvent.java @@ -38,6 +38,8 @@ import com.raytheon.uf.viz.remote.graphics.events.ICreationEvent; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 27, 2012 mschenke Initial creation + * Aug 13, 2014 3492 mapeters Deprecated simplificationLevel, spatialChopFlag, + * and extent fields. * * * @@ -54,12 +56,15 @@ public class CreateWireframeShapeEvent extends AbstractDispatchingObjectEvent @DynamicSerializeElement private boolean mutable; + @Deprecated @DynamicSerializeElement private Float simplificationLevel; + @Deprecated @DynamicSerializeElement private Boolean spatialChopFlag; + @Deprecated @DynamicSerializeElement private double[] extent; diff --git a/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java b/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java index b9794387bb..3cce409357 100644 --- a/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java +++ b/cave/com.raytheon.viz.bcd/src/com/raytheon/viz/bcd/BCDResource.java @@ -77,6 +77,7 @@ import com.vividsolutions.jts.geom.Coordinate; * now closes on FileInputStream instead of FileChannel in initInternal() * Jul 29, 2014 3465 mapeters Updated deprecated drawString() calls. * Aug 04, 2014 3489 mapeters Updated deprecated getStringBounds() calls. + * Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls. * * * @@ -172,8 +173,7 @@ public class BCDResource extends if (wireframeShape == null) { this.gridGeometry = descriptor.getGridGeometry(); - wireframeShape = target.createWireframeShape(true, descriptor, - 0.0f); + wireframeShape = target.createWireframeShape(true, descriptor); // wireframeShape = target.createWireframeShape(true, // mapDescriptor); File file = new File(resourceData.getFilename()); diff --git a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java index 60e377c722..edd09301c4 100644 --- a/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java +++ b/cave/com.raytheon.viz.dataaccess/src/com/raytheon/viz/dataaccess/rsc/geometry/GenericGeometryResource.java @@ -58,6 +58,7 @@ import com.vividsolutions.jts.geom.Point; * ------------ ---------- ----------- -------------------------- * Jan 30, 2013 bkowal Initial creation * Feb 6, 2013 #1555 bkowal Improve Geometry Loop + * Aug 13, 2014 #3492 mapeters Updated deprecated createWireframeShape() calls. * * * @author bkowal @@ -207,7 +208,7 @@ public class GenericGeometryResource extends if (numberOfPoints > 0) { // create the wireframe shape - shape = target.createWireframeShape(false, this.descriptor, 0.0f); + shape = target.createWireframeShape(false, this.descriptor); JTSCompiler jtsCompiler = new JTSCompiler(null, shape, this.descriptor, PointStyle.CROSS); diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java index 373c33fd22..f56c66ee74 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/zones/ShapeBuilderJob.java @@ -56,7 +56,8 @@ import com.vividsolutions.jts.io.WKBReader; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * wldougher Initial creation. - * Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls. * * * @@ -189,9 +190,9 @@ public class ShapeBuilderJob extends Job { response.background = request.target.createShadedShape(false, descriptor.getGridGeometry(), true); response.outline = request.target.createWireframeShape(false, - descriptor, 0.0f); + descriptor); response.cwaOutline = request.target.createWireframeShape(false, - descriptor, 0.0f); + descriptor); JTSCompiler compiler = new JTSCompiler(response.background, response.outline, descriptor, PointStyle.CROSS); JTSCompiler cwaCompiler = new JTSCompiler(null, diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java index c0cb29d555..a1c9eeb5d5 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java @@ -104,6 +104,7 @@ import com.vividsolutions.jts.io.WKBReader; * Jul 31, 2013 #2239 randerso Fixed scaling of maps that cross the date line * Jan 07, 2014 #2662 randerso Fixed limitZones (subDomainUGCs) support * Feb 18, 2014 #2819 randerso Removed unnecessary clones of geometries + * Aug 13, 2014 #3492 mapeters Updated deprecated createWireframeShape() calls. * * * @@ -322,7 +323,7 @@ public class ZoneSelectorResource extends DbMapResource { } IWireframeShape newOutlineShape = req.target - .createWireframeShape(false, req.descriptor, 0.0f); + .createWireframeShape(false, req.descriptor); newOutlineShape.allocate(numPoints); JTSCompiler outlineCompiler = new JTSCompiler(null, @@ -354,8 +355,7 @@ public class ZoneSelectorResource extends DbMapResource { if (wfoGeoms.size() > 0) { IWireframeShape newWfoShape = req.target - .createWireframeShape(false, req.descriptor, - 0.0f); + .createWireframeShape(false, req.descriptor); newWfoShape.allocate(wfoPoints); JTSCompiler wfoCompiler = new JTSCompiler(null, diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaFreezeResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaFreezeResource.java index 0c33c65784..9ef8d4f4e0 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaFreezeResource.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaFreezeResource.java @@ -67,8 +67,9 @@ import com.vividsolutions.jts.geom.Polygon; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Apr 8, 2009 snaples Initial creation - * Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Apr 08, 2009 snaples Initial creation + * Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls. * * * @@ -203,7 +204,7 @@ public class PlotMeanAreaFreezeResource extends IMapDescriptor descriptor = (IMapDescriptor) displayMgr .getRenderableDisplay().getDescriptor(); jtsGeometryFactory = new GeometryFactory(); - outlineShape = target.createWireframeShape(false, descriptor, 0.0f); + outlineShape = target.createWireframeShape(false, descriptor); shadedShape = target.createShadedShape(false, descriptor.getGridGeometry(), true); diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaPrecipResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaPrecipResource.java index 49ec6499be..6e37e1daf5 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaPrecipResource.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaPrecipResource.java @@ -70,9 +70,10 @@ import com.vividsolutions.jts.geom.Polygon; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Apr 8, 2009 snaples Initial creation - * May 2, 2013 15970 snaples Updated setColor to use the correct color. - * Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Apr 08, 2009 snaples Initial creation + * May 02, 2013 15970 snaples Updated setColor to use the correct color. + * Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls. * * * @@ -222,7 +223,7 @@ public class PlotMeanAreaPrecipResource extends .getRenderableDisplay().getDescriptor(); jtsGeometryFactory = new GeometryFactory(); - outlineShape = target.createWireframeShape(false, descriptor, 0.0f); + outlineShape = target.createWireframeShape(false, descriptor); shadedShape = target.createShadedShape(false, descriptor.getGridGeometry(), true); diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaTempResource.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaTempResource.java index acf6e2c6c7..fe7ba9976c 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaTempResource.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PlotMeanAreaTempResource.java @@ -67,8 +67,9 @@ import com.vividsolutions.jts.geom.Polygon; * SOFTWARE HISTORY * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- - * Apr 8, 2009 snaples Initial creation - * Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Apr 08, 2009 snaples Initial creation + * Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls. + * Aug 13, 2014 3492 mapeters Updated deprecated createWireframeShape() calls. * * * @@ -201,7 +202,7 @@ public class PlotMeanAreaTempResource extends IMapDescriptor descriptor = (IMapDescriptor) displayMgr .getRenderableDisplay().getDescriptor(); jtsGeometryFactory = new GeometryFactory(); - outlineShape = target.createWireframeShape(false, descriptor, 0.0f); + outlineShape = target.createWireframeShape(false, descriptor); shadedShape = target.createShadedShape(false, descriptor.getGridGeometry(), true);