[cp-patches] FYI: java.text.AttributedStringIterator.java reformatted

[David Gilbert]

I committed this patch:

2005-07-28  David Gilbert  <address@hidden>

        * java/text/AttributedStringIterator.java: reformatted.

Regards,

Dave Gilbert

Index: java/text/AttributedStringIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedStringIterator.java,v
retrieving revision 1.9
diff -u -r1.9 AttributedStringIterator.java
--- java/text/AttributedStringIterator.java     2 Jul 2005 20:32:41 -0000       
1.9
+++ java/text/AttributedStringIterator.java     28 Jul 2005 09:23:45 -0000
@@ -55,129 +55,102 @@
 class AttributedStringIterator implements AttributedCharacterIterator
 {
 
-/*************************************************************************/
+  /*************************************************************************/
 
-/**
-  * Instance Variables
-  */
-
-/**
-  * The character iterator containing the text
-  */
-private CharacterIterator ci;
-
-/**
-  * The list of attributes and ranges
-  */
-private AttributedString.AttributeRange[] attribs;
-
-/**
-  * The list of attributes that the user is interested in.  We may,
-  * at our option, not return any other attributes.
-  */
-private AttributedCharacterIterator.Attribute[] restricts;
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-AttributedStringIterator(StringCharacterIterator sci, 
-                         AttributedString.AttributeRange[] attribs,
-                         int begin_index, int end_index,
-                         AttributedCharacterIterator.Attribute[] restricts)
-{
-  this.ci = new StringCharacterIterator(sci, begin_index, end_index);
-  this.attribs = attribs;
-  this.restricts = restricts;
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
-// First we have a bunch of stupid redirects.  If StringCharacterIterator
-// weren't final, I just would have extended that for this class.  Alas, no.
-
-public Object
-clone()
-{
-  return(ci.clone());
-}
-
-public char
-current()
-{
-  return(ci.current());
-}
-
-public char
-next()
-{
-  return(ci.next());
-}
-
-public char
-previous()
-{
-  return(ci.previous());
-}
-
-public char
-first()
-{
-  return(ci.first());
-}
-
-public char
-last()
-{
-  return(ci.last());
-}
-
-public int
-getIndex()
-{
-  return(ci.getIndex());
-}
-
-public char
-setIndex(int index)
-{
-  return(ci.setIndex(index));
-}
-
-public int
-getBeginIndex()
-{
-  return(ci.getBeginIndex());
-}
-
-public int
-getEndIndex()
-{
-  return(ci.getEndIndex());
-}
-
-/*
- * Here is where the AttributedCharacterIterator methods start.
- */ 
-
-/*************************************************************************/
-
-/**
-  * Returns a list of all the attribute keys that are defined anywhere
-  * on this string.
-  */
-public Set
-getAllAttributeKeys()
-{
-  HashSet s = new HashSet();
-  if (attribs == null)
-    return(s);
+  /** The character iterator containing the text */
+  private CharacterIterator ci;
+
+  /** The list of attributes and ranges */
+  private AttributedString.AttributeRange[] attribs;
+
+  /**
+   * The list of attributes that the user is interested in.  We may,
+   * at our option, not return any other attributes.
+   */
+  private AttributedCharacterIterator.Attribute[] restricts;
+
+  /*************************************************************************/
+
+  AttributedStringIterator(StringCharacterIterator sci, 
+                           AttributedString.AttributeRange[] attribs,
+                           int begin_index, int end_index,
+                           AttributedCharacterIterator.Attribute[] restricts)
+  {
+    this.ci = new StringCharacterIterator(sci, begin_index, end_index);
+    this.attribs = attribs;
+    this.restricts = restricts;
+  }
+
+  /*************************************************************************/
+
+  // First we have a bunch of stupid redirects.  If StringCharacterIterator
+  // weren't final, I just would have extended that for this class.  Alas, no.
+
+  public Object clone()
+  {
+    return(ci.clone());
+  }
+
+  public char current()
+  {
+    return(ci.current());
+  }
+
+  public char next()
+  {
+    return(ci.next());
+  }
+
+  public char previous()
+  {
+    return(ci.previous());
+  }
+
+  public char first()
+  {
+    return(ci.first());
+  }
+
+  public char last()
+  {
+    return(ci.last());
+  }
+
+  public int getIndex()
+  {
+    return(ci.getIndex());
+  }
+
+  public char setIndex(int index)
+  {
+    return(ci.setIndex(index));  
+  }
+
+  public int getBeginIndex()
+  {
+    return(ci.getBeginIndex());
+  }
+
+  public int getEndIndex()
+  {
+    return(ci.getEndIndex());
+  }
+
+  /*
+   * Here is where the AttributedCharacterIterator methods start.
+   */ 
+
+  /*************************************************************************/
+
+  /**
+   * Returns a list of all the attribute keys that are defined anywhere
+   * on this string.
+   */
+  public Set getAllAttributeKeys()
+  {
+    HashSet s = new HashSet();
+    if (attribs == null)
+      return(s);
 
     for (int i = 0; i < attribs.length; i++)
     {
@@ -193,156 +166,146 @@
         }
     }
 
-  return(s);
-}
+    return(s);
+  }
 
-/*************************************************************************/
+  /*************************************************************************/
 
-/**
-  * Various methods that determine how far the run extends for various
-  * attribute combinations.
-  */
-
-public int
-getRunLimit()
-{
-  return(getRunLimit(getAttributes().keySet()));
-}
-
-public int
-getRunLimit(AttributedCharacterIterator.Attribute attrib)
-{
-  HashSet s = new HashSet();
-  s.add(attrib);
-
-  return(getRunLimit(s));
-}
-
-public synchronized int
-getRunLimit(Set attribute_set)
-{
-  boolean hit = false;
-  int runLimit = ci.getEndIndex ();
-  int pos = ci.getIndex ();
+  /**
+   * Various methods that determine how far the run extends for various
+   * attribute combinations.
+   */
+
+  public int getRunLimit()
+  {
+    return(getRunLimit(getAttributes().keySet()));
+  }
+
+  public int getRunLimit(AttributedCharacterIterator.Attribute attrib)
+  {
+    HashSet s = new HashSet();
+    s.add(attrib);
+    return(getRunLimit(s));
+  }
+
+  public synchronized int getRunLimit(Set attribute_set)
+  {
+    boolean hit = false;
+    int runLimit = ci.getEndIndex ();
+    int pos = ci.getIndex ();
+
+    for (int i = 0; i < attribs.length; ++i)
+      {
+        if (pos >= attribs[i].begin_index &&
+            pos < attribs[i].end_index)
+          {
+            Iterator iter = attribute_set.iterator();
+            while(iter.hasNext()) 
+              if (attribs[i].attribs.containsKey(iter.next()))
+                {
+                  hit = true;
+                  runLimit = Math.min(runLimit, attribs[i].end_index);
+                }
+          }
+      }
+    if (hit)
+      return runLimit;
+    else
+      return ci.getEndIndex();
+  }
+
+  /*************************************************************************/
+
+  /**
+   * Various methods that determine where the run begins for various
+   * attribute combinations.
+   */
+
+  public int getRunStart()
+  {
+    return(getRunStart(getAttributes().keySet()));
+  }
+
+  public int getRunStart(AttributedCharacterIterator.Attribute attrib)
+  {
+    HashSet s = new HashSet();
+    s.add(attrib);
+
+    return(getRunStart(s));
+  }
+
+  public int getRunStart(Set attribute_set)
+  {
+    boolean hit = false;
+    int runBegin = 0;
+    int pos = ci.getIndex();
+
+    for (int i = 0; i < attribs.length; ++i)
+      {
+        if (pos >= attribs[i].begin_index &&
+            pos <= attribs[i].end_index)
+          {
+            Iterator iter = attribute_set.iterator();
+            while(iter.hasNext()) 
+              if (attribs[i].attribs.containsKey(iter.next()))
+                {
+                  hit = true;
+                  runBegin = Math.max(runBegin, attribs[i].begin_index);
+                }
+          }
+      }
+    if (hit)
+      return runBegin;
+    else
+      return -1;
+  }
+
+  /*************************************************************************/
+
+  public Object getAttribute(AttributedCharacterIterator.Attribute attrib)
+  {
+    if (attribs == null)
+      return(null);
 
-  for (int i = 0; i < attribs.length; ++i)
-    {
-      if (pos >= attribs[i].begin_index &&
-          pos < attribs[i].end_index)
-        {
-          Iterator iter = attribute_set.iterator();
-          while(iter.hasNext()) 
-            if (attribs[i].attribs.containsKey(iter.next()))
-              {
-                hit = true;
-                runLimit = Math.min(runLimit, attribs[i].end_index);
-              }
-        }
-    }
-  if (hit)
-    return runLimit;
-  else
-    return ci.getEndIndex();
-}
-
-/*************************************************************************/
-
-/**
-  * Various methods that determine where the run begins for various
-  * attribute combinations.
-  */
-
-public int
-getRunStart()
-{
-  return(getRunStart(getAttributes().keySet()));
-}
-
-public int
-getRunStart(AttributedCharacterIterator.Attribute attrib)
-{
-  HashSet s = new HashSet();
-  s.add(attrib);
-
-  return(getRunStart(s));
-}
-
-public int
-getRunStart(Set attribute_set)
-{
-  boolean hit = false;
-  int runBegin = 0;
-  int pos = ci.getIndex ();
+    for (int i = 0; i < attribs.length; i++)
+      {
+        Set key_set = attribs[i].attribs.keySet();
+        Iterator iter = key_set.iterator();
+        while (iter.hasNext())
+          {
+            Object obj = iter.next();
+
+            // Check for attribute match and range match
+            if (obj.equals(attrib))
+              if ((ci.getIndex() >= attribs[i].begin_index) &&
+                  (ci.getIndex() < attribs[i].end_index))
+                return(attribs[i].attribs.get(obj));
+          }
+      }
 
-  for (int i = 0; i < attribs.length; ++i)
-    {
-      if (pos >= attribs[i].begin_index &&
-          pos <= attribs[i].end_index)
-        {
-          Iterator iter = attribute_set.iterator();
-          while(iter.hasNext()) 
-            if (attribs[i].attribs.containsKey(iter.next()))
-              {
-                hit = true;
-                runBegin = Math.max(runBegin, attribs[i].begin_index);
-              }
-        }
-    }
-  if (hit)
-    return runBegin;
-  else
-    return -1;
-}
-
-/*************************************************************************/
-
-public Object
-getAttribute(AttributedCharacterIterator.Attribute attrib)
-{
-  if (attribs == null)
     return(null);
+  }
 
-  for (int i = 0; i < attribs.length; i++)
-    {
-      Set key_set = attribs[i].attribs.keySet();
-      Iterator iter = key_set.iterator();
-      while (iter.hasNext())
-        {
-          Object obj = iter.next();
-
-          // Check for attribute match and range match
-          if (obj.equals(attrib))
-            if ((ci.getIndex() >= attribs[i].begin_index) &&
-                (ci.getIndex() < attribs[i].end_index))
-              return(attribs[i].attribs.get(obj));
-        }
-    }
-
-  return(null);
-}
+  /*************************************************************************/
 
-/*************************************************************************/
-
-/**
-  * Return a list of all the attributes and values defined for this
-  * character
-  */
-public Map
-getAttributes()
-{
-  HashMap m = new HashMap();
-  if (attribs == null)
-    return(m);
+  /**
+   * Return a list of all the attributes and values defined for this
+   * character
+   */
+  public Map getAttributes()
+  {
+    HashMap m = new HashMap();
+    if (attribs == null)
+      return(m);
   
-  for (int i = 0; i < attribs.length; i++)
-    {
-       if ((ci.getIndex() >= attribs[i].begin_index) &&
-           (ci.getIndex() < attribs[i].end_index))
-         m.putAll(attribs[i].attribs);
-    }
+    for (int i = 0; i < attribs.length; i++)
+      {
+         if ((ci.getIndex() >= attribs[i].begin_index) &&
+             (ci.getIndex() < attribs[i].end_index))
+           m.putAll(attribs[i].attribs);
+      }
 
-  return(m);
-}
+    return(m);
+  }
 
 } // class AttributedStringIterator
-