Changeset 35665 in osm for applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java

Timestamp:

2020-12-07T18:10:16+01:00 (4 years ago)

Author:

Don-vip

Message:

update to latest JNA

File:

• applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java (modified) (6 diffs)

applications/editors/josm/plugins/native-password-manager/src/org/netbeans/modules/keyring/gnome/GnomeKeyringLibrary.java

@@ -43 +43 @@
 package org.netbeans.modules.keyring.gnome;
 
-import com.sun.jna.DefaultTypeMapper;
+import com.sun.jna.DefaultTypeMapper; // NOSONAR
 import com.sun.jna.FromNativeContext;
 import com.sun.jna.Library;
@@ -68 +68 @@
         // http://packages.ubuntu.com/search?suite=precise&arch=any&mode=exactfilename&searchon=contents&keywords=libgnome-keyring.so.0
         private static final String EXPLICIT_ONEIRIC = "/usr/lib/libgnome-keyring.so.0";
-        private static Object load(Map<String,?> options) {
+        private static GnomeKeyringLibrary load(Map<String,?> options) {
             try {
-                return Native.loadLibrary(GENERIC, GnomeKeyringLibrary.class, options);
+                return Native.load(GENERIC, GnomeKeyringLibrary.class, options);
             } catch (UnsatisfiedLinkError x) {
                 // #203735: on Oneiric, may have trouble finding right lib.
@@ -76 +76 @@
                 // Unclear if this workaround is still needed for Oneiric with 3.4, but seems harmless to leave it in for now.
                 if (new File(EXPLICIT_ONEIRIC).isFile()) {
-                    return Native.loadLibrary(EXPLICIT_ONEIRIC, GnomeKeyringLibrary.class, options);
+                    return Native.load(EXPLICIT_ONEIRIC, GnomeKeyringLibrary.class, options);
                 } else {
                     throw x;
@@ -85 +85 @@
     }
 
-    GnomeKeyringLibrary LIBRARY = (GnomeKeyringLibrary) LibFinder.load(Collections.singletonMap(OPTION_TYPE_MAPPER, new DefaultTypeMapper() {
+    GnomeKeyringLibrary LIBRARY = LibFinder.load(Collections.singletonMap(OPTION_TYPE_MAPPER, new DefaultTypeMapper() {
         {
             addTypeConverter(Boolean.TYPE, new TypeConverter() { // #198921
@@ -107 +107 @@
 
     // GnomeKeyringAttributeList gnome_keyring_attribute_list_new() = g_array_new(FALSE, FALSE, sizeof(GnomeKeyringAttribute))
-    int GnomeKeyringAttribute_SIZE = Pointer.SIZE * 3; // conservatively: 2 pointers + 1 enum
+    int GnomeKeyringAttribute_SIZE = Native.POINTER_SIZE * 3; // conservatively: 2 pointers + 1 enum
 
     void gnome_keyring_attribute_list_append_string(
@@ -146 +146 @@
         @Override
         protected List<String> getFieldOrder() {
-            return Arrays.asList( new String[] {
+            return Arrays.asList(
                 "keyring",
                 "item_id",
                 "attributes",
-                "secret",
-            } );
+                "secret"
+            );
         }
     }