From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: spearce@spearce.org
Cc: git@vger.kernel.org, Robin Rosenberg <robin.rosenberg@dewire.com>
Subject: [EGIT PATCH 2/3] Present type of change with file revision in diff viewer
Date: Sat, 10 Jan 2009 02:14:36 +0100 [thread overview]
Message-ID: <1231550077-1057-3-git-send-email-robin.rosenberg@dewire.com> (raw)
In-Reply-To: <1231550077-1057-2-git-send-email-robin.rosenberg@dewire.com>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>
---
.../spearce/egit/ui/internal/history/RevDiff.java | 40 +++++++++++++++++++-
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java
index 020ec73..084da3b 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/history/RevDiff.java
@@ -2,9 +2,13 @@
import org.eclipse.compare.ITypedElement;
import org.eclipse.compare.structuremergeviewer.IStructureComparator;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.DecorationOverlayIcon;
+import org.eclipse.jface.viewers.IDecoration;
import org.eclipse.swt.graphics.Image;
import org.eclipse.team.internal.ui.history.FileRevisionTypedElement;
import org.spearce.egit.core.internal.storage.GitFileRevision;
+import org.spearce.egit.ui.UIIcons;
import org.spearce.jgit.lib.Repository;
class RevDiff {
@@ -46,9 +50,41 @@ public String getType() {
public Object[] getChildren() {
FileRevisionTypedElement[] ret = new FileRevisionTypedElement[fileDiffs.length];
for (int i = 0; i < ret.length; ++i) {
+ final FileDiff d = fileDiffs[i];
ret[i] = new FileRevisionTypedElement(GitFileRevision.inCommit(db,
- fileDiffs[i].commit, fileDiffs[i].path,
- fileDiffs[i].blobs[side]));
+ d.commit, d.path, d.blobs[side])) {
+ private Image image;
+
+ @Override
+ protected void finalize() throws Throwable {
+ if (image != null)
+ image.dispose();
+ }
+
+ @Override
+ public Image getImage() {
+ if (image == null) {
+ ImageDescriptor overlay;
+ switch (d.change.charAt(0)) {
+ case 'A':
+ overlay = UIIcons.OVR_PENDING_ADD;
+ break;
+ case 'M':
+ overlay = UIIcons.OVR_SHARED;
+ break;
+ case 'D':
+ overlay = UIIcons.OVR_PENDING_REMOVE;
+ break;
+ default:
+ return super.getImage(); // Should not happen...
+ }
+ image = new DecorationOverlayIcon(super.getImage(),
+ overlay, IDecoration.BOTTOM_RIGHT)
+ .createImage();
+ }
+ return image;
+ }
+ };
}
return ret;
}
--
1.6.1.rc3.56.gd0306
next prev parent reply other threads:[~2009-01-10 1:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-10 1:14 [EGIT PATCH 0/3] Show all changes files in the same compare editor Robin Rosenberg
2009-01-10 1:14 ` [EGIT PATCH 1/3] Support viewing all changes in a single " Robin Rosenberg
2009-01-10 1:14 ` Robin Rosenberg [this message]
2009-01-10 1:14 ` [EGIT PATCH 3/3] Present full name of file revision Robin Rosenberg
2009-01-10 1:28 ` Robin Rosenberg
2009-01-12 16:54 ` [EGIT PATCH 1/3] Support viewing all changes in a single compare editor 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=1231550077-1057-3-git-send-email-robin.rosenberg@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).