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

Issue #2936 - Remove the join alert from the nws collaboration feed

Browse source 
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: ca47cb349b4749edaac6afe0648c18cb06a9f9df
This commit is contained in:
Mike Duff 2014-03-24 14:59:33 -05:00
parent 702ebe6881
commit fd31ea7fa5
3 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/prefs/CollabPrefConstants.java
View file

@ -33,6 +33,7 @@ package com.raytheon.uf.viz.collaboration.ui.prefs;
* Jan 27, 2014 2700 bclement added auto accept subscribe * Jan 27, 2014 2700 bclement added auto accept subscribe
* Feb 3, 2014 2699 bclement added handle preferences * Feb 3, 2014 2699 bclement added handle preferences
* Feb 18, 2014 2631 mpduff Add constants for room change events. * Feb 18, 2014 2631 mpduff Add constants for room change events.
* Mar 24, 2014 2936 mpduff Remove INCLUDE_NWS_FEED_FIELD_EDITOR_ID.
* *
* </pre> * </pre>
* *
@ -69,9 +70,6 @@ public class CollabPrefConstants {
/** Join file field editor id */ /** Join file field editor id */
public static final String JOIN_FILE_FIELD_EDITOR_ID = "roomJoinSoundFile"; public static final String JOIN_FILE_FIELD_EDITOR_ID = "roomJoinSoundFile";
/** Include nws feed field editor id */
public static final String INCLUDE_NWS_FEED_FIELD_EDITOR_ID = "includeNwsFeed";
public class HttpCollaborationConfiguration { public class HttpCollaborationConfiguration {
public static final String P_SESSION_CONFIGURED = "http.sessionConfigured"; public static final String P_SESSION_CONFIGURED = "http.sessionConfigured";

12
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/prefs/CollaborationRoomChangePreferencePage.java
View file

@ -46,6 +46,7 @@ import com.raytheon.uf.viz.collaboration.ui.Activator;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Feb 18, 2014 2631 mpduff Initial creation. * Feb 18, 2014 2631 mpduff Initial creation.
* Mar 24, 2014 2936 mpduff Remove join alerts from feed view.
* *
* </pre> * </pre>
* *
@ -55,8 +56,6 @@ import com.raytheon.uf.viz.collaboration.ui.Activator;
public class CollaborationRoomChangePreferencePage extends public class CollaborationRoomChangePreferencePage extends
FieldEditorPreferencePage implements IWorkbenchPreferencePage { FieldEditorPreferencePage implements IWorkbenchPreferencePage {
/** Include nws-collaboration feed controls */
private BooleanFieldEditor includeFeed;
/** Join event controls */ /** Join event controls */
private FileFieldEditor joinFileEditor; private FileFieldEditor joinFileEditor;
@ -99,17 +98,9 @@ public class CollaborationRoomChangePreferencePage extends
joinFileEditor.setFilterPath(file.getFile()); joinFileEditor.setFilterPath(file.getFile());
this.addField(joinFileEditor); this.addField(joinFileEditor);
// Apply to nws collaboration feed if checked
includeFeed = new BooleanFieldEditor(
CollabPrefConstants.INCLUDE_NWS_FEED_FIELD_EDITOR_ID,
"Apply to NWS-collaboration feed", BooleanFieldEditor.DEFAULT,
getFieldEditorParent());
this.addField(includeFeed);
boolean enabled = this.getPreferenceStore().getBoolean( boolean enabled = this.getPreferenceStore().getBoolean(
CollabPrefConstants.ENABLE_JOIN_EVENTS_FIELD_EDITOR_ID); CollabPrefConstants.ENABLE_JOIN_EVENTS_FIELD_EDITOR_ID);
joinFileEditor.setEnabled(enabled, getFieldEditorParent()); joinFileEditor.setEnabled(enabled, getFieldEditorParent());
includeFeed.setEnabled(enabled, getFieldEditorParent());
if (!joinFileEditor.isValid()) { if (!joinFileEditor.isValid()) {
joinFileEditor.setStringValue(""); joinFileEditor.setStringValue("");
@ -129,7 +120,6 @@ public class CollaborationRoomChangePreferencePage extends
if (event.getSource().equals(this.enableJoinAlerts)) { if (event.getSource().equals(this.enableJoinAlerts)) {
boolean enabled = (Boolean) event.getNewValue(); boolean enabled = (Boolean) event.getNewValue();
joinFileEditor.setEnabled(enabled, getFieldEditorParent()); joinFileEditor.setEnabled(enabled, getFieldEditorParent());
includeFeed.setEnabled(enabled, getFieldEditorParent());
} else if (event.getSource().equals(this.joinFileEditor)) { } else if (event.getSource().equals(this.joinFileEditor)) {
if (enableJoinAlerts.getBooleanValue()) { if (enableJoinAlerts.getBooleanValue()) {
super.propertyChange(event); super.propertyChange(event);

21
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionFeedView.java
View file

@ -73,6 +73,7 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
* Mar 06, 2014 2751 bclement moved users table refresh logic to refreshParticipantList() * Mar 06, 2014 2751 bclement moved users table refresh logic to refreshParticipantList()
* Mar 18, 2014 2798 mpduff Fixed issue with user changing site and participant list not * Mar 18, 2014 2798 mpduff Fixed issue with user changing site and participant list not
* having the color update to reflect the change. * having the color update to reflect the change.
* Mar 24, 2014 2936 mpduff Remove join alerts from feed view.
* *
* </pre> * </pre>
* *
@ -432,7 +433,6 @@ public class SessionFeedView extends SessionView {
message.append(" ").append(roleName).append(" ") message.append(" ").append(roleName).append(" ")
.append(siteName); .append(siteName);
sendSystemMessage(message); sendSystemMessage(message);
processJoinAlert();
} }
} }
@ -464,25 +464,6 @@ public class SessionFeedView extends SessionView {
} }
} }
/*
* (non-Javadoc)
*
* @see
* com.raytheon.uf.viz.collaboration.ui.session.SessionView#processJoinAlert
* ()
*/
@Override
protected void processJoinAlert() {
boolean includeFeed = Activator
.getDefault()
.getPreferenceStore()
.getBoolean(
CollabPrefConstants.INCLUDE_NWS_FEED_FIELD_EDITOR_ID);
if (includeFeed) {
super.processJoinAlert();
}
}
/* /*
* (non-Javadoc) * (non-Javadoc)
* *