diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | tools/gnu/classpath/tools/gjdoc/Main.java | 11 | ||||
| -rw-r--r-- | tools/gnu/classpath/tools/javah/Main.java | 19 |
3 files changed, 30 insertions, 11 deletions
@@ -64,6 +64,11 @@ casting to E. Safe as we know it's an E via the kind test. +2013-01-10 Matthias Klose <doko@ubuntu.com> + + * tools/gnu/classpath/tools/gjdoc/Main.java: Accept -source 1.5, + 1.6, 1.7. + 2013-01-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/lang/model/element/AnnotationValueVisitor.java: @@ -369,6 +374,12 @@ (getSourceVersions()): Added. (run(InputStream,OutputStream,OutputStream,String...)): Likewise. +2012-12-17 Andrew Haley <aph@redhat.com> + + PR libgcj/55716 + * tools/gnu/classpath/tools/javah/Main.java (parseClasses): Dont + scan inner classes if our item is a file. + 2012-11-30 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/lang/model/type/ArrayType.java: diff --git a/tools/gnu/classpath/tools/gjdoc/Main.java b/tools/gnu/classpath/tools/gjdoc/Main.java index feb30863d..5d9638697 100644 --- a/tools/gnu/classpath/tools/gjdoc/Main.java +++ b/tools/gnu/classpath/tools/gjdoc/Main.java @@ -1308,12 +1308,17 @@ public final class Main void process(String[] args) { option_source = args[0]; - if (!"1.2".equals(option_source) + if ("1.5".equals(option_source) + || "1.6".equals(option_source) + || "1.7".equals(option_source)) { + System.err.println("WARNING: support for option -source " + option_source + " is experimental"); + } + else if (!"1.2".equals(option_source) && !"1.3".equals(option_source) && !"1.4".equals(option_source)) { - throw new RuntimeException("Only he following values are currently" - + " supported for option -source: 1.2, 1.3, 1.4."); + throw new RuntimeException("Only the following values are currently" + + " supported for option -source: 1.2, 1.3, 1.4; experimental: 1.5, 1.6, 1.7."); } } }); diff --git a/tools/gnu/classpath/tools/javah/Main.java b/tools/gnu/classpath/tools/javah/Main.java index 894a5c4d2..2bea36caf 100644 --- a/tools/gnu/classpath/tools/javah/Main.java +++ b/tools/gnu/classpath/tools/javah/Main.java @@ -370,16 +370,19 @@ public class Main results.put(filename, klass); parsed.add(item.toString()); - // Check to see if there are inner classes to also parse - Iterator<?> innerClasses = klass.innerClasses.iterator(); - HashSet<Object> innerNames = new HashSet<Object>(); - while (innerClasses.hasNext()) + if (! (item instanceof File)) { - String innerName = ((InnerClassNode) innerClasses.next()).name; - if (!parsed.contains(innerName)) - innerNames.add(innerName); + // Check to see if there are inner classes to also parse + Iterator<?> innerClasses = klass.innerClasses.iterator(); + HashSet<Object> innerNames = new HashSet<Object>(); + while (innerClasses.hasNext()) + { + String innerName = ((InnerClassNode) innerClasses.next()).name; + if (!parsed.contains(innerName)) + innerNames.add(innerName); + } + results.putAll(parseClasses(innerNames.iterator())); } - results.putAll(parseClasses(innerNames.iterator())); } return results; } |