Author: vrubezhny Date: 2011-09-30 14:31:58 -0400 (Fri, 30 Sep 2011) New Revision: 35238 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java Log: JBIDE-7892 Search for @Named beans. JUnit test case is fixed 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-09-30 18:13:45 UTC (rev 35237) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/OpenCDINamedBeanDialog.java 2011-09-30 18:31:58 UTC (rev 35238) @@ -71,9 +71,14 @@ private static final String NO = "no"; //$NON-NLS-1$ public OpenCDINamedBeanDialog(Shell shell) { + this(shell, false); + } + + public OpenCDINamedBeanDialog(Shell shell, boolean disableHistory) { super(shell); - setSelectionHistory(new CDINamedBeanSelectionHistory()); + if (!disableHistory) + setSelectionHistory(new CDINamedBeanSelectionHistory()); setListLabelProvider(new CDINamedBeanLabelProvider()); setDetailsLabelProvider(new CDINamedBeanLabelProvider()); @@ -95,13 +100,16 @@ @Override public int open() { - XMLMemento memento = loadMemento(); - if (memento != null) { - getSelectionHistory().load(memento); - updateHistory(memento); - saveMemento(memento); + if (getSelectionHistory() != null) { + XMLMemento memento = loadMemento(); + if (memento != null) { + getSelectionHistory().load(memento); + updateHistory(memento); + saveMemento(memento); + } + CDICorePlugin.addCDIProjectListener(cdiProjectListener); } - CDICorePlugin.addCDIProjectListener(cdiProjectListener); + return super.open(); } @@ -480,7 +488,7 @@ saveMemento(memento); } } - + public static void validateHistory(ICDIProject cdiProject, XMLMemento memento) { String cdiProjectName = cdiProject.getNature().getProject().getName(); XMLMemento historyMemento = (XMLMemento) memento Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java 2011-09-30 18:13:45 UTC (rev 35237) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/OpenCDINamedBeanDialogTest.java 2011-09-30 18:31:58 UTC (rev 35238) @@ -51,7 +51,7 @@ private void find(String pattern, String beanName, String editorName, boolean wait) throws CoreException{ OpenCDINamedBeanDialog dialog = new OpenCDINamedBeanDialog( - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), true); dialog.setBlockOnOpen(false); dialog.setInitialPattern(pattern); @@ -79,7 +79,6 @@ } bean.open(); - TestUtil.waitForValidation(); IEditorPart resultEditor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); assertTrue("Unexpected editor is opened for CDI Named Bean '" + bean.getName() + "': " + resultEditor.getTitle(), editorName.equals(resultEditor.getTitle())); }