toString(): Use reflection to fetch value of ByReference object

matthiasblaesing · matthiasblaesing · commit 4b240469ca7c · 2020-05-13T20:53:36.000+02:00
diff --git a/contrib/platform/src/com/sun/jna/platform/unix/X11.java b/contrib/platform/src/com/sun/jna/platform/unix/X11.java
@@ -172,11 +172,6 @@ public Atom getValue() {
             NativeLong value = getPointer().getNativeLong(0);
             return (Atom)new Atom().fromNative(value, null);
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
     class Colormap extends XID {
         private static final long serialVersionUID = 1L;
@@ -256,11 +251,6 @@ public Window getValue() {
             NativeLong value = getPointer().getNativeLong(0);
             return value.longValue() == X11.None ? Window.None : new Window(value.longValue());
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
     class Pixmap extends Drawable {
         private static final long serialVersionUID = 1L;
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java b/contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java
@@ -107,11 +107,6 @@ public ULONG_PTR getValue() {
                                  ? getPointer().getInt(0)
                                  : getPointer().getLong(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
 
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/HighLevelMonitorConfigurationAPI.java b/contrib/platform/src/com/sun/jna/platform/win32/HighLevelMonitorConfigurationAPI.java
@@ -274,11 +274,6 @@ public void setValue(MC_DISPLAY_TECHNOLOGY_TYPE value) {
             public MC_DISPLAY_TECHNOLOGY_TYPE getValue() {
                 return EnumUtils.fromInteger(getPointer().getInt(0), MC_DISPLAY_TECHNOLOGY_TYPE.class);
             }
-
-            @Override
-            public String toString() {
-                return super.toString(getValue());
-            }
         }
     }
 
@@ -445,11 +440,6 @@ public void setValue(MC_COLOR_TEMPERATURE value) {
             public MC_COLOR_TEMPERATURE getValue() {
                 return EnumUtils.fromInteger(getPointer().getInt(0), MC_COLOR_TEMPERATURE.class);
             }
-
-            @Override
-            public String toString() {
-                return super.toString(getValue());
-            }
         }
     }
 }
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/LowLevelMonitorConfigurationAPI.java b/contrib/platform/src/com/sun/jna/platform/win32/LowLevelMonitorConfigurationAPI.java
@@ -111,11 +111,6 @@ public void setValue(MC_VCP_CODE_TYPE value) {
             public MC_VCP_CODE_TYPE getValue() {
                 return EnumUtils.fromInteger(getPointer().getInt(0), MC_VCP_CODE_TYPE.class);
             }
-
-            @Override
-            public String toString() {
-                return super.toString(getValue());
-            }
         }
     }
 }
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/OaIdl.java b/contrib/platform/src/com/sun/jna/platform/win32/OaIdl.java
@@ -200,11 +200,6 @@ public void setValue(VARIANT_BOOL value) {
         public VARIANT_BOOL getValue() {
             return new VARIANT_BOOL(getPointer().getShort(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     public static class _VARIANT_BOOLByReference extends ByReference {
@@ -224,11 +219,6 @@ public void setValue(VARIANT_BOOL value) {
         public VARIANT_BOOL getValue() {
             return new VARIANT_BOOL(getPointer().getShort(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     @FieldOrder({"date"})
@@ -321,11 +311,6 @@ public void setValue(DISPID value) {
         public DISPID getValue() {
             return new DISPID(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     public static class MEMBERID extends DISPID {
@@ -357,11 +342,6 @@ public void setValue(MEMBERID value) {
         public MEMBERID getValue() {
             return new MEMBERID(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     // The Collect property. You use this property if the method you are calling
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java b/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java
@@ -171,11 +171,6 @@ public BSTR getValue() {
         public String getString() {
             return this.getValue().getValue();
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     public static class LPSTR extends PointerType {
@@ -323,10 +318,5 @@ public void setValue(VARTYPE value) {
         public VARTYPE getValue() {
             return new VARTYPE(getPointer().getShort(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 }
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java b/contrib/platform/src/com/sun/jna/platform/win32/WinDef.java
@@ -117,11 +117,6 @@ public void setValue(WORD value) {
         public WORD getValue() {
             return new WORD(getPointer().getShort(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -212,11 +207,6 @@ public void setValue(DWORD value) {
         public DWORD getValue() {
             return new DWORD(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -288,11 +278,6 @@ public void setValue(LONG value) {
         public LONG getValue() {
             return new LONG(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -364,11 +349,6 @@ public void setValue(LONGLONG value) {
         public LONGLONG getValue() {
             return new LONGLONG(getPointer().getLong(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -926,11 +906,6 @@ public void setValue(ULONG value) {
         public ULONG getValue() {
             return new ULONG(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1002,11 +977,6 @@ public void setValue(ULONGLONG value) {
         public ULONGLONG getValue() {
             return new ULONGLONG(getPointer().getLong(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1284,11 +1254,6 @@ public void setValue(USHORT value) {
         public USHORT getValue() {
             return new USHORT(getPointer().getShort(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1392,11 +1357,6 @@ public void setValue(UINT value) {
         public UINT getValue() {
             return new UINT(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1461,11 +1421,6 @@ public void setValue(SCODE value) {
         public SCODE getValue() {
             return new SCODE(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1637,11 +1592,6 @@ public void setValue(BOOL value) {
         public BOOL getValue() {
             return new BOOL(getPointer().getInt(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1778,11 +1728,6 @@ public void setValue(CHAR value) {
         public CHAR getValue() {
             return new CHAR(getPointer().getByte(0));
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WinNT.java b/contrib/platform/src/com/sun/jna/platform/win32/WinNT.java
@@ -398,11 +398,6 @@ public PSID getValue() {
                 return new PSID(p);
             }
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -1367,11 +1362,6 @@ public HANDLE getValue() {
             h.setPointer(p);
             return h;
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     /**
@@ -2572,11 +2562,6 @@ public ACL getValue() {
                 return new ACL(p);
             }
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     @FieldOrder({"Revision", "Sbz1", "Control", "Owner", "Group", "Sacl", "Dacl"})
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WinReg.java b/contrib/platform/src/com/sun/jna/platform/win32/WinReg.java
@@ -67,11 +67,6 @@ public HKEY getValue() {
             h.setPointer(p);
             return h;
         }
-
-        @Override
-        public String toString() {
-            return super.toString(getValue());
-        }
     }
 
     HKEY HKEY_CLASSES_ROOT = new HKEY(0x80000000);
diff --git a/src/com/sun/jna/ptr/ByReference.java b/src/com/sun/jna/ptr/ByReference.java
@@ -26,6 +26,7 @@
 import com.sun.jna.Memory;
 import com.sun.jna.Pointer;
 import com.sun.jna.PointerType;
+import java.lang.reflect.Method;
 
 /** Provides generic "pointer to type" functionality, often used in C
  * code to return values to the caller in addition to a function result.
@@ -43,19 +44,21 @@ protected ByReference(int dataSize) {
         setPointer(new Memory(dataSize));
     }
 
-    /**
-     * Express this reference and the value it points to.
-     *
-     * @param value
-     *            The value to display. Callers should pass the result of
-     *            {@code getValue()}.
-     * @return A formatted string containing the object type, reference address, and
-     *         value
-     */
-    protected String toString(Object value) {
-        if (value == null) {
-            return String.format("null@0x%x", Pointer.nativeValue(getPointer()));
+    @Override
+    public String toString() {
+        try {
+            Method getValue = getClass().getMethod("getValue");
+            Object value = getValue.invoke(this);
+            if (value == null) {
+                return String.format("null@0x%x", Pointer.nativeValue(getPointer()));
+            }
+            return String.format("%s@0x%x=%s", value.getClass().getSimpleName(), Pointer.nativeValue(getPointer()), value);
+        } catch (Exception ex) {
+            return String.format(
+                "ByReference Contract violated - %s#getValue raised exception: %s",
+                getClass().getName(),
+                ex.getMessage()
+            );
         }
-        return String.format("%s@0x%x=%s", value.getClass().getSimpleName(), Pointer.nativeValue(getPointer()), value);
     }
 }
diff --git a/src/com/sun/jna/ptr/PointerByReference.java b/src/com/sun/jna/ptr/PointerByReference.java
@@ -49,8 +49,4 @@ public Pointer getValue() {
         return getPointer().getPointer(0);
     }
 
-    @Override
-    public String toString() {
-        return super.toString(getValue());
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -172,11 +172,6 @@ public Atom getValue() {`
`172`	`172`	`NativeLong value = getPointer().getNativeLong(0);`
`173`	`173`	`return (Atom)new Atom().fromNative(value, null);`
`174`	`174`	`}`
`175`		`-`
`176`		`- @Override`
`177`		`- public String toString() {`
`178`		`- return super.toString(getValue());`
`179`		`- }`
`180`	`175`	`}`
`181`	`176`	`class Colormap extends XID {`
`182`	`177`	`private static final long serialVersionUID = 1L;`
`@@ -256,11 +251,6 @@ public Window getValue() {`
`256`	`251`	`NativeLong value = getPointer().getNativeLong(0);`
`257`	`252`	`return value.longValue() == X11.None ? Window.None : new Window(value.longValue());`
`258`	`253`	`}`
`259`		`-`
`260`		`- @Override`
`261`		`- public String toString() {`
`262`		`- return super.toString(getValue());`
`263`		`- }`
`264`	`254`	`}`
`265`	`255`	`class Pixmap extends Drawable {`
`266`	`256`	`private static final long serialVersionUID = 1L;`
Original file line number	Diff line number	Diff line change
`@@ -107,11 +107,6 @@ public ULONG_PTR getValue() {`
`107`	`107`	`? getPointer().getInt(0)`
`108`	`108`	`: getPointer().getLong(0));`
`109`	`109`	`}`
`110`		`-`
`111`		`- @Override`
`112`		`- public String toString() {`
`113`		`- return super.toString(getValue());`
`114`		`- }`
`115`	`110`	`}`
`116`	`111`
`117`	`112`
Original file line number	Diff line number	Diff line change
`@@ -274,11 +274,6 @@ public void setValue(MC_DISPLAY_TECHNOLOGY_TYPE value) {`
`274`	`274`	`public MC_DISPLAY_TECHNOLOGY_TYPE getValue() {`
`275`	`275`	`return EnumUtils.fromInteger(getPointer().getInt(0), MC_DISPLAY_TECHNOLOGY_TYPE.class);`
`276`	`276`	`}`
`277`		`-`
`278`		`- @Override`
`279`		`- public String toString() {`
`280`		`- return super.toString(getValue());`
`281`		`- }`
`282`	`277`	`}`
`283`	`278`	`}`
`284`	`279`
`@@ -445,11 +440,6 @@ public void setValue(MC_COLOR_TEMPERATURE value) {`
`445`	`440`	`public MC_COLOR_TEMPERATURE getValue() {`
`446`	`441`	`return EnumUtils.fromInteger(getPointer().getInt(0), MC_COLOR_TEMPERATURE.class);`
`447`	`442`	`}`
`448`		`-`
`449`		`- @Override`
`450`		`- public String toString() {`
`451`		`- return super.toString(getValue());`
`452`		`- }`
`453`	`443`	`}`
`454`	`444`	`}`
`455`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,6 @@ public void setValue(MC_VCP_CODE_TYPE value) {`
`111`	`111`	`public MC_VCP_CODE_TYPE getValue() {`
`112`	`112`	`return EnumUtils.fromInteger(getPointer().getInt(0), MC_VCP_CODE_TYPE.class);`
`113`	`113`	`}`
`114`		`-`
`115`		`- @Override`
`116`		`- public String toString() {`
`117`		`- return super.toString(getValue());`
`118`		`- }`
`119`	`114`	`}`
`120`	`115`	`}`
`121`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,11 +200,6 @@ public void setValue(VARIANT_BOOL value) {`
`200`	`200`	`public VARIANT_BOOL getValue() {`
`201`	`201`	`return new VARIANT_BOOL(getPointer().getShort(0));`
`202`	`202`	`}`
`203`		`-`
`204`		`- @Override`
`205`		`- public String toString() {`
`206`		`- return super.toString(getValue());`
`207`		`- }`
`208`	`203`	`}`
`209`	`204`
`210`	`205`	`public static class _VARIANT_BOOLByReference extends ByReference {`
`@@ -224,11 +219,6 @@ public void setValue(VARIANT_BOOL value) {`
`224`	`219`	`public VARIANT_BOOL getValue() {`
`225`	`220`	`return new VARIANT_BOOL(getPointer().getShort(0));`
`226`	`221`	`}`
`227`		`-`
`228`		`- @Override`
`229`		`- public String toString() {`
`230`		`- return super.toString(getValue());`
`231`		`- }`
`232`	`222`	`}`
`233`	`223`
`234`	`224`	`@FieldOrder({"date"})`
`@@ -321,11 +311,6 @@ public void setValue(DISPID value) {`
`321`	`311`	`public DISPID getValue() {`
`322`	`312`	`return new DISPID(getPointer().getInt(0));`
`323`	`313`	`}`
`324`		`-`
`325`		`- @Override`
`326`		`- public String toString() {`
`327`		`- return super.toString(getValue());`
`328`		`- }`
`329`	`314`	`}`
`330`	`315`
`331`	`316`	`public static class MEMBERID extends DISPID {`
`@@ -357,11 +342,6 @@ public void setValue(MEMBERID value) {`
`357`	`342`	`public MEMBERID getValue() {`
`358`	`343`	`return new MEMBERID(getPointer().getInt(0));`
`359`	`344`	`}`
`360`		`-`
`361`		`- @Override`
`362`		`- public String toString() {`
`363`		`- return super.toString(getValue());`
`364`		`- }`
`365`	`345`	`}`
`366`	`346`
`367`	`347`	`// The Collect property. You use this property if the method you are calling`
Original file line number	Diff line number	Diff line change
`@@ -171,11 +171,6 @@ public BSTR getValue() {`
`171`	`171`	`public String getString() {`
`172`	`172`	`return this.getValue().getValue();`
`173`	`173`	`}`
`174`		`-`
`175`		`- @Override`
`176`		`- public String toString() {`
`177`		`- return super.toString(getValue());`
`178`		`- }`
`179`	`174`	`}`
`180`	`175`
`181`	`176`	`public static class LPSTR extends PointerType {`
`@@ -323,10 +318,5 @@ public void setValue(VARTYPE value) {`
`323`	`318`	`public VARTYPE getValue() {`
`324`	`319`	`return new VARTYPE(getPointer().getShort(0));`
`325`	`320`	`}`
`326`		`-`
`327`		`- @Override`
`328`		`- public String toString() {`
`329`		`- return super.toString(getValue());`
`330`		`- }`
`331`	`321`	`}`
`332`	`322`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,6 @@ public void setValue(WORD value) {`
`117`	`117`	`public WORD getValue() {`
`118`	`118`	`return new WORD(getPointer().getShort(0));`
`119`	`119`	`}`
`120`		`-`
`121`		`- @Override`
`122`		`- public String toString() {`
`123`		`- return super.toString(getValue());`
`124`		`- }`
`125`	`120`	`}`
`126`	`121`
`127`	`122`	`/**`
`@@ -212,11 +207,6 @@ public void setValue(DWORD value) {`
`212`	`207`	`public DWORD getValue() {`
`213`	`208`	`return new DWORD(getPointer().getInt(0));`
`214`	`209`	`}`
`215`		`-`
`216`		`- @Override`
`217`		`- public String toString() {`
`218`		`- return super.toString(getValue());`
`219`		`- }`
`220`	`210`	`}`
`221`	`211`
`222`	`212`	`/**`
`@@ -288,11 +278,6 @@ public void setValue(LONG value) {`
`288`	`278`	`public LONG getValue() {`
`289`	`279`	`return new LONG(getPointer().getInt(0));`
`290`	`280`	`}`
`291`		`-`
`292`		`- @Override`
`293`		`- public String toString() {`
`294`		`- return super.toString(getValue());`
`295`		`- }`
`296`	`281`	`}`
`297`	`282`
`298`	`283`	`/**`
`@@ -364,11 +349,6 @@ public void setValue(LONGLONG value) {`
`364`	`349`	`public LONGLONG getValue() {`
`365`	`350`	`return new LONGLONG(getPointer().getLong(0));`
`366`	`351`	`}`
`367`		`-`
`368`		`- @Override`
`369`		`- public String toString() {`
`370`		`- return super.toString(getValue());`
`371`		`- }`
`372`	`352`	`}`
`373`	`353`
`374`	`354`	`/**`
`@@ -926,11 +906,6 @@ public void setValue(ULONG value) {`
`926`	`906`	`public ULONG getValue() {`
`927`	`907`	`return new ULONG(getPointer().getInt(0));`
`928`	`908`	`}`
`929`		`-`
`930`		`- @Override`
`931`		`- public String toString() {`
`932`		`- return super.toString(getValue());`
`933`		`- }`
`934`	`909`	`}`
`935`	`910`
`936`	`911`	`/**`
`@@ -1002,11 +977,6 @@ public void setValue(ULONGLONG value) {`
`1002`	`977`	`public ULONGLONG getValue() {`
`1003`	`978`	`return new ULONGLONG(getPointer().getLong(0));`
`1004`	`979`	`}`
`1005`		`-`
`1006`		`- @Override`
`1007`		`- public String toString() {`
`1008`		`- return super.toString(getValue());`
`1009`		`- }`
`1010`	`980`	`}`
`1011`	`981`
`1012`	`982`	`/**`
`@@ -1284,11 +1254,6 @@ public void setValue(USHORT value) {`
`1284`	`1254`	`public USHORT getValue() {`
`1285`	`1255`	`return new USHORT(getPointer().getShort(0));`
`1286`	`1256`	`}`
`1287`		`-`
`1288`		`- @Override`
`1289`		`- public String toString() {`
`1290`		`- return super.toString(getValue());`
`1291`		`- }`
`1292`	`1257`	`}`
`1293`	`1258`
`1294`	`1259`	`/**`
`@@ -1392,11 +1357,6 @@ public void setValue(UINT value) {`
`1392`	`1357`	`public UINT getValue() {`
`1393`	`1358`	`return new UINT(getPointer().getInt(0));`
`1394`	`1359`	`}`
`1395`		`-`
`1396`		`- @Override`
`1397`		`- public String toString() {`
`1398`		`- return super.toString(getValue());`
`1399`		`- }`
`1400`	`1360`	`}`
`1401`	`1361`
`1402`	`1362`	`/**`
`@@ -1461,11 +1421,6 @@ public void setValue(SCODE value) {`
`1461`	`1421`	`public SCODE getValue() {`
`1462`	`1422`	`return new SCODE(getPointer().getInt(0));`
`1463`	`1423`	`}`
`1464`		`-`
`1465`		`- @Override`
`1466`		`- public String toString() {`
`1467`		`- return super.toString(getValue());`
`1468`		`- }`
`1469`	`1424`	`}`
`1470`	`1425`
`1471`	`1426`	`/**`
`@@ -1637,11 +1592,6 @@ public void setValue(BOOL value) {`
`1637`	`1592`	`public BOOL getValue() {`
`1638`	`1593`	`return new BOOL(getPointer().getInt(0));`
`1639`	`1594`	`}`
`1640`		`-`
`1641`		`- @Override`
`1642`		`- public String toString() {`
`1643`		`- return super.toString(getValue());`
`1644`		`- }`
`1645`	`1595`	`}`
`1646`	`1596`
`1647`	`1597`	`/**`
`@@ -1778,11 +1728,6 @@ public void setValue(CHAR value) {`
`1778`	`1728`	`public CHAR getValue() {`
`1779`	`1729`	`return new CHAR(getPointer().getByte(0));`
`1780`	`1730`	`}`
`1781`		`-`
`1782`		`- @Override`
`1783`		`- public String toString() {`
`1784`		`- return super.toString(getValue());`
`1785`		`- }`
`1786`	`1731`	`}`
`1787`	`1732`
`1788`	`1733`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -398,11 +398,6 @@ public PSID getValue() {`
`398`	`398`	`return new PSID(p);`
`399`	`399`	`}`
`400`	`400`	`}`
`401`		`-`
`402`		`- @Override`
`403`		`- public String toString() {`
`404`		`- return super.toString(getValue());`
`405`		`- }`
`406`	`401`	`}`
`407`	`402`
`408`	`403`	`/**`
`@@ -1367,11 +1362,6 @@ public HANDLE getValue() {`
`1367`	`1362`	`h.setPointer(p);`
`1368`	`1363`	`return h;`
`1369`	`1364`	`}`
`1370`		`-`
`1371`		`- @Override`
`1372`		`- public String toString() {`
`1373`		`- return super.toString(getValue());`
`1374`		`- }`
`1375`	`1365`	`}`
`1376`	`1366`
`1377`	`1367`	`/**`
`@@ -2572,11 +2562,6 @@ public ACL getValue() {`
`2572`	`2562`	`return new ACL(p);`
`2573`	`2563`	`}`
`2574`	`2564`	`}`
`2575`		`-`
`2576`		`- @Override`
`2577`		`- public String toString() {`
`2578`		`- return super.toString(getValue());`
`2579`		`- }`
`2580`	`2565`	`}`
`2581`	`2566`
`2582`	`2567`	`@FieldOrder({"Revision", "Sbz1", "Control", "Owner", "Group", "Sacl", "Dacl"})`
Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,6 @@ public HKEY getValue() {`
`67`	`67`	`h.setPointer(p);`
`68`	`68`	`return h;`
`69`	`69`	`}`
`70`		`-`
`71`		`- @Override`
`72`		`- public String toString() {`
`73`		`- return super.toString(getValue());`
`74`		`- }`
`75`	`70`	`}`
`76`	`71`
`77`	`72`	`HKEY HKEY_CLASSES_ROOT = new HKEY(0x80000000);`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,4 @@ public Pointer getValue() {`
`49`	`49`	`return getPointer().getPointer(0);`
`50`	`50`	`}`
`51`	`51`
`52`		`- @Override`
`53`		`- public String toString() {`
`54`		`- return super.toString(getValue());`
`55`		`- }`
`56`	`52`	`}`