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.


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

30 files changed, 69 insertions, 69 deletions

diff --git a/libjava/java/util/ArrayDeque.h b/libjava/java/util/ArrayDeque.h
index 6154213dd7e..d1ac9e514d2 100644
--- a/libjava/java/util/ArrayDeque.h
+++ b/libjava/java/util/ArrayDeque.h
@@ -55,7 +55,7 @@ public:
   virtual void clear();
   virtual JArray< ::java::lang::Object * > * toArray();
   virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
-  virtual ::java::util::ArrayDeque * target$clone();
+  virtual ::java::util::ArrayDeque * ArrayDeque$clone();
 private:
   void writeObject(::java::io::ObjectOutputStream *);
   void readObject(::java::io::ObjectInputStream *);
diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h
index bde84d5558a..3a46dc03793 100644
--- a/libjava/java/util/Calendar.h
+++ b/libjava/java/util/Calendar.h
@@ -66,7 +66,7 @@ public:
   virtual jint getLeastMaximum(jint) = 0;
   virtual jint getActualMinimum(jint);
   virtual jint getActualMaximum(jint);
-  virtual jint target$compareTo(::java::util::Calendar *);
+  virtual jint Calendar$compareTo(::java::util::Calendar *);
   virtual ::java::lang::Object * clone();
   virtual ::java::lang::String * toString();
 private:
diff --git a/libjava/java/util/Collections$4.h b/libjava/java/util/Collections$4.h
index eb7699b0da2..11c7d205243 100644
--- a/libjava/java/util/Collections$4.h
+++ b/libjava/java/util/Collections$4.h
@@ -14,7 +14,7 @@ class java::util::Collections$4 : public ::java::util::Collections$SynchronizedI
 public: // actually package-private
   Collections$4(::java::util::Collections$3 *, ::java::lang::Object *, ::java::util::Iterator *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * Collections$4$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::Collections$3 * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedIterator)))) this$2;
diff --git a/libjava/java/util/Collections$5.h b/libjava/java/util/Collections$5.h
index b57ee4f03cc..a5cf8b690e6 100644
--- a/libjava/java/util/Collections$5.h
+++ b/libjava/java/util/Collections$5.h
@@ -14,7 +14,7 @@ class java::util::Collections$5 : public ::java::util::Collections$UnmodifiableI
 public: // actually package-private
   Collections$5(::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet *, ::java::util::Iterator *);
 public:
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * Collections$5$next();
   ::java::lang::Object * next();
 public: // actually package-private
   ::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableIterator)))) this$2;
diff --git a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
index 24daec69337..1128060de45 100644
--- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
+++ b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
@@ -17,7 +17,7 @@ public: // actually package-private
   Collections$UnmodifiableMap$UnmodifiableEntrySet(::java::util::Set *);
 public:
   ::java::util::Iterator * iterator();
-  JArray< ::java::util::Map$Entry * > * target$toArray();
+  JArray< ::java::util::Map$Entry * > * Collections$UnmodifiableMap$UnmodifiableEntrySet$toArray();
   JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
   JArray< ::java::lang::Object * > * toArray();
 private:
diff --git a/libjava/java/util/Date.h b/libjava/java/util/Date.h
index e9814834457..0f801d87aa0 100644
--- a/libjava/java/util/Date.h
+++ b/libjava/java/util/Date.h
@@ -28,7 +28,7 @@ public:
   virtual jboolean after(::java::util::Date *);
   virtual jboolean before(::java::util::Date *);
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::util::Date *);
+  virtual jint Date$compareTo(::java::util::Date *);
   virtual jint hashCode();
   virtual ::java::lang::String * toString();
   virtual ::java::lang::String * toLocaleString();
diff --git a/libjava/java/util/EnumMap$2.h b/libjava/java/util/EnumMap$2.h
index 325d8ad583d..6ab63d39069 100644
--- a/libjava/java/util/EnumMap$2.h
+++ b/libjava/java/util/EnumMap$2.h
@@ -15,7 +15,7 @@ public: // actually package-private
   EnumMap$2(::java::util::EnumMap$1 *);
 public:
   jboolean hasNext();
-  ::java::lang::Enum * target$next();
+  ::java::lang::Enum * EnumMap$2$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/EnumMap$6.h b/libjava/java/util/EnumMap$6.h
index fde1cbd4d82..eaa36b04c9e 100644
--- a/libjava/java/util/EnumMap$6.h
+++ b/libjava/java/util/EnumMap$6.h
@@ -15,7 +15,7 @@ public: // actually package-private
   EnumMap$6(::java::util::EnumMap$5 *);
 public:
   jboolean hasNext();
-  ::java::util::Map$Entry * target$next();
+  ::java::util::Map$Entry * EnumMap$6$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/EnumMap.h b/libjava/java/util/EnumMap.h
index 0c303d82529..074f8783917 100644
--- a/libjava/java/util/EnumMap.h
+++ b/libjava/java/util/EnumMap.h
@@ -21,7 +21,7 @@ public:
   virtual jboolean containsValue(::java::lang::Object *);
   virtual jboolean containsKey(::java::lang::Object *);
   virtual ::java::lang::Object * get(::java::lang::Object *);
-  virtual ::java::lang::Object * target$put(::java::lang::Enum *, ::java::lang::Object *);
+  virtual ::java::lang::Object * EnumMap$put(::java::lang::Enum *, ::java::lang::Object *);
   virtual ::java::lang::Object * remove(::java::lang::Object *);
   virtual void putAll(::java::util::Map *);
   virtual void clear();
@@ -29,7 +29,7 @@ public:
   virtual ::java::util::Collection * values();
   virtual ::java::util::Set * entrySet();
   virtual jboolean equals(::java::lang::Object *);
-  virtual ::java::util::EnumMap * target$clone();
+  virtual ::java::util::EnumMap * EnumMap$clone();
   virtual ::java::lang::Object * clone();
   virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
 private:
diff --git a/libjava/java/util/EnumSet$1.h b/libjava/java/util/EnumSet$1.h
index 38088dc013f..55e1c91d248 100644
--- a/libjava/java/util/EnumSet$1.h
+++ b/libjava/java/util/EnumSet$1.h
@@ -15,7 +15,7 @@ public: // actually package-private
   EnumSet$1(::java::util::EnumSet *);
 public:
   jboolean hasNext();
-  ::java::lang::Enum * target$next();
+  ::java::lang::Enum * EnumSet$1$next();
   void remove();
   ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/EnumSet.h b/libjava/java/util/EnumSet.h
index f0e2a7af3a6..200868ae876 100644
--- a/libjava/java/util/EnumSet.h
+++ b/libjava/java/util/EnumSet.h
@@ -16,10 +16,10 @@ class java::util::EnumSet : public ::java::util::AbstractSet
 public: // actually package-private
   EnumSet();
 public:
-  virtual ::java::util::EnumSet * target$clone();
+  virtual ::java::util::EnumSet * EnumSet$clone();
   virtual jint size();
   virtual ::java::util::Iterator * iterator();
-  virtual jboolean target$add(::java::lang::Enum *);
+  virtual jboolean EnumSet$add(::java::lang::Enum *);
   virtual jboolean addAll(::java::util::Collection *);
   virtual void clear();
   virtual jboolean contains(::java::lang::Object *);
diff --git a/libjava/java/util/Hashtable$EntryEnumerator.h b/libjava/java/util/Hashtable$EntryEnumerator.h
index 1480d182e3b..a0f16015312 100644
--- a/libjava/java/util/Hashtable$EntryEnumerator.h
+++ b/libjava/java/util/Hashtable$EntryEnumerator.h
@@ -15,7 +15,7 @@ public: // actually package-private
   Hashtable$EntryEnumerator(::java::util::Hashtable *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::util::Map$Entry * target$nextElement();
+  virtual ::java::util::Map$Entry * Hashtable$EntryEnumerator$nextElement();
   virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count;
diff --git a/libjava/java/util/Hashtable$EntryIterator.h b/libjava/java/util/Hashtable$EntryIterator.h
index d70d486c70a..7927391ef4a 100644
--- a/libjava/java/util/Hashtable$EntryIterator.h
+++ b/libjava/java/util/Hashtable$EntryIterator.h
@@ -15,7 +15,7 @@ public: // actually package-private
   Hashtable$EntryIterator(::java::util::Hashtable *);
 public:
   virtual jboolean hasNext();
-  virtual ::java::util::Map$Entry * target$next();
+  virtual ::java::util::Map$Entry * Hashtable$EntryIterator$next();
   virtual void remove();
   virtual ::java::lang::Object * next();
 public: // actually package-private
diff --git a/libjava/java/util/UUID.h b/libjava/java/util/UUID.h
index 86cb4bc476e..0eda9d67bbb 100644
--- a/libjava/java/util/UUID.h
+++ b/libjava/java/util/UUID.h
@@ -16,7 +16,7 @@ class java::util::UUID : public ::java::lang::Object
 public:
   UUID(jlong, jlong);
   jint clockSequence();
-  jint target$compareTo(::java::util::UUID *);
+  jint UUID$compareTo(::java::util::UUID *);
   jboolean equals(::java::lang::Object *);
   static ::java::util::UUID * fromString(::java::lang::String *);
   ::java::lang::String * toString();
diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h
index 5044f070ab8..4c4c191b51b 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 1949e5ac617..67d71928f54 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 c2372f8b491..e52b30ea14d 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 8b01d994082..0c0c9e55248 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 e065dbe6caa..345fb255173 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 be9beb80ca9..2f4da898b7c 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 75afde92de6..65ea1a9a932 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 ab7af20e87b..cdcc1bf20b3 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 76dd489f298..b97f32248cc 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 cd6608f955e..5ae31075595 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 fd5871a6a72..26fac62545c 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 1bd4e3bdacb..ba9ad31a4a6 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 c9dedf0df50..10f87c92202 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 3bea3cc54a1..e7da50a750b 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();
diff --git a/libjava/java/util/jar/JarFile$JarEnumeration.h b/libjava/java/util/jar/JarFile$JarEnumeration.h
index 8916b5bf14b..60aea699679 100644
--- a/libjava/java/util/jar/JarFile$JarEnumeration.h
+++ b/libjava/java/util/jar/JarFile$JarEnumeration.h
@@ -15,7 +15,7 @@ public: // actually package-private
   JarFile$JarEnumeration(::java::util::Enumeration *, ::java::util::jar::JarFile *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::util::jar::JarEntry * target$nextElement();
+  virtual ::java::util::jar::JarEntry * JarFile$JarEnumeration$nextElement();
   virtual ::java::lang::Object * nextElement();
 private:
   ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
diff --git a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
index 40a7e975b2e..f041ae04a4f 100644
--- a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
+++ b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h
@@ -14,7 +14,7 @@ class java::util::zip::ZipFile$ZipEntryEnumeration : public ::java::lang::Object
 public:
   ZipFile$ZipEntryEnumeration(::java::util::Iterator *);
   virtual jboolean hasMoreElements();
-  virtual ::java::util::zip::ZipEntry * target$nextElement();
+  virtual ::java::util::zip::ZipEntry * ZipFile$ZipEntryEnumeration$nextElement();
   virtual ::java::lang::Object * nextElement();
 private:
   ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elements;