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.


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

1 files changed, 4 insertions, 4 deletions

diff --git a/libjava/classpath/java/text/ChoiceFormat.java b/libjava/classpath/java/text/ChoiceFormat.java
index 4842f491d9c..c6a508cb89a 100644
--- a/libjava/classpath/java/text/ChoiceFormat.java
+++ b/libjava/classpath/java/text/ChoiceFormat.java
@@ -1,5 +1,5 @@
 /* ChoiceFormat.java -- Format over a range of numbers
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2012
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -98,8 +98,8 @@ public class ChoiceFormat extends NumberFormat
     // This isn't explicitly documented.  But for instance we accept
     // '#' as a literal hash in a format string.
     int index = 0, max = newPattern.length();
-    Vector stringVec = new Vector ();
-    Vector limitVec = new Vector ();
+    Vector<String> stringVec = new Vector<String> ();
+    Vector<Double> limitVec = new Vector<Double> ();
     final CPStringBuilder buf = new CPStringBuilder ();
 
     while (true)
@@ -159,7 +159,7 @@ public class ChoiceFormat extends NumberFormat
     choiceLimits = new double[limitVec.size()];
     for (int i = 0; i < choiceLimits.length; ++i)
       {
-        Double d = (Double) limitVec.elementAt(i);
+        Double d = limitVec.elementAt(i);
         choiceLimits[i] = d.doubleValue();
       }
   }