Author: vrubezhny Date: 2011-08-10 16:07:03 -0400 (Wed, 10 Aug 2011) New Revision: 33786 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java Log: JBIDE-7892 Search for @Named beans. Open CDI Named Bean Dialog is added Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java 2011-08-10 19:20:32 UTC (rev 33785) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/handlers/OpenCDINamedBeanHandler.java 2011-08-10 20:07:03 UTC (rev 33786) @@ -74,29 +74,32 @@ ELResolution resolution = resolver.resolve(elContext, resolver.parseOperand("${" + bean.getName() + "}"), 0); if (resolution.isResolved() && resolution.getNumberOfResolvedSegments() == 1) { ELSegment segment = resolution.getLastSegment(); - if (segment != null && segment.isResolved()) { + if (segment.isResolved()) { IOpenableReference[] openables = segment.getOpenable(); if(openables.length == 0 || !openables[0].open()) { ITextSourceReference ref = segment.getSourceReference(); - if (ref.getResource() != null && ref.getResource() instanceof IFile) { - IEditorPart part = null; + if (ref.getResource() instanceof IFile) { try { IWorkbenchPage page = PlatformUI.getWorkbench() .getActiveWorkbenchWindow().getActivePage(); - part = IDE.openEditor(page, (IFile)ref.getResource(), true); + IEditorPart part = IDE.openEditor(page, (IFile)ref.getResource(), true); + if (ref.getStartPosition() >=0 && ref.getLength() > 0) { + if (part instanceof JavaEditor) { + EditorUtility.revealInEditor(part, + ref.getStartPosition(), ref.getLength()); + } else if (part != null) { + // We have not to pass null argument here, because the following call will + // perform select and reveal on active editor which is wrong in part == null + // + StructuredSelectionHelper.setSelectionAndRevealInActiveEditor( + new Region(ref.getStartPosition(), ref.getLength())); + } + } + } catch (PartInitException pie) { CDICorePlugin.getDefault().logError(pie); } - if (part != null && ref.getStartPosition() >=0 && ref.getLength() > 0) { - if (part instanceof JavaEditor) { - EditorUtility.revealInEditor(part, - ref.getStartPosition(), ref.getLength()); - } else { - StructuredSelectionHelper.setSelectionAndRevealInActiveEditor( - new Region(ref.getStartPosition(), ref.getLength())); - } - } } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 19:20:32 UTC (rev 33785) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-08-10 20:07:03 UTC (rev 33786) @@ -348,7 +348,7 @@ if (cdiProject != null) { Set<IBean> beans = cdiProject .getBeans(beanName, true); - if (beans != null && !beans.isEmpty()) + if (!beans.isEmpty()) return beans.iterator().next(); } }