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

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72357 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 25 insertions, 93 deletions

diff --git a/libjava/java/text/AttributedCharacterIterator.java b/libjava/java/text/AttributedCharacterIterator.java
index ba976b7de84..85f644c3251 100644
--- a/libjava/java/text/AttributedCharacterIterator.java
+++ b/libjava/java/text/AttributedCharacterIterator.java
@@ -59,11 +59,6 @@ import java.util.Map;
   */
 public interface AttributedCharacterIterator extends CharacterIterator
 {
-
-/*
- * Inner Classes
- */
-
 /**
   * 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.
   */
-public String
-toString()
+public String toString()
 {
   return(getClass().getName() + "(" + getName() + ")");
 }
 
 } // Inner class Attribute
 
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
 /**
   * 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.
   *
   * @return A list of keys 
   */
-public abstract Set
-getAllAttributeKeys();
-
-/*************************************************************************/
+Set getAllAttributeKeys();
 
 /**
   * 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.
   */
-public abstract Map
-getAttributes();
-
-/*************************************************************************/
+Map getAttributes();
 
 /**
   * This method returns the value of the specified attribute for the
@@ -263,10 +245,7 @@ getAttributes();
   *
   * @return The value of the specified attribute
   */
-public abstract Object
-getAttribute(AttributedCharacterIterator.Attribute attrib);
-
-/*************************************************************************/
+Object getAttribute (AttributedCharacterIterator.Attribute attrib);
 
 /**
   * 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
   */
-public abstract int
-getRunStart();
-
-/*************************************************************************/
+int getRunStart();
 
 /**
   * 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.
   */
-public abstract int
-getRunStart(Set attribs);
-
-/*************************************************************************/
+int getRunStart (Set attribs);
 
 /**
   * 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.
   */
-public abstract int
-getRunStart(AttributedCharacterIterator.Attribute attrib);
-
-/*************************************************************************/
+int getRunStart (AttributedCharacterIterator.Attribute attrib);
 
 /**
   * 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.
   */
-public abstract int
-getRunLimit();
-
-/*************************************************************************/
+int getRunLimit();
 
 /**
   * 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.
   */
-public abstract int
-getRunLimit(Set attribs);
-
-/*************************************************************************/
+int getRunLimit (Set attribs);
 
 /**
   * 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.
   */
-public abstract int
-getRunLimit(AttributedCharacterIterator.Attribute attrib);
+int getRunLimit (AttributedCharacterIterator.Attribute attrib);
 
 } // interface AttributedCharacterIterator
 
diff --git a/libjava/java/text/CharacterIterator.java b/libjava/java/text/CharacterIterator.java
index 692c0063376..bcf100d7435 100644
--- a/libjava/java/text/CharacterIterator.java
+++ b/libjava/java/text/CharacterIterator.java
@@ -45,61 +45,42 @@ package java.text;
   * by the methods in this interface.  Additionally, various methods allow
   * the index to be set. 
   *
-  * @version 0.0
-  *
   * @author Aaron M. Renn (arenn@urbanophile.com)
   */
 public interface CharacterIterator extends Cloneable
 {
-
-  /*************************************************************************/
-
-  /*
-   * Static Variables
-   */
-
   /**
    * This is a special constant value that is returned when the beginning or
    * end of the character range has been reached.
    */
-  public static final char DONE = '\uFFFF';
-
-  /*************************************************************************/
-
-  /*
-   * Instance Methods
-   */
+  char DONE = '\uFFFF';
 
   /**
    * This method returns 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
    * at the new index value.  If the index is already at <code>getEndIndex() - 1</code>,
    * 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
    * at the new index value.  If the index value is already at the beginning
    * 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
@@ -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.
    */
-  public abstract char first ();
-
-  /*************************************************************************/
+  char first();
 
   /**
    * 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.
    */
-  public abstract char last ();  
-
-  /*************************************************************************/
+  char last();  
 
   /**
    * This method returns the current value of the index.
    *
    * @return The current index value
    */
-  public abstract int getIndex ();
-
-  /*************************************************************************/
+  int getIndex();
 
   /**
    * 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>.
    */
-  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
@@ -149,9 +122,7 @@ public interface CharacterIterator extends Cloneable
    *
    * @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.
@@ -161,14 +132,12 @@ public interface CharacterIterator extends Cloneable
    *
    * @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>.
    *
    * @return A copy of this <code>CharacterIterator</code>.
    */
-  public abstract Object clone ();
+  Object clone();
 }