From a44b6f1766bf012a589d6da75f72d4ef0de8cee2 Mon Sep 17 00:00:00 2001 From: Bingfan Yin Date: Fri, 30 Jan 2015 11:53:54 -0500 Subject: [PATCH] VLab Issue #5413 - Added three files modified but not committed last time. Change-Id: Ifc790ecffca5a2dde99f771824a188241962c3dd Former-commit-id: e2179266b509b73155abaaed5b046b5cf349c376 --- .../src/gov/noaa/nws/ncep/ui/pgen/PgenUtil.java | 4 +++- .../nws/ncep/ui/pgen/palette/PgenPaletteAction.java | 13 +++++++++++++ .../noaa/nws/ncep/ui/pgen/rsc/PgenResourceData.java | 11 ++++++++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/PgenUtil.java b/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/PgenUtil.java index 1367e4ea53..f6368f187a 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/PgenUtil.java +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/PgenUtil.java @@ -146,7 +146,9 @@ import com.vividsolutions.jts.linearref.LocationIndexedLine; * 07/14 Chin Chen In latlonToPixel(), make sure not to add null pixel to its return pixel array * 08/14 TTR962 J. Wu Add replaceWithDate to format output file with DD, MM, YYYY, HH. * 12/14 R5413 B. Yin Add a listener for D2D swapping pane - * + * 12/14 R5413 B. Yin Check null in findResource + * + * * @author * @version 1 diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/palette/PgenPaletteAction.java b/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/palette/PgenPaletteAction.java index 0f905d764a..725e7342fe 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/palette/PgenPaletteAction.java +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/palette/PgenPaletteAction.java @@ -32,6 +32,19 @@ import com.raytheon.viz.ui.editor.AbstractEditor; import com.raytheon.viz.ui.perspectives.AbstractVizPerspectiveManager; import com.raytheon.viz.ui.perspectives.VizPerspectiveListener; +/** + * + *
+ * SOFTWARE HISTORY
+ * Date       	Ticket#		Engineer	Description
+ * ------------	----------	-----------	--------------------------
+ * 01/15		#5413		B. Yin   	Added meesage box if PGEN is running in another perspective
+ *
+ * 
+ * + * @author ? + */ + public class PgenPaletteAction extends AbstractHandler { @SuppressWarnings("restriction") diff --git a/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceData.java b/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceData.java index 63c30780d5..bb803c34a9 100644 --- a/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceData.java +++ b/ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceData.java @@ -46,7 +46,6 @@ import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import org.eclipse.jface.dialogs.MessageDialog; @@ -60,7 +59,6 @@ import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.viz.core.drawables.IDescriptor; -import com.raytheon.uf.viz.core.drawables.ResourcePair; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.AbstractResourceData; import com.raytheon.uf.viz.core.rsc.IResourceDataChanged.ChangeType; @@ -75,10 +73,17 @@ import com.vividsolutions.jts.geom.Coordinate; * Contains all the PGEN Products, layers, and Elements behind the PgenResource. * Also holds the command manager to undo/redo changes to the data in the * productlist + *
+ * SOFTWARE HISTORY
+ * Date       	Ticket#		Engineer	Description
+ * ------------	----------	-----------	--------------------------
+ * 01/15		#5413		B. Yin   	Close PGEN palette in cleanup
+ * 
+ * 
* * @author sgilbert - * */ + @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) public class PgenResourceData extends AbstractResourceData implements