From ed4303158cc6d839ad3cade6b4230efa72589bfe Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Wed, 25 Apr 2012 16:54:58 -0500 Subject: [PATCH] Issue #427 remove sysouts Change-Id: I82dd5bcd8e7eb20afcf516c0b8d33e37d72d45db Former-commit-id: 5b87a033a88899b1ca033b18efc9532002b047c0 --- .../data/CollaborationDataManager.java | 11 ----- .../ui/CollaborationGroupView.java | 1 - .../collaboration/ui/session/SessionView.java | 8 +--- .../comm/provider/roster/Roster.java | 2 +- .../provider/session/RosterEventHandler.java | 46 ++++++++++--------- .../comm/provider/user/UserId.java | 2 +- 6 files changed, 27 insertions(+), 43 deletions(-) diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java index afef1473d6..8b4f742c78 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationDataManager.java @@ -465,10 +465,6 @@ public class CollaborationDataManager implements IRosterEventSubscriber { @Subscribe public void handleInvitationEvent(IVenueInvitationEvent event) { final IVenueInvitationEvent invitation = event; - System.out.println("==== handleInvitationEvent sessionId: " - + invitation.getInvite().getSessionId()); - System.out.println("==== handleInvitationEvent inviter: " - + invitation.getInviter()); VizApp.runSync(new Runnable() { @Override @@ -551,8 +547,6 @@ public class CollaborationDataManager implements IRosterEventSubscriber { @Subscribe public void peer2peerMessage(ITextMessageEvent messageEvent) { final TextMessage message = messageEvent.getMessage(); - // System.out.println("p2pMsg from: " + message.getFrom().getFQName()); - // System.out.println("p2pMsgt body: " + message.getBody()); VizApp.runAsync(new Runnable() { @Override @@ -642,11 +636,6 @@ public class CollaborationDataManager implements IRosterEventSubscriber { // TODO update the event's user groups here for the desired type IRosterEntry rosterEntry = rosterChangeEvent.getEntry(); IPresence presence = rosterChangeEvent.getEntry().getPresence(); - if (presence != null) { - System.out.println("\t" + presence.getMode() + "/" - + presence.getType() + ": \"" + presence.getStatusMessage() - + "\""); - } Collection userGroups = rosterEntry.getGroups(); switch (rosterChangeEvent.getType()) { case ADD: diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java index cd55a704c3..a83c313a21 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java @@ -225,7 +225,6 @@ public class CollaborationGroupView extends ViewPart implements IPartListener { inviteAction = new Action("Invite...") { @Override public void run() { - System.out.println("Invite... to join session" + getId()); String sessionId = getId(); IVenueSession session = CollaborationDataManager.getInstance() .getSession(sessionId); diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java index bc65c93ff6..5db524a798 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/SessionView.java @@ -212,12 +212,8 @@ public class SessionView extends AbstractSessionView { protected void fillContextMenu(IMenuManager manager) { IStructuredSelection selection = (IStructuredSelection) usersTable .getSelection(); - // do something here! + // TODO do something here! Object ob = selection.getFirstElement(); - System.out.println(ob.toString()); - // super.fillContextMenu(manager); - // manager.add(chatAction); - // manager.add(new Separator()); } @Subscribe @@ -659,8 +655,6 @@ public class SessionView extends AbstractSessionView { @SuppressWarnings("unchecked") private void participantDeparted(UserId participant) { - System.out.println("++++ handle departed here: " - + participant.getName() + ", " + participant.getFQName()); List users = (List) usersTable.getInput(); for (int i = 0; i < users.size(); ++i) { if (users.get(i) == null diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/roster/Roster.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/roster/Roster.java index 63118c5997..ae79814e21 100644 --- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/roster/Roster.java +++ b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/roster/Roster.java @@ -208,7 +208,7 @@ public class Roster extends RosterItem implements IRoster { } internalEntries.put(entry.getUser(), entry); - listRoster(); + // listRoster(); } } diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/RosterEventHandler.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/RosterEventHandler.java index 4b050ac663..279e55af52 100644 --- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/RosterEventHandler.java +++ b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/RosterEventHandler.java @@ -32,61 +32,63 @@ import com.raytheon.uf.viz.collaboration.comm.identity.roster.IRosterGroup; * TODO Add Description * * 
- *
+ * 
  * SOFTWARE HISTORY
- *
+ * 
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Apr 11, 2012            jkorman     Initial creation
- *
+ * 
  *
- * + * * @author jkorman - * @version 1.0 + * @version 1.0 */ public class RosterEventHandler implements IRosterEventSubscriber { - @Subscribe public void eventHandler(IRosterChangeEvent event) { - - StringBuilder sb = new StringBuilder("-------------------------------------------------------\n"); + + StringBuilder sb = new StringBuilder( + "-------------------------------------------------------\n"); sb.append("RosterEventHandler.eventHandler("); - switch(event.getType()) { - - case ADD : { + switch (event.getType()) { + + case ADD: { sb.append("ADD)"); break; } - case MODIFY : { + case MODIFY: { sb.append("MODIFY)"); break; } - case DELETE : { + case DELETE: { sb.append("DELETE)"); break; } - case PRESENCE : { + case PRESENCE: { sb.append("PRESENCE)"); break; } } - System.out.println(sb.toString()); - printRosterEntry(event.getEntry()); + // System.out.println(sb.toString()); + // printRosterEntry(event.getEntry()); } - + private void printRosterEntry(IRosterEntry entry) { - // System.out.println("handleRosterEntryAdd " + System.currentTimeMillis()); + // System.out.println("handleRosterEntryAdd " + + // System.currentTimeMillis()); System.out.println(" user : " + entry.getUser().getFQName()); Collection groups = entry.getGroups(); - for(IRosterGroup group : groups) { + for (IRosterGroup group : groups) { System.out.println(" " + group.getName()); } IPresence presence = entry.getPresence(); - if(presence != null) { - System.out.println(" pres : " + presence.getType() + " : " + presence.getMode()); + if (presence != null) { + System.out.println(" pres : " + presence.getType() + " : " + + presence.getMode()); } } - + } diff --git a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/user/UserId.java b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/user/UserId.java index 5735b64930..f8305d9f0c 100644 --- a/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/user/UserId.java +++ b/cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/user/UserId.java @@ -167,7 +167,7 @@ public class UserId implements IQualifiedID { // requiring a resource for peerToPeer to go through sb.append("resource"); } - System.out.println(sb.toString()); + // System.out.println(sb.toString()); return sb.toString(); }