diff options
| author | jfrijters <jfrijters> | 2009-07-28 17:01:25 +0400 |
|---|---|---|
| committer | jfrijters <jfrijters> | 2009-07-28 17:01:25 +0400 |
| commit | 45a57e8ec5853146ae9c40f7cba64e3232111434 (patch) | |
| tree | 1906a8a3f9e89a5c529eee0239a21fcb15b0f406 | |
| parent | b82d3bbceacbe6492bcd1041e832167209a2d757 (diff) | |
Moved most java.lang.Class changes from map.xml to java source.
| -rw-r--r-- | openjdk/java/lang/Class.java | 12 | ||||
| -rw-r--r-- | openjdk/map.xml | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/openjdk/java/lang/Class.java b/openjdk/java/lang/Class.java index 7677879b..f0f2ad67 100644 --- a/openjdk/java/lang/Class.java +++ b/openjdk/java/lang/Class.java @@ -121,6 +121,10 @@ public final private static final int ENUM = 0x00004000; private static final int SYNTHETIC = 0x00001000; + // [IKVM] additional fields + java.security.ProtectionDomain pd; + Object[] signers; + // for types that support fast class literals, this is used to store the Type that can later (on demand) // be resolved to the corresponding TypeWrapper, but for other types this will be null. final cli.System.Type type; @@ -142,6 +146,14 @@ public final this.type = type; } + // [IKVM] this provides an implicit conversion operator from System.Type to java.lang.Class + @cli.System.Runtime.CompilerServices.SpecialNameAttribute.Annotation + @cli.IKVM.Attributes.HideFromJavaAttribute.Annotation + public static Class op_Implicit(cli.System.Type type) + { + return ikvm.runtime.Util.getFriendlyClassFromType(type); + } + /** * Converts the object to a string. The string representation is the * string "class" or "interface", followed by a space, and then by the diff --git a/openjdk/map.xml b/openjdk/map.xml index a04d501d..64e9126e 100644 --- a/openjdk/map.xml +++ b/openjdk/map.xml @@ -1343,16 +1343,6 @@ <field name="typeWrapper" sig="Lcli.IKVM.Internal.TypeWrapper;" modifiers=""> <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" /> </field> - <field name="pd" sig="Ljava.security.ProtectionDomain;" modifiers="" /> - <field name="signers" sig="[Ljava.lang.Object;" modifiers="" /> - <method name="op_Implicit" sig="(Lcli.System.Type;)Ljava.lang.Class;" modifiers="public static" attributes="SpecialName"> - <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" /> - <body> - <ldarg_0 /> - <call class="ikvm.runtime.Util" name="getFriendlyClassFromType" sig="(Lcli.System.Type;)Ljava.lang.Class;" /> - <ret /> - </body> - </method> </class> <class name="java.lang.ClassLoader"> <field name="wrapper" sig="Lcli.IKVM.Internal.ClassLoaderWrapper;" modifiers=""> |