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

Merge "Issue #1820 - Implement notification center delete config Review comments Change-Id: I0d388e51bb322974a0dccb94e7a09d8965d98d39" into development

Browse source 
Former-commit-id: 38c24ffb6d [formerly b81d09897d] [formerly 38c24ffb6d [formerly b81d09897d] [formerly a330061066 [formerly 6d353398ef7ff044fe8667112aaf34c049aca7b0]]]
Former-commit-id: a330061066
Former-commit-id: 221886f18f [formerly b0ab1d6100]
Former-commit-id: 2c1e956779
This commit is contained in:
Dustin Johnson 2013-04-25 12:43:49 -05:00 • committed by Gerrit Code Review
commit eef3b3b00b
4 changed files with 180 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

218
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/LoadSaveConfigDlg.java
View file

@ -53,6 +53,9 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.datadelivery.common.xml.IDisplayXml;
import com.raytheon.uf.viz.datadelivery.filter.config.xml.FilterSettingsXML;
import com.raytheon.uf.viz.datadelivery.filter.config.xml.FilterTypeXML;
@ -80,38 +83,40 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Jun 1, 2012 645 jpiatt Added tooltips.
* Jun 19, 2012 717 jpiatt Save action update.
* Aug 22, 2012 0743 djohnson Add new TimeXML sub-classes.
* Apr 25, 2013 1820 mpduff Implement deletion of config file.
*
* </pre>
*
* @author
* @version 1.0
*/
public class LoadSaveConfigDlg extends CaveSWTDialog {
/** Status Handler */
private final IUFStatusHandler statusHandler = UFStatus
.getHandler(LoadSaveConfigDlg.class);
/**
* Dialog Type Enumeration. Types include OPEN,
* SAVE_AS, DELETE, SELECT_DEFAULT.
*
* Dialog Type Enumeration. Types include OPEN, SAVE_AS, DELETE,
* SELECT_DEFAULT.
*/
public static enum DialogType {
/**
* Open dialog.
*/
OPEN,
OPEN,
/**
* Save as dialog.
*/
SAVE_AS,
SAVE_AS,
/**
* Delete dialog.
*/
DELETE,
DELETE,
/**
* Default dialog.
*/
SELECT_DEFAULT
};
/** DialogType object */
@ -165,9 +170,6 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
/** Preview button */
private Button previewBtn;
/** Configuration file */
private final NotificationConfigXML xml = null;
/** JAXB context */
private JAXBContext jax;
@ -192,18 +194,18 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
* @param excludedNameForSaving
* Exclude name for saving flag.
* @param showPreview
* show the preview pane if true
*/
public LoadSaveConfigDlg(Shell parent, DialogType type, String fileNamePath, String excludedNameForSaving,
public LoadSaveConfigDlg(Shell parent, DialogType type,
String fileNamePath, String excludedNameForSaving,
boolean showPreview) {
super(parent, SWT.TITLE);
if (type == DialogType.OPEN) {
setText("Load Configuration");
}
else if (type == DialogType.SAVE_AS) {
} else if (type == DialogType.SAVE_AS) {
setText("Save Configuration");
}
else if (type == DialogType.SELECT_DEFAULT) {
} else if (type == DialogType.SELECT_DEFAULT) {
setText("Select Default");
} else if (type == DialogType.DELETE) {
setText("Delete Configuration");
@ -224,18 +226,36 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
* Constructor that does not show the preview pane.
*
* @param parent
* parent shell
* parent shell
* @param type
* dialog type
* dialog type
* @param fileNamePath
* path of the file
* path of the file
* @param excludedNameForSaving
* exclude name
*/
public LoadSaveConfigDlg(Shell parent, DialogType type, String fileNamePath, String excludedNameForSaving) {
public LoadSaveConfigDlg(Shell parent, DialogType type,
String fileNamePath, String excludedNameForSaving) {
this(parent, type, fileNamePath, excludedNameForSaving, false);
}
/**
* Constructor.
*
* @param parent
* parent shell
* @param type
* dialog type
* @param filePath
* path for the dialog
* @param showPreview
* show the preview pane
*/
public LoadSaveConfigDlg(Shell parent, DialogType type, String filePath,
boolean showPreview) {
this(parent, type, filePath, null, showPreview);
}
@Override
protected Layout constructShellLayout() {
// Create the main layout for the shell.
@ -302,30 +322,34 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
gd = new GridData();
gd.widthHint = 350;
gd.heightHint = 350;
cfgFileList = new List(controlComp, SWT.BORDER | SWT.SINGLE | SWT.V_SCROLL);
cfgFileList = new List(controlComp, SWT.BORDER | SWT.SINGLE
| SWT.V_SCROLL);
cfgFileList.setLayoutData(gd);
cfgFileList.setFont(controlFont);
cfgFileList.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
if (dialogType == DialogType.SAVE_AS) {
String selItem = cfgFileList.getItem(cfgFileList.getSelectionIndex());
String selItem = cfgFileList.getItem(cfgFileList
.getSelectionIndex());
int idx = selItem.lastIndexOf(":");
String newStr = selItem.substring(idx + 1);
newFileNameTF.setText(newStr);
if (selItem.startsWith(LocalizationContext.LocalizationLevel.SITE.name())
|| selItem.startsWith(LocalizationContext.LocalizationLevel.BASE.name())) {
if (selItem
.startsWith(LocalizationContext.LocalizationLevel.SITE
.name())
|| selItem
.startsWith(LocalizationContext.LocalizationLevel.BASE
.name())) {
siteBtn.setSelection(true);
userBtn.setSelection(false);
}
else {
} else {
userBtn.setSelection(true);
siteBtn.setSelection(false);
}
}
else if (dialogType == DialogType.OPEN) {
} else if (dialogType == DialogType.OPEN) {
if (showPreview) {
updatePreview();
}
@ -346,8 +370,9 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
if (dialogType == DialogType.SAVE_AS) {
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
gd.horizontalSpan = ((GridLayout)controlComp.getLayout()).numColumns;
Label sepLbl = new Label(controlComp, SWT.SEPARATOR | SWT.HORIZONTAL);
gd.horizontalSpan = ((GridLayout) controlComp.getLayout()).numColumns;
Label sepLbl = new Label(controlComp, SWT.SEPARATOR
| SWT.HORIZONTAL);
sepLbl.setLayoutData(gd);
gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
@ -394,11 +419,12 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
gd = new GridData();
gd.widthHint = 350;
gd.heightHint = 350;
previewTxt = new StyledText(previewComp, SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
previewTxt = new StyledText(previewComp, SWT.BORDER | SWT.H_SCROLL
| SWT.V_SCROLL);
previewTxt.setLayoutData(gd);
previewComp.setVisible(false);
((GridData)previewComp.getLayoutData()).exclude = true;
((GridData) previewComp.getLayoutData()).exclude = true;
parentComp.layout();
}
@ -445,8 +471,9 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
gd = new GridData(100, SWT.DEFAULT);
actionBtn = new Button(buttonComp, SWT.PUSH);
actionBtn.setLayoutData(gd);
shell.setDefaultButton(actionBtn);
//Open Dialog
// Open Dialog
if (dialogType == DialogType.OPEN) {
actionBtn.setText("Load");
actionBtn.addSelectionListener(new SelectionAdapter() {
@ -456,7 +483,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
}
});
}
//Delete Dialog
// Delete Dialog
else if (dialogType == DialogType.DELETE) {
actionBtn.setText("Delete");
actionBtn.addSelectionListener(new SelectionAdapter() {
@ -466,7 +493,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
}
});
}
//Save As Dialog
// Save As Dialog
else if (dialogType == DialogType.SAVE_AS) {
actionBtn.setText("Save");
actionBtn.addSelectionListener(new SelectionAdapter() {
@ -478,8 +505,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
}
}
});
}
else if (dialogType == DialogType.SELECT_DEFAULT) {
} else if (dialogType == DialogType.SELECT_DEFAULT) {
actionBtn.setText("Select");
actionBtn.addSelectionListener(new SelectionAdapter() {
@Override
@ -500,7 +526,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
}
});
}
/**
* Perform a configuration delete action.
*/
@ -509,9 +535,11 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
String str = cfgFileList.getItem(selectedIndex);
if (dialogType == DialogType.DELETE) {
MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES | SWT.NO);
MessageBox mb = new MessageBox(shell, SWT.ICON_QUESTION | SWT.YES
| SWT.NO);
mb.setText("Delete");
mb.setMessage("You are about to delete the file:\n\n" + str + "\n\nDo you wish to continue?");
mb.setMessage("You are about to delete the file:\n\n" + str
+ "\n\nDo you wish to continue?");
int result = mb.open();
if (result == SWT.NO) {
@ -534,17 +562,25 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
selectedFile = locFileMap.get(str);
IPathManager pm = PathManagerFactory.getPathManager();
LocalizationContext context = pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
LocalizationContext context = pm.getContext(
LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
if (str.startsWith("SITE")) {
context = pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
context = pm.getContext(LocalizationType.CAVE_STATIC,
LocalizationLevel.SITE);
}
LocalizationFile locFile = pm.getLocalizationFile(context, selectedFile.getName());
LocalizationFile locFile = pm.getLocalizationFile(context,
selectedFile.getName());
setReturnValue(locFile);
close();
} else {
MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
mb.setText("Selection Required");
mb.setMessage("Please select a configuration file to load.");
mb.open();
}
}
@ -553,35 +589,39 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
*/
private void saveAction() {
String fileName = fileNamePath + File.separator + newFileNameTF.getText();
String fileName = fileNamePath + File.separator
+ newFileNameTF.getText();
IPathManager pm = PathManagerFactory.getPathManager();
// check if USER or SITE radio button
LocalizationContext context = pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
LocalizationContext context = pm.getContext(
LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
if (siteBtn.getSelection() == true) {
context = pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
context = pm.getContext(LocalizationType.CAVE_STATIC,
LocalizationLevel.SITE);
}
LocalizationFile locFile = pm.getLocalizationFile(context, fileName);
if (locFile != null) {
for (LocalizationFile lf: locFiles) {
for (LocalizationFile lf : locFiles) {
if (locFile.equals(lf)) {
String msg = locFile.getFile().getName() + " already exists.\n\nAre you sure you want to overwrite the file?";
int answer = DataDeliveryUtils.showMessage(getShell(), SWT.YES | SWT.NO, "Overwrite?",
msg);
String msg = locFile.getFile().getName()
+ " already exists.\n\nAre you sure you want to overwrite the file?";
int answer = DataDeliveryUtils.showMessage(getShell(),
SWT.YES | SWT.NO, "Overwrite?", msg);
if (answer == SWT.YES) {
setReturnValue(locFile);
}
}
}
}
//set return value if null
// set return value if null
if (getReturnValue() == null) {
setReturnValue(locFile);
setReturnValue(locFile);
}
}
}
@ -591,8 +631,9 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
*/
@SuppressWarnings("rawtypes")
private void createContext() {
Class[] classes = new Class[] { NotificationConfigXML.class, NotificationFilterXML.class,
FilterSettingsXML.class, FilterTypeXML.class, SubscriptionManagerConfigXML.class,
Class[] classes = new Class[] { NotificationConfigXML.class,
NotificationFilterXML.class, FilterSettingsXML.class,
FilterTypeXML.class, SubscriptionManagerConfigXML.class,
SubsetXML.class, TimeXML.class, SpecificDateTimeXML.class,
DateRangeTimeXML.class, VerticalXML.class };
@ -601,13 +642,10 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
this.unmarshaller = jax.createUnmarshaller();
this.marshaller = jax.createMarshaller();
} catch (JAXBException e) {
// statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
// e);
e.printStackTrace();
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}
}
private boolean validateFileName() {
StringBuffer strBuf = new StringBuffer(newFileNameTF.getText().trim());
@ -631,7 +669,8 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
if (strBuf.toString().compareTo(excludedNameForSaving) == 0) {
MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.OK);
mb.setText("Warning");
mb.setMessage("Cannot save to the base default file name.\n" + "Please choose anther file name.");
mb.setMessage("Cannot save to the base default file name.\n"
+ "Please choose anther file name.");
mb.open();
return false;
}
@ -643,9 +682,11 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
String fn = listItem.substring(idx + 1);
if (fn.compareTo(strBuf.toString()) == 0) {
MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.YES | SWT.NO);
MessageBox mb = new MessageBox(shell, SWT.ICON_ERROR | SWT.YES
| SWT.NO);
mb.setText("Warning");
mb.setMessage("File name already exists. Do you wish to overwrite\n" + "the existing file?.");
mb.setMessage("File name already exists. Do you wish to overwrite\n"
+ "the existing file?.");
int result = mb.open();
if (result == SWT.NO) {
@ -670,10 +711,13 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
IPathManager pm = PathManagerFactory.getPathManager();
ArrayList<LocalizationContext> contextList = new ArrayList<LocalizationContext>();
contextList.add(pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.SITE));
contextList.add(pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.USER));
locFiles = pm.listFiles(contextList.toArray(new LocalizationContext[contextList.size()]), fileNamePath,
extensions, false, true);
contextList.add(pm.getContext(LocalizationType.CAVE_STATIC,
LocalizationLevel.SITE));
contextList.add(pm.getContext(LocalizationType.CAVE_STATIC,
LocalizationLevel.USER));
locFiles = pm.listFiles(contextList
.toArray(new LocalizationContext[contextList.size()]),
fileNamePath, extensions, false, true);
if (locFiles == null) {
return;
@ -686,7 +730,8 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
int idx = locFile.lastIndexOf("/");
String newStr = locFile.substring(idx + 1);
locFileMap.put(locFiles[i].getContext().getLocalizationLevel() + ":" + newStr, locFiles[i]);
locFileMap.put(locFiles[i].getContext().getLocalizationLevel()
+ ":" + newStr, locFiles[i]);
}
for (String str : locFileMap.keySet()) {
@ -714,7 +759,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
* Parent composite.
*/
private void addSeparator(Composite parentComp) {
GridLayout gl = (GridLayout)parentComp.getLayout();
GridLayout gl = (GridLayout) parentComp.getLayout();
GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
gd.horizontalSpan = gl.numColumns;
@ -732,14 +777,13 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
if (previewOn) {
previewBtn.setText("<< Preview");
previewComp.setVisible(true);
((GridData)previewComp.getLayoutData()).exclude = false;
((GridData) previewComp.getLayoutData()).exclude = false;
updatePreview();
}
else {
} else {
previewBtn.setText("Preview >>");
previewComp.setVisible(false);
((GridData)previewComp.getLayoutData()).exclude = true;
((GridData) previewComp.getLayoutData()).exclude = true;
}
this.listPreviewComp.layout();
@ -762,35 +806,33 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
selectedFile = locFileMap.get(str);
IPathManager pm = PathManagerFactory.getPathManager();
LocalizationContext context = pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
LocalizationContext context = pm.getContext(
LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
if (str.startsWith("SITE")) {
context = pm.getContext(LocalizationType.CAVE_STATIC, LocalizationLevel.SITE);
context = pm.getContext(LocalizationType.CAVE_STATIC,
LocalizationLevel.SITE);
}
LocalizationFile locFile = pm.getLocalizationFile(context, selectedFile.getName());
LocalizationFile locFile = pm.getLocalizationFile(context,
selectedFile.getName());
try {
// TODO : Check for instance of IDisplayXml
Object obj = unmarshaller.unmarshal(locFile.getFile());
if (obj instanceof IDisplayXml) {
IDisplayXml dispXml = (IDisplayXml)obj;
IDisplayXml dispXml = (IDisplayXml) obj;
previewTxt.setText(dispXml.getDisplayXmlString());
}
else {
this.marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
} else {
this.marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT,
true);
StringWriter sw = new StringWriter();
this.marshaller.marshal(obj, sw);
previewTxt.setText(sw.toString());
}
} catch (JAXBException e) {
// statusHandler.handle(Priority.PROBLEM,
// e.getLocalizedMessage(), e);
e.printStackTrace();
statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(), e);
}
}
}

53
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationConfigManager.java
View file

@ -32,6 +32,7 @@ import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.localization.exception.LocalizationOpFailedException;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
@ -40,19 +41,20 @@ import com.raytheon.uf.viz.datadelivery.notification.xml.NotificationFilterXML;
/**
* Notification Configuration Manager
*
*
* <pre>
*
*
* SOFTWARE HISTORY
*
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 31, 2012 mpduff Initial creation
* Feb 23, 2012 418 jpiatt Added current file save.
* Aug 15, 2012 430 jpiatt Added reRead method.
* Oct 22, 2012 1284 mpduff Code Cleanup.
* Apr 25, 2013 1820 mpduff Add deleteXml method.
* </pre>
*
*
* @author mpduff
* @version 1.0
*/
@ -115,7 +117,7 @@ public class NotificationConfigManager {
/**
* Get the instance of this class.
*
*
* @return instance
*/
public static NotificationConfigManager getInstance() {
@ -134,7 +136,6 @@ public class NotificationConfigManager {
String fileName = "dataDelivery" + File.separator
+ DEFAULT_CONFIG_XML_FILE;
IPathManager pm = PathManagerFactory.getPathManager();
LocalizationContext context = pm.getContext(
LocalizationType.CAVE_STATIC, LocalizationLevel.USER);
LocalizationFile configLocFile = pm.getLocalizationFile(context,
@ -224,6 +225,29 @@ public class NotificationConfigManager {
}
}
/**
* Delete the localization file.
*
* @param file
* the file to delete
*/
public void deleteXml(LocalizationFile file) {
try {
boolean success = file.delete();
if (!success) {
statusHandler.handle(Priority.WARN,
"Error deleting " + file.getName());
}
if (currentConfigFile.equals(file)) {
setConfigFile(this.defaultConfigFile);
}
} catch (LocalizationOpFailedException e) {
statusHandler.handle(Priority.PROBLEM,
"Error deleting " + file.getName(), e);
}
}
/**
* Create the JAXB context
*/
@ -247,40 +271,37 @@ public class NotificationConfigManager {
/**
* Set the current Configuration File.
*
*
* @param currentConfigFile
* the currentConfigFile to set
*/
public void setConfigFile(LocalizationFile currentConfigFile) {
this.currentConfigFile = currentConfigFile;
}
/**
* Set the current Filter File.
*
*
* @param currentFilterFile
* the currentFilterFile to set
*/
public void setFilterFile(LocalizationFile currentFilterFile) {
this.currentFilterFile = currentFilterFile;
}
/**
* Set the current default Configuration File.
*
*
* @param defaultConfigFile
* the currentConfigFile to set
*/
public void setDefaultConfigFile(LocalizationFile defaultConfigFile) {
this.defaultConfigFile = defaultConfigFile;
}
/**
* Get the configuration xml.
*
*
* @return the notification config xml
*/
public NotificationConfigXML getConfigXml() {
@ -289,7 +310,7 @@ public class NotificationConfigManager {
/**
* Set the configuration xml.
*
*
* @param xml
* the notification config xml
*/
@ -299,7 +320,7 @@ public class NotificationConfigManager {
/**
* Get the filter xml.
*
*
* @return the filterXml
*/
public NotificationFilterXML getFilterXml() {
@ -308,7 +329,7 @@ public class NotificationConfigManager {
/**
* Set the filter xml.
*
*
* @param filterXml
* the filterXml
*/

16
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationDlg.java
View file

@ -96,6 +96,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Dec 03, 2012 1285 bgonzale Added implementation of the tableLock method.
* Update title bar text when paused.
* Jan 22, 2013 1520 mpduff Change delete menus to hide.
* Apr 25, 2013 1820 mpduff Implemente delete config.
*
* </pre>
*
@ -639,7 +640,6 @@ public class NotificationDlg extends CaveSWTDialog implements ITableChange,
// set the configuration to the selected file
configMan.setConfigXml(xml);
tableComp.tableChangedAfterConfigLoad();
}
/**
@ -682,9 +682,8 @@ public class NotificationDlg extends CaveSWTDialog implements ITableChange,
* Save as configuration action.
*/
private void handleSaveAsConfig() {
NotificationConfigManager configMan;
configMan = NotificationConfigManager.getInstance();
NotificationConfigManager configMan = NotificationConfigManager
.getInstance();
LoadSaveConfigDlg loadDlg = new LoadSaveConfigDlg(shell,
DialogType.SAVE_AS, CONFIG_PATH, DEFAULT_CONFIG);
@ -699,7 +698,14 @@ public class NotificationDlg extends CaveSWTDialog implements ITableChange,
* Delete configuration action.
*/
private void handleDeleteConfig() {
System.out.println("Delete");
LoadSaveConfigDlg dlg = new LoadSaveConfigDlg(shell, DialogType.DELETE,
CONFIG_PATH, true);
LocalizationFile fileName = (LocalizationFile) dlg.open();
NotificationConfigManager configMan = NotificationConfigManager
.getInstance();
configMan.deleteXml(fileName);
tableComp.tableChangedAfterConfigLoad();
}
/**

5
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
View file

@ -76,6 +76,7 @@ import com.raytheon.uf.viz.datadelivery.utils.NotificationHandler;
* Oct 22, 2012 1284 mpduff Fix the start/end index for pagination of new records, code cleanup.
* Nov 29, 2012 1285 bgonzale Added a refresh pause button to the Notification Center Dialog.
* Jan 22, 2013 1520 mpduff Update javadoc.
* Apr 25, 2013 1820 mpduff Get the column list every time.
* </pre>
*
* @author lvenable
@ -977,9 +978,7 @@ public class NotificationTableComp extends TableComp implements ITableFind {
// Get list of columns from config
NotificationConfigXML xml = configMan.getConfigXml();
if (columnList == null) {
columnList = xml.getColumnList();
}
columnList = xml.getColumnList();
pageConfig = xml.getPaginationSetting();