Imported GNU Classpath 0.90

Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942
This commit is contained in:
Mark Wielaard 2006-03-10 21:46:48 +00:00
parent 27079765d0
commit 8aa540d2f7
1367 changed files with 188789 additions and 22762 deletions

View file

@ -0,0 +1,112 @@
/* EventDispatcher.java -- Dispatch events for prefs
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package gnu.java.util.prefs;
import java.util.ArrayList;
/**
* This is a helper class used for dispatching events for
* the prefs package.
*/
public class EventDispatcher extends Thread
{
// This is a singleton class. We dispatch all events via a
// new Thread which is created on demand.
private static final Thread dispatchThread = new EventDispatcher();
// 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();
// FIXME: this thread probably ought to go in some classpath-internal
// ThreadGroup. But we don't have that yet.
private EventDispatcher()
{
setDaemon(true);
start();
}
public void run()
{
while (true)
{
Runnable r;
synchronized (queue)
{
while (queue.size() == 0)
{
try
{
wait();
}
catch (InterruptedException _)
{
// Ignore.
}
}
r = (Runnable) queue.remove(0);
}
// Invoke outside the synchronization, so that
// we aren't blocking other threads from posting events.
try
{
r.run();
}
catch (Throwable _)
{
// Ignore.
}
}
}
/**
* Add a new runnable to the event dispatch queue. The
* runnable will be invoked in the event dispatch queue
* without any locks held.
* @param runner the Runnable to dispatch
*/
public static void dispatch(Runnable runner)
{
synchronized (queue)
{
queue.add(runner);
}
}
}

View file

@ -47,11 +47,19 @@ import java.util.prefs.*;
*/
public class FileBasedFactory implements PreferencesFactory {
// We don't save or read any system preferences for the
// time being.
private static final Preferences systemPreferences
= new MemoryBasedPreferences(null, "", false);
private static final Preferences userPreferences
= new FileBasedPreferences();
public Preferences systemRoot() {
return null;
return systemPreferences;
}
public Preferences userRoot() {
return null;
return userPreferences;
}
}

View file

@ -0,0 +1,273 @@
/* FileBasedPreferences.java -- File-based preference implementation
Copyright (C) 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package gnu.java.util.prefs;
import gnu.classpath.SystemProperties;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FilenameFilter;
import java.io.IOException;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.util.Properties;
import java.util.prefs.AbstractPreferences;
import java.util.prefs.BackingStoreException;
/**
* This is a simple file-based preference implementation which writes
* the preferences as properties files. A node is represented as a directory
* beneath the user's home directory. The preferences for the node are
* stored in a single properties file in that directory. Sub-nodes are
* stored in subdirectories. This implementation uses file locking to
* mediate access to the properties files.
*/
public class FileBasedPreferences
extends AbstractPreferences
{
/**
* Name of the property file storing the data in a given directory.
*/
private static final String DATA_FILE = "data.properties";
/**
* The directory corresponding to this preference node.
*/
private File directory;
/**
* The file holding the data for this node.
*/
private File dataFile;
/**
* The data in this node.
*/
private Properties properties;
/**
* Create the root node for the file-based preferences.
*/
FileBasedPreferences()
{
super(null, "");
String home = SystemProperties.getProperty("user.home");
this.directory = new File(new File(home, ".classpath"), "userPrefs");
this.dataFile = new File(this.directory, DATA_FILE);
load();
}
/**
* Create a new file-based preference object with the given parent
* and the given name.
* @param parent the parent
* @param name the name of this node
*/
FileBasedPreferences(FileBasedPreferences parent, String name)
{
super(parent, name);
this.directory = new File(parent.directory, name);
this.dataFile = new File(this.directory, DATA_FILE);
load();
}
private void load()
{
this.properties = new Properties();
FileInputStream fis = null;
FileLock lock = null;
try
{
fis = new FileInputStream(this.dataFile);
FileChannel channel = fis.getChannel();
lock = channel.lock(0, Long.MAX_VALUE, true);
this.properties.load(fis);
// We release the lock and close the stream in the 'finally'
// clause.
}
catch (IOException _)
{
// We don't mind; this means we're making a new node.
newNode = true;
}
finally
{
try
{
// Release the lock and close the stream.
if (lock != null)
lock.release();
}
catch (IOException ignore)
{
// Ignore.
}
try
{
// Close the stream.
if (fis != null)
fis.close();
}
catch (IOException ignore)
{
// Ignore.
}
}
}
public boolean isUserNode()
{
// For now file preferences are always user nodes.
return true;
}
protected String[] childrenNamesSpi() throws BackingStoreException
{
// FIXME: security manager.
String[] result = directory.list(new FilenameFilter()
{
public boolean accept(File dir, String name)
{
return new File(dir, name).isDirectory();
}
});
if (result == null)
result = new String[0];
return result;
}
protected AbstractPreferences childSpi(String name)
{
return new FileBasedPreferences(this, name);
}
protected String[] keysSpi() throws BackingStoreException
{
return (String[]) properties.keySet().toArray(new String[0]);
}
protected String getSpi(String key)
{
return properties.getProperty(key);
}
protected void putSpi(String key, String value)
{
properties.put(key, value);
}
protected void removeSpi(String key)
{
properties.remove(key);
}
protected void flushSpi() throws BackingStoreException
{
// FIXME: security manager.
try
{
if (isRemoved())
{
// Delete the underlying file.
// FIXME: ideally we would also delete the directory
// if it had no subdirectories. This doesn't matter
// much though.
// FIXME: there's a strange race here if a different VM is
// simultaneously updating this node.
dataFile.delete();
}
else
{
// Write the underlying file.
directory.mkdirs();
FileOutputStream fos = null;
FileLock lock = null;
try
{
// Note that we let IOExceptions from the try clause
// propagate to the outer 'try'.
fos = new FileOutputStream(dataFile);
FileChannel channel = fos.getChannel();
lock = channel.lock();
properties.store(fos, "created by GNU Classpath FileBasedPreferences");
// Lock is released and file closed in the finally clause.
}
finally
{
try
{
if (lock != null)
lock.release();
}
catch (IOException _)
{
// Ignore.
}
try
{
if (fos != null)
fos.close();
}
catch (IOException _)
{
// Ignore.
}
}
}
}
catch (IOException ioe)
{
throw new BackingStoreException(ioe);
}
}
protected void syncSpi() throws BackingStoreException
{
// FIXME: we ought to synchronize but instead we merely flush.
flushSpi();
}
protected void removeNodeSpi() throws BackingStoreException
{
// We can simply delegate.
flushSpi();
}
}

View file

@ -40,7 +40,7 @@ package gnu.java.util.prefs;
import java.util.prefs.*;
/**
* Memory based PreferencesFactory usefull for testing.
* Memory based PreferencesFactory useful for testing.
* Returns completely empty Preferences for system and user roots.
* All changes are only backed by the current instances in memory.
*

View file

@ -1,5 +1,5 @@
/* MemoryBasedPreferences - A Preference node which holds all entries in memory
Copyright (C) 2001 Free Software Foundation, Inc.
Copyright (C) 2001, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -79,7 +79,7 @@ public class MemoryBasedPreferences extends AbstractPreferences {
/**
* Returns an empty array since all children names are always already
* chached.
* cached.
*/
protected String[] childrenNamesSpi() throws BackingStoreException {
return new String[0];

View file

@ -1,5 +1,5 @@
/* NodeWriter - Writes and exports preferences nodes to files
Copyright (C) 2001 Free Software Foundation, Inc.
Copyright (C) 2001, 2006 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -41,6 +41,7 @@ import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.util.StringTokenizer;
@ -66,24 +67,25 @@ public class NodeWriter {
*/
private boolean subtree;
/**
* Creates a new NodeWriter for the given preferences node and writer.
*/
public NodeWriter(Preferences prefs, Writer w) {
this.prefs = prefs;
if (w instanceof BufferedWriter) {
this.bw = (BufferedWriter) w;
} else {
this.bw = new BufferedWriter(w);
}
}
/**
* Creates a new NodeWriter for the given preferences node and
* outputstream. Creates a new OutputStreamWriter.
*/
public NodeWriter(Preferences prefs, OutputStream os) {
this(prefs, new OutputStreamWriter(os));
this.prefs = prefs;
Writer w;
try
{
w = new OutputStreamWriter(os, "UTF-8");
}
catch (UnsupportedEncodingException uee)
{
// Shouldn't happen, since we always have UTF-8 available.
InternalError ie = new InternalError("UTF-8 encoding missing");
ie.initCause(uee);
throw ie;
}
this.bw = new BufferedWriter(w);
}
/**
@ -112,6 +114,9 @@ public class NodeWriter {
private void writeHeader() throws BackingStoreException, IOException {
bw.write("<?xml version=\"1.0\"?>");
bw.newLine();
bw.write("<!DOCTYPE preferences SYSTEM "
+ "\"http://java.sun.com/dtd/preferences.dtd\">");
bw.newLine();
bw.newLine();
bw.write("<!-- GNU Classpath java.util.prefs Preferences ");