aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2007-03-17 05:00:07 +0000
committerTom Tromey <tromey@gcc.gnu.org>2007-03-17 05:00:07 +0000
commit191da376a5359a11eb959be5d3cbdd2060c85948 (patch)
tree8f67ed316ed7925e7a01f587f5f506841126a614
parent94eb7e42ff2bf7cea5ff861b28685b5372c53b4f (diff)
downloadgcc-191da376a5359a11eb959be5d3cbdd2060c85948.zip
gcc-191da376a5359a11eb959be5d3cbdd2060c85948.tar.gz
gcc-191da376a5359a11eb959be5d3cbdd2060c85948.tar.bz2
Main.java (run): Use class' name in File case.
* tools/gnu/classpath/tools/javah/Main.java (run): Use class' name in File case. From-SVN: r123012
-rw-r--r--libjava/classpath/ChangeLog5
-rw-r--r--libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.classbin10929 -> 10939 bytes
-rw-r--r--libjava/classpath/tools/gnu/classpath/tools/javah/Main.java4
3 files changed, 7 insertions, 2 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 0f68f91..120747c 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,5 +1,10 @@
2007-03-16 Tom Tromey <tromey@redhat.com>
+ * tools/gnu/classpath/tools/javah/Main.java (run): Use class'
+ name in File case.
+
+2007-03-16 Tom Tromey <tromey@redhat.com>
+
* tools/gnu/classpath/tools/javah/JniStubPrinter.java
(printClass): Added filename argument.
* tools/gnu/classpath/tools/javah/JniIncludePrinter.java
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 66c3793..56c7f48 100644
--- a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
+++ b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
Binary files differ
diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 250844d..dfa04c4 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -392,8 +392,8 @@ public class Main
// Load class from file.
if (verbose)
System.err.println("[reading file " + item + "]");
- filename = (File) item;
- klass = getClass(filename);
+ klass = getClass((File) item);
+ filename = new File(klass.name);
}
else
{