FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AttributedCharacterIterator.java, [...]: Removed redundant modifiers.

Browse source 
2003-10-11  Michael Koch  <konqueror@gmx.de>

	* java/text/AttributedCharacterIterator.java,
	java/text/CharacterIterator.java:
	Removed redundant modifiers.

From-SVN: r72357
This commit is contained in:
Michael Koch 2003-10-11 18:51:14 +00:00 • committed by Michael Koch
parent afe6016980
commit af6b79a63c
3 changed files with 31 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/ChangeLog
View file

@ -1,3 +1,9 @@
2003-10-11 Michael Koch <konqueror@gmx.de>
* java/text/AttributedCharacterIterator.java,
java/text/CharacterIterator.java:
Removed redundant modifiers.
2003-10-11 Michael Koch <konqueror@gmx.de> 2003-10-11 Michael Koch <konqueror@gmx.de>
* java/sql/Array.java, * java/sql/Array.java,

57
libjava/java/text/AttributedCharacterIterator.java
View file

@ -59,11 +59,6 @@ import java.util.Map;
*/ */
public interface AttributedCharacterIterator extends CharacterIterator public interface AttributedCharacterIterator extends CharacterIterator
{ {
/*
* Inner Classes
*/
/** /**
* This class defines attribute keys that are used as text attributes. * This class defines attribute keys that are used as text attributes.
*/ */
@ -218,30 +213,20 @@ hashCode()
* *
* @return A <code>String</code> representation of this object. * @return A <code>String</code> representation of this object.
*/ */
public String public String toString()
toString()
{ {
return(getClass().getName() + "(" + getName() + ")"); return(getClass().getName() + "(" + getName() + ")");
} }
} // Inner class Attribute } // Inner class Attribute
/*************************************************************************/
/*
* Instance Methods
*/
/** /**
* This method returns a list of all keys that are defined for the * This method returns a list of all keys that are defined for the
* text range. This can be an empty list if no attributes are defined. * text range. This can be an empty list if no attributes are defined.
* *
* @return A list of keys * @return A list of keys
*/ */
public abstract Set Set getAllAttributeKeys();
getAllAttributeKeys();
/*************************************************************************/
/** /**
* This method returns a <code>Map</code> of the attributed defined for * This method returns a <code>Map</code> of the attributed defined for
@ -249,10 +234,7 @@ getAllAttributeKeys();
* *
* @return A <code>Map</code> of the attributes for the current character. * @return A <code>Map</code> of the attributes for the current character.
*/ */
public abstract Map Map getAttributes();
getAttributes();
/*************************************************************************/
/** /**
* This method returns the value of the specified attribute for the * This method returns the value of the specified attribute for the
@ -263,10 +245,7 @@ getAttributes();
* *
* @return The value of the specified attribute * @return The value of the specified attribute
*/ */
public abstract Object Object getAttribute (AttributedCharacterIterator.Attribute attrib);
getAttribute(AttributedCharacterIterator.Attribute attrib);
/*************************************************************************/
/** /**
* This method returns the index of the first character in the run that * This method returns the index of the first character in the run that
@ -274,10 +253,7 @@ getAttribute(AttributedCharacterIterator.Attribute attrib);
* *
* @return The start index of the run * @return The start index of the run
*/ */
public abstract int int getRunStart();
getRunStart();
/*************************************************************************/
/** /**
* This method returns the index of the first character in the run that * This method returns the index of the first character in the run that
@ -288,10 +264,7 @@ getRunStart();
* *
* @return The start index of the run. * @return The start index of the run.
*/ */
public abstract int int getRunStart (Set attribs);
getRunStart(Set attribs);
/*************************************************************************/
/** /**
* This method returns the index of the first character in the run that * This method returns the index of the first character in the run that
@ -301,10 +274,7 @@ getRunStart(Set attribs);
* *
* @return The start index of the run. * @return The start index of the run.
*/ */
public abstract int int getRunStart (AttributedCharacterIterator.Attribute attrib);
getRunStart(AttributedCharacterIterator.Attribute attrib);
/*************************************************************************/
/** /**
* This method returns the index of the character after the end of the run * This method returns the index of the character after the end of the run
@ -312,10 +282,7 @@ getRunStart(AttributedCharacterIterator.Attribute attrib);
* *
* @return The end index of the run. * @return The end index of the run.
*/ */
public abstract int int getRunLimit();
getRunLimit();
/*************************************************************************/
/** /**
* This method returns the index of the character after the end of the run * This method returns the index of the character after the end of the run
@ -326,10 +293,7 @@ getRunLimit();
* *
* @return The end index of the run. * @return The end index of the run.
*/ */
public abstract int int getRunLimit (Set attribs);
getRunLimit(Set attribs);
/*************************************************************************/
/** /**
* This methods returns the index of the character after the end of the run * This methods returns the index of the character after the end of the run
@ -339,8 +303,7 @@ getRunLimit(Set attribs);
* *
* @return The end index of the run. * @return The end index of the run.
*/ */
public abstract int int getRunLimit (AttributedCharacterIterator.Attribute attrib);
getRunLimit(AttributedCharacterIterator.Attribute attrib);
} // interface AttributedCharacterIterator } // interface AttributedCharacterIterator

61
libjava/java/text/CharacterIterator.java
View file

@ -45,61 +45,42 @@ package java.text;
* by the methods in this interface. Additionally, various methods allow * by the methods in this interface. Additionally, various methods allow
* the index to be set. * the index to be set.
* *
* @version 0.0
*
* @author Aaron M. Renn (arenn@urbanophile.com) * @author Aaron M. Renn (arenn@urbanophile.com)
*/ */
public interface CharacterIterator extends Cloneable public interface CharacterIterator extends Cloneable
{ {
/*************************************************************************/
/*
* Static Variables
*/
/** /**
* This is a special constant value that is returned when the beginning or * This is a special constant value that is returned when the beginning or
* end of the character range has been reached. * end of the character range has been reached.
*/ */
public static final char DONE = '\uFFFF'; char DONE = '\uFFFF';
/*************************************************************************/
/*
* Instance Methods
*/
/** /**
* This method returns the character at the current index position * This method returns the character at the current index position
* *
* @return The character at the current index position. * @return The character at the current index position.
*/ */
public abstract char current (); char current();
/*************************************************************************/
/** /**
* This method increments the current index and then returns the character * This method increments the current index and then returns the character
* at the new index value. If the index is already at <code>getEndIndex() - 1</code>, * at the new index value. If the index is already at <code>getEndIndex() - 1</code>,
* it will not be incremented. * it will not be incremented.
* *
* @return The character at the position of the incremented index value, or <code>DONE</code> if the index has reached getEndIndex() - 1 * @return The character at the position of the incremented index value,
* or <code>DONE</code> if the index has reached getEndIndex() - 1
*/ */
public abstract char next (); char next();
/*************************************************************************/
/** /**
* This method decrements the current index and then returns the character * This method decrements the current index and then returns the character
* at the new index value. If the index value is already at the beginning * at the new index value. If the index value is already at the beginning
* index, it will not be decremented. * index, it will not be decremented.
* *
* @return The character at the position of the decremented index value, or <code>DONE</code> if index was already equal to the beginning index value. * @return The character at the position of the decremented index value,
* or <code>DONE</code> if index was already equal to the beginning index value.
*/ */
public abstract char previous (); char previous();
/*************************************************************************/
/** /**
* This method sets the index value to the beginning of the range and returns * This method sets the index value to the beginning of the range and returns
@ -107,9 +88,7 @@ public interface CharacterIterator extends Cloneable
* *
* @return The character at the beginning of the range, or <code>DONE</code> if the range is empty. * @return The character at the beginning of the range, or <code>DONE</code> if the range is empty.
*/ */
public abstract char first (); char first();
/*************************************************************************/
/** /**
* This method sets the index value to <code>getEndIndex() - 1</code> and * This method sets the index value to <code>getEndIndex() - 1</code> and
@ -118,18 +97,14 @@ public interface CharacterIterator extends Cloneable
* *
* @return The character at the end of the range, or <code>DONE</code> if the range is empty. * @return The character at the end of the range, or <code>DONE</code> if the range is empty.
*/ */
public abstract char last (); char last();
/*************************************************************************/
/** /**
* This method returns the current value of the index. * This method returns the current value of the index.
* *
* @return The current index value * @return The current index value
*/ */
public abstract int getIndex (); int getIndex();
/*************************************************************************/
/** /**
* This method sets the value of the index to the specified value, then * This method sets the value of the index to the specified value, then
@ -139,9 +114,7 @@ public interface CharacterIterator extends Cloneable
* *
* @return The character at the new index value or <code>DONE</code> if the index value is equal to <code>getEndIndex</code>. * @return The character at the new index value or <code>DONE</code> if the index value is equal to <code>getEndIndex</code>.
*/ */
public abstract char setIndex (int index) throws IllegalArgumentException; char setIndex (int index) throws IllegalArgumentException;
/*************************************************************************/
/** /**
* This method returns the character position of the first character in the * This method returns the character position of the first character in the
@ -149,9 +122,7 @@ public interface CharacterIterator extends Cloneable
* *
* @return The index of the first character in the range. * @return The index of the first character in the range.
*/ */
public abstract int getBeginIndex (); int getBeginIndex();
/*************************************************************************/
/** /**
* This method returns the character position of the end of the text range. * This method returns the character position of the end of the text range.
@ -161,14 +132,12 @@ public interface CharacterIterator extends Cloneable
* *
* @return The index of the end of the range. * @return The index of the end of the range.
*/ */
public abstract int getEndIndex (); int getEndIndex();
/*************************************************************************/
/** /**
* This method creates a copy of this <code>CharacterIterator</code>. * This method creates a copy of this <code>CharacterIterator</code>.
* *
* @return A copy of this <code>CharacterIterator</code>. * @return A copy of this <code>CharacterIterator</code>.
*/ */
public abstract Object clone (); Object clone();
} }