From: <fd...@us...> - 2010-04-03 19:17:35
|
Revision: 5746 http://jnode.svn.sourceforge.net/jnode/?rev=5746&view=rev Author: fduminy Date: 2010-04-03 19:17:29 +0000 (Sat, 03 Apr 2010) Log Message: ----------- removed unused BaseMagicHelper.MagicClass and updated javadoc pointing to it Modified Paths: -------------- trunk/core/src/core/org/jnode/vm/VmMagic.java trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java trunk/core/src/vmmagic/org/vmmagic/unboxed/Address.java trunk/core/src/vmmagic/org/vmmagic/unboxed/AddressArray.java trunk/core/src/vmmagic/org/vmmagic/unboxed/Extent.java trunk/core/src/vmmagic/org/vmmagic/unboxed/ExtentArray.java trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReference.java trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java trunk/core/src/vmmagic/org/vmmagic/unboxed/Offset.java trunk/core/src/vmmagic/org/vmmagic/unboxed/OffsetArray.java trunk/core/src/vmmagic/org/vmmagic/unboxed/Word.java trunk/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java Modified: trunk/core/src/core/org/jnode/vm/VmMagic.java =================================================================== --- trunk/core/src/core/org/jnode/vm/VmMagic.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/core/org/jnode/vm/VmMagic.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -36,9 +36,9 @@ * Methods in this class can also be called from inside JNode. * * @author Ewout Prangsma (ep...@us...) - * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass} to get the list of "magic" classes - * (including this class). - * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod} to get the list of "magic" methods. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods */ @MagicPermission public final class VmMagic { Modified: trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java =================================================================== --- trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/core/org/jnode/vm/compiler/BaseMagicHelper.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -20,12 +20,9 @@ package org.jnode.vm.compiler; -import java.util.Map; - +import org.jnode.annotation.SharedStatics; import org.jnode.util.BootableHashMap; import org.jnode.vm.classmgr.VmMethod; -import org.jnode.vm.classmgr.VmType; -import org.jnode.annotation.SharedStatics; /** * @author Ewout Prangsma (ep...@us...) @@ -33,71 +30,6 @@ public class BaseMagicHelper { /** - * Enum of all magic classes. - * - * @author Ewout Prangsma (ep...@us...) - */ - @SharedStatics - public enum MagicClass { - ADDRESS("org.vmmagic.unboxed.Address"), - EXTENT("org.vmmagic.unboxed.Extent"), - OBJECTREFERENCE("org.vmmagic.unboxed.ObjectReference"), - OFFSET("org.vmmagic.unboxed.Offset"), - WORD("org.vmmagic.unboxed.Word"), - ADDRESSARRAY("org.vmmagic.unboxed.AddressArray"), - EXTENTARRAY("org.vmmagic.unboxed.ExtentArray"), - OBJECTREFERENCEARRAY("org.vmmagic.unboxed.ObjectReferenceArray"), - OFFSETARRAY("org.vmmagic.unboxed.OffsetArray"), - WORDARRAY("org.vmmagic.unboxed.WordArray"), - VMMAGIC("org.jnode.vm.VmMagic"); - - /** - * Name of the class - */ - private final String name; - - /** - * Lookup table - */ - private static final Map<String, MagicClass> nameToClass; - - /** - * Initialize this instance. - * - * @param name - */ - private MagicClass(String name) { - this.name = name; - } - - /** - * Initialize the lookup table - */ - static { - nameToClass = new BootableHashMap<String, MagicClass>(); - for (MagicClass mc : values()) { - nameToClass.put(mc.name, mc); - } - } - - /** - * Gets the MagicClass instance for the given type. - * - * @param type - * @return a MagicClass instance - * @throws InternalError When type is no magic type. - */ - public static MagicClass get(VmType<?> type) { - MagicClass mc = nameToClass.get(type.getName()); - if (mc == null) { - throw new InternalError("Unknown magic type " + type.getName()); - } else { - return mc; - } - } - } - - /** * Enum of all methods in all magic classes. * * @author Ewout Prangsma (ep...@us...) Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/Address.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/Address.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/Address.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -14,6 +14,7 @@ package org.vmmagic.unboxed; import org.jnode.vm.VmAddress; +import org.jnode.vm.classmgr.VmType; import org.jnode.annotation.KernelSpace; import org.jnode.annotation.Uninterruptible; @@ -22,12 +23,10 @@ * <p/> * <u>JNode specific notes</u> : This class contains some "magic" * methods that are interpreted by the VM itself, instead of being executed - * as normal java methods. The actual method bodies are not used. <br/> - * For further details, see the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass list of "magic" classes} - * and the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod list of "magic" methods}. - * + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ public final class Address implements UnboxedObject { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/AddressArray.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/AddressArray.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/AddressArray.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -14,8 +14,12 @@ package org.vmmagic.unboxed; /** - * Commenting required - * + * <u>JNode specific notes</u> : This class contains some "magic" + * methods that are interpreted by the VM itself, instead of being executed + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ final public class AddressArray { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/Extent.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/Extent.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/Extent.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -16,12 +16,10 @@ /** * <u>JNode specific notes</u> : This class contains some "magic" * methods that are interpreted by the VM itself, instead of being executed - * as normal java methods. The actual method bodies are not used. <br/> - * For further details, see the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass list of "magic" classes} - * and the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod list of "magic" methods}. - * + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ public final class Extent implements UnboxedObject { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/ExtentArray.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/ExtentArray.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/ExtentArray.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -14,8 +14,12 @@ package org.vmmagic.unboxed; /** - * Commenting required - * + * <u>JNode specific notes</u> : This class contains some "magic" + * methods that are interpreted by the VM itself, instead of being executed + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ final public class ExtentArray { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReference.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReference.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReference.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -23,7 +23,13 @@ * distinction between objects the VM is written in, and objects that the VM is * managing. No operations that can not be completed in pure Java should be * allowed on Object. - * + * <br/><br/> + * <u>JNode specific notes</u> : This class contains some "magic" + * methods that are interpreted by the VM itself, instead of being executed + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ public final class ObjectReference implements Uninterruptible { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/ObjectReferenceArray.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -14,8 +14,12 @@ package org.vmmagic.unboxed; /** - * Commenting required - * + * <u>JNode specific notes</u> : This class contains some "magic" + * methods that are interpreted by the VM itself, instead of being executed + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ final public class ObjectReferenceArray { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/Offset.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/Offset.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/Offset.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -17,12 +17,10 @@ * <p/> * <u>JNode specific notes</u> : This class contains some "magic" * methods that are interpreted by the VM itself, instead of being executed - * as normal java methods. The actual method bodies are not used. <br/> - * For further details, see the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass list of "magic" classes} - * and the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod list of "magic" methods}. - * + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Ewout Prangsma (ep...@us...) * @author Daniel Frampton */ Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/OffsetArray.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/OffsetArray.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/OffsetArray.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -14,8 +14,12 @@ package org.vmmagic.unboxed; /** - * Commenting required - * + * <u>JNode specific notes</u> : This class contains some "magic" + * methods that are interpreted by the VM itself, instead of being executed + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ final public class OffsetArray { Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/Word.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/Word.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/Word.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -20,12 +20,10 @@ * <p/> * <u>JNode specific notes</u> : This class contains some "magic" * methods that are interpreted by the VM itself, instead of being executed - * as normal java methods. The actual method bodies are not used. <br/> - * For further details, see the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicClass list of "magic" classes} - * and the - * {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod list of "magic" methods}. - * + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Ewout Prangsma (ep...@us...) * @author Daniel Frampton * @see Address Modified: trunk/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java =================================================================== --- trunk/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java 2010-04-03 18:01:32 UTC (rev 5745) +++ trunk/core/src/vmmagic/org/vmmagic/unboxed/WordArray.java 2010-04-03 19:17:29 UTC (rev 5746) @@ -14,8 +14,12 @@ package org.vmmagic.unboxed; /** - * Commenting required - * + * <u>JNode specific notes</u> : This class contains some "magic" + * methods that are interpreted by the VM itself, instead of being executed + * as normal java methods. <b>The actual method bodies are never used</b>. + * @see {@link org.jnode.classmgr.VmType VmType} to get the list of "magic" classes + * @see {@link org.jnode.vm.compiler.BaseMagicHelper.MagicMethod MagicMethod} + * to get the list of "magic" methods * @author Daniel Frampton */ final public class WordArray { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |