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

Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development

Browse source 
Former-commit-id: ae9adefbf7 [formerly cf4631f9bf] [formerly 48fa8f8d1b [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: d3f18729c3
This commit is contained in:
Nate Jensen 2014-03-05 14:41:12 -06:00 • committed by Gerrit Code Review
commit b097d488ca
2 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/notifier/NotifierTools.java
View file

@ -35,8 +35,6 @@ import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.Presence.Mode;
import org.jivesoftware.smack.packet.Presence.Type;
import sun.audio.AudioDataStream;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
@ -62,7 +60,8 @@ import com.raytheon.uf.viz.core.sounds.SoundUtil;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 24, 2014 2632 mpduff Initial creation
* Feb 24, 2014 2632 mpduff Initial creation.
* Mar 05, 2014 2632 mpduff Removed unused field.
*
* </pre>
*
@ -83,9 +82,6 @@ public class NotifierTools {
/** Sound directory in localization */
private static final String SOUND_DIR = "collaboration/sounds";
/** AudioDataStream object */
private static AudioDataStream ads = null;
/** The contact notifier localization file */
private static LocalizationFile taskFile;

30
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/AddNotifierDlg.java
View file

@ -21,10 +21,8 @@ package com.raytheon.uf.viz.collaboration.ui.session;
import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@ -67,6 +65,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 20, 2014 2632 mpduff Initial creation
* Mar 05, 2014 2632 mpduff Changed task set to map of user->task.
*
* </pre>
*
@ -83,7 +82,7 @@ public class AddNotifierDlg extends CaveSWTDialog {
private final Map<Button, Notifier> buttonMap = new HashMap<Button, Notifier>();
/** Set of NotifierTask objects */
private final Set<NotifierTask> taskSet = new HashSet<NotifierTask>();
private final Map<String, NotifierTask> taskMap = new HashMap<String, NotifierTask>();
/** The user select Combo box */
private Combo userCbo;
@ -94,10 +93,13 @@ public class AddNotifierDlg extends CaveSWTDialog {
/** Recurring radio button */
private Button recurringRdo;
/** The non-recurring radio button */
private Button singleRdo;
/** Close callback */
private final ICloseCallback callback;
/** The class return value */
/** The class return value */
private boolean returnValue = false;
/**
@ -286,7 +288,7 @@ public class AddNotifierDlg extends CaveSWTDialog {
freqComp.setLayoutData(gd);
gd = new GridData(SWT.DEFAULT, SWT.TOP, false, true);
Button singleRdo = new Button(freqComp, SWT.RADIO);
singleRdo = new Button(freqComp, SWT.RADIO);
singleRdo.setLayoutData(gd);
singleRdo.setText("Single Instance");
singleRdo.setSelection(true);
@ -338,14 +340,11 @@ public class AddNotifierDlg extends CaveSWTDialog {
*/
@Override
protected void opened() {
// Check for existing notifiers
List<NotifierTask> taskList = NotifierTools.getNotifierTasks();
for (NotifierTask task : taskList) {
taskSet.add(task);
this.taskMap.put(task.getUserName(), task);
if (task.getUserName().equals(userCbo.getText())) {
this.populate(task);
return;
}
}
}
@ -364,6 +363,14 @@ public class AddNotifierDlg extends CaveSWTDialog {
}
soundTxt.setText(task.getSoundFilePath());
if (task.isRecurring()) {
recurringRdo.setSelection(true);
singleRdo.setSelection(false);
} else {
recurringRdo.setSelection(false);
singleRdo.setSelection(true);
}
}
/**
@ -405,10 +412,9 @@ public class AddNotifierDlg extends CaveSWTDialog {
}
task.setRecurring(recurringRdo.getSelection());
this.taskMap.put(task.getUserName(), task);
taskSet.add(task);
if (NotifierTools.saveNotifiers(Lists.newArrayList(taskSet))) {
if (NotifierTools.saveNotifiers(Lists.newArrayList(taskMap.values()))) {
MessageBox messageDialog = new MessageBox(this.getShell(), SWT.OK);
messageDialog.setText("Notifier Saved");
messageDialog