Add toString to classes extending ByReference

java-native-access · Apr 25, 2020 · 5d377ac · 5d377ac
1 parent fa9dfdb
commit 5d377ac
Show file tree

Hide file tree

Showing 21 changed files with 512 additions and 26 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -12,6 +12,7 @@ Features
 * [#1168](https://github.com/java-native-access/jna/pull/1168): Add `c.s.j.p.win32.Kernel32#SetProcessAffinityMask` - [@dbwiddis](https://github.com/dbwiddis).
 * [#1169](https://github.com/java-native-access/jna/issues/1169): Wait for process in getLinuxLdPaths - [@rdesgroppes](https://github.com/rdesgroppes).
 * [#1178](https://github.com/java-native-access/jna/pull/1178): Add `c.s.j.p.win32.IPHlpAPI#GetTcpStatistics`, `c.s.j.p.win32.IPHlpAPI#GetUdpStatistics`, `c.s.j.p.win32.IPHlpAPI#GetTcpStatisticsEx` and `c.s.j.p.win32.IPHlpAPI#GetUdpStatisticsEx` - [@dbwiddis](https://github.com/dbwiddis).
+* [#1182](https://github.com/java-native-access/jna/pull/1182): Add `toString` to classes extending `c.s.j.ptr.ByReference` - [@dbwiddis](https://github.com/dbwiddis).
 
 Bug Fixes
 ---------

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,6 +172,11 @@ 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;
@@ -251,6 +256,11 @@ 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,6 +107,11 @@ 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,6 +274,11 @@ 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());
+            }
         }
     }
 
@@ -440,6 +445,11 @@ 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,6 +111,11 @@ 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
@@ -22,7 +22,29 @@
  */
 package com.sun.jna.platform.win32;
 
-import java.util.List;
+import static com.sun.jna.platform.win32.Variant.VT_BOOL;
+import static com.sun.jna.platform.win32.Variant.VT_BSTR;
+import static com.sun.jna.platform.win32.Variant.VT_CY;
+import static com.sun.jna.platform.win32.Variant.VT_DATE;
+import static com.sun.jna.platform.win32.Variant.VT_DECIMAL;
+import static com.sun.jna.platform.win32.Variant.VT_DISPATCH;
+import static com.sun.jna.platform.win32.Variant.VT_ERROR;
+import static com.sun.jna.platform.win32.Variant.VT_I1;
+import static com.sun.jna.platform.win32.Variant.VT_I2;
+import static com.sun.jna.platform.win32.Variant.VT_I4;
+import static com.sun.jna.platform.win32.Variant.VT_INT;
+import static com.sun.jna.platform.win32.Variant.VT_R4;
+import static com.sun.jna.platform.win32.Variant.VT_R8;
+import static com.sun.jna.platform.win32.Variant.VT_RECORD;
+import static com.sun.jna.platform.win32.Variant.VT_UI1;
+import static com.sun.jna.platform.win32.Variant.VT_UI2;
+import static com.sun.jna.platform.win32.Variant.VT_UI4;
+import static com.sun.jna.platform.win32.Variant.VT_UINT;
+import static com.sun.jna.platform.win32.Variant.VT_UNKNOWN;
+import static com.sun.jna.platform.win32.Variant.VT_VARIANT;
+
+import java.io.Closeable;
+import java.util.Date;
 
 import com.sun.jna.IntegerType;
 import com.sun.jna.Memory;
@@ -32,8 +54,6 @@
 import com.sun.jna.Structure.FieldOrder;
 import com.sun.jna.Union;
 import com.sun.jna.platform.win32.BaseTSD.ULONG_PTR;
-import com.sun.jna.platform.win32.COM.COMUtils;
-import com.sun.jna.platform.win32.COM.Dispatch;
 import com.sun.jna.platform.win32.Guid.GUID;
 import com.sun.jna.platform.win32.Variant.VARIANT;
 import com.sun.jna.platform.win32.Variant.VariantArg;
@@ -53,32 +73,12 @@
 import com.sun.jna.platform.win32.WinDef.ULONGLONG;
 import com.sun.jna.platform.win32.WinDef.USHORT;
 import com.sun.jna.platform.win32.WinDef.WORD;
+import com.sun.jna.platform.win32.COM.COMUtils;
+import com.sun.jna.platform.win32.COM.Dispatch;
 import com.sun.jna.platform.win32.COM.TypeComp;
 import com.sun.jna.platform.win32.COM.Unknown;
-import static com.sun.jna.platform.win32.Variant.VT_BOOL;
-import static com.sun.jna.platform.win32.Variant.VT_BSTR;
-import static com.sun.jna.platform.win32.Variant.VT_CY;
-import static com.sun.jna.platform.win32.Variant.VT_DATE;
-import static com.sun.jna.platform.win32.Variant.VT_DECIMAL;
-import static com.sun.jna.platform.win32.Variant.VT_DISPATCH;
-import static com.sun.jna.platform.win32.Variant.VT_ERROR;
-import static com.sun.jna.platform.win32.Variant.VT_I1;
-import static com.sun.jna.platform.win32.Variant.VT_I2;
-import static com.sun.jna.platform.win32.Variant.VT_I4;
-import static com.sun.jna.platform.win32.Variant.VT_INT;
-import static com.sun.jna.platform.win32.Variant.VT_R4;
-import static com.sun.jna.platform.win32.Variant.VT_R8;
-import static com.sun.jna.platform.win32.Variant.VT_RECORD;
-import static com.sun.jna.platform.win32.Variant.VT_UI1;
-import static com.sun.jna.platform.win32.Variant.VT_UI2;
-import static com.sun.jna.platform.win32.Variant.VT_UI4;
-import static com.sun.jna.platform.win32.Variant.VT_UINT;
-import static com.sun.jna.platform.win32.Variant.VT_UNKNOWN;
-import static com.sun.jna.platform.win32.Variant.VT_VARIANT;
 import com.sun.jna.ptr.ByReference;
 import com.sun.jna.ptr.PointerByReference;
-import java.io.Closeable;
-import java.util.Date;
 
 /**
  * The Interface OaIdl.
@@ -200,6 +200,11 @@ 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 {
@@ -219,6 +224,11 @@ 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"})
@@ -311,6 +321,11 @@ 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 {
@@ -342,6 +357,11 @@ 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
@@ -895,6 +915,7 @@ public void destroy() {
         /**
          * Implemented to satisfy Closeable interface, delegates to destroy.
          */
+        @Override
         public void close() {
             destroy();
         }

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java b/contrib/platform/src/com/sun/jna/platform/win32/WTypes.java
@@ -24,14 +24,15 @@
  */
 package com.sun.jna.platform.win32;
 
+import java.io.UnsupportedEncodingException;
+
 import com.sun.jna.Memory;
 import com.sun.jna.Native;
 import com.sun.jna.Pointer;
 import com.sun.jna.PointerType;
 import com.sun.jna.Structure;
 import com.sun.jna.platform.win32.WinDef.USHORT;
 import com.sun.jna.ptr.ByReference;
-import java.io.UnsupportedEncodingException;
 
 /**
  * Constant defined in WTypes.h
@@ -170,6 +171,11 @@ public BSTR getValue() {
         public String getString() {
             return this.getValue().getValue();
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     public static class LPSTR extends PointerType {
@@ -317,5 +323,10 @@ 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,6 +117,11 @@ public void setValue(WORD value) {
         public WORD getValue() {
             return new WORD(getPointer().getShort(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -207,6 +212,11 @@ public void setValue(DWORD value) {
         public DWORD getValue() {
             return new DWORD(getPointer().getInt(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -278,6 +288,11 @@ public void setValue(LONG value) {
         public LONG getValue() {
             return new LONG(getPointer().getInt(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -349,6 +364,11 @@ public void setValue(LONGLONG value) {
         public LONGLONG getValue() {
             return new LONGLONG(getPointer().getLong(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -906,6 +926,11 @@ public void setValue(ULONG value) {
         public ULONG getValue() {
             return new ULONG(getPointer().getInt(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -977,6 +1002,11 @@ public void setValue(ULONGLONG value) {
         public ULONGLONG getValue() {
             return new ULONGLONG(getPointer().getLong(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -1254,6 +1284,11 @@ public void setValue(USHORT value) {
         public USHORT getValue() {
             return new USHORT(getPointer().getShort(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -1357,6 +1392,11 @@ public void setValue(UINT value) {
         public UINT getValue() {
             return new UINT(getPointer().getInt(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -1421,6 +1461,11 @@ public void setValue(SCODE value) {
         public SCODE getValue() {
             return new SCODE(getPointer().getInt(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -1592,6 +1637,11 @@ public void setValue(BOOL value) {
         public BOOL getValue() {
             return new BOOL(getPointer().getInt(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**
@@ -1728,6 +1778,11 @@ public void setValue(CHAR value) {
         public CHAR getValue() {
             return new CHAR(getPointer().getChar(0));
         }
+
+        @Override
+        public String toString() {
+            return super.toString(getValue());
+        }
     }
 
     /**