From c34e649e657853cf92eb13b146dc46cf63904e73 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 24 Sep 2012 15:31:15 -0500 Subject: [PATCH] Issue #1131 disable PanTool in Nsharp to avoid conflicting with nsharp mouse handlers. Former-commit-id: c4e1d834c1058d4201ea10cb148c3172471da779 [formerly c4e1d834c1058d4201ea10cb148c3172471da779 [formerly efe7d92966e8d53a1f071f62c5b73576d9c6793a]] Former-commit-id: 50969cb7e2751e5ad4e68ea640d6f15ec4af7044 Former-commit-id: 9e0c697daf5a7f22cceeaa4e70528dddf9c01d24 --- .../com.raytheon.uf.viz.d2d.nsharp/plugin.xml | 21 +++- .../display/D2DNSharpPaletteWindow.java | 114 +----------------- 2 files changed, 22 insertions(+), 113 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml index a2cdf66126..541dae7509 100644 --- a/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml +++ b/cave/com.raytheon.uf.viz.d2d.nsharp/plugin.xml @@ -39,7 +39,7 @@ commandId="com.raytheon.viz.ui.actions.saveScreen"> - + @@ -48,10 +48,27 @@ commandId="com.raytheon.viz.ui.actions.printScreenAction"> - + + + + + + + + + + + + + + + + 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 79b6b8d5b1..c125eb7c95 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 @@ -19,7 +19,6 @@ **/ package com.raytheon.uf.viz.d2d.nsharp.display; -import gov.noaa.nws.ncep.ui.nsharp.display.rsc.NsharpResourceHandler; import gov.noaa.nws.ncep.ui.nsharp.view.NsharpPaletteWindow; import org.eclipse.swt.SWT; @@ -27,14 +26,11 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import com.raytheon.viz.ui.perspectives.AbstractVizPerspectiveManager; -import com.raytheon.viz.ui.perspectives.VizPerspectiveListener; -import com.raytheon.viz.ui.tools.AbstractModalTool; -import com.raytheon.viz.ui.tools.ModalToolManager; - /** * - * TODO Add Description + * Extends NsharpPaletteWindow but overide load to prevent opening ncmapeditor. + * Also disable unload since loading and unloading is being handled by time + * matched resources. * * 
  * 
@@ -51,45 +47,6 @@ import com.raytheon.viz.ui.tools.ModalToolManager;
  */
 public class D2DNSharpPaletteWindow extends NsharpPaletteWindow {
 
-    private static final String EDIT_TOOL_CATEGY = "com.raytheon.viz.ui.modalTool.nav";
-
-    private class EditTool extends AbstractModalTool {
-
-        public EditTool() {
-            this.categoryId = EDIT_TOOL_CATEGY;
-        }
-
-        @Override
-        protected void deactivateTool() {
-            if (!graphEditBtn.isDisposed()) {
-                editGraphOn = false;
-                graphEditBtn.setText(EDIT_GRAPH_OFF);
-                notifyRsc();
-            }
-
-        }
-
-        @Override
-        protected void activateTool() {
-            editGraphOn = true;
-            graphEditBtn.setText(EDIT_GRAPH_ON);
-            notifyRsc();
-        }
-
-        private void notifyRsc() {
-            NsharpResourceHandler rsc = getRscHandler();
-            if (rsc == null)
-                return;
-
-            rsc.setEditGraphOn(editGraphOn);
-        }
-
-    }
-
-    private AbstractModalTool editTool = new EditTool();
-
-    private AbstractModalTool lastTool = null;
-
     @Override
     public void createDataControlGp(Composite parent) {
         super.createDataControlGp(parent);
@@ -107,71 +64,6 @@ public class D2DNSharpPaletteWindow extends NsharpPaletteWindow {
             }
         });
 
-        for (Listener listener : graphEditBtn.getListeners(SWT.MouseUp)) {
-            graphEditBtn.removeListener(SWT.MouseUp, listener);
-        }
-        graphEditBtn.addListener(SWT.MouseUp, new Listener() {
-
-            @Override
-            public void handleEvent(Event event) {
-                if (editGraphOn) {
-                    disableEdit();
-                } else {
-                    enableEdit();
-                }
-            }
-        });
-        NsharpResourceHandler rsc = getRscHandler();
-        if (rsc != null && rsc.isEditGraphOn()) {
-            enableEdit();
-        } else {
-            disableEdit();
-        }
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see gov.noaa.nws.ncep.ui.nsharp.palette.NsharpPaletteWindow#dispose()
-     */
-    @Override
-    public void dispose() {
-        disableEdit();
-        getSite().getPage().removePartListener(this);
-    }
-
-    private void enableEdit() {
-        AbstractVizPerspectiveManager perspMgr = VizPerspectiveListener
-                .getCurrentPerspectiveManager();
-        if (perspMgr == null) {
-            return;
-        }
-        ModalToolManager mgr = perspMgr.getToolManager();
-        lastTool = mgr.getSelectedModalTool(EDIT_TOOL_CATEGY);
-        if (lastTool != editTool) {
-            mgr.selectModalTool(editTool);
-            editTool.activate();
-        } else {
-            lastTool = null;
-        }
-    }
-
-    private void disableEdit() {
-        AbstractVizPerspectiveManager perspMgr = VizPerspectiveListener
-                .getCurrentPerspectiveManager();
-        if (perspMgr == null) {
-            return;
-        }
-        ModalToolManager mgr = perspMgr.getToolManager();
-        if (mgr.getSelectedModalTool(EDIT_TOOL_CATEGY) == editTool) {
-            mgr.deselectModalTool(editTool);
-            if (lastTool != null) {
-                mgr.selectModalTool(lastTool);
-                lastTool.activate();
-                lastTool = null;
-            }
-        }
     }
 
 }