libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.


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

1 files changed, 24 insertions, 0 deletions

diff --git a/libjava/java/util/TreeMap.h b/libjava/java/util/TreeMap.h
index a68bcf6252c..b87c8926262 100644
--- a/libjava/java/util/TreeMap.h
+++ b/libjava/java/util/TreeMap.h
@@ -25,6 +25,7 @@ public:
   virtual ::java::lang::Object * firstKey();
   virtual ::java::lang::Object * get(::java::lang::Object *);
   virtual ::java::util::SortedMap * headMap(::java::lang::Object *);
+  virtual ::java::util::NavigableMap * headMap(::java::lang::Object *, jboolean);
   virtual ::java::util::Set * keySet();
   virtual ::java::lang::Object * lastKey();
   virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);
@@ -32,7 +33,9 @@ public:
   virtual ::java::lang::Object * remove(::java::lang::Object *);
   virtual jint size();
   virtual ::java::util::SortedMap * subMap(::java::lang::Object *, ::java::lang::Object *);
+  virtual ::java::util::NavigableMap * subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean);
   virtual ::java::util::SortedMap * tailMap(::java::lang::Object *);
+  virtual ::java::util::NavigableMap * tailMap(::java::lang::Object *, jboolean);
   virtual ::java::util::Collection * values();
 public: // actually package-private
   virtual jint compare(::java::lang::Object *, ::java::lang::Object *);
@@ -43,11 +46,13 @@ public: // actually package-private
   virtual ::java::util::TreeMap$Node * firstNode();
   virtual ::java::util::TreeMap$Node * getNode(::java::lang::Object *);
   virtual ::java::util::TreeMap$Node * highestLessThan(::java::lang::Object *);
+  virtual ::java::util::TreeMap$Node * highestLessThan(::java::lang::Object *, jboolean);
 private:
   void insertFixup(::java::util::TreeMap$Node *);
   ::java::util::TreeMap$Node * lastNode();
 public: // actually package-private
   virtual ::java::util::TreeMap$Node * lowestGreaterThan(::java::lang::Object *, jboolean);
+  virtual ::java::util::TreeMap$Node * lowestGreaterThan(::java::lang::Object *, jboolean, jboolean);
 private:
   ::java::util::TreeMap$Node * predecessor(::java::util::TreeMap$Node *);
 public: // actually package-private
@@ -64,6 +69,23 @@ public: // actually package-private
   virtual ::java::util::TreeMap$Node * successor(::java::util::TreeMap$Node *);
 private:
   void writeObject(::java::io::ObjectOutputStream *);
+public:
+  virtual ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *);
+  virtual ::java::lang::Object * ceilingKey(::java::lang::Object *);
+  virtual ::java::util::NavigableSet * descendingKeySet();
+  virtual ::java::util::NavigableMap * descendingMap();
+  virtual ::java::util::Map$Entry * firstEntry();
+  virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *);
+  virtual ::java::lang::Object * floorKey(::java::lang::Object *);
+  virtual ::java::util::Map$Entry * higherEntry(::java::lang::Object *);
+  virtual ::java::lang::Object * higherKey(::java::lang::Object *);
+  virtual ::java::util::Map$Entry * lastEntry();
+  virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *);
+  virtual ::java::lang::Object * lowerKey(::java::lang::Object *);
+  virtual ::java::util::NavigableSet * navigableKeySet();
+  virtual ::java::util::Map$Entry * pollFirstEntry();
+  virtual ::java::util::Map$Entry * pollLastEntry();
+private:
   static const jlong serialVersionUID = 919286545866124006LL;
 public: // actually package-private
   static const jint RED = -1;
@@ -75,6 +97,8 @@ public: // actually package-private
   jint size__;
 private:
   ::java::util::Set * entries;
+  ::java::util::NavigableMap * descendingMap__;
+  ::java::util::NavigableSet * nKeys;
 public: // actually package-private
   jint modCount;
   ::java::util::Comparator * comparator__;