Don't use deprecated *Action(Shell) constructors.
Change-Id: I85692300a786f66f8ff4d0c961ea8c2be8e4244d
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/core/plugins/org.eclipse.dltk.ui/core refactoring/org/eclipse/dltk/internal/corext/refactoring/reorg/ReorgMoveAction.java b/core/plugins/org.eclipse.dltk.ui/core refactoring/org/eclipse/dltk/internal/corext/refactoring/reorg/ReorgMoveAction.java
index 548e8d0..e2ae2d1 100644
--- a/core/plugins/org.eclipse.dltk.ui/core refactoring/org/eclipse/dltk/internal/corext/refactoring/reorg/ReorgMoveAction.java
+++ b/core/plugins/org.eclipse.dltk.ui/core refactoring/org/eclipse/dltk/internal/corext/refactoring/reorg/ReorgMoveAction.java
@@ -28,13 +28,15 @@
import org.eclipse.ui.IWorkbenchSite;
import org.eclipse.ui.actions.MoveProjectAction;
-
public class ReorgMoveAction extends SelectionDispatchAction {
public ReorgMoveAction(IWorkbenchSite site) {
super(site);
setText(ReorgMessages.ReorgMoveAction_3);
setDescription(ReorgMessages.ReorgMoveAction_4);
- /*PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IScriptHelpContextIds.MOVE_ACTION);*/
+ /*
+ * PlatformUI.getWorkbench().getHelpSystem().setHelp(this,
+ * IScriptHelpContextIds.MOVE_ACTION);
+ */
if (DLTKCore.DEBUG) {
System.err.println("Add help support here..."); //$NON-NLS-1$
}
@@ -48,13 +50,15 @@
return;
}
try {
- List elements= selection.toList();
- IResource[] resources= ReorgUtils.getResources(elements);
- IModelElement[] modelElements= ReorgUtils.getModelElements(elements);
+ List elements = selection.toList();
+ IResource[] resources = ReorgUtils.getResources(elements);
+ IModelElement[] modelElements = ReorgUtils
+ .getModelElements(elements);
if (elements.size() != resources.length + modelElements.length)
setEnabled(false);
else
- setEnabled(RefactoringAvailabilityTester.isMoveAvailable(resources, modelElements));
+ setEnabled(RefactoringAvailabilityTester
+ .isMoveAvailable(resources, modelElements));
} catch (ModelException e) {
// no ui here - this happens on selection changes
// http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
@@ -72,19 +76,22 @@
}
/**
- * Note: This method is for internal use only. Clients should not call this method.
+ * Note: This method is for internal use only. Clients should not call this
+ * method.
*/
@Override
public void selectionChanged(ModelTextSelection selection) {
try {
- setEnabled(RefactoringAvailabilityTester.isMoveAvailable(selection));
+ setEnabled(
+ RefactoringAvailabilityTester.isMoveAvailable(selection));
} catch (ModelException e) {
setEnabled(false);
}
}
- private MoveProjectAction createWorkbenchAction(IStructuredSelection selection) {
- MoveProjectAction action= new MoveProjectAction(getShell());
+ private MoveProjectAction createWorkbenchAction(
+ IStructuredSelection selection) {
+ MoveProjectAction action = new MoveProjectAction(getSite());
action.selectionChanged(selection);
return action;
}
@@ -96,13 +103,18 @@
return;
}
try {
- List elements= selection.toList();
- IResource[] resources= ReorgUtils.getResources(elements);
- IModelElement[] modelElements= ReorgUtils.getModelElements(elements);
- if (RefactoringAvailabilityTester.isMoveAvailable(resources, modelElements))
- RefactoringExecutionStarter.startRefactoring(resources, modelElements, getShell());
+ List elements = selection.toList();
+ IResource[] resources = ReorgUtils.getResources(elements);
+ IModelElement[] modelElements = ReorgUtils
+ .getModelElements(elements);
+ if (RefactoringAvailabilityTester.isMoveAvailable(resources,
+ modelElements))
+ RefactoringExecutionStarter.startRefactoring(resources,
+ modelElements, getShell());
} catch (ModelException e) {
- ExceptionHandler.handle(e, RefactoringMessages.OpenRefactoringWizardAction_refactoring, RefactoringMessages.OpenRefactoringWizardAction_exception);
+ ExceptionHandler.handle(e,
+ RefactoringMessages.OpenRefactoringWizardAction_refactoring,
+ RefactoringMessages.OpenRefactoringWizardAction_exception);
}
}
}
diff --git a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenProjectAction.java b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenProjectAction.java
index 8e3b3c3..c2d1830 100644
--- a/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenProjectAction.java
+++ b/core/plugins/org.eclipse.dltk.ui/src/org/eclipse/dltk/internal/ui/actions/OpenProjectAction.java
@@ -35,65 +35,65 @@
import org.eclipse.ui.actions.OpenResourceAction;
import org.eclipse.ui.dialogs.ElementListSelectionDialog;
-
/**
* Action to open a closed project. Action either opens the closed projects
- * provided by the structured selection or presents a dialog from which the
- * user can select the projects to be opened.
+ * provided by the structured selection or presents a dialog from which the user
+ * can select the projects to be opened.
*
* <p>
* This class may be instantiated; it is not intended to be subclassed.
* </p>
*
- *
+ *
*/
-public class OpenProjectAction extends SelectionDispatchAction implements IResourceChangeListener {
+public class OpenProjectAction extends SelectionDispatchAction
+ implements IResourceChangeListener {
- private static final int EMPTY_SELECTION= 1;
- private static final int ELEMENT_SELECTION= 2;
+ private static final int EMPTY_SELECTION = 1;
+ private static final int ELEMENT_SELECTION = 2;
private int fMode;
private OpenResourceAction fWorkbenchAction;
/**
- * Creates a new <code>OpenProjectAction</code>. The action requires
- * that the selection provided by the site's selection provider is of type <code>
+ * Creates a new <code>OpenProjectAction</code>. The action requires that
+ * the selection provided by the site's selection provider is of type <code>
* org.eclipse.jface.viewers.IStructuredSelection</code>.
*
- * @param site the site providing context information for this action
+ * @param site
+ * the site providing context information for this action
*/
public OpenProjectAction(IWorkbenchSite site) {
super(site);
- fWorkbenchAction= new OpenResourceAction(site.getShell());
+ fWorkbenchAction = new OpenResourceAction(site);
setText(fWorkbenchAction.getText());
setToolTipText(fWorkbenchAction.getToolTipText());
if (DLTKCore.DEBUG) {
System.err.println("Add help support here..."); //$NON-NLS-1$
}
- //PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IScriptHelpContextIds.OPEN_PROJECT_ACTION);
+ // PlatformUI.getWorkbench().getHelpSystem().setHelp(this,
+ // IScriptHelpContextIds.OPEN_PROJECT_ACTION);
}
- /*
- * @see IResourceChangeListener#resourceChanged(IResourceChangeEvent)
- */
@Override
public void resourceChanged(IResourceChangeEvent event) {
fWorkbenchAction.resourceChanged(event);
switch (fMode) {
- case ELEMENT_SELECTION:
- setEnabled(fWorkbenchAction.isEnabled());
- break;
- case EMPTY_SELECTION:
- internalResourceChanged(event);
- break;
+ case ELEMENT_SELECTION:
+ setEnabled(fWorkbenchAction.isEnabled());
+ break;
+ case EMPTY_SELECTION:
+ internalResourceChanged(event);
+ break;
}
}
private void internalResourceChanged(IResourceChangeEvent event) {
IResourceDelta delta = event.getDelta();
if (delta != null) {
- IResourceDelta[] projDeltas = delta.getAffectedChildren(IResourceDelta.CHANGED);
+ IResourceDelta[] projDeltas = delta
+ .getAffectedChildren(IResourceDelta.CHANGED);
for (int i = 0; i < projDeltas.length; ++i) {
IResourceDelta projDelta = projDeltas[i];
if ((projDelta.getFlags() & IResourceDelta.OPEN) != 0) {
@@ -104,12 +104,12 @@
}
}
- //---- normal selection -------------------------------------
+ // ---- normal selection -------------------------------------
@Override
public void selectionChanged(ISelection selection) {
setEnabled(hasCloseProjects());
- fMode= EMPTY_SELECTION;
+ fMode = EMPTY_SELECTION;
}
@Override
@@ -117,13 +117,13 @@
internalRun();
}
- //---- structured selection ---------------------------------------
+ // ---- structured selection ---------------------------------------
@Override
public void selectionChanged(IStructuredSelection selection) {
if (selection.isEmpty()) {
setEnabled(hasCloseProjects());
- fMode= EMPTY_SELECTION;
+ fMode = EMPTY_SELECTION;
return;
}
if (!hasCloseProjects()) {
@@ -132,7 +132,7 @@
}
fWorkbenchAction.selectionChanged(selection);
setEnabled(fWorkbenchAction.isEnabled());
- fMode= ELEMENT_SELECTION;
+ fMode = ELEMENT_SELECTION;
}
@Override
@@ -145,22 +145,24 @@
}
private void internalRun() {
- ElementListSelectionDialog dialog= new ElementListSelectionDialog(getShell(), new ModelElementLabelProvider());
+ ElementListSelectionDialog dialog = new ElementListSelectionDialog(
+ getShell(), new ModelElementLabelProvider());
dialog.setTitle(ActionMessages.OpenProjectAction_dialog_title);
dialog.setMessage(ActionMessages.OpenProjectAction_dialog_message);
dialog.setElements(getClosedProjects());
dialog.setMultipleSelection(true);
- int result= dialog.open();
+ int result = dialog.open();
if (result != Window.OK)
return;
- final Object[] projects= dialog.getResult();
- IWorkspaceRunnable runnable= createRunnable(projects);
+ final Object[] projects = dialog.getResult();
+ IWorkspaceRunnable runnable = createRunnable(projects);
try {
- PlatformUI.getWorkbench().getProgressService().run(true, true, new WorkbenchRunnableAdapter(runnable));
+ PlatformUI.getWorkbench().getProgressService().run(true, true,
+ new WorkbenchRunnableAdapter(runnable));
} catch (InvocationTargetException e) {
ExceptionHandler.handle(e, getShell(),
- ActionMessages.OpenProjectAction_dialog_title,
- ActionMessages.OpenProjectAction_error_message);
+ ActionMessages.OpenProjectAction_dialog_title,
+ ActionMessages.OpenProjectAction_error_message);
} catch (InterruptedException e) {
}
}
@@ -189,10 +191,11 @@
}
private Object[] getClosedProjects() {
- IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects();
- List result= new ArrayList(5);
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
+ .getProjects();
+ List<IProject> result = new ArrayList<>(5);
for (int i = 0; i < projects.length; i++) {
- IProject project= projects[i];
+ IProject project = projects[i];
if (!project.isOpen())
result.add(project);
}
@@ -200,7 +203,8 @@
}
private boolean hasCloseProjects() {
- IProject[] projects= ResourcesPlugin.getWorkspace().getRoot().getProjects();
+ IProject[] projects = ResourcesPlugin.getWorkspace().getRoot()
+ .getProjects();
for (int i = 0; i < projects.length; i++) {
if (!projects[i].isOpen())
return true;
diff --git a/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/DeleteAction.java b/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/DeleteAction.java
index 8949133..0190288 100644
--- a/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/DeleteAction.java
+++ b/core/plugins/org.eclipse.dltk.ui/ui refactoring/org/eclipse/dltk/internal/ui/refactoring/reorg/DeleteAction.java
@@ -30,16 +30,21 @@
super(site);
setText(ReorgMessages.DeleteAction_3);
setDescription(ReorgMessages.DeleteAction_4);
- ISharedImages workbenchImages= DLTKUIPlugin.getDefault().getWorkbench().getSharedImages();
- setDisabledImageDescriptor(workbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
- setImageDescriptor(workbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
- setHoverImageDescriptor(workbenchImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+ ISharedImages workbenchImages = DLTKUIPlugin.getDefault().getWorkbench()
+ .getSharedImages();
+ setDisabledImageDescriptor(workbenchImages
+ .getImageDescriptor(ISharedImages.IMG_TOOL_DELETE_DISABLED));
+ setImageDescriptor(workbenchImages
+ .getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+ setHoverImageDescriptor(workbenchImages
+ .getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
if (DLTKCore.DEBUG) {
System.err.println("Add help support here..."); //$NON-NLS-1$
}
- //PlatformUI.getWorkbench().getHelpSystem().setHelp(this, IScriptHelpContextIds.DELETE_ACTION);
+ // PlatformUI.getWorkbench().getHelpSystem().setHelp(this,
+ // IScriptHelpContextIds.DELETE_ACTION);
}
@Override
@@ -49,9 +54,10 @@
return;
}
try {
- setEnabled(RefactoringAvailabilityTester.isDeleteAvailable(selection.toArray()));
+ setEnabled(RefactoringAvailabilityTester
+ .isDeleteAvailable(selection.toArray()));
} catch (CoreException e) {
- //no ui here - this happens on selection changes
+ // no ui here - this happens on selection changes
// http://bugs.eclipse.org/bugs/show_bug.cgi?id=19253
if (ScriptModelUtil.isExceptionToBeLogged(e))
DLTKUIPlugin.log(e);
@@ -60,7 +66,7 @@
}
private IAction createWorkbenchAction(IStructuredSelection selection) {
- DeleteResourceAction action= new DeleteResourceAction(getShell());
+ DeleteResourceAction action = new DeleteResourceAction(getSite());
action.selectionChanged(selection);
return action;
}
@@ -72,9 +78,12 @@
return;
}
try {
- RefactoringExecutionStarter.startDeleteRefactoring(selection.toArray(), getShell());
+ RefactoringExecutionStarter
+ .startDeleteRefactoring(selection.toArray(), getShell());
} catch (CoreException e) {
- ExceptionHandler.handle(e, RefactoringMessages.OpenRefactoringWizardAction_refactoring, RefactoringMessages.OpenRefactoringWizardAction_exception);
+ ExceptionHandler.handle(e,
+ RefactoringMessages.OpenRefactoringWizardAction_refactoring,
+ RefactoringMessages.OpenRefactoringWizardAction_exception);
}
}
}
