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

Issue #642 removing update code

Browse source 
Former-commit-id: 8f16eecde5 [formerly acc5d69e59] [formerly 8f16eecde5 [formerly acc5d69e59] [formerly 2935d69e4f [formerly 510ca9d1234dba1b4e76f05536fb24c7fd693a76]]]
Former-commit-id: 2935d69e4f
Former-commit-id: c3732cc601 [formerly 2a476c6ce8]
Former-commit-id: ca4c0baa6e
This commit is contained in:
Matt Nash 2012-06-04 09:13:23 -05:00
parent 258e64971b
commit f94bff689f
1 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/session/CollaborationSessionView.java
View file

@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.ColorDialog;
import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IViewSite; import org.eclipse.ui.IViewSite;
import org.eclipse.ui.PartInitException; import org.eclipse.ui.PartInitException;
@ -53,16 +52,10 @@ import com.raytheon.uf.viz.collaboration.data.CollaborationDataManager;
import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr; import com.raytheon.uf.viz.collaboration.data.SharedDisplaySessionMgr;
import com.raytheon.uf.viz.collaboration.ui.Activator; import com.raytheon.uf.viz.collaboration.ui.Activator;
import com.raytheon.uf.viz.collaboration.ui.ColorChangeEvent; import com.raytheon.uf.viz.collaboration.ui.ColorChangeEvent;
import com.raytheon.uf.viz.collaboration.ui.telestrator.CollaborationDrawingResource;
import com.raytheon.uf.viz.collaboration.ui.telestrator.CollaborationDrawingResource.DrawingLayerUpdate;
import com.raytheon.uf.viz.core.IDisplayPane;
import com.raytheon.uf.viz.core.VizApp; import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.drawables.ResourcePair;
import com.raytheon.uf.viz.core.icon.IconUtil; import com.raytheon.uf.viz.core.icon.IconUtil;
import com.raytheon.uf.viz.core.rsc.ResourceList;
import com.raytheon.uf.viz.drawing.DrawingToolLayer; import com.raytheon.uf.viz.drawing.DrawingToolLayer;
import com.raytheon.uf.viz.drawing.DrawingToolLayer.DrawMode; import com.raytheon.uf.viz.drawing.DrawingToolLayer.DrawMode;
import com.raytheon.viz.ui.editor.AbstractEditor;
/** /**
* TODO Add Description * TODO Add Description
@ -120,35 +113,36 @@ public class CollaborationSessionView extends SessionView {
.getEventPublisher().register(this); .getEventPublisher().register(this);
} }
@Subscribe // @Subscribe
public void drawingLayerUpdate(DrawingLayerUpdate update) { // public void drawingLayerUpdate(DrawingLayerUpdate update) {
IEditorPart part = null; // IEditorPart part = null;
if (SharedDisplaySessionMgr.getSessionContainer(sessionId) // if (SharedDisplaySessionMgr.getSessionContainer(sessionId)
.getCollaborationEditor() == null) { // .getCollaborationEditor() == null) {
for (AbstractEditor editor : SharedDisplaySessionMgr // for (AbstractEditor editor : SharedDisplaySessionMgr
.getSessionContainer(sessionId).getSharedEditors()) { // .getSessionContainer(sessionId).getSharedEditors()) {
part = editor; // part = editor;
} // }
} else { // } else {
part = SharedDisplaySessionMgr.getSessionContainer(sessionId) // part = SharedDisplaySessionMgr.getSessionContainer(sessionId)
.getCollaborationEditor(); // .getCollaborationEditor();
} // }
if (part instanceof AbstractEditor) { // if (part instanceof AbstractEditor) {
AbstractEditor editor = (AbstractEditor) part; // AbstractEditor editor = (AbstractEditor) part;
for (IDisplayPane pane : editor.getDisplayPanes()) { // for (IDisplayPane pane : editor.getDisplayPanes()) {
ResourceList list = pane.getDescriptor().getResourceList(); // ResourceList list = pane.getDescriptor().getResourceList();
for (ResourcePair pair : list) { // for (ResourcePair pair : list) {
if (pair.getResource() instanceof CollaborationDrawingResource) { // if (pair.getResource() instanceof CollaborationDrawingResource) {
CollaborationDrawingResource resource = (CollaborationDrawingResource) pair // CollaborationDrawingResource resource = (CollaborationDrawingResource)
.getResource(); // pair
layer = resource.getDrawingLayerFor(resource // .getResource();
.getMyUser()); // layer = resource.getDrawingLayerFor(resource
break; // .getMyUser());
} // break;
} // }
} // }
} // }
} // }
// }
/* /*
* (non-Javadoc) * (non-Javadoc)