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

Issue #1287 Changes for non-blocking SaveDeleteSelectTRDialog.

Browse source 
Change-Id: I22500cf5f7e3f11c16abd50b1ad5c80be81283cb

Former-commit-id: 5f016cac30 [formerly 86f70d36d7eac5b472a1aa22922c30390436f880]
Former-commit-id: d2122ef959
This commit is contained in:
Roger Ferrel 2012-10-25 08:08:33 -05:00
parent b46d3ef692
commit fbc8331f28
3 changed files with 25 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowDeleteSelectionTimeRangeDialog.java
View file

@ -37,6 +37,7 @@ import com.raytheon.viz.gfe.dialogs.SaveDeleteSelectTRDialog;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jan 23, 2008 Eric Babin Initial Creation * Jan 23, 2008 Eric Babin Initial Creation
* Oct 25, 2012 1287 rferrel Changes for non-blocking ShowDeleteSelectionTimeRangeDialog.
* *
* </pre> * </pre>
* *
@ -46,7 +47,7 @@ import com.raytheon.viz.gfe.dialogs.SaveDeleteSelectTRDialog;
public class ShowDeleteSelectionTimeRangeDialog extends AbstractHandler { public class ShowDeleteSelectionTimeRangeDialog extends AbstractHandler {
protected static final String DEFAULT_MSG = "You have selected delete on a default period. Only the user's entry of this item will be deleted. That is, the item will be reset to the Base default value. Continue?"; private SaveDeleteSelectTRDialog dialog;
/** /**
* *
@ -68,42 +69,17 @@ public class ShowDeleteSelectionTimeRangeDialog extends AbstractHandler {
return null; return null;
} }
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
.getShell();
SaveDeleteSelectTRDialog dialog = new SaveDeleteSelectTRDialog(shell, Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
dataManager, "Delete"); .getShell();
dialog.setBlockOnOpen(true);
dialog.open(); dialog = new SaveDeleteSelectTRDialog(shell, dataManager, "Delete");
// String delName = null; dialog.setBlockOnOpen(false);
// if (dialog.getReturnCode() == Window.OK) { dialog.open();
// delName = dialog.getItemToDelete(); } else {
// if (selectTRmgr.getRange(delName).getLevel() != dialog.bringToTop();
// LocalizationLevel.USER) { }
// // Confirm
// if (!MessageDialog.openConfirm(shell,
// "Default Time Period", DEFAULT_MSG)) {
// returnCode = Window.CANCEL;
// }
// }
// }
//
// if (returnCode == Window.OK) {
// selectTRmgr.remove(delName);
// TimeScaleDisplayedPeriodsPreference
// .removeTimeScaleDisplayedPeriod(delName);
// try {
// selectTRmgr.save(LocalizationLevel.USER);
// } catch (Exception e) {
// throw new ExecutionException(
// "Error saving SelectTimeRanges", e);
// }
// }
// } else {
// UFStatus.handle(Priority.PROBLEM, Activator.PLUGIN_ID,
// StatusConstants.CATEGORY_GFE, null,
// "Error loading time ranges");
// }
return null; return null;
} }
} }

17
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSaveSelectionTimeRangeDialog.java
View file

@ -38,6 +38,7 @@ import com.raytheon.viz.gfe.dialogs.SaveDeleteSelectTRDialog;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Jan 23, 2008 Eric Babin Initial Creation * Jan 23, 2008 Eric Babin Initial Creation
* Nov 11, 2008 1213 wdougherty Use SelectTimeRangeContainer * Nov 11, 2008 1213 wdougherty Use SelectTimeRangeContainer
* Oct 25, 2012 1287 rferrel Code changes for non-blocking SaveDeleteSelectTRDialog.
* *
* </pre> * </pre>
* *
@ -46,6 +47,7 @@ import com.raytheon.viz.gfe.dialogs.SaveDeleteSelectTRDialog;
*/ */
public class ShowSaveSelectionTimeRangeDialog extends AbstractHandler { public class ShowSaveSelectionTimeRangeDialog extends AbstractHandler {
private SaveDeleteSelectTRDialog dialog;
public ShowSaveSelectionTimeRangeDialog() { public ShowSaveSelectionTimeRangeDialog() {
} }
@ -64,13 +66,16 @@ public class ShowSaveSelectionTimeRangeDialog extends AbstractHandler {
return null; return null;
} }
Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow() if (dialog == null || dialog.getShell() == null || dialog.isDisposed()) {
.getShell(); Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
.getShell();
SaveDeleteSelectTRDialog dialog = new SaveDeleteSelectTRDialog(shell, dialog = new SaveDeleteSelectTRDialog(shell, dataManager, "Save");
dataManager, "Save"); dialog.setBlockOnOpen(false);
dialog.setBlockOnOpen(true); dialog.open();
dialog.open(); } else {
dialog.bringToTop();
}
return null; return null;
} }

9
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/SaveDeleteSelectTRDialog.java
View file

@ -54,7 +54,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog;
import com.raytheon.viz.ui.widgets.SpinScale; import com.raytheon.viz.ui.widgets.SpinScale;
/** /**
* TODO Add Description * Dialog for performing selected time range save or delete.
* *
* <pre> * <pre>
* *
@ -63,6 +63,7 @@ import com.raytheon.viz.ui.widgets.SpinScale;
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Dec 7, 2009 randerso Initial creation * Dec 7, 2009 randerso Initial creation
* Aug 1, 2012 #965 dgilling Change location of SelectTimeRange. * Aug 1, 2012 #965 dgilling Change location of SelectTimeRange.
* Oct 25, 2012 #1287 rferrel Code cleanup part of non-blocking dialogs.
* *
* </pre> * </pre>
* *
@ -338,8 +339,6 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
} else { } else {
mode = Mode.ZULU; mode = Mode.ZULU;
} }
// LogStream.logUse("Save",id, self.__modeVar.get(),
// self.__startScale.get(), self.__stopScale.get())
dataManager.getSelectTimeRangeManager().save(id, dataManager.getSelectTimeRangeManager().save(id,
startScale.getSelection(), stopScale.getSelection(), startScale.getSelection(), stopScale.getSelection(),
mode); mode);
@ -361,10 +360,6 @@ public class SaveDeleteSelectTRDialog extends CaveJFACEDialog {
} }
if (!protectedIds.contains(id[0]) && ids.contains(id[0])) { if (!protectedIds.contains(id[0]) && ids.contains(id[0])) {
// verify = self.__accessMgr.verifyDelete(
// id, self.__category, self.__parent)
// if verify == 1:
// LogStream.logUse("Delete", id)
if (!MessageDialog.openConfirm(this.getShell(), "Confirm Delete", if (!MessageDialog.openConfirm(this.getShell(), "Confirm Delete",
"Delete Select Time Range: \"" + id[0] + "\"?")) { "Delete Select Time Range: \"" + id[0] + "\"?")) {
return; return;