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 6184b265e99f9a8778bce669fc56313b682db32a..cc02c28180b8f67293aa0cda074fbb7767f8ce9a 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,7 +69,7 @@ public class ResourceComponent extends ListComponent { 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 dbf4b0bb021a5137766b1079768b86e26d6501c1..4fc20c461656c177402e544e0b9f3430fde6e2f0 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; @@ -22,11 +23,14 @@ 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; 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. @@ -177,7 +181,16 @@ 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) { + } + }; + 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.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 9c418b787efc783d3fa31dfa52739cecf0ed35aa..cac9604187a3c867d9370724ce2cb89c9b1404b4 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 58ccf28a7375ecd7d41574e51d93b2f26d9b541c..43737d701f0201489f055a30e7b8001a5066fca9 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 0696fe201675583244b83946033d1ee89e20884d..16fd503aed59c2a71f428d778cd12e75b8bfa17f 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() + "\"."); - resources.remove(resource); + resourceComponent.remove(resource); } } 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 609d6be0b76e132ee0382a654e891f7a64e09367..156eff3e389c43b000798a4746b450e48c8b8132 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 905bbb784d2a544479d58e8233bcc0498cad491a..3ca9bc56071d9edd6252755aa55301eba7d2d101 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; @@ -30,6 +31,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 +160,8 @@ public class VisitEditor extends EditorPart { vizWidget.zoom(direction); } }); + + // Use mouse click to move the plot vizWidget.addMouseMoveListener(new MouseMoveListener() { @Override @@ -180,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