From d15e5c7a00745c235529676dfafb83b338294ed8 Mon Sep 17 00:00:00 2001 From: r8s Date: Thu, 4 Jun 2015 10:40:07 -0400 Subject: [PATCH 1/6] Fixes bugs 469299 and 469302, the file viewer delete button not working and the CSV Plot Editor not being openable. Signed-off-by: r8s --- .../ice/datastructures/form/ResourceComponent.java | 11 +++++++++++ .../eclipse/ice/viz/service/csv/CSVPlotEditor.java | 2 +- src/org.eclipse.ice.viz/plugin.xml | 4 ++-- .../src/org/eclipse/ice/viz/VizFileViewer.java | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java b/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java index 6184b265e..dc5995224 100644 --- a/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java +++ b/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java @@ -69,6 +69,17 @@ public class ResourceComponent extends ListComponent { return; } + + /** + * This operation removes an ICEResource from the component. + * + * @param resource + * The resource to remove. + */ + public void removeResource(ICEResource resource) { + this.remove(resource); + return; + } /** * This operation gets all of the ICEResources from the component. diff --git a/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java b/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java index 9c418b787..cac960418 100644 --- a/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java +++ b/src/org.eclipse.ice.viz.service/src/org/eclipse/ice/viz/service/csv/CSVPlotEditor.java @@ -57,7 +57,7 @@ public class CSVPlotEditor extends EditorPart { /** * The ID for this editor. */ - public static final String ID = "org.eclipse.ice.viz.plotviewer.CSVPlotEditor"; + public static final String ID = "org.eclipse.ice.viz.service.csv.CSVPlotEditor"; /** * The top level composite that holds the editor's contents. diff --git a/src/org.eclipse.ice.viz/plugin.xml b/src/org.eclipse.ice.viz/plugin.xml index 58ccf28a7..43737d701 100644 --- a/src/org.eclipse.ice.viz/plugin.xml +++ b/src/org.eclipse.ice.viz/plugin.xml @@ -32,9 +32,9 @@ name="VisIt Editor"> diff --git a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java index 0696fe201..7c0cee1d3 100644 --- a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java +++ b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java @@ -403,7 +403,7 @@ public class VizFileViewer extends ViewPart implements IUpdateableListener, System.out.println("VizFileViewer message: " + "Removing the resource for file \"" + resource.getPath().getPath() + "\"."); - resources.remove(resource); + resourceComponent.removeResource(resource); } } -- GitLab From 2ad4c40cad22be0bba48988f68429542cd1615a0 Mon Sep 17 00:00:00 2001 From: r8s Date: Thu, 4 Jun 2015 13:33:12 -0400 Subject: [PATCH 2/6] Fixes bug 469305, allowing the mouse wheel to zoom VisIt models. Signed-off-by: r8s --- .../ice/viz/service/visit/VisItMouseManager.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java index dbf4b0bb0..f9adaccc0 100644 --- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java +++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java @@ -14,6 +14,7 @@ package org.eclipse.ice.viz.service.visit; import gov.lbnl.visit.swt.VisItSwtWidget; +import java.awt.Event; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; @@ -27,6 +28,7 @@ import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.MouseMoveListener; import org.eclipse.swt.events.MouseWheelListener; import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Listener; /** * This class is used for managing a daemon thread for processing mouse input. @@ -175,8 +177,17 @@ public class VisItMouseManager { public void mouseScrolled(MouseEvent e) { String direction = (e.count > 0) ? "in" : "out"; widget.zoom(direction); + System.out.println(direction); } }; + Listener dummy = new Listener(){ + @Override + public void handleEvent(org.eclipse.swt.widgets.Event event) { + // TODO Auto-generated method stub + + } + }; + widget.addListener(SWT.KeyDown, dummy); widget.addMouseWheelListener(wheelListener); } // Create a MouseMoveListener to keep track of the mouse location when -- GitLab From 957c8ec2a66f6e0e777203bff015f12107af0615 Mon Sep 17 00:00:00 2001 From: r8s Date: Thu, 4 Jun 2015 13:41:24 -0400 Subject: [PATCH 3/6] Removed line of debug code. Signed-off-by: r8s --- .../src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java index f9adaccc0..df4f0ff0a 100644 --- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java +++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java @@ -177,7 +177,6 @@ public class VisItMouseManager { public void mouseScrolled(MouseEvent e) { String direction = (e.count > 0) ? "in" : "out"; widget.zoom(direction); - System.out.println(direction); } }; Listener dummy = new Listener(){ -- GitLab From 461119f3fa6477a8096f8bfaeebf48d6a60d01cb Mon Sep 17 00:00:00 2001 From: r8s Date: Fri, 5 Jun 2015 08:45:10 -0400 Subject: [PATCH 4/6] Fixed bug 469305 as it effected the Visualization Perspective. Added error messages to prevent the user from opening multiple VisIt sessions on the same port. Signed-off-by: r8s --- .../ice/viz/visit/LaunchVisitWizardPage.java | 32 +++++++++++++++++++ .../eclipse/ice/viz/visit/VisitEditor.java | 9 ++++++ 2 files changed, 41 insertions(+) diff --git a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/LaunchVisitWizardPage.java b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/LaunchVisitWizardPage.java index 609d6be0b..156eff3e3 100644 --- a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/LaunchVisitWizardPage.java +++ b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/LaunchVisitWizardPage.java @@ -12,9 +12,12 @@ *******************************************************************************/ package org.eclipse.ice.viz.visit; +import java.io.IOException; +import java.net.Socket; import java.util.List; import java.util.Map; import java.util.Set; + import gov.lbnl.visit.swt.VisItSwtConnection; import gov.lbnl.visit.swt.VisItSwtConnectionManager; @@ -716,6 +719,15 @@ public class LaunchVisitWizardPage extends WizardPage { + "Visit connection."); return false; } + // Check if the specified port is in use, then prompt an + // error if it is. + try (Socket test = new Socket("localhost", Integer.valueOf(port))){ + MessageDialog.openError(getShell(), "Port in use", + "The specified port number is already in use. " + + "Please select a different port."); + return false; + } catch (IOException e) { + } password = localPasswordComp.getPassword(); use_tunneling = false; } @@ -754,6 +766,17 @@ public class LaunchVisitWizardPage extends WizardPage { + "Visit connection."); return false; } + + // Check if the specified port is in use, then prompt an + // error if it is. + try (Socket test = new Socket("localhost", Integer.valueOf(port))){ + MessageDialog.openError(getShell(), "Port in use", + "The specified port number is already in use. " + + "Please select a different port."); + return false; + } catch (IOException e) { + } + password = remotePasswordComp.getPassword(); use_tunneling = true; gateway = remoteGatewayComp.getURLString(); @@ -784,6 +807,15 @@ public class LaunchVisitWizardPage extends WizardPage { + "Visit connection."); return false; } + + try (Socket test = new Socket("localhost", Integer.valueOf(port))){ + MessageDialog.openError(getShell(), "Port in use", + "The specified port number is already in use. " + + "Please select a different port."); + return false; + } catch (IOException e) { + } + password = servicePassText.getText(); use_tunneling = false; gateway = serviceGatewayComp.getURLString(); diff --git a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java index 905bbb784..41d8fc6fb 100644 --- a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java +++ b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java @@ -30,6 +30,7 @@ import org.eclipse.swt.events.MouseWheelListener; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IEditorInput; @@ -158,6 +159,14 @@ public class VisitEditor extends EditorPart { vizWidget.zoom(direction); } }); + Listener dummy = new Listener(){ + @Override + public void handleEvent(org.eclipse.swt.widgets.Event event) { + // TODO Auto-generated method stub + + } + }; + vizWidget.addListener(SWT.KeyDown, dummy); // Use mouse click to move the plot vizWidget.addMouseMoveListener(new MouseMoveListener() { @Override -- GitLab From bf5d939272a886942e5d9b171ada86a3dbe36099 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 5 Jun 2015 10:31:54 -0400 Subject: [PATCH 5/6] [469299][469302][469305] File viewer delete button fix, CSV Editor loading issue, and mouse wheel zooming for VisIt. The file viewer button now removes from ResourceComponent instead of a local arraylist. The CSV Editor's path has been repaired so that it can be properly loaded. The VisIt editors now receive focus properly, and can use the mouse wheel for zooming. Added error messages when user attempts to open a VisIt connection on a port that is already in use. Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=469299 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=469302 Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=469305 Signed-off-by: Robert Smith --- .../ice/datastructures/form/ResourceComponent.java | 11 ----------- .../ice/viz/service/visit/VisItMouseManager.java | 5 +++++ .../src/org/eclipse/ice/viz/VizFileViewer.java | 6 +----- .../src/org/eclipse/ice/viz/visit/VisitEditor.java | 12 ++++-------- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java b/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java index dc5995224..cc02c2818 100644 --- a/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java +++ b/src/org.eclipse.ice.datastructures/src/org/eclipse/ice/datastructures/form/ResourceComponent.java @@ -70,17 +70,6 @@ public class ResourceComponent extends ListComponent { return; } - /** - * This operation removes an ICEResource from the component. - * - * @param resource - * The resource to remove. - */ - public void removeResource(ICEResource resource) { - this.remove(resource); - return; - } - /** * This operation gets all of the ICEResources from the component. * diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java index df4f0ff0a..c31bb4315 100644 --- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java +++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java @@ -23,6 +23,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.swt.SWT; import org.eclipse.swt.events.DisposeEvent; import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.events.KeyAdapter; +import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.MouseEvent; import org.eclipse.swt.events.MouseListener; import org.eclipse.swt.events.MouseMoveListener; @@ -179,6 +181,8 @@ public class VisItMouseManager { widget.zoom(direction); } }; + // Dummy listener required to give widget proper focus for mouse wheel + // scrolling. Listener dummy = new Listener(){ @Override public void handleEvent(org.eclipse.swt.widgets.Event event) { @@ -188,6 +192,7 @@ public class VisItMouseManager { }; widget.addListener(SWT.KeyDown, dummy); widget.addMouseWheelListener(wheelListener); + } // Create a MouseMoveListener to keep track of the mouse location when // dragging. diff --git a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java index 7c0cee1d3..16fd503ae 100644 --- a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java +++ b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/VizFileViewer.java @@ -391,10 +391,6 @@ public class VizFileViewer extends ViewPart implements IUpdateableListener, if (selection instanceof IStructuredSelection) { IStructuredSelection structuredSelection = (IStructuredSelection) selection; - // Get the resources from the ResourceComponent. - ArrayList resources = resourceComponent - .getResources(); - // Remove each ICEResource in the selection from the // ResourceComponent. for (Iterator iter = structuredSelection.iterator(); iter @@ -403,7 +399,7 @@ public class VizFileViewer extends ViewPart implements IUpdateableListener, System.out.println("VizFileViewer message: " + "Removing the resource for file \"" + resource.getPath().getPath() + "\"."); - resourceComponent.removeResource(resource); + resourceComponent.remove(resource); } } diff --git a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java index 41d8fc6fb..3ca9bc560 100644 --- a/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java +++ b/src/org.eclipse.ice.viz/src/org/eclipse/ice/viz/visit/VisitEditor.java @@ -16,6 +16,7 @@ import gov.lbnl.visit.swt.VisItSwtConnection; import gov.lbnl.visit.swt.VisItSwtConnectionManager; import gov.lbnl.visit.swt.VisItSwtWidget; +import java.awt.event.MouseAdapter; import java.util.HashMap; import org.eclipse.core.runtime.IProgressMonitor; @@ -159,14 +160,8 @@ public class VisitEditor extends EditorPart { vizWidget.zoom(direction); } }); - Listener dummy = new Listener(){ - @Override - public void handleEvent(org.eclipse.swt.widgets.Event event) { - // TODO Auto-generated method stub - - } - }; - vizWidget.addListener(SWT.KeyDown, dummy); + + // Use mouse click to move the plot vizWidget.addMouseMoveListener(new MouseMoveListener() { @Override @@ -189,6 +184,7 @@ public class VisitEditor extends EditorPart { @Override public void mouseDown(MouseEvent e) { + vizWidget.setFocus(); // Set the pressed flag mousePressed = true; // Start the mouseManager thread -- GitLab From c850df2d36f7528688f2165300351c33a09c3ca4 Mon Sep 17 00:00:00 2001 From: Robert Smith Date: Fri, 5 Jun 2015 10:45:11 -0400 Subject: [PATCH 6/6] [469299][469302][469305] File viewer delete button fix, CSV Editor loading issue, and mouse wheel zooming for VisIt. The file viewer button now removes from ResourceComponent instead of a local arraylist. The CSV Editor's path has been repaired so that it can be properly loaded. The VisIt editors now receive focus properly, and can use the mouse wheel for zooming. Added error messages when user attempts to open a VisIt connection on a port that is already in use. My previous commits to this repository list my name as r8s and my email address as r8s@ornl.gov. I certify that my username is r8s and r8s@ornl.gov is an alternative email address. I further certify that I did all the work listed under those credentials. Bug: 469299 https://bugs.eclipse.org/bugs/show_bug.cgi?id=469299 Bug: 469302 https://bugs.eclipse.org/bugs/show_bug.cgi?id=469302 Bug: 469305 https://bugs.eclipse.org/bugs/show_bug.cgi?id=469305 Signed-off-by: Robert Smith --- .../org/eclipse/ice/viz/service/visit/VisItMouseManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java index c31bb4315..4fc20c461 100644 --- a/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java +++ b/src/org.eclipse.ice.viz.service.visit/src/org/eclipse/ice/viz/service/visit/VisItMouseManager.java @@ -185,9 +185,7 @@ public class VisItMouseManager { // scrolling. Listener dummy = new Listener(){ @Override - public void handleEvent(org.eclipse.swt.widgets.Event event) { - // TODO Auto-generated method stub - + public void handleEvent(org.eclipse.swt.widgets.Event event) { } }; widget.addListener(SWT.KeyDown, dummy); -- GitLab