From 4d36cdb22fd3ca6880e5fb3f299e533e78323d8d Mon Sep 17 00:00:00 2001 From: Mykola Nikishov Date: Thu, 19 Nov 2009 12:39:51 +0200 Subject: [PATCH] Remove never used parameter Remove unused parameter from AbstractOperationAction's createOperation by changing signature of createOperation(IAction, List) to createOperation(List) Change-Id: Ib2cc4efe011ee0ceda2d233c01de4f074c4ad3c8 Signed-off-by: Mykola Nikishov Signed-off-by: Robin Rosenberg --- .../eclipse/egit/ui/internal/actions/AbstractOperationAction.java | 8 +++----- .../org/eclipse/egit/ui/internal/actions/AddToIndexAction.java | 4 +--- .../src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java | 4 +--- .../src/org/eclipse/egit/ui/internal/actions/Disconnect.java | 4 +--- .../egit/ui/internal/actions/HardResetToRevisionAction.java | 3 +-- .../egit/ui/internal/actions/MixedResetToRevisionAction.java | 3 +-- .../egit/ui/internal/actions/ResetQuickdiffBaselineAction.java | 3 +-- .../internal/actions/ResetQuickdiffBaselineHeadParentAction.java | 3 +-- .../egit/ui/internal/actions/SetQuickdiffBaselineAction.java | 3 +-- .../egit/ui/internal/actions/SoftResetToRevisionAction.java | 3 +-- .../src/org/eclipse/egit/ui/internal/actions/Untrack.java | 4 +--- .../src/org/eclipse/egit/ui/internal/actions/Update.java | 4 +--- 12 files changed, 14 insertions(+), 32 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java index be0cf4dc..269dfb40 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AbstractOperationAction.java @@ -53,19 +53,17 @@ public abstract class AbstractOperationAction implements IObjectActionDelegate { } else { selection = Collections.EMPTY_LIST; } - op = createOperation(act, selection); + op = createOperation(selection); act.setEnabled(op != null && wp != null); } /** * Instantiate an operation on an action on provided objects. - * - * @param act * @param selection + * * @return a {@link IWorkspaceRunnable} for invoking this operation later on */ - protected abstract IWorkspaceRunnable createOperation(final IAction act, - final List selection); + protected abstract IWorkspaceRunnable createOperation(final List selection); /** * A method to invoke when the operation is finished. diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AddToIndexAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AddToIndexAction.java index 7aa768d7..179bf9d5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AddToIndexAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AddToIndexAction.java @@ -15,7 +15,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.AddToIndexOperation; import org.eclipse.egit.ui.UIText; -import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; /** @@ -26,8 +25,7 @@ import org.eclipse.jface.dialogs.MessageDialog; public class AddToIndexAction extends AbstractOperationAction { private AddToIndexOperation operation = null; - protected IWorkspaceRunnable createOperation(final IAction act, - final List sel) { + protected IWorkspaceRunnable createOperation(final List sel) { if (sel.isEmpty()) { return null; } else { diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java index bfbaf6cf..e8bec36b 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/AssumeUnchanged.java @@ -13,7 +13,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.AssumeUnchangedOperation; -import org.eclipse.jface.action.IAction; /** * This operation sets the assume-valid bit in the index for the @@ -22,8 +21,7 @@ import org.eclipse.jface.action.IAction; * @see AssumeUnchangedOperation */ public class AssumeUnchanged extends AbstractOperationAction { - protected IWorkspaceRunnable createOperation(final IAction act, - final List sel) { + protected IWorkspaceRunnable createOperation(final List sel) { return sel.isEmpty() ? null : new AssumeUnchangedOperation(sel); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java index a8ed9f9c..0beecf55 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Disconnect.java @@ -14,7 +14,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.DisconnectProviderOperation; import org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator; -import org.eclipse.jface.action.IAction; /** * Action to disassociate a project from its Git repository. @@ -22,8 +21,7 @@ import org.eclipse.jface.action.IAction; * @see DisconnectProviderOperation */ public class Disconnect extends AbstractOperationAction { - protected IWorkspaceRunnable createOperation(final IAction act, - final List sel) { + protected IWorkspaceRunnable createOperation(final List sel) { return sel.isEmpty() ? null : new DisconnectProviderOperation(sel); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java index 13dab060..255f66a0 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/HardResetToRevisionAction.java @@ -12,7 +12,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.ResetOperation; -import org.eclipse.jface.action.IAction; import org.eclipse.jgit.lib.AnyObjectId; /** @@ -21,7 +20,7 @@ import org.eclipse.jgit.lib.AnyObjectId; public class HardResetToRevisionAction extends AbstractRevObjectAction { @Override - protected IWorkspaceRunnable createOperation(IAction act, List selection) { + protected IWorkspaceRunnable createOperation(List selection) { return new ResetOperation(getActiveRepository(), ((AnyObjectId) selection.get(0)).name(), ResetOperation.ResetType.HARD); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java index 45ec53b7..e2a3aaf4 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/MixedResetToRevisionAction.java @@ -12,7 +12,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.ResetOperation; -import org.eclipse.jface.action.IAction; import org.eclipse.jgit.lib.AnyObjectId; /** @@ -21,7 +20,7 @@ import org.eclipse.jgit.lib.AnyObjectId; public class MixedResetToRevisionAction extends AbstractRevObjectAction { @Override - protected IWorkspaceRunnable createOperation(IAction act, List selection) { + protected IWorkspaceRunnable createOperation(List selection) { return new ResetOperation(getActiveRepository(), ((AnyObjectId) selection.get(0)).name(), ResetOperation.ResetType.MIXED); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java index 3b42ddbc..abdfe53c 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineAction.java @@ -11,7 +11,6 @@ package org.eclipse.egit.ui.internal.actions; import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.jface.action.IAction; import org.eclipse.jgit.lib.Constants; /** @@ -20,7 +19,7 @@ import org.eclipse.jgit.lib.Constants; public class ResetQuickdiffBaselineAction extends AbstractRevObjectAction { @Override - protected IWorkspaceRunnable createOperation(IAction act, List selection) { + protected IWorkspaceRunnable createOperation(List selection) { return new QuickdiffBaselineOperation(getActiveRepository(), Constants.HEAD); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java index fe33ec34..90aa6cbf 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/ResetQuickdiffBaselineHeadParentAction.java @@ -11,7 +11,6 @@ package org.eclipse.egit.ui.internal.actions; import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.jface.action.IAction; /** * Changes the reference for the quickdiff to the (first) parent of HEAD @@ -19,7 +18,7 @@ import org.eclipse.jface.action.IAction; public class ResetQuickdiffBaselineHeadParentAction extends AbstractRevObjectAction { @Override - protected IWorkspaceRunnable createOperation(IAction act, List selection) { + protected IWorkspaceRunnable createOperation(List selection) { return new QuickdiffBaselineOperation(getActiveRepository(), "HEAD^1"); //$NON-NLS-1$ } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java index 907803c7..03cdadec 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SetQuickdiffBaselineAction.java @@ -11,7 +11,6 @@ package org.eclipse.egit.ui.internal.actions; import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; -import org.eclipse.jface.action.IAction; import org.eclipse.jgit.revwalk.RevObject; /** @@ -20,7 +19,7 @@ import org.eclipse.jgit.revwalk.RevObject; public class SetQuickdiffBaselineAction extends AbstractRevObjectAction { @Override - protected IWorkspaceRunnable createOperation(IAction act, List selection) { + protected IWorkspaceRunnable createOperation(List selection) { return new QuickdiffBaselineOperation(getActiveRepository(), ((RevObject)selection.get(0)).getId().name()); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java index 220807b8..bddc332a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/SoftResetToRevisionAction.java @@ -12,7 +12,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.ResetOperation; -import org.eclipse.jface.action.IAction; import org.eclipse.jgit.lib.AnyObjectId; /** @@ -21,7 +20,7 @@ import org.eclipse.jgit.lib.AnyObjectId; public class SoftResetToRevisionAction extends AbstractRevObjectAction { @Override - protected IWorkspaceRunnable createOperation(IAction act, List selection) { + protected IWorkspaceRunnable createOperation(List selection) { return new ResetOperation(getActiveRepository(), ((AnyObjectId) selection.get(0)).name(), ResetOperation.ResetType.SOFT); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java index 19805c30..35e04b04 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Untrack.java @@ -13,7 +13,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.UntrackOperation; -import org.eclipse.jface.action.IAction; /** * An action to remove files from a Git repository. The removal does not alter @@ -22,8 +21,7 @@ import org.eclipse.jface.action.IAction; * @see UntrackOperation */ public class Untrack extends AbstractOperationAction { - protected IWorkspaceRunnable createOperation(final IAction act, - final List sel) { + protected IWorkspaceRunnable createOperation(final List sel) { return sel.isEmpty() ? null : new UntrackOperation(sel); } } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java index 40306361..ae63ca49 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/Update.java @@ -13,7 +13,6 @@ import java.util.List; import org.eclipse.core.resources.IWorkspaceRunnable; import org.eclipse.egit.core.op.UpdateOperation; -import org.eclipse.jface.action.IAction; /** * Action to update index for selected resources with content from workdir. @@ -21,8 +20,7 @@ import org.eclipse.jface.action.IAction; * @see UpdateOperation */ public class Update extends AbstractOperationAction { - protected IWorkspaceRunnable createOperation(final IAction act, - final List sel) { + protected IWorkspaceRunnable createOperation(final List sel) { return sel.isEmpty() ? null : new UpdateOperation(sel); } } -- 2.11.4.GIT