Author: dazarov Date: 2011-11-07 14:17:04 -0500 (Mon, 07 Nov 2011) New Revision: 36204 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java Log: Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-07 19:10:33 UTC (rev 36203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-07 19:17:04 UTC (rev 36204) @@ -13,8 +13,8 @@ import java.util.List; import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring; +import org.eclipse.ltk.internal.ui.refactoring.RefactoringWizardDialog; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; -import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.IBean; @@ -28,12 +28,8 @@ public boolean showWizard() { final IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); - RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(this); - try { - op.run(win.getShell(), getWindowTitle()); - } catch (final InterruptedException irex) { - return false; - } + RefactoringWizardDialog dialog = new RefactoringWizardDialog(win.getShell(),this); + dialog.open(); return true; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:10:33 UTC (rev 36203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-07 19:17:04 UTC (rev 36204) @@ -449,14 +449,14 @@ PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress(){ public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - Job autoBuildJob = null; - Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD); - for(Job j : jobs){ - autoBuildJob = j; - } - if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){ +// Job autoBuildJob = null; +// Job[] jobs = Job.getJobManager().find(ResourcesPlugin.FAMILY_AUTO_BUILD); +// for(Job j : jobs){ +// autoBuildJob = j; +// } +// if(autoBuildJob != null && autoBuildJob.getState() == Job.RUNNING){ Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); - } +// } } }); }catch(InterruptedException ie){