Author: rob.stryker(a)jboss.com Date: 2009-04-16 06:19:21 -0400 (Thu, 16 Apr 2009) New Revision: 14769 Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java Log: JBIDE-3991 jmx compilation Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java 2009-04-16 09:22:04 UTC (rev 14768) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/JMXNavigator.java 2009-04-16 10:19:21 UTC (rev 14769) @@ -20,7 +20,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.internal.navigator.NavigatorContentService; import org.eclipse.ui.navigator.CommonNavigator; +import org.eclipse.ui.navigator.LinkHelperService; import org.jboss.tools.jmx.ui.internal.actions.NewConnectionAction; /** @@ -72,6 +74,11 @@ return filterText; } + public synchronized LinkHelperService getLinkHelperService() { + return super.getLinkHelperService(); + } + + public void fillActionBars() { // queryContribution = new QueryContribution(this); // getViewSite().getActionBars().getToolBarManager().add(queryContribution); Modified: trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java =================================================================== --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java 2009-04-16 09:22:04 UTC (rev 14768) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/src/org/jboss/tools/jmx/ui/internal/views/navigator/UpdateSelectionJob.java 2009-04-16 10:19:21 UTC (rev 14769) @@ -29,8 +29,8 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.navigator.NavigatorContentService; import org.eclipse.ui.internal.navigator.NavigatorPlugin; -import org.eclipse.ui.internal.navigator.extensions.LinkHelperService; import org.eclipse.ui.navigator.CommonNavigator; +import org.eclipse.ui.navigator.LinkHelperService; import org.eclipse.ui.progress.UIJob; public class UpdateSelectionJob extends UIJob { @@ -55,12 +55,14 @@ public UpdateSelectionJob(CommonNavigator commonNavigator) { super("Updating Selection Job"); // TODO this.commonNavigator = commonNavigator; - linkService = new LinkHelperService((NavigatorContentService)commonNavigator.getCommonViewer().getNavigatorContentService()); + if( commonNavigator instanceof JMXNavigator ) { + linkService = ((JMXNavigator)commonNavigator).getLinkHelperService(); + } } public IStatus runInUIThread(IProgressMonitor monitor) { - if (!commonNavigator.getCommonViewer().getControl().isDisposed()) { + if (linkService!= null && !commonNavigator.getCommonViewer().getControl().isDisposed()) { SafeRunner.run(new ISafeRunnable() { public void run() throws Exception {