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

Issue #427 cleanup

Browse source 
Change-Id: I2a294a679f8cfb1ed62a63a95bcd21b4954194a3

Former-commit-id: fe0baf5515 [formerly c986c29e6c] [formerly ec2a0e39ed] [formerly d6e119bde1 [formerly ec2a0e39ed [formerly feaa63a200183b87c45a4fcea6b655cf4b1a826f]]]
Former-commit-id: d6e119bde1
Former-commit-id: f7707c6b096715da51ec34551f58decf2cd0391e [formerly 601b6628f7]
Former-commit-id: 033e7768ed
This commit is contained in:
Nate Jensen 2012-04-18 13:44:24 -05:00
parent add307f5bd
commit 5b5d7d0e7c
14 changed files with 16 additions and 399 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/ColorChangeEvent.java
View file

@ -23,7 +23,6 @@ import org.eclipse.swt.graphics.RGB;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
/**
* Event for when a new user enters and a color is added
@ -43,7 +42,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
*/
@DynamicSerialize
public class ColorChangeEvent implements IDisplayEvent {
public class ColorChangeEvent {
@DynamicSerializeElement
private String userName;

6
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/telestrator/CollaborationDrawingLayer.java
View file

@ -36,7 +36,6 @@ import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.collaboration.comm.identity.CollaborationException;
import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
import com.raytheon.uf.viz.collaboration.ui.ColorChangeEvent;
import com.raytheon.uf.viz.collaboration.ui.SessionColorManager;
@ -417,12 +416,13 @@ public class CollaborationDrawingLayer extends DrawingLayer {
sendGenericEvent(event);
}
private void sendGenericEvent(IDisplayEvent event) {
private void sendGenericEvent(CollaborationDrawingEvent event) {
Map<String, IVenueSession> sessions = CollaborationDataManager
.getInstance().getSessions();
for (String str : sessions.keySet()) {
try {
((ISharedDisplaySession) sessions.get(str)).sendEvent(event);
((ISharedDisplaySession) sessions.get(str))
.sendObjectToVenue(event);
} catch (CollaborationException e) {
statusHandler.handle(Priority.ERROR, "Unable to send event", e);
}

14
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/telestrator/CollaborationPathDrawingTool.java
View file

@ -20,7 +20,7 @@
package com.raytheon.uf.viz.collaboration.ui.telestrator;
import com.raytheon.uf.viz.collaboration.comm.identity.user.ParticipantRole;
import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr;
import com.raytheon.uf.viz.core.rsc.AbstractResourceData;
import com.raytheon.uf.viz.core.rsc.IInputHandler;
import com.raytheon.uf.viz.drawing.tools.PathDrawingTool;
@ -93,8 +93,8 @@ public class CollaborationPathDrawingTool extends PathDrawingTool {
public boolean handleMouseDown(int anX, int aY, int button) {
boolean allowDraw = ((CollaborationDrawingLayer) theDrawingLayer)
.isAllowDraw();
boolean isSessionLeader = CollaborationDataManager.getInstance()
.getSession(session)
boolean isSessionLeader = SharedDisplaySessionMgr
.getSessionContainer(session).getSession()
.hasRole(ParticipantRole.SESSION_LEADER);
if (allowDraw && !isSessionLeader) {
return false;
@ -112,8 +112,8 @@ public class CollaborationPathDrawingTool extends PathDrawingTool {
public boolean handleMouseDownMove(int x, int y, int button) {
boolean allowDraw = ((CollaborationDrawingLayer) theDrawingLayer)
.isAllowDraw();
boolean isSessionLeader = CollaborationDataManager.getInstance()
.getSession(session)
boolean isSessionLeader = SharedDisplaySessionMgr
.getSessionContainer(session).getSession()
.hasRole(ParticipantRole.SESSION_LEADER);
if (allowDraw && !isSessionLeader) {
return false;
@ -131,8 +131,8 @@ public class CollaborationPathDrawingTool extends PathDrawingTool {
public boolean handleMouseUp(int anX, int aY, int button) {
boolean allowDraw = ((CollaborationDrawingLayer) theDrawingLayer)
.isAllowDraw();
boolean isSessionLeader = CollaborationDataManager.getInstance()
.getSession(session)
boolean isSessionLeader = SharedDisplaySessionMgr
.getSessionContainer(session).getSession()
.hasRole(ParticipantRole.SESSION_LEADER);
if (allowDraw && !isSessionLeader) {
return false;

8
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/telestrator/CollaborationPathToolbar.java
View file

@ -26,9 +26,9 @@ import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.ToolItem;
import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
import com.raytheon.uf.viz.collaboration.comm.identity.user.ParticipantRole;
import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr;
import com.raytheon.uf.viz.collaboration.ui.Activator;
import com.raytheon.uf.viz.collaboration.ui.telestrator.event.CollaborationDrawingEvent;
import com.raytheon.uf.viz.collaboration.ui.telestrator.event.CollaborationDrawingEvent.CollaborationEventType;
@ -119,8 +119,8 @@ public class CollaborationPathToolbar extends PathToolbar {
if (resource.getResourceData() instanceof CollaborationPathDrawingResourceData) {
String sessionId = ((CollaborationPathDrawingResourceData) resource
.getResourceData()).getSessionId();
IVenueSession session = CollaborationDataManager.getInstance()
.getSession(sessionId);
ISharedDisplaySession session = SharedDisplaySessionMgr
.getSessionContainer(sessionId).getSession();
if (session != null
&& !session.hasRole(ParticipantRole.SESSION_LEADER)
&& leaderOnly != null) {

4
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/telestrator/event/CollaborationDrawingEvent.java
View file

@ -21,7 +21,6 @@ package com.raytheon.uf.viz.collaboration.ui.telestrator.event;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
import com.raytheon.uf.viz.collaboration.ui.telestrator.ShapeContainer;
import com.raytheon.uf.viz.drawing.events.DrawingEvent;
@ -43,8 +42,7 @@ import com.raytheon.uf.viz.drawing.events.DrawingEvent;
*/
@DynamicSerialize
public class CollaborationDrawingEvent extends DrawingEvent implements
IDisplayEvent {
public class CollaborationDrawingEvent extends DrawingEvent {
public static enum CollaborationEventType {
DRAW, ERASE, REDO, UNDO, CLEAR, DISABLE;

7
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/ISharedDisplaySession.java
View file

@ -19,7 +19,6 @@
**/
package com.raytheon.uf.viz.collaboration.comm.identity;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IEventPublisher;
import com.raytheon.uf.viz.collaboration.comm.identity.user.IQualifiedID;
import com.raytheon.uf.viz.collaboration.comm.identity.user.IVenueParticipant;
@ -64,12 +63,6 @@ import com.raytheon.uf.viz.collaboration.comm.identity.user.ParticipantRole;
public interface ISharedDisplaySession extends IEventPublisher {
/**
*
* @param event
*/
void sendEvent(IDisplayEvent event) throws CollaborationException;
/**
* Sends the object to the other collaborators on the session. The object
* must be serializable and once received by the others, will be posted to

8
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/IVenueSession.java
View file

@ -23,7 +23,6 @@ import java.util.List;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IEventPublisher;
import com.raytheon.uf.viz.collaboration.comm.identity.info.IVenue;
import com.raytheon.uf.viz.collaboration.comm.identity.user.ParticipantRole;
/**
*
@ -73,13 +72,6 @@ public interface IVenueSession extends ISession, IEventPublisher {
*/
IVenue getVenue();
/**
*
* @param role
* @return
*/
boolean hasRole(ParticipantRole role);
/**
* Send a Collaboration message.
*

40
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/event/IDisplayEvent.java
View file

@ -1,40 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.comm.identity.event;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 22, 2012 jkorman Initial creation
*
* </pre>
*
* @author jkorman
* @version 1.0
*/
public interface IDisplayEvent {
}

41
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/event/IInitData.java
View file

@ -1,41 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.comm.identity.event;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 26, 2012 njensen Initial creation
*
* </pre>
*
* @author njensen
* @version 1.0
*/
public interface IInitData {
}

40
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/identity/event/IRenderable.java
View file

@ -1,40 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.comm.identity.event;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 22, 2012 jkorman Initial creation
*
* </pre>
*
* @author jkorman
* @version 1.0
*/
public interface IRenderable {
}

67
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/DataHandler.java
View file

@ -1,67 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.comm.provider.session;
import com.google.common.eventbus.Subscribe;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IInitData;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IVenueInvitationEvent;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 27, 2012 jkorman Initial creation
*
* </pre>
*
* @author jkorman
* @version 1.0
*/
public class DataHandler {
@Subscribe
public void handle(IInitData initdata) {
System.out.println("DataHandler---------------------------------");
System.out.println(" Handling IInitData " + initdata);
}
@Subscribe
public void handle(IDisplayEvent event) {
System.out.println("DataHandler---------------------------------");
System.out.println("Handling IDisplayEvent " + event);
}
@Subscribe
public void handle(IVenueInvitationEvent event) {
System.out.println("DataHandler---------------------------------");
System.out.println(" venue identifer " + event.getRoomId());
System.out.println(" inviter " + event.getInviter());
System.out.println(" sessionid "
+ event.getInvite().getSessionId());
// System.out.println(" body " + event.getBody());
}
}

72
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/TestJAXBObject.java
View file

@ -1,72 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.comm.provider.session;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IRenderable;
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
public class TestJAXBObject implements IRenderable, ISerializableObject {
@XmlElement
protected String item_1 = null;
@XmlElement
private Integer value = -1;
public TestJAXBObject() {
}
/**
* @return the item_1
*/
public String getItem_1() {
return item_1;
}
/**
* @param item_1
* the item_1 to set
*/
public void setItem_1(String item_1) {
this.item_1 = item_1;
}
/**
* @return the value
*/
public Integer getValue() {
return value;
}
/**
* @param value
* the value to set
*/
public void setValue(Integer value) {
this.value = value;
}
}

88
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/TestObject.java
View file

@ -1,88 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.collaboration.comm.provider.session;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IRenderable;
/**
* TODO Add Description
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 23, 2012 jkorman Initial creation
*
* </pre>
*
* @author jkorman
* @version 1.0
*/
@DynamicSerialize
public class TestObject implements IRenderable {
@DynamicSerializeElement
private String name;
@DynamicSerializeElement
private int value = 0;
public TestObject() {
}
public TestObject(String name) {
this.name = name;
}
/**
* @return the name
*/
public String getName() {
return name;
}
/**
* @param name
* the name to set
*/
public void setName(String name) {
this.name = name;
}
/**
* @return the value
*/
public int getValue() {
return value;
}
/**
* @param value
* the value to set
*/
public void setValue(int value) {
this.value = value;
}
}

17
cave/com.raytheon.uf.viz.collaboration/src/com/raytheon/uf/viz/collaboration/comm/provider/session/VenueSession.java
View file

@ -47,7 +47,6 @@ import com.raytheon.uf.viz.collaboration.comm.identity.IMessage;
import com.raytheon.uf.viz.collaboration.comm.identity.IPresence;
import com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession;
import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IVenueParticipantEvent;
import com.raytheon.uf.viz.collaboration.comm.identity.event.ParticipantEventType;
import com.raytheon.uf.viz.collaboration.comm.identity.info.IVenue;
@ -327,22 +326,6 @@ public class VenueSession extends BaseSession implements IVenueSession,
// ISharedDisplaySession
// ***************************
/**
*
* @param event
* @throws CollaborationException
* @see com.raytheon.uf.viz.collaboration.comm.identity.ISharedDisplaySession#sendEvent(com.raytheon.uf.viz.collaboration.comm.identity.event.IDisplayEvent)
*/
@Override
public void sendEvent(IDisplayEvent event) throws CollaborationException {
if (event != null) {
String message = Tools.marshallData(event);
if (message != null) {
sendTextMessage(message);
}
}
}
@Override
public void sendObjectToVenue(Object obj) throws CollaborationException {
if (obj != null) {