libjava

	* Regenerated headers with new gjavah.
libjava/classpath
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Changed arguments.  Directly print method name.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java
	(methodNameMap): New field.
	(makeVtable): Initialize it.
	(printMethods): Compute name for bridge targets.

From-SVN: r123965

14 files changed, 51 insertions, 51 deletions

diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
index 5044f07..4c4c191 100644
--- a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
+++ b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
@@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentHashMap$EntryIterator : public ::java::u
 public: // actually package-private
   ConcurrentHashMap$EntryIterator(::java::util::concurrent::ConcurrentHashMap *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * ConcurrentHashMap$EntryIterator$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
index 1949e5a..67d7192 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h
@@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$EntryIterator : public ::jav
 public: // actually package-private
   ConcurrentSkipListMap$EntryIterator(::java::util::concurrent::ConcurrentSkipListMap *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * ConcurrentSkipListMap$EntryIterator$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
index c2372f8..e52b30e 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h
@@ -38,9 +38,9 @@ public:
   ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
   ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
   ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
-  ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
-  ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
+  ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$subSet(::java::lang::Object *, ::java::lang::Object *);
+  ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$headSet(::java::lang::Object *);
+  ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$tailSet(::java::lang::Object *);
   ::java::util::NavigableSet * descendingSet();
   ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *);
   ::java::util::SortedSet * tailSet(::java::lang::Object *);
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
index 8b01d99..0c0c9e5 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h
@@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapEntryIterator :
 public: // actually package-private
   ConcurrentSkipListMap$SubMap$SubMapEntryIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * ConcurrentSkipListMap$SubMap$SubMapEntryIterator$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1;
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
index e065dbe..345fb25 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h
@@ -46,13 +46,13 @@ public:
 private:
   ::java::util::concurrent::ConcurrentSkipListMap$SubMap * newSubMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
 public:
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *, jboolean);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *);
-  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$descendingMap();
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *, jboolean);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *, jboolean);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, ::java::lang::Object *);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *);
+  ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$descendingMap();
   ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *);
   ::java::lang::Object * ceilingKey(::java::lang::Object *);
   ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
@@ -67,7 +67,7 @@ public:
   ::java::util::Map$Entry * lastEntry();
   ::java::util::Map$Entry * pollFirstEntry();
   ::java::util::Map$Entry * pollLastEntry();
-  ::java::util::NavigableSet * target$keySet();
+  ::java::util::NavigableSet * ConcurrentSkipListMap$SubMap$keySet();
   ::java::util::NavigableSet * navigableKeySet();
   ::java::util::Collection * values();
   ::java::util::Set * entrySet();
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
index be9beb8..2f4da89 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListMap.h
@@ -51,7 +51,7 @@ public:
   ConcurrentSkipListMap(::java::util::Comparator *);
   ConcurrentSkipListMap(::java::util::Map *);
   ConcurrentSkipListMap(::java::util::SortedMap *);
-  virtual ::java::util::concurrent::ConcurrentSkipListMap * target$clone();
+  virtual ::java::util::concurrent::ConcurrentSkipListMap * ConcurrentSkipListMap$clone();
 private:
   void buildFromSorted(::java::util::SortedMap *);
   void writeObject(::java::io::ObjectOutputStream *);
@@ -65,11 +65,11 @@ public:
   virtual jint size();
   virtual jboolean isEmpty();
   virtual void clear();
-  virtual ::java::util::NavigableSet * target$keySet();
+  virtual ::java::util::NavigableSet * ConcurrentSkipListMap$keySet();
   virtual ::java::util::NavigableSet * navigableKeySet();
   virtual ::java::util::Collection * values();
   virtual ::java::util::Set * entrySet();
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$descendingMap();
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$descendingMap();
   virtual ::java::util::NavigableSet * descendingKeySet();
   virtual jboolean equals(::java::lang::Object *);
   virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *);
@@ -79,12 +79,12 @@ public:
   virtual ::java::util::Comparator * comparator();
   virtual ::java::lang::Object * firstKey();
   virtual ::java::lang::Object * lastKey();
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *, jboolean);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *);
-  virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *, jboolean);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *, jboolean);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *);
+  virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *);
   virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
   virtual ::java::lang::Object * lowerKey(::java::lang::Object *);
   virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *);
diff --git a/libjava/java/util/concurrent/ConcurrentSkipListSet.h b/libjava/java/util/concurrent/ConcurrentSkipListSet.h
index 75afde9..65ea1a9 100644
--- a/libjava/java/util/concurrent/ConcurrentSkipListSet.h
+++ b/libjava/java/util/concurrent/ConcurrentSkipListSet.h
@@ -29,7 +29,7 @@ public:
 public: // actually package-private
   ConcurrentSkipListSet(::java::util::concurrent::ConcurrentNavigableMap *);
 public:
-  virtual ::java::util::concurrent::ConcurrentSkipListSet * target$clone();
+  virtual ::java::util::concurrent::ConcurrentSkipListSet * ConcurrentSkipListSet$clone();
   virtual jint size();
   virtual jboolean isEmpty();
   virtual jboolean contains(::java::lang::Object *);
@@ -52,9 +52,9 @@ public:
   virtual ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
   virtual ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean);
   virtual ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean);
-  virtual ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *);
-  virtual ::java::util::NavigableSet * target$headSet(::java::lang::Object *);
-  virtual ::java::util::NavigableSet * target$tailSet(::java::lang::Object *);
+  virtual ::java::util::NavigableSet * ConcurrentSkipListSet$subSet(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::util::NavigableSet * ConcurrentSkipListSet$headSet(::java::lang::Object *);
+  virtual ::java::util::NavigableSet * ConcurrentSkipListSet$tailSet(::java::lang::Object *);
   virtual ::java::util::NavigableSet * descendingSet();
 private:
   void setMap(::java::util::concurrent::ConcurrentNavigableMap *);
diff --git a/libjava/java/util/concurrent/DelayQueue$Itr.h b/libjava/java/util/concurrent/DelayQueue$Itr.h
index ab7af20..cdcc1bf 100644
--- a/libjava/java/util/concurrent/DelayQueue$Itr.h
+++ b/libjava/java/util/concurrent/DelayQueue$Itr.h
@@ -17,7 +17,7 @@ public: // actually package-private
   DelayQueue$Itr(::java::util::concurrent::DelayQueue *, JArray< ::java::lang::Object * > *);
 public:
   virtual jboolean hasNext();
-  virtual ::java::util::concurrent::Delayed * target$next();
+  virtual ::java::util::concurrent::Delayed * DelayQueue$Itr$next();
   virtual void remove();
   virtual ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/concurrent/DelayQueue.h b/libjava/java/util/concurrent/DelayQueue.h
index 76dd489..b97f322 100644
--- a/libjava/java/util/concurrent/DelayQueue.h
+++ b/libjava/java/util/concurrent/DelayQueue.h
@@ -16,14 +16,14 @@ class java::util::concurrent::DelayQueue : public ::java::util::AbstractQueue
 public:
   DelayQueue();
   DelayQueue(::java::util::Collection *);
-  virtual jboolean target$add(::java::util::concurrent::Delayed *);
-  virtual jboolean target$offer(::java::util::concurrent::Delayed *);
-  virtual void target$put(::java::util::concurrent::Delayed *);
-  virtual jboolean target$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Delayed * target$poll();
-  virtual ::java::util::concurrent::Delayed * target$take();
-  virtual ::java::util::concurrent::Delayed * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::util::concurrent::Delayed * target$peek();
+  virtual jboolean DelayQueue$add(::java::util::concurrent::Delayed *);
+  virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *);
+  virtual void DelayQueue$put(::java::util::concurrent::Delayed *);
+  virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *);
+  virtual ::java::util::concurrent::Delayed * DelayQueue$poll();
+  virtual ::java::util::concurrent::Delayed * DelayQueue$take();
+  virtual ::java::util::concurrent::Delayed * DelayQueue$poll(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual ::java::util::concurrent::Delayed * DelayQueue$peek();
   virtual jint size();
   virtual jint drainTo(::java::util::Collection *);
   virtual jint drainTo(::java::util::Collection *, jint);
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
index cd6608f..5ae3107 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h
@@ -15,7 +15,7 @@ public: // actually package-private
   ScheduledThreadPoolExecutor$1(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *);
 public:
   jboolean hasNext();
-  ::java::lang::Runnable * target$next();
+  ::java::lang::Runnable * ScheduledThreadPoolExecutor$1$next();
   void remove();
   ::java::lang::Object * next();
 private:
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
index fd5871a..26fac62 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h
@@ -15,16 +15,16 @@ class java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue : pub
 
   ScheduledThreadPoolExecutor$DelayedWorkQueue();
 public:
-  virtual ::java::lang::Runnable * target$poll();
-  virtual ::java::lang::Runnable * target$peek();
-  virtual ::java::lang::Runnable * target$take();
-  virtual ::java::lang::Runnable * target$poll(jlong, ::java::util::concurrent::TimeUnit *);
-  virtual jboolean target$add(::java::lang::Runnable *);
-  virtual jboolean target$offer(::java::lang::Runnable *);
-  virtual void target$put(::java::lang::Runnable *);
-  virtual jboolean target$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
-  virtual ::java::lang::Runnable * target$remove();
-  virtual ::java::lang::Runnable * target$element();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$peek();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$take();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll(jlong, ::java::util::concurrent::TimeUnit *);
+  virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$add(::java::lang::Runnable *);
+  virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *);
+  virtual void ScheduledThreadPoolExecutor$DelayedWorkQueue$put(::java::lang::Runnable *);
+  virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *);
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$remove();
+  virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$element();
   virtual void clear();
   virtual jint drainTo(::java::util::Collection *);
   virtual jint drainTo(::java::util::Collection *, jint);
diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
index 1bd4e3b..ba9ad31 100644
--- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
+++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h
@@ -17,7 +17,7 @@ public: // actually package-private
   ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::util::concurrent::Callable *, jlong);
 public:
   virtual jlong getDelay(::java::util::concurrent::TimeUnit *);
-  virtual jint target$compareTo(::java::util::concurrent::Delayed *);
+  virtual jint ScheduledThreadPoolExecutor$ScheduledFutureTask$compareTo(::java::util::concurrent::Delayed *);
   virtual jboolean isPeriodic();
 private:
   void runPeriodic();
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
index c9dedf0..10f87c9 100644
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
+++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h
@@ -14,7 +14,7 @@ class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHold
 public: // actually package-private
   ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter();
 public:
-  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * target$initialValue();
+  ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter$initialValue();
   ::java::lang::Object * initialValue();
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
index 3bea3cc..e7da50a 100644
--- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
+++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h
@@ -14,8 +14,8 @@ class java::util::concurrent::locks::ReentrantReadWriteLock : public ::java::lan
 public:
   ReentrantReadWriteLock();
   ReentrantReadWriteLock(jboolean);
-  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * target$writeLock();
-  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * target$readLock();
+  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * ReentrantReadWriteLock$writeLock();
+  virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * ReentrantReadWriteLock$readLock();
   virtual jboolean isFair();
 public: // actually protected
   virtual ::java::lang::Thread * getOwner();