Skip to content

Commit 4b3b7ee

Browse files
dbwiddisdbwiddis
committed
Add toString to classes extending ByReference
1 parent fa9dfdb commit 4b3b7ee

21 files changed

+510
-26
lines changed

‎CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Features
1212
* [#1168](https://github.com/java-native-access/jna/pull/1168): Add `c.s.j.p.win32.Kernel32#SetProcessAffinityMask` - [@dbwiddis](https://github.com/dbwiddis).
1313
* [#1169](https://github.com/java-native-access/jna/issues/1169): Wait for process in getLinuxLdPaths - [@rdesgroppes](https://github.com/rdesgroppes).
1414
* [#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).
15+
* [#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).
1516

1617
Bug Fixes
1718
---------

‎contrib/platform/src/com/sun/jna/platform/unix/X11.java

+10
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@ public Atom getValue() {
172172
NativeLong value = getPointer().getNativeLong(0);
173173
return (Atom)new Atom().fromNative(value, null);
174174
}
175+
176+
@Override
177+
public String toString() {
178+
return super.toString(getValue());
179+
}
175180
}
176181
class Colormap extends XID {
177182
private static final long serialVersionUID = 1L;
@@ -251,6 +256,11 @@ public Window getValue() {
251256
NativeLong value = getPointer().getNativeLong(0);
252257
return value.longValue() == X11.None ? Window.None : new Window(value.longValue());
253258
}
259+
260+
@Override
261+
public String toString() {
262+
return super.toString(getValue());
263+
}
254264
}
255265
class Pixmap extends Drawable {
256266
private static final long serialVersionUID = 1L;

‎contrib/platform/src/com/sun/jna/platform/win32/BaseTSD.java

+5
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,11 @@ public ULONG_PTR getValue() {
107107
? getPointer().getInt(0)
108108
: getPointer().getLong(0));
109109
}
110+
111+
@Override
112+
public String toString() {
113+
return super.toString(getValue());
114+
}
110115
}
111116

112117

‎contrib/platform/src/com/sun/jna/platform/win32/HighLevelMonitorConfigurationAPI.java

+10
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,11 @@ public void setValue(MC_DISPLAY_TECHNOLOGY_TYPE value) {
274274
public MC_DISPLAY_TECHNOLOGY_TYPE getValue() {
275275
return EnumUtils.fromInteger(getPointer().getInt(0), MC_DISPLAY_TECHNOLOGY_TYPE.class);
276276
}
277+
278+
@Override
279+
public String toString() {
280+
return super.toString(getValue());
281+
}
277282
}
278283
}
279284

@@ -440,6 +445,11 @@ public void setValue(MC_COLOR_TEMPERATURE value) {
440445
public MC_COLOR_TEMPERATURE getValue() {
441446
return EnumUtils.fromInteger(getPointer().getInt(0), MC_COLOR_TEMPERATURE.class);
442447
}
448+
449+
@Override
450+
public String toString() {
451+
return super.toString(getValue());
452+
}
443453
}
444454
}
445455
}

‎contrib/platform/src/com/sun/jna/platform/win32/LowLevelMonitorConfigurationAPI.java

+5
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,11 @@ public void setValue(MC_VCP_CODE_TYPE value) {
111111
public MC_VCP_CODE_TYPE getValue() {
112112
return EnumUtils.fromInteger(getPointer().getInt(0), MC_VCP_CODE_TYPE.class);
113113
}
114+
115+
@Override
116+
public String toString() {
117+
return super.toString(getValue());
118+
}
114119
}
115120
}
116121
}

‎contrib/platform/src/com/sun/jna/platform/win32/OaIdl.java

+46-25
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,29 @@
2222
*/
2323
package com.sun.jna.platform.win32;
2424

25-
import java.util.List;
25+
import static com.sun.jna.platform.win32.Variant.VT_BOOL;
26+
import static com.sun.jna.platform.win32.Variant.VT_BSTR;
27+
import static com.sun.jna.platform.win32.Variant.VT_CY;
28+
import static com.sun.jna.platform.win32.Variant.VT_DATE;
29+
import static com.sun.jna.platform.win32.Variant.VT_DECIMAL;
30+
import static com.sun.jna.platform.win32.Variant.VT_DISPATCH;
31+
import static com.sun.jna.platform.win32.Variant.VT_ERROR;
32+
import static com.sun.jna.platform.win32.Variant.VT_I1;
33+
import static com.sun.jna.platform.win32.Variant.VT_I2;
34+
import static com.sun.jna.platform.win32.Variant.VT_I4;
35+
import static com.sun.jna.platform.win32.Variant.VT_INT;
36+
import static com.sun.jna.platform.win32.Variant.VT_R4;
37+
import static com.sun.jna.platform.win32.Variant.VT_R8;
38+
import static com.sun.jna.platform.win32.Variant.VT_RECORD;
39+
import static com.sun.jna.platform.win32.Variant.VT_UI1;
40+
import static com.sun.jna.platform.win32.Variant.VT_UI2;
41+
import static com.sun.jna.platform.win32.Variant.VT_UI4;
42+
import static com.sun.jna.platform.win32.Variant.VT_UINT;
43+
import static com.sun.jna.platform.win32.Variant.VT_UNKNOWN;
44+
import static com.sun.jna.platform.win32.Variant.VT_VARIANT;
45+
46+
import java.io.Closeable;
47+
import java.util.Date;
2648

2749
import com.sun.jna.IntegerType;
2850
import com.sun.jna.Memory;
@@ -32,8 +54,6 @@
3254
import com.sun.jna.Structure.FieldOrder;
3355
import com.sun.jna.Union;
3456
import com.sun.jna.platform.win32.BaseTSD.ULONG_PTR;
35-
import com.sun.jna.platform.win32.COM.COMUtils;
36-
import com.sun.jna.platform.win32.COM.Dispatch;
3757
import com.sun.jna.platform.win32.Guid.GUID;
3858
import com.sun.jna.platform.win32.Variant.VARIANT;
3959
import com.sun.jna.platform.win32.Variant.VariantArg;
@@ -53,32 +73,12 @@
5373
import com.sun.jna.platform.win32.WinDef.ULONGLONG;
5474
import com.sun.jna.platform.win32.WinDef.USHORT;
5575
import com.sun.jna.platform.win32.WinDef.WORD;
76+
import com.sun.jna.platform.win32.COM.COMUtils;
77+
import com.sun.jna.platform.win32.COM.Dispatch;
5678
import com.sun.jna.platform.win32.COM.TypeComp;
5779
import com.sun.jna.platform.win32.COM.Unknown;
58-
import static com.sun.jna.platform.win32.Variant.VT_BOOL;
59-
import static com.sun.jna.platform.win32.Variant.VT_BSTR;
60-
import static com.sun.jna.platform.win32.Variant.VT_CY;
61-
import static com.sun.jna.platform.win32.Variant.VT_DATE;
62-
import static com.sun.jna.platform.win32.Variant.VT_DECIMAL;
63-
import static com.sun.jna.platform.win32.Variant.VT_DISPATCH;
64-
import static com.sun.jna.platform.win32.Variant.VT_ERROR;
65-
import static com.sun.jna.platform.win32.Variant.VT_I1;
66-
import static com.sun.jna.platform.win32.Variant.VT_I2;
67-
import static com.sun.jna.platform.win32.Variant.VT_I4;
68-
import static com.sun.jna.platform.win32.Variant.VT_INT;
69-
import static com.sun.jna.platform.win32.Variant.VT_R4;
70-
import static com.sun.jna.platform.win32.Variant.VT_R8;
71-
import static com.sun.jna.platform.win32.Variant.VT_RECORD;
72-
import static com.sun.jna.platform.win32.Variant.VT_UI1;
73-
import static com.sun.jna.platform.win32.Variant.VT_UI2;
74-
import static com.sun.jna.platform.win32.Variant.VT_UI4;
75-
import static com.sun.jna.platform.win32.Variant.VT_UINT;
76-
import static com.sun.jna.platform.win32.Variant.VT_UNKNOWN;
77-
import static com.sun.jna.platform.win32.Variant.VT_VARIANT;
7880
import com.sun.jna.ptr.ByReference;
7981
import com.sun.jna.ptr.PointerByReference;
80-
import java.io.Closeable;
81-
import java.util.Date;
8282

8383
/**
8484
* The Interface OaIdl.
@@ -200,6 +200,11 @@ public void setValue(VARIANT_BOOL value) {
200200
public VARIANT_BOOL getValue() {
201201
return new VARIANT_BOOL(getPointer().getShort(0));
202202
}
203+
204+
@Override
205+
public String toString() {
206+
return super.toString(getValue());
207+
}
203208
}
204209

205210
public static class _VARIANT_BOOLByReference extends ByReference {
@@ -219,6 +224,11 @@ public void setValue(VARIANT_BOOL value) {
219224
public VARIANT_BOOL getValue() {
220225
return new VARIANT_BOOL(getPointer().getShort(0));
221226
}
227+
228+
@Override
229+
public String toString() {
230+
return super.toString(getValue());
231+
}
222232
}
223233

224234
@FieldOrder({"date"})
@@ -311,6 +321,11 @@ public void setValue(DISPID value) {
311321
public DISPID getValue() {
312322
return new DISPID(getPointer().getInt(0));
313323
}
324+
325+
@Override
326+
public String toString() {
327+
return super.toString(getValue());
328+
}
314329
}
315330

316331
public static class MEMBERID extends DISPID {
@@ -342,6 +357,11 @@ public void setValue(MEMBERID value) {
342357
public MEMBERID getValue() {
343358
return new MEMBERID(getPointer().getInt(0));
344359
}
360+
361+
@Override
362+
public String toString() {
363+
return super.toString(getValue());
364+
}
345365
}
346366

347367
// The Collect property. You use this property if the method you are calling
@@ -895,6 +915,7 @@ public void destroy() {
895915
/**
896916
* Implemented to satisfy Closeable interface, delegates to destroy.
897917
*/
918+
@Override
898919
public void close() {
899920
destroy();
900921
}

‎contrib/platform/src/com/sun/jna/platform/win32/WTypes.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@
2424
*/
2525
package com.sun.jna.platform.win32;
2626

27+
import java.io.UnsupportedEncodingException;
28+
2729
import com.sun.jna.Memory;
2830
import com.sun.jna.Native;
2931
import com.sun.jna.Pointer;
3032
import com.sun.jna.PointerType;
3133
import com.sun.jna.Structure;
3234
import com.sun.jna.platform.win32.WinDef.USHORT;
3335
import com.sun.jna.ptr.ByReference;
34-
import java.io.UnsupportedEncodingException;
3536

3637
/**
3738
* Constant defined in WTypes.h
@@ -170,6 +171,11 @@ public BSTR getValue() {
170171
public String getString() {
171172
return this.getValue().getValue();
172173
}
174+
175+
@Override
176+
public String toString() {
177+
return super.toString(getValue());
178+
}
173179
}
174180

175181
public static class LPSTR extends PointerType {
@@ -317,5 +323,10 @@ public void setValue(VARTYPE value) {
317323
public VARTYPE getValue() {
318324
return new VARTYPE(getPointer().getShort(0));
319325
}
326+
327+
@Override
328+
public String toString() {
329+
return super.toString(getValue());
330+
}
320331
}
321332
}

‎contrib/platform/src/com/sun/jna/platform/win32/WinDef.java

+55
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,11 @@ public void setValue(WORD value) {
117117
public WORD getValue() {
118118
return new WORD(getPointer().getShort(0));
119119
}
120+
121+
@Override
122+
public String toString() {
123+
return super.toString(getValue());
124+
}
120125
}
121126

122127
/**
@@ -207,6 +212,11 @@ public void setValue(DWORD value) {
207212
public DWORD getValue() {
208213
return new DWORD(getPointer().getInt(0));
209214
}
215+
216+
@Override
217+
public String toString() {
218+
return super.toString(getValue());
219+
}
210220
}
211221

212222
/**
@@ -278,6 +288,11 @@ public void setValue(LONG value) {
278288
public LONG getValue() {
279289
return new LONG(getPointer().getInt(0));
280290
}
291+
292+
@Override
293+
public String toString() {
294+
return super.toString(getValue());
295+
}
281296
}
282297

283298
/**
@@ -349,6 +364,11 @@ public void setValue(LONGLONG value) {
349364
public LONGLONG getValue() {
350365
return new LONGLONG(getPointer().getLong(0));
351366
}
367+
368+
@Override
369+
public String toString() {
370+
return super.toString(getValue());
371+
}
352372
}
353373

354374
/**
@@ -906,6 +926,11 @@ public void setValue(ULONG value) {
906926
public ULONG getValue() {
907927
return new ULONG(getPointer().getInt(0));
908928
}
929+
930+
@Override
931+
public String toString() {
932+
return super.toString(getValue());
933+
}
909934
}
910935

911936
/**
@@ -977,6 +1002,11 @@ public void setValue(ULONGLONG value) {
9771002
public ULONGLONG getValue() {
9781003
return new ULONGLONG(getPointer().getLong(0));
9791004
}
1005+
1006+
@Override
1007+
public String toString() {
1008+
return super.toString(getValue());
1009+
}
9801010
}
9811011

9821012
/**
@@ -1254,6 +1284,11 @@ public void setValue(USHORT value) {
12541284
public USHORT getValue() {
12551285
return new USHORT(getPointer().getShort(0));
12561286
}
1287+
1288+
@Override
1289+
public String toString() {
1290+
return super.toString(getValue());
1291+
}
12571292
}
12581293

12591294
/**
@@ -1357,6 +1392,11 @@ public void setValue(UINT value) {
13571392
public UINT getValue() {
13581393
return new UINT(getPointer().getInt(0));
13591394
}
1395+
1396+
@Override
1397+
public String toString() {
1398+
return super.toString(getValue());
1399+
}
13601400
}
13611401

13621402
/**
@@ -1421,6 +1461,11 @@ public void setValue(SCODE value) {
14211461
public SCODE getValue() {
14221462
return new SCODE(getPointer().getInt(0));
14231463
}
1464+
1465+
@Override
1466+
public String toString() {
1467+
return super.toString(getValue());
1468+
}
14241469
}
14251470

14261471
/**
@@ -1592,6 +1637,11 @@ public void setValue(BOOL value) {
15921637
public BOOL getValue() {
15931638
return new BOOL(getPointer().getInt(0));
15941639
}
1640+
1641+
@Override
1642+
public String toString() {
1643+
return super.toString(getValue());
1644+
}
15951645
}
15961646

15971647
/**
@@ -1728,6 +1778,11 @@ public void setValue(CHAR value) {
17281778
public CHAR getValue() {
17291779
return new CHAR(getPointer().getChar(0));
17301780
}
1781+
1782+
@Override
1783+
public String toString() {
1784+
return super.toString(getValue());
1785+
}
17311786
}
17321787

17331788
/**

0 commit comments

Comments
 (0)