You are viewing a plain text version of this content. The canonical link for it is here.
Posted to regexp-dev@jakarta.apache.org by vg...@apache.org on 2003/11/18 15:05:54 UTC
cvs commit: jakarta-regexp/src/java/org/apache/regexp CharacterArrayCharacterIterator.java CharacterIterator.java ReaderCharacterIterator.java StreamCharacterIterator.java StringCharacterIterator.java
vgritsenko 2003/11/18 06:05:54
Modified: src/java/org/apache/regexp
CharacterArrayCharacterIterator.java
CharacterIterator.java ReaderCharacterIterator.java
StreamCharacterIterator.java
StringCharacterIterator.java
Log:
Apply patch from bug #3273: Change substring() method argument names to
match actual implementation.
Revision Changes Path
1.2 +15 -5 jakarta-regexp/src/java/org/apache/regexp/CharacterArrayCharacterIterator.java
Index: CharacterArrayCharacterIterator.java
===================================================================
RCS file: /home/cvs/jakarta-regexp/src/java/org/apache/regexp/CharacterArrayCharacterIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CharacterArrayCharacterIterator.java 14 May 2000 21:04:17 -0000 1.1
+++ CharacterArrayCharacterIterator.java 18 Nov 2003 14:05:54 -0000 1.2
@@ -57,9 +57,11 @@
*
*/
-/** Encapsulates String
+/**
+ * Encapsulates char[] as CharacterIterator
*
* @author <a href="mailto:ales.novak@netbeans.com">Ales Novak</a>
+ * @version CVS $Id$
*/
public final class CharacterArrayCharacterIterator implements CharacterIterator
{
@@ -79,15 +81,23 @@
}
/** @return a substring */
- public String substring(int offset, int length)
+ public String substring(int beginIndex, int endIndex)
{
- return new String(src, off + offset, length);
+ if (endIndex > len) {
+ throw new IndexOutOfBoundsException("endIndex=" + endIndex
+ + "; sequence size=" + len);
+ }
+ if (beginIndex < 0 || beginIndex > endIndex) {
+ throw new IndexOutOfBoundsException("beginIndex=" + beginIndex
+ + "; endIndex=" + endIndex);
+ }
+ return new String(src, off + beginIndex, endIndex - beginIndex);
}
/** @return a substring */
- public String substring(int offset)
+ public String substring(int beginIndex)
{
- return new String(src, off + offset, len);
+ return substring(beginIndex, len);
}
/** @return a character at the specified position. */
1.2 +5 -3 jakarta-regexp/src/java/org/apache/regexp/CharacterIterator.java
Index: CharacterIterator.java
===================================================================
RCS file: /home/cvs/jakarta-regexp/src/java/org/apache/regexp/CharacterIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CharacterIterator.java 14 May 2000 21:04:17 -0000 1.1
+++ CharacterIterator.java 18 Nov 2003 14:05:54 -0000 1.2
@@ -57,18 +57,20 @@
*
*/
-/** Encapsulates different types of character sources - String, InputStream, ...
+/**
+ * Encapsulates different types of character sources - String, InputStream, ...
* Defines a set of common methods
*
* @author <a href="mailto:ales.novak@netbeans.com">Ales Novak</a>
+ * @version CVS $Id$
*/
public interface CharacterIterator
{
/** @return a substring */
- String substring(int offset, int length);
+ String substring(int beginIndex, int endIndex);
/** @return a substring */
- String substring(int offset);
+ String substring(int beginIndex);
/** @return a character at the specified position. */
char charAt(int pos);
1.3 +8 -6 jakarta-regexp/src/java/org/apache/regexp/ReaderCharacterIterator.java
Index: ReaderCharacterIterator.java
===================================================================
RCS file: /home/cvs/jakarta-regexp/src/java/org/apache/regexp/ReaderCharacterIterator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ReaderCharacterIterator.java 2 Sep 2003 15:53:22 -0000 1.2
+++ ReaderCharacterIterator.java 18 Nov 2003 14:05:54 -0000 1.3
@@ -60,9 +60,11 @@
import java.io.Reader;
import java.io.IOException;
-/** Encapsulates InputStream, ...
+/**
+ * Encapsulates java.io.Reader as CharacterIterator
*
* @author <a href="mailto:ales.novak@netbeans.com">Ales Novak</a>
+ * @version CVS $Id$
*/
public final class ReaderCharacterIterator implements CharacterIterator
{
@@ -84,12 +86,12 @@
}
/** @return a substring */
- public String substring(int offset, int length)
+ public String substring(int beginIndex, int endIndex)
{
try
{
- ensure(offset + length);
- return buff.toString().substring(offset, length);
+ ensure(endIndex);
+ return buff.toString().substring(beginIndex, endIndex);
}
catch (IOException e)
{
@@ -98,12 +100,12 @@
}
/** @return a substring */
- public String substring(int offset)
+ public String substring(int beginIndex)
{
try
{
readAll();
- return buff.toString().substring(offset);
+ return buff.toString().substring(beginIndex);
}
catch (IOException e)
{
1.2 +8 -6 jakarta-regexp/src/java/org/apache/regexp/StreamCharacterIterator.java
Index: StreamCharacterIterator.java
===================================================================
RCS file: /home/cvs/jakarta-regexp/src/java/org/apache/regexp/StreamCharacterIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StreamCharacterIterator.java 14 May 2000 21:04:17 -0000 1.1
+++ StreamCharacterIterator.java 18 Nov 2003 14:05:54 -0000 1.2
@@ -60,9 +60,11 @@
import java.io.InputStream;
import java.io.IOException;
-/** Encapsulates InputStream, ...
+/**
+ * Encapsulates java.io.InputStream as CharacterIterator.
*
* @author <a href="mailto:ales.novak@netbeans.com">Ales Novak</a>
+ * @version CVS $Id$
*/
public final class StreamCharacterIterator implements CharacterIterator
{
@@ -84,12 +86,12 @@
}
/** @return a substring */
- public String substring(int offset, int length)
+ public String substring(int beginIndex, int endIndex)
{
try
{
- ensure(offset + length);
- return buff.toString().substring(offset, length);
+ ensure(endIndex);
+ return buff.toString().substring(beginIndex, endIndex);
}
catch (IOException e)
{
@@ -98,12 +100,12 @@
}
/** @return a substring */
- public String substring(int offset)
+ public String substring(int beginIndex)
{
try
{
readAll();
- return buff.toString().substring(offset);
+ return buff.toString().substring(beginIndex);
}
catch (IOException e)
{
1.2 +7 -5 jakarta-regexp/src/java/org/apache/regexp/StringCharacterIterator.java
Index: StringCharacterIterator.java
===================================================================
RCS file: /home/cvs/jakarta-regexp/src/java/org/apache/regexp/StringCharacterIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- StringCharacterIterator.java 14 May 2000 21:04:17 -0000 1.1
+++ StringCharacterIterator.java 18 Nov 2003 14:05:54 -0000 1.2
@@ -57,9 +57,11 @@
*
*/
-/** Encapsulates String
+/**
+ * Encapsulates String as CharacterIterator.
*
* @author <a href="mailto:ales.novak@netbeans.com">Ales Novak</a>
+ * @version CVS $Id$
*/
public final class StringCharacterIterator implements CharacterIterator
{
@@ -73,15 +75,15 @@
}
/** @return a substring */
- public String substring(int offset, int length)
+ public String substring(int beginIndex, int endIndex)
{
- return src.substring(offset, length);
+ return src.substring(beginIndex, endIndex);
}
/** @return a substring */
- public String substring(int offset)
+ public String substring(int beginIndex)
{
- return src.substring(offset);
+ return src.substring(beginIndex);
}
/** @return a character at the specified position. */
---------------------------------------------------------------------
To unsubscribe, e-mail: regexp-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: regexp-dev-help@jakarta.apache.org