2006-07-25 David Gilbert <david.gilbert@object-refinery.com>

	* javax/swing/text/Segment.java
	(last): Update current index before returning DONE for zero count.

2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c22cb833..e699f6b29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-25  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* javax/swing/text/Segment.java
+	(last): Update current index before returning DONE for zero count.
+	
 2006-07-24  Mark Wielaard  <mark@klomp.org>
 
 	* javax/swing/tree/TreePath.java (equals): Swap path equals call.
diff --git a/javax/swing/text/Segment.java b/javax/swing/text/Segment.java
index d2364e05a..63c5fa09d 100644
--- a/javax/swing/text/Segment.java
+++ b/javax/swing/text/Segment.java
@@ -165,8 +165,9 @@ public class Segment implements Cloneable, CharacterIterator
 
   /**
    * Sets the current index to point to the last character in the segment and 
-   * returns that character.  If the segment contains zero characters, this 
-   * method returns {@link #DONE}.
+   * returns that character.  If the segment contains zero characters, the 
+   * current index is set to {@link #getEndIndex()} and this method returns 
+   * {@link #DONE}.
    * 
    * @return The last character in the segment, or {@link #DONE} if the 
    *         segment contains zero characters.
@@ -174,7 +175,10 @@ public class Segment implements Cloneable, CharacterIterator
   public char last()
   {
     if (count == 0)
-      return DONE;
+      {
+        current = getEndIndex();
+        return DONE;
+      }
     
     current = getEndIndex() - 1;
     return array[current];