Index: src/java/org/apache/lucene/analysis/CharTokenizer.java
===================================================================
--- src/java/org/apache/lucene/analysis/CharTokenizer.java	(revision 769060)
+++ src/java/org/apache/lucene/analysis/CharTokenizer.java	(working copy)
@@ -90,8 +90,7 @@
     }
 
     termAtt.setTermLength(length);
-    offsetAtt.setStartOffset(start);
-    offsetAtt.setEndOffset(start+length);
+    offsetAtt.setOffset(start, start+length);
     return true;
   }
 
Index: src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java
===================================================================
--- src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java	(revision 769060)
+++ src/java/org/apache/lucene/analysis/tokenattributes/OffsetAttribute.java	(working copy)
@@ -43,11 +43,14 @@
     return startOffset;
   }
 
-  /** Set the starting offset.
-    @see #startOffset() */
-  public void setStartOffset(int offset) {
-    this.startOffset = offset;
+  
+  /** Set the starting and ending offset.
+    @see #startOffset() and #endOffset()*/
+  public void setOffset(int startOffset, int endOffset) {
+    this.startOffset = startOffset;
+    this.endOffset = endOffset;
   }
+  
 
   /** Returns this Token's ending offset, one greater than the position of the
   last character corresponding to this token in the source text. The length
@@ -56,11 +59,6 @@
     return endOffset;
   }
 
-  /** Set the ending offset.
-    @see #endOffset() */
-  public void setEndOffset(int offset) {
-    this.endOffset = offset;
-  }
 
   public void clear() {
     startOffset = 0;
@@ -92,7 +90,6 @@
   
   public void copyTo(Attribute target) {
     OffsetAttribute t = (OffsetAttribute) target;
-    t.setStartOffset(startOffset);
-    t.setEndOffset(endOffset);
+    t.setOffset(startOffset, endOffset);
   }  
 }