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 <robin.rosenberg@xxxxxxxxxx>
---
.../actions/CompareWithRevisionAction.java | 5 ++---
.../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 9cded79..981c14c 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 db6f3e2..d2f9c47 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();
}
}
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html