Merge pull request #383 from ikvmnet/runtimeclean

IKVM.Runtime cleanup
ikvmnet · Jul 17, 2023 · e305520 · e305520
2 parents 5a52624 + 0851440
commit e305520
Show file tree

Hide file tree

Showing 298 changed files with 7,498 additions and 7,420 deletions.
diff --git a/src/IKVM.Java/map.xml b/src/IKVM.Java/map.xml
@@ -958,7 +958,7 @@
             <field name="suppressedExceptions" sig="Ljava.util.List;" />
             <clinit>
                 <body>
-                    <call type="IKVM.Internal.ExceptionHelper" name="getPersistentFields" sig="()[Ljava.io.ObjectStreamField;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="getPersistentFields" sig="()[Ljava.io.ObjectStreamField;" />
                     <stsfld class="java.lang.Throwable" name="serialPersistentFields" sig="[Ljava.io.ObjectStreamField;" />
                     <ldc_i4_0 />
                     <newarr sig="Ljava.lang.StackTraceElement;" />
@@ -994,7 +994,7 @@
                 </attribute>
                 <body>
                     <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="UnmapException" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="UnmapException" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
                     <ret />
                 </body>
             </method>
@@ -1005,7 +1005,7 @@
                 </attribute>
                 <body>
                     <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FixateException" sig="(Ljava.lang.Throwable;)V" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="FixateException" sig="(Ljava.lang.Throwable;)V" />
                     <ldarg_0 />
                     <ret />
                 </body>
@@ -1016,7 +1016,7 @@
                 <body>
                     <ldarg_0 />
                     <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="readObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectInputStream;)V" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="readObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectInputStream;)V" />
                     <ret />
                 </body>
             </method>
@@ -1025,7 +1025,7 @@
                 <body>
                     <ldarg_0 />
                     <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="writeObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectOutputStream;)V" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="writeObject" sig="(Ljava.lang.Throwable;Ljava.io.ObjectOutputStream;)V" />
                     <ret />
                 </body>
             </method>
@@ -1071,7 +1071,7 @@
                     <!-- End field initialization -->
                     <ldarg_0 />
                     <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
                     <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;)V" />
                     <ldarg_0 />
                     <ldarg_0 />
@@ -1106,7 +1106,7 @@
                     <!-- End field initialization -->
                     <ldarg_0 />
                     <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
                     <ldarg_2 />
                     <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
                     <ldarg_0 />
@@ -1144,7 +1144,7 @@
                     <!-- End field initialization -->
                     <ldarg_0 />
                     <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="GetMessageFromCause" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="GetMessageFromCause" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" />
                     <ldarg_1 />
                     <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
                     <ldarg_0 />
@@ -1189,7 +1189,7 @@
                     <!-- End field initialization -->
                     <ldarg_0 />
                     <ldarg_1 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="FilterMessage" sig="(Ljava.lang.String;)Ljava.lang.String;" />
                     <ldarg_2 />
                     <call type="System.Exception" name=".ctor" sig="(Ljava.lang.String;Ljava.lang.Throwable;)V" />
                     <ldarg_s argNum="4" />
@@ -1249,7 +1249,7 @@
                 </alternateBody>
             </method>
             <method name="getLocalizedMessage" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
             </method>
             <method name="fillInStackTrace" sig="()Ljava.lang.Throwable;" modifiers="public">
                 <body>
@@ -1290,7 +1290,7 @@
                 </body>
                 <alternateBody>
                     <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="fillInStackTrace" sig="(Ljava.lang.Throwable;)V" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="fillInStackTrace" sig="(Ljava.lang.Throwable;)V" />
                     <ldarg_0 />
                     <ret />
                 </alternateBody>
@@ -1306,7 +1306,7 @@
                             <ldarg_0 />
                             <ldfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
                             <ldarg_1 />
-                            <call type="IKVM.Internal.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
+                            <call type="IKVM.Runtime.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
                             <ldarg_0 />
                             <ldarg_1 />
                             <stfld class="java.lang.Throwable" name="cause" sig="Ljava.lang.Throwable;" />
@@ -1327,15 +1327,15 @@
                     <ldarg_0 />
                     <ldnull />
                     <ldnull />
-                    <call type="IKVM.Internal.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="checkInitCause" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
                     <ldarg_0 />
                     <ret />
                 </alternateBody>
             </method>
             <method name="getCause" sig="()Ljava.lang.Throwable;" modifiers="public">
                 <body>
                     <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="getCause" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="getCause" sig="(Ljava.lang.Throwable;)Ljava.lang.Throwable;" />
                     <ret />
                 </body>
                 <alternateBody>
@@ -1347,21 +1347,21 @@
             <method name="getStackTrace" sig="()[Ljava.lang.StackTraceElement;" modifiers="public">
                 <body>
                     <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
                     <callvirt type="System.Array" name="Clone" sig="()Ljava.lang.Object;" />
                     <castclass class="[Ljava.lang.StackTraceElement;" />
                     <ret />
                 </body>
             </method>
             <method name="getOurStackTrace" sig="()[Ljava.lang.StackTraceElement;" modifiers="private">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
             </method>
             <method name="setStackTrace" sig="([Ljava.lang.StackTraceElement;)V" modifiers="public">
                 <parameter name="stackTrace" />
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="setStackTrace" sig="(Ljava.lang.Throwable;[Ljava.lang.StackTraceElement;)V" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" name="setStackTrace" sig="(Ljava.lang.Throwable;[Ljava.lang.StackTraceElement;)V" />
             </method>
             <method name="toString" sig="()Ljava.lang.String;" modifiers="public">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" sig="(Ljava.lang.Throwable;)Ljava.lang.String;" type="static" />
             </method>
             <method name="GetObjectData" sig="(Lcli.System.Runtime.Serialization.SerializationInfo;Lcli.System.Runtime.Serialization.StreamingContext;)V" modifiers="public">
                 <attribute type="System.Security.SecurityCriticalAttribute" sig="()V" />
@@ -1395,23 +1395,23 @@
             </constructor>
             <method name="addSuppressed" sig="(Ljava.lang.Throwable;)V" modifiers="public final">
                 <parameter name="exception" />
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="addSuppressed" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" name="addSuppressed" sig="(Ljava.lang.Throwable;Ljava.lang.Throwable;)V" />
             </method>
             <method name="getSuppressed" sig="()[Ljava.lang.Throwable;" modifiers="public final">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getSuppressed" sig="(Ljava.lang.Throwable;)[Ljava.lang.Throwable;" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getSuppressed" sig="(Ljava.lang.Throwable;)[Ljava.lang.Throwable;" />
             </method>
             <method name="getStackTraceDepth" sig="()I" modifiers="">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getStackTraceDepth" sig="(Ljava.lang.Throwable;)I" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getStackTraceDepth" sig="(Ljava.lang.Throwable;)I" />
             </method>
             <method name="getStackTraceElement" sig="(I)Ljava.lang.StackTraceElement;" modifiers="">
-                <redirect class="cli.IKVM.Internal.ExceptionHelper" name="getStackTraceElement" sig="(Ljava.lang.Throwable;I)Ljava.lang.StackTraceElement;" />
+                <redirect class="cli.IKVM.Runtime.ExceptionHelper" name="getStackTraceElement" sig="(Ljava.lang.Throwable;I)Ljava.lang.StackTraceElement;" />
             </method>
         </class>
         <class name="java.lang.ThrowableHelper">
             <method name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;">
                 <body>
                     <ldarg_0 />
-                    <call type="IKVM.Internal.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
+                    <call type="IKVM.Runtime.ExceptionHelper" name="getOurStackTrace" sig="(Ljava.lang.Throwable;)[Ljava.lang.StackTraceElement;" />
                     <ret />
                 </body>
             </method>
@@ -1437,12 +1437,12 @@
         <!-- Here we are adding/replacing methods to existing classes -->
         <class name="java.lang.Class">
             <implements class="cli.System.Runtime.Serialization.ISerializable" />
-            <field name="typeWrapper" sig="Lcli.IKVM.Internal.TypeWrapper;" modifiers="">
+            <field name="typeWrapper" sig="Lcli.IKVM.Runtime.TypeWrapper;" modifiers="">
                 <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
             </field>
         </class>
         <class name="java.lang.ClassLoader">
-            <field name="wrapper" sig="Lcli.IKVM.Internal.ClassLoaderWrapper;" modifiers="">
+            <field name="wrapper" sig="Lcli.IKVM.Runtime.ClassLoaderWrapper;" modifiers="">
                 <attribute type="IKVM.Attributes.HideFromJavaAttribute" sig="()V" />
             </field>
             <constructor sig="(Z)V">

diff --git a/src/IKVM.Runtime/AccessStubConstructorMethodWrapper.cs b/src/IKVM.Runtime/AccessStubConstructorMethodWrapper.cs
@@ -33,7 +33,7 @@ Jeroen Frijters
 using System.Reflection.Emit;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
     sealed class AccessStubConstructorMethodWrapper : SmartMethodWrapper

diff --git a/src/IKVM.Runtime/AccessStubMethodWrapper.cs b/src/IKVM.Runtime/AccessStubMethodWrapper.cs
@@ -33,7 +33,7 @@ Jeroen Frijters
 using System.Reflection.Emit;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
     sealed class AccessStubMethodWrapper : SmartMethodWrapper

diff --git a/src/IKVM.Runtime/Accessors/FieldAccessor.cs b/src/IKVM.Runtime/Accessors/FieldAccessor.cs
@@ -4,8 +4,6 @@
 using System.Reflection.Emit;
 using System.Threading;
 
-using IKVM.Internal;
-
 namespace IKVM.Runtime.Accessors
 {
 

diff --git a/src/IKVM.Runtime/Accessors/MethodAccessor.cs b/src/IKVM.Runtime/Accessors/MethodAccessor.cs
@@ -3,8 +3,6 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-using IKVM.Internal;
-
 namespace IKVM.Runtime.Accessors
 {
 

diff --git a/src/IKVM.Runtime/Accessors/PropertyAccessor.cs b/src/IKVM.Runtime/Accessors/PropertyAccessor.cs
@@ -2,8 +2,6 @@
 using System.Reflection;
 using System.Reflection.Emit;
 
-using IKVM.Internal;
-
 namespace IKVM.Runtime.Accessors
 {
 

diff --git a/src/IKVM.Runtime/Annotation.cs b/src/IKVM.Runtime/Annotation.cs
@@ -41,7 +41,7 @@ Jeroen Frijters
 using IKVM.Tools.Importer;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
     abstract class Annotation

diff --git a/src/IKVM.Runtime/AnonymousTypeWrapper.cs b/src/IKVM.Runtime/AnonymousTypeWrapper.cs
@@ -39,7 +39,7 @@ Jeroen Frijters
 using IKVM.Tools.Importer;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
 #if !IMPORTER && !EXPORTER

diff --git a/src/IKVM.Runtime/ArrayTypeWrapper.cs b/src/IKVM.Runtime/ArrayTypeWrapper.cs
@@ -39,7 +39,7 @@ Jeroen Frijters
 using IKVM.Tools.Importer;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
     sealed class ArrayTypeWrapper : TypeWrapper
     {

diff --git a/src/IKVM.Runtime/ArrayUtil.cs b/src/IKVM.Runtime/ArrayUtil.cs
@@ -23,7 +23,7 @@ Jeroen Frijters
 */
 using System;
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
     static class ArrayUtil

diff --git a/src/IKVM.Runtime/AssemblyClassLoader.cs b/src/IKVM.Runtime/AssemblyClassLoader.cs
@@ -47,7 +47,7 @@ Jeroen Frijters
 using IKVM.Tools.Importer;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
     internal class AssemblyClassLoader : ClassLoaderWrapper

diff --git a/src/IKVM.Runtime/Assertions.cs b/src/IKVM.Runtime/Assertions.cs
@@ -24,7 +24,7 @@ Jeroen Frijters
 using System;
 using System.Globalization;
 
-using IKVM.Internal;
+using IKVM.Runtime;
 
 namespace IKVM.Runtime
 {

diff --git a/src/IKVM.Runtime/AttributeHelper.cs b/src/IKVM.Runtime/AttributeHelper.cs
@@ -48,7 +48,7 @@ Jeroen Frijters
 using IKVM.Tools.Importer;
 #endif
 
-namespace IKVM.Internal
+namespace IKVM.Runtime
 {
 
     static class AttributeHelper

diff --git a/src/IKVM.Runtime/Attributes/AnnotationAttributeAttribute.cs b/src/IKVM.Runtime/Attributes/AnnotationAttributeAttribute.cs
@@ -23,7 +23,7 @@ Jeroen Frijters
 */
 using System;
 
-using IKVM.Internal;
+using IKVM.Runtime;
 
 namespace IKVM.Attributes
 {

diff --git a/src/IKVM.Runtime/Attributes/AnnotationDefaultAttribute.cs b/src/IKVM.Runtime/Attributes/AnnotationDefaultAttribute.cs
@@ -23,17 +23,15 @@ Jeroen Frijters
 */
 using System;
 
-using IKVM.Internal;
-
-#if IMPORTER || EXPORTER
-using Type = IKVM.Reflection.Type;
-#endif
+using IKVM.Runtime;
 
 namespace IKVM.Attributes
 {
+
     [AttributeUsage(AttributeTargets.Method)]
     public sealed class AnnotationDefaultAttribute : Attribute
     {
+
         public const byte TAG_ENUM = (byte)'e';
         public const byte TAG_CLASS = (byte)'c';
         public const byte TAG_ANNOTATION = (byte)'@';

diff --git a/src/IKVM.Runtime/Attributes/ConstantPoolAttribute.cs b/src/IKVM.Runtime/Attributes/ConstantPoolAttribute.cs
@@ -24,17 +24,15 @@ Jeroen Frijters
 using System;
 using System.Collections.Generic;
 
-using IKVM.Internal;
-
-#if IMPORTER || EXPORTER
-using Type = IKVM.Reflection.Type;
-#endif
+using IKVM.Runtime;
 
 namespace IKVM.Attributes
 {
+
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface)]
 	public sealed class ConstantPoolAttribute : Attribute
 	{
+
 		internal readonly object[] constantPool;
 
 		public ConstantPoolAttribute(object[] constantPool)
@@ -112,5 +110,7 @@ private static object Escape(object obj)
 			}
 			return obj;
 		}
+
 	}
+
 }
diff --git a/src/IKVM.Runtime/Attributes/DynamicAnnotationAttribute.cs b/src/IKVM.Runtime/Attributes/DynamicAnnotationAttribute.cs
@@ -23,15 +23,13 @@ Jeroen Frijters
 */
 using System;
 
-#if IMPORTER || EXPORTER
-using Type = IKVM.Reflection.Type;
-#endif
-
 namespace IKVM.Attributes
 {
+
     [AttributeUsage(AttributeTargets.Class | AttributeTargets.Delegate | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Parameter, AllowMultiple = false)]
 	public sealed class DynamicAnnotationAttribute : Attribute
 	{
+
 		private readonly object[] definition;
 
 		public DynamicAnnotationAttribute(object[] definition)
@@ -43,5 +41,7 @@ public object[] Definition
 		{
 			get { return definition; }
 		}
+
 	}
+
 }