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. From-SVN: r125302
This commit is contained in:
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
@ -53,7 +53,7 @@ public class EventDispatcher extends Thread
|
|||
// This is a queue of events to dispatch. This thread waits on
|
||||
// the queue and when notified will remove events until the queue
|
||||
// is empty.
|
||||
private static final ArrayList queue = new ArrayList();
|
||||
private static final ArrayList<Runnable> queue = new ArrayList<Runnable>();
|
||||
|
||||
// FIXME: this thread probably ought to go in some classpath-internal
|
||||
// ThreadGroup. But we don't have that yet.
|
||||
|
@ -81,7 +81,7 @@ public class EventDispatcher extends Thread
|
|||
// Ignore.
|
||||
}
|
||||
}
|
||||
r = (Runnable) queue.remove(0);
|
||||
r = queue.remove(0);
|
||||
}
|
||||
// Invoke outside the synchronization, so that
|
||||
// we aren't blocking other threads from posting events.
|
||||
|
|
|
@ -41,7 +41,6 @@ import gnu.java.util.prefs.gconf.GConfNativePeer;
|
|||
|
||||
import java.security.Permission;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.prefs.AbstractPreferences;
|
||||
import java.util.prefs.BackingStoreException;
|
||||
|
@ -185,7 +184,7 @@ public class GConfBasedPreferences
|
|||
*/
|
||||
protected String[] childrenNamesSpi() throws BackingStoreException
|
||||
{
|
||||
List nodeList = backend.getChildrenNodes(this.node);
|
||||
List<String> nodeList = backend.getChildrenNodes(this.node);
|
||||
String[] nodes = new String[nodeList.size()];
|
||||
nodeList.toArray(nodes);
|
||||
|
||||
|
@ -228,7 +227,7 @@ public class GConfBasedPreferences
|
|||
*/
|
||||
protected String[] keysSpi() throws BackingStoreException
|
||||
{
|
||||
List keyList = backend.getKeys(this.node);
|
||||
List<String> keyList = backend.getKeys(this.node);
|
||||
String[] keys = new String[keyList.size()];
|
||||
keyList.toArray(keys);
|
||||
|
||||
|
@ -246,31 +245,24 @@ public class GConfBasedPreferences
|
|||
try
|
||||
{
|
||||
// gets the listing of directories in this node
|
||||
List dirs = backend.getChildrenNodes(directory);
|
||||
List<String> dirs = backend.getChildrenNodes(directory);
|
||||
|
||||
if (dirs.size() != 0)
|
||||
{
|
||||
String currentDir = null;
|
||||
|
||||
for (Iterator itr = dirs.iterator(); itr.hasNext();)
|
||||
for (String currentDir : dirs)
|
||||
{
|
||||
currentDir = (String) itr.next();
|
||||
|
||||
// recursive search inside this directory
|
||||
postorderRemove(currentDir);
|
||||
}
|
||||
}
|
||||
|
||||
// remove all the keys associated to this directory
|
||||
List entries = backend.getKeys(directory);
|
||||
List<String> entries = backend.getKeys(directory);
|
||||
|
||||
if (entries.size() != 0)
|
||||
{
|
||||
String key = null;
|
||||
|
||||
for (Iterator keys = entries.iterator(); keys.hasNext();)
|
||||
for (String key : entries)
|
||||
{
|
||||
key = (String) keys.next();
|
||||
this.removeSpi(key);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -52,7 +52,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
|
|||
private final boolean isUser;
|
||||
|
||||
/** Contains all the preference entries of this node. */
|
||||
private HashMap entries = new HashMap();
|
||||
private HashMap<String, String> entries = new HashMap<String, String>();
|
||||
|
||||
/**
|
||||
* Creates a new preferences node with the given name and parent.
|
||||
|
@ -98,7 +98,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
|
|||
* this node.
|
||||
*/
|
||||
protected String[] keysSpi() throws BackingStoreException {
|
||||
return (String[]) entries.keySet().toArray(new String[entries.size()]);
|
||||
return entries.keySet().toArray(new String[entries.size()]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -106,7 +106,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
|
|||
* null when the key has not been set.
|
||||
*/
|
||||
protected String getSpi(String key) {
|
||||
return (String) entries.get(key);
|
||||
return entries.get(key);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -147,7 +147,7 @@ public final class GConfNativePeer
|
|||
* @return a java.util.List of keys. If there are no keys in the given node, a
|
||||
* list of size 0 is returned.
|
||||
*/
|
||||
public List getKeys(String node) throws BackingStoreException
|
||||
public List<String> getKeys(String node) throws BackingStoreException
|
||||
{
|
||||
return gconf_client_all_keys(node);
|
||||
}
|
||||
|
@ -159,7 +159,7 @@ public final class GConfNativePeer
|
|||
* @param node the node to get subnodes from. If there are no subnodes in the
|
||||
* given node, a list of size 0 is returned.
|
||||
*/
|
||||
public List getChildrenNodes(String node) throws BackingStoreException
|
||||
public List<String> getChildrenNodes(String node) throws BackingStoreException
|
||||
{
|
||||
return gconf_client_all_nodes(node);
|
||||
}
|
||||
|
@ -295,7 +295,7 @@ public final class GConfNativePeer
|
|||
* @return A list of nodes under the given source node.
|
||||
*/
|
||||
native
|
||||
static final protected List gconf_client_all_nodes(String node)
|
||||
static final protected List<String> gconf_client_all_nodes(String node)
|
||||
throws BackingStoreException;
|
||||
|
||||
/**
|
||||
|
@ -305,7 +305,7 @@ public final class GConfNativePeer
|
|||
* @return A list of all keys stored in the given node.
|
||||
*/
|
||||
native
|
||||
static final protected List gconf_client_all_keys(String node)
|
||||
static final protected List<String> gconf_client_all_keys(String node)
|
||||
throws BackingStoreException;
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue