xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1287 Changes SampleSetDialog from review.

Browse source 
Change-Id: Ifcca23bdacabf7495cdc08763b6ebad0b6961f09

Former-commit-id: 0eb964cc6bb9e2961b30f39e52a0b178f09d96ca
This commit is contained in:
Roger Ferrel 2012-10-25 11:09:55 -05:00
parent da5917e583
commit 5e4c7c0d53
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDeleteSampleSetDialog.java
View file

@ -22,6 +22,7 @@ package com.raytheon.viz.gfe.actions;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List;
import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionEvent;
@ -113,7 +114,7 @@ public class ShowDeleteSampleSetDialog extends AbstractHandler {
private void doDialogClose(int returnCode) { private void doDialogClose(int returnCode) {
if (returnCode != Window.CANCEL if (returnCode != Window.CANCEL
&& dialog.getSelectedSampleIdIndexes() != null) { && dialog.getSelectedSampleIdIndexes() != null) {
ArrayList<SampleId> sampleIdList = dialog.getSamples(); List<SampleId> sampleIdList = dialog.getSamples();
SampleId id = sampleIdList SampleId id = sampleIdList
.get(dialog.getSelectedSampleIdIndexes()[0]); .get(dialog.getSelectedSampleIdIndexes()[0]);
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()

6
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowLoadSampleSetDialog.java
View file

@ -22,6 +22,7 @@ package com.raytheon.viz.gfe.actions;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.List;
import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionEvent;
@ -121,7 +122,7 @@ public class ShowLoadSampleSetDialog extends AbstractHandler {
private void doDialogClosed(int returnCode) { private void doDialogClosed(int returnCode) {
if (returnCode != Window.CANCEL if (returnCode != Window.CANCEL
&& dialog.getSelectedSampleIdIndexes() != null) { && dialog.getSelectedSampleIdIndexes() != null) {
ArrayList<SampleId> sampleIdList = dialog.getSamples(); List<SampleId> sampleIdList = dialog.getSamples();
ISampleSetManager.SampleSetLoadMode mode = null; ISampleSetManager.SampleSetLoadMode mode = null;
switch (returnCode) { switch (returnCode) {
case SampleSetDialog.OK: case SampleSetDialog.OK:
@ -145,7 +146,8 @@ public class ShowLoadSampleSetDialog extends AbstractHandler {
dm.getSampleSetManager().loadSampleSet(id, mode); dm.getSampleSetManager().loadSampleSet(id, mode);
} catch (GFEException e) { } catch (GFEException e) {
statusHandler.handle(Priority.ERROR, statusHandler.handle(Priority.ERROR,
"Load failed for mode: " + mode.toString(), e); "Load failed for mode: " + mode.toString()
+ ", sample id: " + id.toString(), e);
} }
} }
} }

13
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SampleSetDialog.java
View file

@ -19,8 +19,6 @@
**/ **/
package com.raytheon.viz.gfe.dialogs; package com.raytheon.viz.gfe.dialogs;
import java.util.ArrayList;
import org.eclipse.jface.window.Window; import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyEvent;
@ -73,7 +71,7 @@ public class SampleSetDialog extends CaveJFACEDialog {
private Composite top; private Composite top;
private ArrayList<SampleId> samples; private java.util.List<SampleId> samples;
private List sampleSetList; private List sampleSetList;
@ -83,11 +81,12 @@ public class SampleSetDialog extends CaveJFACEDialog {
private int[] selectedSamples; private int[] selectedSamples;
private int returnCode = OK; private int returnCode = CANCEL;
private int type = CANCEL; private int type;
public SampleSetDialog(Shell parent, ArrayList<SampleId> samples, int type) { public SampleSetDialog(Shell parent, java.util.List<SampleId> samples,
int type) {
super(parent); super(parent);
this.setShellStyle(SWT.DIALOG_TRIM | SWT.MODELESS); this.setShellStyle(SWT.DIALOG_TRIM | SWT.MODELESS);
this.samples = samples; this.samples = samples;
@ -222,7 +221,7 @@ public class SampleSetDialog extends CaveJFACEDialog {
this.sampleName = sampleName; this.sampleName = sampleName;
} }
public ArrayList<SampleId> getSamples() { public java.util.List<SampleId> getSamples() {
return samples; return samples;
} }
} }