diff --git a/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertAreaLayer.java b/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertAreaLayer.java index 6625e6de6a..ef83bbb254 100644 --- a/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertAreaLayer.java +++ b/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertAreaLayer.java @@ -64,6 +64,21 @@ import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.GeometryFactory; import com.vividsolutions.jts.geom.LineString; +/** + * Display radar alert request areas. + * + *
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ *                                     Initial creation.
+ * Aug 1, 2014  3471       mapeters    Updated deprecated createShadedShape() calls.
+ * 
+ * 
+ * + */ + public class AlertAreaLayer extends AbstractVizResource implements IContextMenuContributor, IChangeListener { @@ -239,7 +254,8 @@ public class AlertAreaLayer extends GeneralGridGeometry gg = getGridGeometry(); if (gg != null) { - gridSO = target.createShadedShape(false, this.descriptor, true); + gridSO = target.createShadedShape(false, + this.descriptor.getGridGeometry(), true); gridWF = target.createWireframeShape(false, this.descriptor); GeometryFactory geomFactory = new GeometryFactory(); diff --git a/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertRequestWindow.java b/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertRequestWindow.java index 36ab27ecd8..b230de7a5c 100644 --- a/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertRequestWindow.java +++ b/cave/com.raytheon.uf.viz.radarapps.requests/src/com/raytheon/uf/viz/radarapps/alertreq/AlertRequestWindow.java @@ -86,14 +86,12 @@ import com.raytheon.uf.viz.core.drawables.IDescriptor; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.LoadProperties; import com.raytheon.uf.viz.core.rsc.capabilities.ColorableCapability; -import com.raytheon.uf.viz.core.status.StatusConstants; import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertCategory; import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertRequestDoc; import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertRequestEditing; import com.raytheon.uf.viz.radarapps.alertreq.impl.AlertRequestEditing.Sel; import com.raytheon.uf.viz.radarapps.core.RadarApps; import com.raytheon.uf.viz.radarapps.products.ui.ExtProductsUI; -import com.raytheon.uf.viz.radarapps.requests.Activator; import com.raytheon.viz.ui.EditorUtil; public class AlertRequestWindow extends Window { @@ -338,7 +336,7 @@ public class AlertRequestWindow extends Window { String message = "There are modified alert requests for some radars. " + "Do you want to send them before exiting?\n\n" + "\t\"Cancel\" to return to the editor.\n" - + "\t\"Exit\" to exit, loosing any modifications.\n" + + "\t\"Exit\" to exit, losing any modifications.\n" + "\t\"Send\" to send modified requests and exit."; String[] labels = { "Cancel", "Exit", "Send Requests" }; MessageDialog dlg = new MessageDialog(getShell(), "Confirm Exit", 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 26385947a3..373c33fd22 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 @@ -48,6 +48,18 @@ import com.vividsolutions.jts.io.ParseException; import com.vividsolutions.jts.io.WKBReader; /** + * TODO Add Description + * + *
+ * 
+ * SOFTWARE HISTORY
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ *                         wldougher   Initial creation.
+ * Aug 1, 2014  3471       mapeters    Updated deprecated createShadedShape() calls.
+ * 
+ * 
+ * * @author wldougher * */ @@ -175,7 +187,7 @@ public class ShapeBuilderJob extends Job { // class are both shaded and outlined, so the extra logic has not // been fully implemented. response.background = request.target.createShadedShape(false, - descriptor, true); + descriptor.getGridGeometry(), true); response.outline = request.target.createWireframeShape(false, descriptor, 0.0f); response.cwaOutline = request.target.createWireframeShape(false, @@ -267,7 +279,7 @@ public class ShapeBuilderJob extends Job { RGB color = getColor(request, Integer.valueOf(groupNum)); IShadedShape groupShape = request.target.createShadedShape( - false, descriptor, true); + false, descriptor.getGridGeometry(), true); JTSCompiler groupCompiler = new JTSCompiler(groupShape, null, descriptor, PointStyle.CROSS); 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 a696ce287f..0c33c65784 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 @@ -26,12 +26,12 @@ import javax.measure.unit.Unit; import org.eclipse.swt.graphics.RGB; -import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue; import com.raytheon.uf.common.colormap.Color; import com.raytheon.uf.common.colormap.ColorMap; import com.raytheon.uf.common.colormap.prefs.ColorMapParameters; import com.raytheon.uf.common.colormap.prefs.DataMappingPreferences; import com.raytheon.uf.common.colormap.prefs.DataMappingPreferences.DataMappingEntry; +import com.raytheon.uf.common.dataplugin.shef.tables.Colorvalue; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; @@ -68,6 +68,7 @@ import com.vividsolutions.jts.geom.Polygon; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 8, 2009 snaples Initial creation + * Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls. * * * @@ -204,7 +205,8 @@ public class PlotMeanAreaFreezeResource extends jtsGeometryFactory = new GeometryFactory(); outlineShape = target.createWireframeShape(false, descriptor, 0.0f); - shadedShape = target.createShadedShape(false, descriptor, true); + shadedShape = target.createShadedShape(false, + descriptor.getGridGeometry(), true); JTSCompiler jtsCompiler = new JTSCompiler(shadedShape, outlineShape, descriptor); 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 7065de4406..49ec6499be 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 @@ -72,6 +72,7 @@ import com.vividsolutions.jts.geom.Polygon; * ------------ ---------- ----------- -------------------------- * 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. * * * @@ -223,7 +224,8 @@ public class PlotMeanAreaPrecipResource extends jtsGeometryFactory = new GeometryFactory(); outlineShape = target.createWireframeShape(false, descriptor, 0.0f); - shadedShape = target.createShadedShape(false, descriptor, true); + shadedShape = target.createShadedShape(false, + descriptor.getGridGeometry(), true); JTSCompiler jtsCompiler = new JTSCompiler(shadedShape, outlineShape, descriptor); 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 6e783a0e47..acf6e2c6c7 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 @@ -68,6 +68,7 @@ import com.vividsolutions.jts.geom.Polygon; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Apr 8, 2009 snaples Initial creation + * Aug 1, 2014 3471 mapeters Updated deprecated createShadedShape() calls. * * * @@ -202,7 +203,8 @@ public class PlotMeanAreaTempResource extends jtsGeometryFactory = new GeometryFactory(); outlineShape = target.createWireframeShape(false, descriptor, 0.0f); - shadedShape = target.createShadedShape(false, descriptor, true); + shadedShape = target.createShadedShape(false, + descriptor.getGridGeometry(), true); JTSCompiler jtsCompiler = new JTSCompiler(shadedShape, outlineShape, descriptor); diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java index aa8b42266a..bb572f49c5 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java @@ -214,6 +214,7 @@ import com.vividsolutions.jts.io.WKTReader; * 04/28,2014 3033 jsanchez Properly handled back up configuration (*.xml) files. Set backupSite to null when backup site is not selected. * 05/16/2014 DR 17365 D. Friedman Check if moved vertex results in polygon valid in both lat/lon and local coordinates. * 07/24/2014 3429 mapeters Updated deprecated drawLine() calls. + * 08/01/2014 3471 mapeters Updated deprecated createShadedShape() calls. * * * @author mschenke @@ -910,8 +911,8 @@ public class WarngenLayer extends AbstractStormTrackResource { }); manager = new WarngenUIManager(this); coveredAreaFrame = target.createWireframeShape(true, this.descriptor); - shadedCoveredArea = target.createShadedShape(true, this.descriptor, - true); + shadedCoveredArea = target.createShadedShape(true, + this.descriptor.getGridGeometry(), true); } /** diff --git a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/CWASPSResource.java b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/CWASPSResource.java index 3e8533c5b2..50d7d1745c 100644 --- a/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/CWASPSResource.java +++ b/cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/CWASPSResource.java @@ -58,6 +58,7 @@ import com.vividsolutions.jts.io.WKTReader; * May 10, 2013 1951 rjpeter Initial history entry, updated ugcZones references * Nov 08, 2013 16758 mgamazaychikov Added mergeWatches to simplify SPS processing * and getEventKey to create SPS-unique key + * Aug 01, 2014 3471 mapeters Updated deprecated createShadedShape() calls. * * * @author rjpeter @@ -210,7 +211,7 @@ public class CWASPSResource extends WatchesResource { } entry.shadedShape = target.createShadedShape(false, - descriptor, false); + descriptor.getGridGeometry(), false); try { geo = wktr.read(record.getGeometry().toString());