From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: spearce@spearce.org
Cc: git@vger.kernel.org
Subject: [PATCH 1/3] Drop the non-structured compare
Date: Thu, 19 Apr 2007 19:10:37 +0000 [thread overview]
Message-ID: <20070419191036.19224.81654.stgit@lathund.dewire.com> (raw)
---
.../src/org/spearce/egit/ui/GitHistoryPage.java | 11 +----------
.../internal/actions/GitCompareRevisionAction.java | 2 +-
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java
index 3057344..bd80324 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/GitHistoryPage.java
@@ -57,7 +57,6 @@ import org.eclipse.team.core.history.IFileHistory;
import org.eclipse.team.core.history.IFileHistoryProvider;
import org.eclipse.team.core.history.IFileRevision;
import org.eclipse.team.internal.ui.TeamUIMessages;
-import org.eclipse.team.internal.ui.actions.CompareRevisionAction;
import org.eclipse.team.internal.ui.history.DialogHistoryPageSite;
import org.eclipse.team.ui.history.HistoryPage;
import org.eclipse.team.ui.history.IHistoryCompareAdapter;
@@ -103,10 +102,8 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
if (parentSite != null && parentSite instanceof DialogHistoryPageSite)
parentSite.setSelectionProvider(viewer);
- final CompareRevisionAction compareAction = new CompareRevisionAction(
+ final GitCompareRevisionAction compareAction = new GitCompareRevisionAction(
"Compare");
- final GitCompareRevisionAction compareActionNG = new GitCompareRevisionAction(
- "Compare NG");
tree.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
// update the current
@@ -119,20 +116,14 @@ public class GitHistoryPage extends HistoryPage implements IAdaptable,
compareAction.setCurrentFileRevision(fileRevisions[0]);
compareAction.selectionChanged(new StructuredSelection(
selection2));
-
- compareActionNG.setCurrentFileRevision(fileRevisions[0]);
- compareActionNG.selectionChanged(new StructuredSelection(
- selection2));
}
});
compareAction.setPage(this);
- compareActionNG.setPage(this);
MenuManager menuMgr = new MenuManager();
Menu menu = menuMgr.createContextMenu(tree);
menuMgr.addMenuListener(new IMenuListener() {
public void menuAboutToShow(IMenuManager menuMgr) {
menuMgr.add(compareAction);
- menuMgr.add(compareActionNG);
}
});
menuMgr.setRemoveAllWhenShown(true);
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/GitCompareRevisionAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/GitCompareRevisionAction.java
index 9a0b378..9487197 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/GitCompareRevisionAction.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/GitCompareRevisionAction.java
@@ -188,7 +188,7 @@ public class GitCompareRevisionAction extends BaseSelectionListenerAction {
return shouldShow();
}
else if (selection.size() == 2){
- this.setText(TeamUIMessages.CompareRevisionAction_CompareWithOther+" NG");
+ this.setText(TeamUIMessages.CompareRevisionAction_CompareWithOther);
return shouldShow();
}
next reply other threads:[~2007-04-19 19:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-19 19:10 Robin Rosenberg [this message]
2007-04-19 19:10 ` [PATCH 2/3] Add compare with previous action Robin Rosenberg
2007-04-19 19:10 ` [PATCH 3/3] Show patch name in history view Robin Rosenberg
2007-04-20 6:28 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070419191036.19224.81654.stgit@lathund.dewire.com \
--to=robin.rosenberg@dewire.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).