* java/lang/reflect/Proxy.java (ProxyData): `pack' now a String.
(ProxyData.getPackage): New method.
(ProxyData.getProxyData): Use package name, not Package.
(ClassFactory.ClassFactory): Updated.
From-SVN: r70809
+2003-08-26 Tom Tromey <tromey@redhat.com>
+
+ * java/lang/reflect/Proxy.java (ProxyData): `pack' now a String.
+ (ProxyData.getPackage): New method.
+ (ProxyData.getProxyData): Use package name, not Package.
+ (ClassFactory.ClassFactory): Updated.
+
2003-08-25 Scott Gilbertson <scottg@mantatest.com>
* Makefile.am: added gnu/awt/xlib/XOffScreenImage.java.
* Makefile.in: re-generated.
2003-08-25 Scott Gilbertson <scottg@mantatest.com>
* Makefile.am: added gnu/awt/xlib/XOffScreenImage.java.
* Makefile.in: re-generated.
/* Proxy.java -- build a proxy class that implements reflected interfaces
/* Proxy.java -- build a proxy class that implements reflected interfaces
- Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
This file is part of GNU Classpath.
This file is part of GNU Classpath.
* The package this class is in. Possibly null, meaning the unnamed
* package.
*/
* The package this class is in. Possibly null, meaning the unnamed
* package.
*/
/**
* The interfaces this class implements. Non-null, but possibly empty.
/**
* The interfaces this class implements. Non-null, but possibly empty.
+ /**
+ * Return the name of a package given the name of a class.
+ * Returns null if no package. We use this in preference to
+ * using Class.getPackage() to avoid problems with ClassLoaders
+ * that don't set the package.
+ */
+ static String getPackage(Class k)
+ {
+ String name = k.getName();
+ int idx = name.lastIndexOf('.');
+ if (idx >= 0)
+ return name.substring(0, idx);
+ return null;
+ }
+
/**
* Verifies that the arguments are legal, and sets up remaining data
* This should only be called when a class must be generated, as
/**
* Verifies that the arguments are legal, and sets up remaining data
* This should only be called when a class must be generated, as
if (! Modifier.isPublic(inter.getModifiers()))
if (in_package)
{
if (! Modifier.isPublic(inter.getModifiers()))
if (in_package)
{
- Package p = inter.getPackage();
- if (data.pack != inter.getPackage())
+ String p = getPackage(inter);
+ if (! data.pack.equals(p))
throw new IllegalArgumentException("non-public interfaces "
+ "from different "
+ "packages");
throw new IllegalArgumentException("non-public interfaces "
+ "from different "
+ "packages");
else
{
in_package = true;
else
{
in_package = true;
- data.pack = inter.getPackage();
+ data.pack = getPackage(inter);
}
for (int j = i-1; j >= 0; j--)
if (data.interfaces[j] == inter)
}
for (int j = i-1; j >= 0; j--)
if (data.interfaces[j] == inter)
// access_flags
putU2(Modifier.SUPER | Modifier.FINAL | Modifier.PUBLIC);
// this_class
// access_flags
putU2(Modifier.SUPER | Modifier.FINAL | Modifier.PUBLIC);
// this_class
- qualName = ((data.pack == null ? "" : data.pack.getName() + '.')
+ qualName = ((data.pack == null ? "" : data.pack + '.')
+ "$Proxy" + data.id);
putU2(classInfo(TypeSignature.getEncodingOfClass(qualName, false)));
// super_class
+ "$Proxy" + data.id);
putU2(classInfo(TypeSignature.getEncodingOfClass(qualName, false)));
// super_class