Author: dazarov Date: 2010-12-23 08:58:06 -0500 (Thu, 23 Dec 2010) New Revision: 27710 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionRefactoringProcessor.java Log: https://issues.jboss.org/browse/JBIDE-7988 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java 2010-12-23 10:36:30 UTC (rev 27709) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java 2010-12-23 13:58:06 UTC (rev 27710) @@ -73,6 +73,7 @@ rootChange = new CompositeChange(label); change = new TextFileChange(file.getName(), file); + change.setSaveMode(TextFileChange.LEAVE_DIRTY); MultiTextEdit root = new MultiTextEdit(); change.setEdit(root); rootChange.add(change); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2010-12-23 10:36:30 UTC (rev 27709) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2010-12-23 13:58:06 UTC (rev 27710) @@ -17,7 +17,6 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring; import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; -import org.eclipse.ltk.ui.refactoring.RefactoringWizard; import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; @@ -47,16 +46,10 @@ public void run(IMarker marker) { DeleteAllDisposerAnnotationsProcessor processor = new DeleteAllDisposerAnnotationsProcessor(file, method, label); ProcessorBasedRefactoring refactoring = new ProcessorBasedRefactoring(processor); - DeletePreviewWizard wizard = new DeletePreviewWizard(refactoring, RefactoringWizard.WIZARD_BASED_USER_INTERFACE); + DeletePreviewWizard wizard = new DeletePreviewWizard(refactoring); RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard); Shell shell = Workbench.getInstance().getActiveWorkbenchWindow().getShell(); - try { - String titleForFailedChecks = CDIUIMessages.CDI_REFACTOR_CONTRIBUTOR_ERROR; - op.run(shell, titleForFailedChecks); - } catch (final InterruptedException irex) { - // operation was canceled - } - + wizard.showWizard(); } public RefactoringProcessor getRefactoringProcessor(){ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2010-12-23 10:36:30 UTC (rev 27709) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2010-12-23 13:58:06 UTC (rev 27710) @@ -57,16 +57,9 @@ public void run(IMarker marker) { DeleteAllInjectedConstructorsProcessor processor = new DeleteAllInjectedConstructorsProcessor(file, method, label); ProcessorBasedRefactoring refactoring = new ProcessorBasedRefactoring(processor); - DeletePreviewWizard wizard = new DeletePreviewWizard(refactoring, RefactoringWizard.WIZARD_BASED_USER_INTERFACE); + DeletePreviewWizard wizard = new DeletePreviewWizard(refactoring); RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard); - Shell shell = Workbench.getInstance().getActiveWorkbenchWindow().getShell(); - try { - String titleForFailedChecks = CDIUIMessages.CDI_REFACTOR_CONTRIBUTOR_ERROR; - op.run(shell, titleForFailedChecks); - } catch (final InterruptedException irex) { - // operation was canceled - } - + wizard.showWizard(); } public RefactoringProcessor getRefactoringProcessor(){ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java 2010-12-23 10:36:30 UTC (rev 27709) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java 2010-12-23 13:58:06 UTC (rev 27710) @@ -65,6 +65,7 @@ rootChange = new CompositeChange(label); change = new TextFileChange(file.getName(), file); + change.setSaveMode(TextFileChange.LEAVE_DIRTY); MultiTextEdit root = new MultiTextEdit(); change.setEdit(root); rootChange.add(change); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java 2010-12-23 10:36:30 UTC (rev 27709) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java 2010-12-23 13:58:06 UTC (rev 27710) @@ -10,17 +10,33 @@ ******************************************************************************/ package org.jboss.tools.cdi.ui.marker; +import org.eclipse.jdt.internal.ui.refactoring.actions.RefactoringStarter; +import org.eclipse.jdt.ui.refactoring.RefactoringSaveHelper; import org.eclipse.ltk.core.refactoring.Refactoring; import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; public class DeletePreviewWizard extends RefactoringWizard { - public DeletePreviewWizard(Refactoring refactoring, int flags) { - super(refactoring, flags); + public DeletePreviewWizard(Refactoring refactoring) { + super(refactoring, RefactoringWizard.WIZARD_BASED_USER_INTERFACE); + //setForcePreviewReview(false); } @Override protected void addUserInputPages() { } + + public boolean showWizard() { + final IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + final Shell shell = win.getShell(); + final RefactoringStarter refactoringStarter = new RefactoringStarter(); + boolean res = refactoringStarter.activate(this, shell, getWindowTitle(), RefactoringSaveHelper.SAVE_ALL); + //RefactoringStatus rs = refactoringStarter.getInitialConditionCheckingStatus(); + return res; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionRefactoringProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionRefactoringProcessor.java 2010-12-23 10:36:30 UTC (rev 27709) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionRefactoringProcessor.java 2010-12-23 13:58:06 UTC (rev 27710) @@ -88,7 +88,7 @@ @Override public Object[] getElements() { - return null; + return new Object[]{file}; } @Override