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

Issue #429 change name of editor sharing

Browse source 
Former-commit-id: 199c8c6af547dc66e8cb068e2617a96f3b68d515
This commit is contained in:
Matt Nash 2012-04-16 15:40:37 -05:00
parent 208f84da4d
commit ac3b674bf3
6 changed files with 23 additions and 22 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/data/CollaborationDataManager.java
View file

@ -275,7 +275,8 @@ public class CollaborationDataManager implements IRosterEventSubscriber {
SessionContainer container = SharedDisplaySessionMgr
.getSessionContainer(session.getSessionId());
container.setCollaborationEditor(editor);
editor.setTabTitle(((IVenueSession) session).getSubject());
editor.setTabTitle(((IVenueSession) session).getVenue().getInfo()
.getVenueDescription());
}
/**

5
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/editor/EditorSetup.java
View file

@ -172,7 +172,10 @@ public class EditorSetup {
desc.getResourceList().instantiateResources(desc, true);
SharedEditorIndicatorRsc rsc = (SharedEditorIndicatorRsc) rp
.getResource();
rsc.setSubject(((IVenueSession) session).getSubject());
rsc.setRoomName(((IVenueSession) session).getVenue().getInfo()
.getVenueDescription());
rsc.setSubject(((IVenueSession) session).getVenue().getInfo()
.getVenueSubject());
// TODO we need to track editors associated with a session

12
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/rsc/SharedEditorIndicatorRsc.java
View file

@ -48,6 +48,8 @@ import com.raytheon.uf.viz.core.rsc.LoadProperties;
public class SharedEditorIndicatorRsc extends
AbstractVizResource<GenericResourceData, IDescriptor> {
protected String roomName;
protected String subject;
public SharedEditorIndicatorRsc(GenericResourceData resourceData,
@ -75,7 +77,15 @@ public class SharedEditorIndicatorRsc extends
}
public String getName() {
return "Sharing with " + subject;
String text = "Sharing with " + roomName;
if (!"".equals(subject)) {
text += " (" + subject + ")";
}
return text;
}
public void setRoomName(String name) {
this.roomName = name;
}
public void setSubject(String subject) {

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

@ -80,21 +80,6 @@ public interface IVenueSession extends ISession, IEventPublisher {
*/
boolean hasRole(ParticipantRole role);
/**
* Set the subject of this collaboration venue conversation.
*
* @param subject
* The subject.
*/
void setSubject(String subject);
/**
* Get the subject of this collaboration venue conversation.
*
* @return The subject.
*/
String getSubject();
/**
* Send a Collaboration message.
*

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

@ -801,5 +801,4 @@ public class VenueSession extends BaseSession implements IVenueSession,
}
return message;
}
}

9
cave/com.raytheon.uf.viz.drawing/src/com/raytheon/uf/viz/drawing/tools/PathDrawingTool.java
View file

@ -227,9 +227,12 @@ public class PathDrawingTool extends AbstractDrawingTool {
editor.unregisterMouseHandler(getMouseHandler());
// change the cursor back
Cursor cursor = new Cursor(Display.getCurrent(), SWT.CURSOR_ARROW);
Display.getCurrent().getActiveShell().setCursor(cursor);
cursor.dispose();
if (Display.getCurrent() != null
&& Display.getCurrent().getActiveShell() != null) {
Cursor cursor = new Cursor(Display.getCurrent(), SWT.CURSOR_ARROW);
Display.getCurrent().getActiveShell().setCursor(cursor);
cursor.dispose();
}
theDrawingLayer = null;
}
}