From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Rosenberg Subject: [JGIT PATCH 3/4] Added a method to get the non-relative name from the tree walker Date: Tue, 24 Jun 2008 23:20:26 +0200 Message-ID: <1214342427-2077-3-git-send-email-robin.rosenberg@dewire.com> References: <20080622233525.GJ11793@spearce.org> <1214342427-2077-1-git-send-email-robin.rosenberg@dewire.com> <1214342427-2077-2-git-send-email-robin.rosenberg@dewire.com> Cc: "Shawn O. Pearce" , Marek Zawirski , Florian Koeberle , Robin Rosenberg To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Tue Jun 24 23:25:30 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1KBG10-0000NM-Gh for gcvg-git-2@gmane.org; Tue, 24 Jun 2008 23:25:26 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754161AbYFXVYc (ORCPT ); Tue, 24 Jun 2008 17:24:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754121AbYFXVYb (ORCPT ); Tue, 24 Jun 2008 17:24:31 -0400 Received: from pne-smtpout1-sn1.fre.skanova.net ([81.228.11.98]:34095 "EHLO pne-smtpout1-sn1.fre.skanova.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753391AbYFXVY1 (ORCPT ); Tue, 24 Jun 2008 17:24:27 -0400 Received: from localhost.localdomain (213.67.100.250) by pne-smtpout1-sn1.fre.skanova.net (7.3.129) id 47A97950028D2DB3; Tue, 24 Jun 2008 23:24:26 +0200 X-Mailer: git-send-email 1.5.5.1.178.g1f811 In-Reply-To: <1214342427-2077-2-git-send-email-robin.rosenberg@dewire.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Signed-off-by: Robin Rosenberg --- .../src/org/spearce/jgit/treewalk/TreeWalk.java | 21 ++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java b/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java index 42f8b25..a5eb4d9 100644 --- a/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java +++ b/org.spearce.jgit/src/org/spearce/jgit/treewalk/TreeWalk.java @@ -499,6 +499,17 @@ public class TreeWalk { } /** + * Get the current entry's name. + *

+ * + * @return name of the current entry only. + * @see #getPathString() + */ + public String getName() { + return nameOf(currentHead); + } + + /** * Test if the supplied path matches the current entry's path. *

* This method tests that the supplied path is exactly equal to the current @@ -659,4 +670,14 @@ public class TreeWalk { + Constants.CHARACTER_ENCODING, uee); } } + + private static String nameOf(final AbstractTreeIterator t) { + try { + return new String(t.path, t.pathOffset, t.pathLen - t.pathOffset, + Constants.CHARACTER_ENCODING); + } catch (UnsupportedEncodingException uee) { + throw new RuntimeException("JVM doesn't support " + + Constants.CHARACTER_ENCODING, uee); + } + } } -- 1.5.5.1.178.g1f811