From 01f283ca91b6a03ae20161560471b0cc77a437de Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Mon, 7 May 2007 23:29:14 +0200 Subject: [PATCH] Fixes due to changes in the Eclipse Team API There were changes made in Eclipse 3.3M7 that blew our cover. Apparently we were not using the API:s properly. Hopefully this is somewhat better. Signed-off-by: Robin Rosenberg Signed-off-by: Shawn O. Pearce --- .../spearce/egit/ui/internal/actions/CompareWithRevisionAction.java | 5 ++--- .../egit/ui/internal/actions/ShowResourceInHistoryAction.java | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java index 9cded79d..981c14cc 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CompareWithRevisionAction.java @@ -22,14 +22,13 @@ import java.util.Hashtable; import org.eclipse.core.resources.IResource; import org.eclipse.jface.action.IAction; import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ui.actions.TeamAction; import org.eclipse.team.ui.TeamUI; import org.eclipse.team.ui.history.HistoryPageSaveablePart; public class CompareWithRevisionAction extends TeamAction { - public void run(IAction action) { + public void execute(IAction action) { super.run(action); System.out.println("Run:" + action); System.out.println("Selection resources:" @@ -45,7 +44,7 @@ public class CompareWithRevisionAction extends TeamAction { HistoryPageSaveablePart.showHistoryInDialog(shell, object); } - protected boolean isEnabled() throws TeamException { + public boolean isEnabled() { return !getSelection().isEmpty(); } diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java index db6f3e25..d2f9c476 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/ShowResourceInHistoryAction.java @@ -18,14 +18,13 @@ package org.spearce.egit.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.swt.widgets.Shell; -import org.eclipse.team.core.TeamException; import org.eclipse.team.internal.ui.actions.TeamAction; import org.eclipse.team.ui.TeamUI; import org.eclipse.team.ui.history.HistoryPageSaveablePart; public class ShowResourceInHistoryAction extends TeamAction { - public void run(IAction action) { + public void execute(IAction action) { TeamUI.getHistoryView().showHistoryFor(getSelectedResources()[0]); } @@ -33,7 +32,7 @@ public class ShowResourceInHistoryAction extends TeamAction { HistoryPageSaveablePart.showHistoryInDialog(shell, object); } - protected boolean isEnabled() throws TeamException { + public boolean isEnabled() { return !getSelection().isEmpty(); } } -- 2.11.4.GIT