Import GNU Classpath (20121202).

2012-12-19  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (20121202).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * sources.am, gcj/javaprims.h: Regenerate.
        * gnu/java/nio/FileLockImpl.java (close): New override.

From-SVN: r194618

1 files changed, 10 insertions, 7 deletions

diff --git a/libjava/classpath/gnu/java/text/FormatBuffer.java b/libjava/classpath/gnu/java/text/FormatBuffer.java
index 590b16cce23..2922897ee1f 100644
--- a/libjava/classpath/gnu/java/text/FormatBuffer.java
+++ b/libjava/classpath/gnu/java/text/FormatBuffer.java
@@ -1,5 +1,5 @@
 /* FormatBuffer.java -- General interface to build attributed strings.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,10 @@ exception statement from your version. */
 package gnu.java.text;
 
 import java.text.AttributedCharacterIterator;
-import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.text.AttributedCharacterIterator.Attribute;
 
 /**
  * This interface describes a modifiable buffer which contains attributed
@@ -67,7 +70,7 @@ public interface FormatBuffer
    * @param s The string to append to the buffer.
    * @param attr Attribute to use for the string in the buffer.
    */
-  public void append(String s, AttributedCharacterIterator.Attribute attr);
+  public void append(String s, Attribute attr);
 
   /**
    * This method appends a simple string to the buffer. This part of
@@ -79,7 +82,7 @@ public interface FormatBuffer
    * to the string.
    * @param attrs The attributes of the string in the buffer.
    */
-  public void append(String s, int[] ranges, HashMap[] attrs);
+  public void append(String s, int[] ranges, List<Map<Attribute,Object>> attrs);
 
   /**
    * This method appends a simple char to the buffer. This part of
@@ -97,7 +100,7 @@ public interface FormatBuffer
    * @param c The character to append to the buffer.
    * @param attr Attribute to use for the character in the buffer.
    */
-  public void append(char c, AttributedCharacterIterator.Attribute attr);
+  public void append(char c, Attribute attr);
 
   /**
    * This method changes the current default attribute for the next string
@@ -105,14 +108,14 @@ public interface FormatBuffer
    *
    * @param attr The attribute which will be used by default.
    */
-  public void setDefaultAttribute(AttributedCharacterIterator.Attribute attr);
+  public void setDefaultAttribute(Attribute attr);
 
   /**
    * This method returns the current default attribute for the buffer.
    *
    * @return The default attribute for the buffer.
    */
-  public AttributedCharacterIterator.Attribute getDefaultAttribute();
+  public Attribute getDefaultAttribute();
 
   /**
    * This method cuts the last characters of the buffer. The number of