Imported Upstream version 4.8.1

[platform/upstream/gcc48.git] / libjava / classpath / tools / gnu / classpath / tools / gjdoc / FieldDocImpl.java

diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
index f99024d..4fa8e5d 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/FieldDocImpl.java
@@ -1,5 +1,5 @@
 /* gnu.classpath.tools.gjdoc.FieldDocImpl
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2012 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -95,11 +95,11 @@ public class FieldDocImpl
       }
    }
 
-   public static Collection createFromSource(ClassDoc containingClass,
-                                             PackageDoc containingPackage,
-                                             char[] source, int startIndex, int endIndex) {
+   public static Collection<FieldDoc> createFromSource(ClassDoc containingClass,
+                                                       PackageDoc containingPackage,
+                                                       char[] source, int startIndex, int endIndex) {
 
-      List rcList=new ArrayList();
+      List<FieldDoc> rcList=new ArrayList<FieldDoc>();
 
       FieldDocImpl fd=new FieldDocImpl(containingClass,
                                        containingPackage,
@@ -120,7 +120,6 @@ public class FieldDocImpl
       final int STATE_COMMENT     = 7;
       final int STATE_LINECOMMENT = 8;
 
-      int lastFieldDefStart = ndx;
       int state = STATE_FIELDNAME;
       int prevState = state;
 
@@ -298,7 +297,7 @@ public class FieldDocImpl
       return constantValue(new HashSet());
    }
 
-   public Object constantValue(Set visitedFields) {
+   public Object constantValue(Set<FieldDoc> visitedFields) {
       if (!isStatic()
           || !isFinal()
           || (!type().isPrimitive() && !"java.lang.String".equals(type().qualifiedTypeName()))