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

Issue #1799 fix activation of tools for new perspectives.

Browse source 
Former-commit-id: a4c1e2f9526efa227b246b8dc4df9cb00566def1
This commit is contained in:
Ben Steffensmeier 2013-03-28 15:47:18 -05:00
parent 8400028e11
commit 4efa92ff49
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/tools/ModalToolManager.java
View file

@ -32,9 +32,7 @@ import org.eclipse.ui.commands.ICommandService;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.viz.core.Activator;
import com.raytheon.uf.viz.core.exception.VizException;
import com.raytheon.uf.viz.core.status.StatusConstants;
/**
* Defines a Tool Manager, which handles the tool registrations and activations
@ -112,19 +110,28 @@ public class ModalToolManager {
*/
public synchronized void activateToolSet(String defaultTool)
throws VizException {
try {
ICommandService service = (ICommandService) PlatformUI
.getWorkbench().getService(ICommandService.class);
if (defaultTool != null) {
Command c = service.getCommand(defaultTool);
c.executeWithChecks(new ExecutionEvent(c,
new HashMap<Object, Object>(), null, null));
boolean found = false;
for (AbstractModalTool tool : toolMap.values()) {
if (tool != null && tool.commandId.equals(defaultTool)) {
found = true;
break;
}
} catch (Exception e) {
statusHandler.handle(Priority.CRITICAL,
"Error loading tool set", e);
}
if (!found) {
try {
ICommandService service = (ICommandService) PlatformUI
.getWorkbench().getService(ICommandService.class);
if (defaultTool != null) {
Command c = service.getCommand(defaultTool);
c.executeWithChecks(new ExecutionEvent(c,
new HashMap<Object, Object>(), null, null));
}
} catch (Exception e) {
statusHandler.handle(Priority.CRITICAL,
"Error loading tool set", e);
throw new VizException("Error loading tool set", e);
throw new VizException("Error loading tool set", e);
}
}
}