Attachment 675065 Details for Bug 885675 – Proposed patch for new jna library

[patch] Proposed patch for new jna library

netbeans-platform-7.2.1-jna-3.5.0.patch (text/plain), 5.88 KB, created by gil cattaneo on 2013-01-08 21:14:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2013-01-08 21:14:27 UTC

Size: 5.88 KB

patch

obsolete

>diff -Nru netbeans-platform-7.2.1/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java netbeans-platform-7.2.1-gil/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java
>--- netbeans-platform-7.2.1/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java	2012-10-10 11:02:12.000000000 +0200
>+++ netbeans-platform-7.2.1-gil/keyring.impl/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java	2013-01-08 21:23:03.861808248 +0100
>@@ -51,7 +51,9 @@
> import com.sun.jna.ToNativeContext;
> import com.sun.jna.TypeConverter;
> import java.io.File;
>+import java.util.Arrays;
> import java.util.Collections;
>+import java.util.List;
> import java.util.Map;
> import org.netbeans.api.annotations.common.SuppressWarnings;
> 
>@@ -142,6 +144,9 @@
>         public int item_id;
>         public /*GnomeKeyringAttributeList*/Pointer attributes;
>         public String secret;
>+        protected List getFieldOrder() {
>+           return Arrays.asList(new String[] { "keyring","item_id","attributes","secret" });
>+        }
>     }
> 
>     /** http://library.gnome.org/devel/glib/2.6/glib-Miscellaneous-Utility-Functions.html#g-set-application-name */
>diff -Nru netbeans-platform-7.2.1/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java netbeans-platform-7.2.1-gil/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java
>--- netbeans-platform-7.2.1/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java	2012-10-10 11:02:12.000000000 +0200
>+++ netbeans-platform-7.2.1-gil/keyring.impl/src/org/netbeans/modules/keyring/win32/Win32Protect.java	2013-01-08 21:23:03.862808196 +0100
>@@ -49,6 +49,7 @@
> import com.sun.jna.WString;
> import com.sun.jna.win32.StdCallLibrary;
> import java.util.Arrays;
>+import java.util.List;
> import java.util.concurrent.Callable;
> import java.util.logging.Level;
> import java.util.logging.Logger;
>@@ -170,6 +171,9 @@
>         void zero() {
>             ((Memory) pbData).clear();
>         }
>+        protected List getFieldOrder() {
>+           return Arrays.asList(new String[] { "cbData","pbData" });
>+        }
>     }
> 
> }
>diff -Nru netbeans-platform-7.2.1/masterfs.solaris/src/org/netbeans/modules/masterfs/watcher/solaris/FAMNotifier.java netbeans-platform-7.2.1-gil/masterfs.solaris/src/org/netbeans/modules/masterfs/watcher/solaris/FAMNotifier.java
>--- netbeans-platform-7.2.1/masterfs.solaris/src/org/netbeans/modules/masterfs/watcher/solaris/FAMNotifier.java	2012-10-10 11:02:18.000000000 +0200
>+++ netbeans-platform-7.2.1-gil/masterfs.solaris/src/org/netbeans/modules/masterfs/watcher/solaris/FAMNotifier.java	2013-01-08 21:27:12.910638118 +0100
>@@ -49,9 +49,11 @@
> import com.sun.jna.Structure;
> import com.sun.jna.Structure.ByReference;
> import java.io.IOException;
>+import java.util.Arrays;
> import java.util.Collections;
> import java.util.HashMap;
> import java.util.HashSet;
>+import java.util.List;
> import java.util.Map;
> import java.util.Set;
> import java.util.concurrent.BlockingQueue;
>@@ -188,6 +190,9 @@
>             public static class Reference extends FAMConnection implements ByReference {}
>             public int fd;
>             public Pointer client;
>+            protected List getFieldOrder() {
>+                return Arrays.asList(new String[] { "fd","client" });
>+            }
>         }
> 
>         static class FAMRequest extends Structure {
>@@ -202,6 +207,9 @@
>             }
> 
>             public int reqnum;
>+            protected List getFieldOrder() {
>+                return Arrays.asList(new String[] { "reqnum" });
>+            }
>         };
> 
>         public static final int PATH_MAX = 1024;
>@@ -223,6 +231,9 @@
>             public byte[] filename = new byte[PATH_MAX];   /* file changed */
>             public Pointer userdata;            /* userdata associated with this monitor req. */
>             public int code;             /* What happened to file - see above */
>+            protected List getFieldOrder() {
>+                return Arrays.asList(new String[] { "fc","fr","hostname","filename","userdata","code"  });
>+            }
>         }
> 
> 
>diff -Nru netbeans-platform-7.2.1/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java netbeans-platform-7.2.1-gil/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java
>--- netbeans-platform-7.2.1/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java	2012-10-10 11:02:18.000000000 +0200
>+++ netbeans-platform-7.2.1-gil/masterfs.windows/src/org/netbeans/modules/masterfs/watcher/windows/WindowsNotifier.java	2013-01-08 21:36:03.894507707 +0100
>@@ -59,6 +59,8 @@
> import com.sun.jna.win32.W32APIFunctionMapper;
> import com.sun.jna.win32.W32APITypeMapper;
> import java.io.InterruptedIOException;
>+import java.util.Arrays;
>+import java.util.List;
> import java.util.concurrent.BlockingQueue;
> import java.util.concurrent.LinkedBlockingQueue;
> import java.util.logging.Level;
>@@ -118,6 +120,9 @@
>         public int Offset;
>         public int OffsetHigh;
>         public HANDLE hEvent;
>+        protected List getFieldOrder() {
>+           return Arrays.asList(new String[] { "Internal","InternalHigh","Offset","OffsetHigh","hEvent" });
>+        }
>     }
> 
>     public static HANDLE INVALID_HANDLE_VALUE = new HANDLE(Pointer.createConstant(
>@@ -190,12 +195,18 @@
>             next.read();
>             return next;
>         }
>+        protected List getFieldOrder() {
>+           return Arrays.asList(new String[] { "NextEntryOffset","Action","FileNameLength","FileName" });
>+        }
>     }
> 
>     public static class SECURITY_ATTRIBUTES extends Structure {
>         public final int nLength = size();
>         public Pointer lpSecurityDescriptor;
>         public boolean bInheritHandle;
>+        protected List getFieldOrder() {
>+           return Arrays.asList(new String[] { "nLength","lpSecurityDescriptor","bInheritHandle" });
>+        }
>     }
> 
>     interface Kernel32 extends StdCallLibrary {

Actions: View | Diff

Attachments on bug 885675: 660747 | 675065