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

Issue #2158 Allow VizGlobalsManager to work without accessing UI thread.

Browse source 
Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1

Former-commit-id: 0cbe0e996d [formerly 872ad4dfa9] [formerly ffed387cce [formerly d3621cf3155841086cd24eecf4543bd70c890e41]]
Former-commit-id: ffed387cce
Former-commit-id: 9606262e7e
This commit is contained in:
Ben Steffensmeier 2013-07-16 10:21:14 -05:00
parent acec066de3
commit 0b336d418b
2 changed files with 69 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/globals/VizGlobalsManager.java
View file

@ -24,12 +24,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.ui.IWindowListener;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import com.raytheon.uf.viz.core.IDisplayPaneContainer;
import com.raytheon.uf.viz.core.VizApp;
import com.raytheon.uf.viz.core.VizConstants;
import com.raytheon.uf.viz.core.datastructure.LoopProperties;
import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
@ -42,7 +43,9 @@ import com.raytheon.uf.viz.core.drawables.IRenderableDisplay;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 26, 2009 mschenke Initial creation
* Oct 26, 2009 mschenke Initial creation
* Jul 16, 2013 2158 bsteffen Allow VizGlobalsManager to work without
* accessing UI thread.
*
* </pre>
*
@ -60,6 +63,8 @@ public class VizGlobalsManager {
private static Map<String, List<IGlobalChangedListener>> listeners = new HashMap<String, List<IGlobalChangedListener>>();
private static WorkbenchWindowListener windowListener = new WorkbenchWindowListener();
private VizGlobalsManager(IWorkbenchWindow window) {
globals = new HashMap<String, Object>();
globals.put(VizConstants.FRAMES_ID, new Integer(12));
@ -70,19 +75,15 @@ public class VizGlobalsManager {
}
public static VizGlobalsManager getCurrentInstance() {
final IWorkbenchWindow[] window = new IWorkbenchWindow[1];
IWorkbenchWindow window = null;
if (PlatformUI.isWorkbenchRunning()) {
VizApp.runSync(new Runnable() {
@Override
public void run() {
window[0] = PlatformUI.getWorkbench()
.getActiveWorkbenchWindow();
}
});
} else {
window[0] = null;
// This returns null when used off the UI thread.
window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
if (window == null) {
window = windowListener.getActiveWindow();
}
}
return getInstance(window[0]);
return getInstance(window);
}
public static synchronized VizGlobalsManager getInstance(
@ -95,6 +96,20 @@ public class VizGlobalsManager {
return instance;
}
/**
* Must be called once during workbench startup to enable using globals for
* the active window off the UI thread.
*
* @param workbench
*/
public static void startForWorkbench(IWorkbench workbench) {
workbench.addWindowListener(windowListener);
IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
if (window != null) {
windowListener.windowOpened(window);
}
}
public synchronized Map<String, Object> cloneGlobals() {
return new HashMap<String, Object>(globals);
}
@ -182,4 +197,39 @@ public class VizGlobalsManager {
updateChanges(globals);
}
}
/**
* Listener for tracking the active window when not on the UI thread.
*/
private static class WorkbenchWindowListener implements IWindowListener {
private IWorkbenchWindow activeWindow = null;
public IWorkbenchWindow getActiveWindow() {
return activeWindow;
}
@Override
public void windowActivated(IWorkbenchWindow window) {
activeWindow = window;
}
@Override
public void windowDeactivated(IWorkbenchWindow window) {
;
}
@Override
public void windowClosed(IWorkbenchWindow window) {
if (window == activeWindow) {
activeWindow = null;
}
}
@Override
public void windowOpened(IWorkbenchWindow window) {
activeWindow = window;
}
}
}

8
cave/com.raytheon.uf.viz.personalities.cave/src/com/raytheon/uf/viz/personalities/cave/workbench/VizWorkbenchAdvisor.java
View file

@ -37,6 +37,7 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
import org.eclipse.ui.contexts.IContextService;
import com.raytheon.uf.viz.application.ProgramArguments;
import com.raytheon.uf.viz.core.globals.VizGlobalsManager;
import com.raytheon.uf.viz.ui.menus.DiscoverMenuContributions;
import com.raytheon.viz.ui.VizWorkbenchManager;
import com.raytheon.viz.ui.perspectives.AbstractVizPerspectiveManager;
@ -49,9 +50,11 @@ import com.raytheon.viz.ui.perspectives.VizPerspectiveListener;
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 7/1/06 chammack Initial Creation.
* Mar 5, 2013 1753 njensen Added shutdown printout
* Jul 01, 2006 chammack Initial Creation.
* Mar 05, 2013 1753 njensen Added shutdown printout
* May 28, 2013 1967 njensen Remove unused subnode preferences
* Jul 16, 2013 2158 bsteffen Allow VizGlobalsManager to work without
* accessing UI thread.
*
* </pre>
*
@ -85,6 +88,7 @@ public class VizWorkbenchAdvisor extends WorkbenchAdvisor {
customizeAppearance();
PlatformUI.getWorkbench().addWindowListener(
VizWorkbenchManager.getInstance());
VizGlobalsManager.startForWorkbench(PlatformUI.getWorkbench());
}
/**