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:
Matthias Klose
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
|
@ -145,7 +145,7 @@ public class URLClassLoader extends SecureClassLoader
|
|||
// Instance variables
|
||||
|
||||
/** Locations to load classes from */
|
||||
private final Vector urls = new Vector();
|
||||
private final Vector<URL> urls = new Vector<URL>();
|
||||
|
||||
/**
|
||||
* Store pre-parsed information for each url into this vector: each
|
||||
|
|
@ -153,7 +153,7 @@ public class URLClassLoader extends SecureClassLoader
|
|||
* attribute which adds to the URLs that will be searched, but this
|
||||
* does not add to the list of urls.
|
||||
*/
|
||||
private final Vector urlinfos = new Vector();
|
||||
private final Vector<URLLoader> urlinfos = new Vector<URLLoader>();
|
||||
|
||||
/** Factory used to get the protocol handlers of the URLs */
|
||||
private final URLStreamHandlerFactory factory;
|
||||
|
|
@ -301,7 +301,6 @@ public class URLClassLoader extends SecureClassLoader
|
|||
if ("file".equals (protocol))
|
||||
{
|
||||
File dir = new File(file);
|
||||
URL absUrl;
|
||||
try
|
||||
{
|
||||
absoluteURL = dir.getCanonicalFile().toURL();
|
||||
|
|
@ -329,12 +328,12 @@ public class URLClassLoader extends SecureClassLoader
|
|||
// First see if we can find a handler with the correct name.
|
||||
try
|
||||
{
|
||||
Class handler = Class.forName(URL_LOADER_PREFIX + protocol);
|
||||
Class[] argTypes = new Class[] { URLClassLoader.class,
|
||||
URLStreamHandlerCache.class,
|
||||
URLStreamHandlerFactory.class,
|
||||
URL.class,
|
||||
URL.class };
|
||||
Class<?> handler = Class.forName(URL_LOADER_PREFIX + protocol);
|
||||
Class<?>[] argTypes = new Class<?>[] { URLClassLoader.class,
|
||||
URLStreamHandlerCache.class,
|
||||
URLStreamHandlerFactory.class,
|
||||
URL.class,
|
||||
URL.class };
|
||||
Constructor k = handler.getDeclaredConstructor(argTypes);
|
||||
loader
|
||||
= (URLLoader) k.newInstance(new Object[] { this,
|
||||
|
|
@ -395,7 +394,7 @@ public class URLClassLoader extends SecureClassLoader
|
|||
}
|
||||
|
||||
urlinfos.add(loader);
|
||||
ArrayList extra = loader.getClassPath();
|
||||
ArrayList<URLLoader> extra = loader.getClassPath();
|
||||
if (extra != null)
|
||||
urlinfos.addAll(extra);
|
||||
}
|
||||
|
|
@ -602,10 +601,10 @@ public class URLClassLoader extends SecureClassLoader
|
|||
Class result = null;
|
||||
if (sm != null && securityContext != null)
|
||||
{
|
||||
result = (Class)AccessController.doPrivileged
|
||||
(new PrivilegedAction()
|
||||
result = AccessController.doPrivileged
|
||||
(new PrivilegedAction<Class>()
|
||||
{
|
||||
public Object run()
|
||||
public Class run()
|
||||
{
|
||||
return defineClass(className, classData,
|
||||
0, classData.length,
|
||||
|
|
@ -848,9 +847,9 @@ public class URLClassLoader extends SecureClassLoader
|
|||
+ securityContext);
|
||||
|
||||
URLClassLoader loader =
|
||||
(URLClassLoader) AccessController.doPrivileged(new PrivilegedAction()
|
||||
AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>()
|
||||
{
|
||||
public Object run()
|
||||
public URLClassLoader run()
|
||||
{
|
||||
return new URLClassLoader(parent,
|
||||
(AccessControlContext) securityContext);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue