+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------- ------- -------- ----------- + * 06/25/2012 229 Chin Chen Initial coding + * 06/15/2023 tiffanym@ucar Added into Unidata v20.3.2 + * + *+ * + * @author Chin Chen + * @version 1.0 + */ +package com.raytheon.uf.viz.d2d.nsharp; + + + +import org.eclipse.core.commands.AbstractHandler; +import org.eclipse.core.commands.ExecutionEvent; +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PlatformUI; + +public class D2DNsharpViewAction extends AbstractHandler { + + @Override + public Object execute(ExecutionEvent arg0) throws ExecutionException { + /* + * The viewID string is in the XML file for NSHARP extension point. + */ + String viewid = "com.raytheon.uf.viz.d2d.nsharp.display.D2DNSharpPaletteWindow"; + IWorkbenchPage wpage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); + IViewPart vpart = wpage.findView( viewid); + try { + if ( vpart == null ){ + vpart = wpage.showView(viewid ); + } else { + if ( ! wpage.isPartVisible(vpart) ) vpart = wpage.showView( viewid ); + } + } + catch (Exception e) { + e.printStackTrace(); + } + + return null; + } + +} diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java index 75a714ed47..4427dbadb6 100644 --- a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java +++ b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNSharpPaletteWindow.java @@ -23,7 +23,9 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IViewSite; +import org.eclipse.ui.PlatformUI; import com.raytheon.viz.ui.EditorUtil; import com.raytheon.viz.ui.perspectives.AbstractVizPerspectiveManager; @@ -47,6 +49,7 @@ import gov.noaa.nws.ncep.ui.nsharp.view.NsharpPaletteWindow; * ------------- -------- --------- ------------------------------------------ * May 12, 2011 9249 bsteffen Initial creation * Apr 29, 2016 5607 bsteffen Fix modal tool manipulation in eclipse 4. + * Jun 15, 2023 tiffanym@ucar reimplement NSHARP load functionality * * * @@ -57,6 +60,11 @@ public class D2DNSharpPaletteWindow extends NsharpPaletteWindow { private static final String EDIT_TOOL_CATEGY = "com.raytheon.viz.ui.modalTool.nav"; private AbstractModalTool lastTool = null; + + Shell shell = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getShell(); + + D2DNsharpLoadDialog loadDia = D2DNsharpLoadDialog.getInstance(shell); @Override public void init(IViewSite site) { @@ -104,8 +112,9 @@ public class D2DNSharpPaletteWindow extends NsharpPaletteWindow { @Override public void handleEvent(Event event) { - D2DNsharpHandleArchiveFile.openArchiveFile(getViewSite() - .getShell()); + if (loadDia != null) { + loadDia.open(); + } } }); diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpLoadDialog.java b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpLoadDialog.java new file mode 100644 index 0000000000..b0940f639e --- /dev/null +++ b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/display/D2DNsharpLoadDialog.java @@ -0,0 +1,292 @@ +/** + * + * com.raytheon.uf.viz.d2d.nsharp.view.D2DNsharpLoadDialog + * + * This java class performs the NSHARP D2DNsharpLoadDialog functions. + * This code has been developed by the NCEP-SIB for use in the AWIPS2 system. + * + *
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------- ------- -------- ----------- + * 03/23/2010 229 Chin Chen Initial coding + * 06/15/2023 tiffanym@ucar Added into Unidata v20.3.2 + * + *+ * + * @author Chin Chen + * @version 1.0 + */ +package com.raytheon.uf.viz.d2d.nsharp.display; + +import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingProfile; +import gov.noaa.nws.ncep.ui.nsharp.NsharpConstants; +import gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor; + +import com.raytheon.uf.viz.d2d.nsharp.display.map.D2DNsharpMapResource; +import com.raytheon.uf.viz.d2d.nsharp.display.D2DNsharpHandleArchiveFile; +import com.raytheon.uf.viz.d2d.nsharp.display.D2DNsharpObservedSoundingDialogContents; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Cursor; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.MessageBox; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; + +import com.raytheon.uf.viz.core.exception.VizException; + +public class D2DNsharpLoadDialog extends Dialog { + + private final static int DIALOG_WIDTH = 300; + + private final static int DIALOG_HEIGHT = 700; + + protected Composite top; + + private static Composite dialogParent; + + private static D2DNsharpLoadDialog INSTANCE = null; + + private static Shell shell; + + public static final String soundingTypeString = "Observed Soundings"; + + public static final int OBSER_SND = 0; + + public static final int ARCHIVE = 3; // TBDGPD 5; + + private D2DNsharpObservedSoundingDialogContents obsDialog; + + private Group soundingTypeGp; + + private int activeLoadSoundingType; + + private NcSoundingProfile.ObsSndType activeObsSndType = NcSoundingProfile.ObsSndType.BUFRUA; + + private ArrayList
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------- ------- -------- ----------- + * 01/2011 229 Chin Chen Initial coding + * 09/14/2011 457 S. Gurung Renamed H5UAIR to NCUAIR + * 07202015 RM#9173 Chin Chen use NcSoundingQuery.genericSoundingDataQuery() to query grid model sounding data + * 06/15/2023 tiffanym@ucar Added into Unidata v20.3.2 + * + *+ * + * @author Chin Chen + * @version 1.0 + */ +package com.raytheon.uf.viz.d2d.nsharp.display; + +import gov.noaa.nws.ncep.viz.soundingrequest.NcSoundingQuery; +import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingProfile; +import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingStnInfo; +import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingStnInfoCollection; +import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingTimeLines; +import gov.noaa.nws.ncep.ui.nsharp.NsharpConstants; +import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo; +import com.raytheon.uf.viz.d2d.nsharp.display.map.D2DNsharpMapResource; + +import java.text.DateFormatSymbols; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Listener; + +public class D2DNsharpObservedSoundingDialogContents { + private Composite parent; + + private org.eclipse.swt.widgets.List sndTimeList; + + private Group sndTimeListGp, topGp; + + private boolean timeLimit = false; + + private boolean rawData = false; + + private Button timeBtn, bufruaBtn, uairBtn, rawBtn; + + private String FILE_UAIR = "UAIR"; + + private String FILE_BUFRUA = "BUFRUA"; + + // private String FILE_DROP = "DROP"; + private NcSoundingProfile.ObsSndType currentSndType = NcSoundingProfile.ObsSndType.NONE; + + private D2DNsharpLoadDialog ldDia; + + private ArrayList
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------- ------- -------- ----------- + * 03/23/2010 229 Chin Chen Initial coding + * 03/11/2013 972 Greg Hull NatlCntrsEditor + * 09/28/2015 RM#10295 Chin Chen Let sounding data query run in its own thread to avoid gui locked out during load + * 06/15/2023 tiffanym@ucar Added into Unidata v20.3.2 + * + *+ * + * @author Chin Chen + * @version 1.0 + */ +package com.raytheon.uf.viz.d2d.nsharp.display.map; + +import gov.noaa.nws.ncep.edex.common.sounding.NcSoundingLayer; +import gov.noaa.nws.ncep.ui.nsharp.NsharpStationInfo; +import gov.noaa.nws.ncep.ui.nsharp.display.NsharpEditor; +import gov.noaa.nws.ncep.ui.nsharp.display.map.NsharpObservedSoundingQuery; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.ui.progress.UIJob; +import org.geotools.referencing.GeodeticCalculator; + +import com.raytheon.uf.common.status.IUFStatusHandler; +import com.raytheon.uf.common.status.UFStatus; +import com.raytheon.uf.viz.core.map.IMapDescriptor; +import com.raytheon.uf.viz.d2d.nsharp.display.D2DNsharpLoadDialog; +import com.raytheon.viz.ui.editor.AbstractEditor; +import com.raytheon.viz.ui.input.InputAdapter; +import org.locationtech.jts.geom.Coordinate; + +public class D2DNsharpMapMouseHandler extends InputAdapter { + private static final IUFStatusHandler statusHandler = UFStatus + .getHandler(D2DNsharpMapMouseHandler.class); + + public D2DNsharpMapMouseHandler() { + instance = this; + } + + private static final double NctextuiPointMinDistance = 45000; + + private static D2DNsharpMapMouseHandler instance; + + private double lat, lon; + + public double getLat() { + return lat; + } + + public double getLon() { + return lon; + } + + public static D2DNsharpMapMouseHandler getAccess() { + return instance; + } + + /* + * (non-Javadoc) + * + * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDown(int, int, + * int) + */ + @Override + public boolean handleMouseDown(int x, int y, int button) { + return false; + } + + /* + * (non-Javadoc) + * + * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseDownMove(int, + * int, int) handle left button, so user be able to shift map while it is + * down + */ + @Override + public boolean handleMouseDownMove(int x, int y, int button) { + return false; + + } + + @Override + public boolean handleMouseMove(int x, int y) { + return false; + } + + /* + * (non-Javadoc) + * + * @see com.raytheon.viz.ui.input.IInputHandler#handleMouseUp(int, int, int) + * handle right button, so user be able to pick stn and print text report + */ + @Override + public boolean handleMouseUp(int x, int y, int button) { + if (!D2DNsharpMapResource.getMapRsc().isEditable()) + return false; + // button 1 is left mouse button + if (button == 1) { + AbstractEditor mapEditor = D2DNsharpMapResource.getMapEditor(); + if (mapEditor != null) { + // Check if mouse is in geographic extent + Coordinate loc = mapEditor.translateClick(x, y); + if (loc == null) + return false; + D2DNsharpLoadDialog loadDia = D2DNsharpLoadDialog.getAccess(); + if (loadDia != null) { + int activeLoadType = loadDia + .getActiveLoadSoundingType(); + List
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------- ------- -------- ----------- + * 03/23/2010 229 Chin Chen Initial coding + * 08/17/2012 655 B. Hebbard Added paintProps as parameter to IDisplayable draw (2) + * 03/11/2013 972 Greg Hull NatlCntrsEditor + * 06/15/2023 tiffanym@ucar Added into Unidata v20.3.2 + * + *+ * + * @author Chin Chen + * @version 1.0 + */ + +public class D2DNsharpMapResource extends + AbstractVizResource
+ * SOFTWARE HISTORY + * + * Date Ticket# Engineer Description + * ------- ------- -------- ----------- + * 03/23/2010 229 Chin Chen Initial coding + * 06/15/2023 tiffanym@ucar Added into Unidata v20.3.2 + * + *+ * + * @author Chin Chen + * @version 1.0 + */ + +public class D2DNsharpMapResourceData extends AbstractResourceData { + + private MarkerState markerState = MarkerState.MARKER_ONLY; + + private MarkerType markerType = MarkerType.DIAMOND; + + private Float markerSize = 1f; + + private Integer markerWidth = 2; + + private MarkerTextSize markerTextSize = MarkerTextSize.MEDIUM; + + private String mapName = "NSHARP"; + + private MarkerType stnMarkerType = MarkerType.LARGE_X; + + public MarkerType getStnMarkerType() { + return stnMarkerType; + } + + public D2DNsharpMapResourceData() { + super(); + } + + /* + * (non-Javadoc) + * + * @see + * com.raytheon.uf.viz.core.rsc.AbstractResourceData#construct(com.raytheon + * .uf.viz.core.comm.LoadProperties, + * com.raytheon.uf.viz.core.drawables.IDescriptor) + */ + @Override + public D2DNsharpMapResource construct(LoadProperties loadProperties, + IDescriptor descriptor) throws VizException { + // TODO Auto-generated method stub + return new D2DNsharpMapResource(this, loadProperties); + } + + /* + * (non-Javadoc) + * + * @see + * com.raytheon.uf.viz.core.rsc.AbstractResourceData#update(java.lang.Object + * ) + */ + @Override + public void update(Object updateData) { + // TODO Auto-generated method stub + + } + + @Override + public boolean equals(Object obj) { + if (obj == null || !(obj instanceof D2DNsharpMapResourceData)) + return false; + D2DNsharpMapResourceData rdata = (D2DNsharpMapResourceData) obj; + if (this.markerState.equals(rdata.getMarkerState()) + && this.markerType.equals(rdata.getMarkerType()) + && this.markerSize.equals(rdata.getMarkerSize()) + && this.markerWidth.equals(rdata.getMarkerWidth()) + && this.markerTextSize.equals(rdata.getMarkerTextSize()) + && this.stnMarkerType.equals(rdata.getStnMarkerType())) + return true; + + return false; + } + + public MarkerState getMarkerState() { + return markerState; + } + + public void setMarkerState(MarkerState markerState) { + this.markerState = markerState; + } + + public MarkerType getMarkerType() { + return markerType; + } + + public void setMarkerType(MarkerType markerType) { + this.markerType = markerType; + } + + public Float getMarkerSize() { + return markerSize; + } + + public void setMarkerSize(Float markerSize) { + this.markerSize = markerSize; + } + + public Integer getMarkerWidth() { + return markerWidth; + } + + public void setMarkerWidth(Integer markerWidth) { + this.markerWidth = markerWidth; + } + + public MarkerTextSize getMarkerTextSize() { + return markerTextSize; + } + + public void setMarkerTextSize(MarkerTextSize markerTextSize) { + this.markerTextSize = markerTextSize; + } + + public String getMapName() { + return mapName; + } + + public void setMapName(String mapName) { + this.mapName = mapName; + } +} diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java index f3bc4949cd..0cb7f3326b 100644 --- a/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java +++ b/cave/com.raytheon.uf.viz.d2d.nsharp/src/com/raytheon/uf/viz/d2d/nsharp/rsc/D2DNSharpResource.java @@ -73,6 +73,7 @@ import gov.noaa.nws.ncep.ui.nsharp.display.rsc.NsharpResourceHandler; * Jan 15, 2019 7697 bsteffen Individually add soundings so station info * is not shared. * Apr 15 2019 7480 bhurley Improved auto-update + * Jun 15, 2023 tiffanym@ucar reimplement NSHARP load functionality * * * @@ -212,8 +213,8 @@ public class D2DNSharpResource @Override protected void initInternal(IGraphicsTarget target) throws VizException { getHandler().setSoundingType(resourceData.getSoundingType()); - partListener = new D2DNSharpPartListener(this); - partListener.enable(); + //partListener = new D2DNSharpPartListener(this); + //partListener.enable(); } @Override diff --git a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseWPC.xml similarity index 94% rename from cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml rename to cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseWPC.xml index ec5cd470fd..43a6d3b1d1 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseHPC.xml +++ b/cave/com.raytheon.uf.viz.d2d.ui.ncephydro/localization/menus/ncepHydro/hpc/baseWPC.xml @@ -24,8 +24,8 @@ -->
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Nov 28, 2016 5937 tgurney Initial creation - * Dec 9, 2016 5937 tgurney Add copy constructor - * Jul 20, 2017 6352 tgurney Add equals(), hashCode(), DynamicSerialize - * Jul 24, 2017 6352 tgurney Move request-sending from BackupService - * Oct 3, 2019 7929 tgurney Add special MY_VERSION version value. - * Move class from edex to common. Use a - * httpClient with gzip enabled - * - *- * - * @author tgurney - */ - -@DynamicSerialize -@XmlAccessorType(XmlAccessType.NONE) -public class BackupHost { - - private final Logger logger = LoggerFactory.getLogger(getClass()); - - private static final int DEFAULT_THRIFT_PORT = Integer - .parseInt(System.getenv("HTTP_PORT")); - - private static final String THRIFT_HTTP_PATH; - static { - String serverPath = System.getenv("HTTP_SERVER_PATH"); - if (!serverPath.startsWith("/")) { - serverPath = "/" + serverPath; - } - THRIFT_HTTP_PATH = serverPath + "/thrift"; - } - - private static HttpClient httpClient; - - static { - HttpClientConfigBuilder cfgBuilder = new HttpClientConfigBuilder(); - cfgBuilder.setGzipEnabled(true); - httpClient = new HttpClient(cfgBuilder.build()); - } - - /** - * Special value that can be used in place of the minimum or maximum - * required version, indicating that the requirement is the sender's current - * EDEX version. - */ - public static final String MY_VERSION = "my"; - - @DynamicSerializeElement - @XmlElement - private int port = DEFAULT_THRIFT_PORT; - - @DynamicSerializeElement - @XmlElement(required = true) - private String name; - - private String hostEdexVersion; - - /** - * No-arg constructor for serialization - */ - public BackupHost() { - } - - /** - * Copy constructor - * - * @param aBackupHost - * The BackupHost to copy - */ - public BackupHost(BackupHost aBackupHost) { - port = aBackupHost.port; - name = aBackupHost.name; - hostEdexVersion = aBackupHost.hostEdexVersion; - } - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + (name == null ? 0 : name.hashCode()); - result = prime * result + port; - return result; - } - - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (!obj.getClass().equals(BackupHost.class)) { - return false; - } - BackupHost other = (BackupHost) obj; - if (name == null) { - if (other.name != null) { - return false; - } - } else if (!name.equals(other.name)) { - return false; - } - if (port != other.port) { - return false; - } - return true; - } - - /** - * Send an IServerRequest to this host - * - * @param request - * @return the object the server returns - * @throws Exception - * If sending the request fails for some reason - */ - public Object sendRequest(IServerRequest request) throws Exception { - return sendRequest(request, null); - } - - /** - * Send an IServerRequest to this host - * - * @param request - * @param rateLimiter - * Token bucket to rate-limit the request, can be null - * @return the object the server returns - * @throws Exception - * If sending the request fails for some reason - */ - public Object sendRequest(IServerRequest request, TokenBucket rateLimiter) - throws Exception { - RequestWrapper wrapper = new RequestWrapper(request, new WsId()); - Object rval = null; - if (rateLimiter != null) { - rval = httpClient.postDynamicSerialize( - "http://" + name + ":" + port + THRIFT_HTTP_PATH, wrapper, - true, rateLimiter); - } else { - rval = httpClient.postDynamicSerialize( - "http://" + name + ":" + port + THRIFT_HTTP_PATH, wrapper, - true); - } - if (rval instanceof ServerErrorResponse) { - ServerErrorResponse resp = (ServerErrorResponse) rval; - Throwable serverException = ExceptionWrapper - .unwrapThrowable(resp.getException()); - throw new BackupServiceException(serverException.getMessage(), - serverException); - } - return rval; - } - - /** - * @param useCached - * If true, use cached version string if it is available - * @return version string. Will query the remote host if necessary. null if - * there is no cached value and the host could not be contacted. - */ - public String getEDEXVersion(boolean useCached) { - if (hostEdexVersion == null || !useCached) { - try { - GetEDEXVersionRequest request = new GetEDEXVersionRequest(); - request.setRequestingHost(SystemUtil.getHostName()); - Object response = sendRequest(new GetEDEXVersionRequest()); - if (response instanceof GetEDEXVersionResponse) { - hostEdexVersion = ((GetEDEXVersionResponse) response) - .getEdexVersion(); - } - } catch (Exception e) { - logger.error( - "Error when sending GetEDEXVersionRequest to " + name, - e); - hostEdexVersion = null; - } - } - return hostEdexVersion; - } - - /* - * @return version string. Will use cached version string if it is - * available, otherwise will query the remote host. - */ - public String getEDEXVersion() { - return getEDEXVersion(true); - } - - /** - * @param minVersionRequired - * If null, use this host's current EDEX version. If - * {@link #MY_VERSION}, use the caller's current EDEX version. - * @param maxVersionRequired - * If null, use this host's current EDEX version. If - * {@link #MY_VERSION}, use the caller's current EDEX version. - * @return Zero if this host's EDEX version falls within the range of - * (minVersionRequired, maxVersionRequired). A positive integer if - * this host's EDEX version is greater than maxVersionRequired. A - * negative integer if this host's EDEX version is less than - * minVersionRequired. Null if unable to contact the host - */ - public Integer compareVersion(String minVersionRequired, - String maxVersionRequired) { - // refresh cached version string - getEDEXVersion(false); - if (hostEdexVersion == null) { - return null; - } - if (minVersionRequired == null) { - minVersionRequired = hostEdexVersion; - } - if (maxVersionRequired == null) { - maxVersionRequired = hostEdexVersion; - } - if (MY_VERSION.equals(minVersionRequired)) { - minVersionRequired = AppInfo.getInstance().getVersion(); - } - if (MY_VERSION.equals(maxVersionRequired)) { - maxVersionRequired = AppInfo.getInstance().getVersion(); - } - Version minVer; - Version maxVer; - Version ver; - try { - minVer = Version.fromString(minVersionRequired); - maxVer = Version.fromString(maxVersionRequired); - ver = Version.fromString(hostEdexVersion); - } catch (ParseException e) { - logger.warn("Failed to parse version string (hostEdexVersion: " - + hostEdexVersion + ", minVersionRequired: " - + minVersionRequired + ", maxVersionRequired: " - + maxVersionRequired + ")", e); - return null; - } - if (ver.compareTo(minVer) < 0) { - // Version is less than the minimum required - return -1; - } else if (ver.compareTo(maxVer) > 0) { - // Version is greater than the max allowed - return 1; - } else { - // Version falls within allowed range - return 0; - } - } - - /** @return List of all this host's capabilities. */ - public Set
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Aug 2, 2017 tgurney Initial creation - * Oct 3, 2019 7929 tgurney Move to common - * - *- * - * @author tgurney - */ - -public class BackupServiceException extends Exception { - - private static final long serialVersionUID = 1L; - - public BackupServiceException(String message) { - super(message); - } - - public BackupServiceException(String message, Throwable cause) { - super(message, cause); - } - - public BackupServiceException(Throwable cause) { - super(cause); - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/IRefreshableServerRequest.java b/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/IRefreshableServerRequest.java deleted file mode 100644 index 635051f801..0000000000 --- a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/IRefreshableServerRequest.java +++ /dev/null @@ -1,55 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.common.backupsvc; - -import java.util.Optional; - -import com.raytheon.uf.common.serialization.comm.IServerRequest; - -/** - * A refreshable {@link IServerRequest}. Calling {@link #refresh()} allows the - * request to update itself arbitrarily. - * - * Introduced for BackupService, which stores IServerRequests to be sent later. - * Such requests may be "stale" for whatever reason by the time they'd be sent. - * This mechanism allows for a stale request to be updated or even canceled - * before it would be sent. - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Oct 7, 2019 tgurney Initial creation - * - *- * - * @author tgurney - */ - -public interface IRefreshableServerRequest extends IServerRequest { - /** - * @return the request itself updated arbitrarily, or a new/different - * request object of the same type, or a different type of request - * object, or nothing. - */ - Optional
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Nov 10, 2016 5937 tgurney Initial creation - * Jul 20, 2017 6352 tgurney Add min/maxversionRequired - * - *- * - * @author tgurney - */ - -@DynamicSerialize -public class BackupEnqueueRequest implements IServerRequest { - @DynamicSerializeElement - private IServerRequest request; - - @DynamicSerializeElement - private String jobName; - - /** Lower number = higher priority. May be negative */ - @DynamicSerializeElement - private int priority; - - @DynamicSerializeElement - private String minVersionRequired; - - @DynamicSerializeElement - private String maxVersionRequired; - - @DynamicSerializeElement - private List
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 20, 2017 6352 tgurney Initial creation - * - *- * - * @author tgurney - */ - -@DynamicSerialize -public class GetBackupHostCapabilitiesMapRequest implements IServerRequest { -} diff --git a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetBackupHostVersionMapRequest.java b/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetBackupHostVersionMapRequest.java deleted file mode 100644 index 1db41699d7..0000000000 --- a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetBackupHostVersionMapRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.common.backupsvc.request; - -import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.comm.IServerRequest; - -/** - * Request to get list of backup hosts and EDEX version for each host - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 20, 2017 6352 tgurney Initial creation - * - *- * - * @author tgurney - */ - -@DynamicSerialize -public class GetBackupHostVersionMapRequest implements IServerRequest { -} diff --git a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetBackupServiceCapabilitiesRequest.java b/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetBackupServiceCapabilitiesRequest.java deleted file mode 100644 index fc012c2c84..0000000000 --- a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetBackupServiceCapabilitiesRequest.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.common.backupsvc.request; - -import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.comm.IServerRequest; - -/** - * Request to get list of BackupService capabilities for a single server - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 26, 2017 6352 tgurney Initial creation - * - *- * - * @author tgurney - */ - -@DynamicSerialize -public class GetBackupServiceCapabilitiesRequest implements IServerRequest { -} diff --git a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetEDEXVersionRequest.java b/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetEDEXVersionRequest.java deleted file mode 100644 index 122cfda644..0000000000 --- a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/request/GetEDEXVersionRequest.java +++ /dev/null @@ -1,61 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.common.backupsvc.request; - -import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; -import com.raytheon.uf.common.serialization.comm.IServerRequest; - -/** - * Request to get EDEX version string - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Oct 17, 2016 5937 tgurney Initial creation - * - *- * - * @author tgurney - */ - -@DynamicSerialize -public class GetEDEXVersionRequest implements IServerRequest { - /** Name of the host that is sending this request. */ - @DynamicSerializeElement - private String requestingHost; - - public String getRequestingHost() { - return requestingHost; - } - - public void setRequestingHost(String requestingHost) { - this.requestingHost = requestingHost; - } - - @Override - public String toString() { - return "GetEDEXVersionRequest [requestingHost=" + requestingHost + "]"; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/response/GetEDEXVersionResponse.java b/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/response/GetEDEXVersionResponse.java deleted file mode 100644 index 91a1105e2e..0000000000 --- a/edexOsgi/com.raytheon.uf.common.backupsvc/src/com/raytheon/uf/common/backupsvc/response/GetEDEXVersionResponse.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * This software was developed and / or modified by Raytheon Company, - * pursuant to Contract DG133W-05-CQ-1067 with the US Government. - * - * U.S. EXPORT CONTROLLED TECHNICAL DATA - * This software product contains export-restricted data whose - * export/transfer/disclosure is restricted by U.S. law. Dissemination - * to non-U.S. persons whether in the United States or abroad requires - * an export license or other authorization. - * - * Contractor Name: Raytheon Company - * Contractor Address: 6825 Pine Street, Suite 340 - * Mail Stop B8 - * Omaha, NE 68106 - * 402.291.0100 - * - * See the AWIPS II Master Rights File ("Master Rights File.pdf") for - * further licensing information. - **/ -package com.raytheon.uf.common.backupsvc.response; - -import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; -import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; - -/** - * Response to GetEDEXVersionRequest - * - *
- * - * SOFTWARE HISTORY - * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Oct 17, 2016 5937 tgurney Initial creation - * - *- * - * @author tgurney - */ - -@DynamicSerialize -public class GetEDEXVersionResponse { - - /** String returned in response when EDEX version is not known */ - public static final String UNDEFINED = "Undefined"; - - @DynamicSerializeElement - private String edexVersion; - - /** Host that is sending this response. */ - @DynamicSerializeElement - private String respondingHost; - - public String getEdexVersion() { - return edexVersion; - } - - public void setEdexVersion(String edexVersion) { - this.edexVersion = edexVersion; - } - - public String getRespondingHost() { - return respondingHost; - } - - public void setRespondingHost(String respondingHost) { - this.respondingHost = respondingHost; - } - - @Override - public String toString() { - return "GetEDEXVersionResponse [edexVersion=" + edexVersion - + ", respondingHost=" + respondingHost + "]"; - } - -} diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/SPC Outlook.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/SPC Outlook.cmap new file mode 100644 index 0000000000..7f0bd82895 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/SPC Outlook.cmap @@ -0,0 +1,259 @@ + +