D2DNSHARP ncep functionality for 17.1.1

This commit is contained in:
mjames-upc 2017-05-05 12:44:47 -06:00
parent 1d7ba65144
commit ca73836f80
2 changed files with 11 additions and 5 deletions

View file

@ -24,11 +24,11 @@ Require-Bundle: com.raytheon.uf.viz.core;bundle-version="1.14.0",
com.raytheon.uf.viz.image.export;bundle-version="1.14.0", com.raytheon.uf.viz.image.export;bundle-version="1.14.0",
org.eclipse.core.runtime;bundle-version="3.8.0", org.eclipse.core.runtime;bundle-version="3.8.0",
com.raytheon.viz.volumebrowser;bundle-version="1.15.0", com.raytheon.viz.volumebrowser;bundle-version="1.15.0",
org.eclipse.e4.ui.model.workbench, gov.noaa.nws.ncep.ui.pgen
gov.noaa.nws.ncep.ui.pgen;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.viz.d2d.nsharp, Export-Package: com.raytheon.uf.viz.d2d.nsharp,
com.raytheon.uf.viz.d2d.nsharp.display, com.raytheon.uf.viz.d2d.nsharp.display,
com.raytheon.uf.viz.d2d.nsharp.rsc, com.raytheon.uf.viz.d2d.nsharp.rsc,
com.raytheon.uf.viz.d2d.nsharp.vb com.raytheon.uf.viz.d2d.nsharp.vb
Bundle-ClassPath: com.raytheon.uf.viz.d2d.nsharp.jar Bundle-ClassPath: com.raytheon.uf.viz.d2d.nsharp.jar
Import-Package: gov.noaa.nws.ncep.viz.soundingrequest Import-Package: gov.noaa.nws.ncep.ui.pgen.display,
gov.noaa.nws.ncep.viz.soundingrequest

View file

@ -23,7 +23,9 @@ import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IViewSite; import org.eclipse.ui.IViewSite;
import org.eclipse.ui.PlatformUI;
import com.raytheon.viz.ui.EditorUtil; import com.raytheon.viz.ui.EditorUtil;
import com.raytheon.viz.ui.perspectives.AbstractVizPerspectiveManager; 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 * May 12, 2011 9249 bsteffen Initial creation
* Apr 29, 2016 5607 bsteffen Fix modal tool manipulation in eclipse 4. * Apr 29, 2016 5607 bsteffen Fix modal tool manipulation in eclipse 4.
* May 05, 2017 mjames Use NCEP NSHARP dialog.
* *
* </pre> * </pre>
* *
@ -58,6 +61,10 @@ public class D2DNSharpPaletteWindow extends NsharpPaletteWindow {
private AbstractModalTool lastTool = null; private AbstractModalTool lastTool = null;
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
D2DNsharpLoadDialog loadDia = D2DNsharpLoadDialog.getInstance(shell);
@Override @Override
public void init(IViewSite site) { public void init(IViewSite site) {
super.init(site); super.init(site);
@ -104,8 +111,7 @@ public class D2DNSharpPaletteWindow extends NsharpPaletteWindow {
@Override @Override
public void handleEvent(Event event) { public void handleEvent(Event event) {
D2DNsharpHandleArchiveFile.openArchiveFile(getViewSite() if (loadDia != null) loadDia.open();
.getShell());
} }
}); });