Return primitive types from convenience methods

Author: dbwiddis

contrib/platform/src/com/sun/jna/platform/mac/CoreFoundation.java

@@ -322,8 +322,8 @@ public CFArrayRef(Pointer p) {
          *
          * @return The number of values in this array.
          */
-        public CFIndex getCount() {
-            return INSTANCE.CFArrayGetCount(this);
+        public int getCount() {
+            return INSTANCE.CFArrayGetCount(this).intValue();
         }
 
         /**
@@ -333,8 +333,8 @@ public CFIndex getCount() {
          *            The index of the value to retrieve.
          * @return The value at the {@code idx} index.
          */
-        public Pointer getValueAtIndex(CFIndex idx) {
-            return INSTANCE.CFArrayGetValueAtIndex(this, idx);
+        public Pointer getValueAtIndex(int idx) {
+            return INSTANCE.CFArrayGetValueAtIndex(this, new CFIndex(idx));
         }
     }
 
@@ -359,8 +359,8 @@ public CFDataRef(Pointer p) {
          * @return An index that specifies the number of bytes associated with this
          *         object.
          */
-        public CFIndex getLength() {
-            return INSTANCE.CFDataGetLength(this);
+        public int getLength() {
+            return INSTANCE.CFDataGetLength(this).intValue();
         }
 
         /**
@@ -402,18 +402,19 @@ public Pointer getValue(PointerType key) {
         }
 
         /**
-         * Convenience method for {@link CoreFoundation#CFDictionaryGetValueIfPresent}
-         * on this object.
+         * Convenience method for
+         * {@link CoreFoundation#CFDictionaryGetValueIfPresent} on this object.
          *
          * @param key
          *            The key for which to find a match.
          * @param value
          *            A pointer to memory which, on return, is filled with the
          *            pointer-sized value if a matching key is found.
-         * @return 1 if a matching key was found, otherwise 0
+         * @return {@code true} if a matching key was found, otherwise
+         *         {@code false}
          */
-        public byte getValueIfPresent(PointerType key, PointerByReference value) {
-            return INSTANCE.CFDictionaryGetValueIfPresent(this, key, value);
+        public boolean getValueIfPresent(PointerType key, PointerByReference value) {
+            return INSTANCE.CFDictionaryGetValueIfPresent(this, key, value) > 0;
         }
     }
 

contrib/platform/src/com/sun/jna/platform/mac/IOKit.java

@@ -398,7 +398,7 @@ public byte[] getByteArrayProperty(String key) {
             keyAsCFString.release();
             if (valueAsCFType != null) {
                 CFDataRef valueAsCFData = new CFDataRef(valueAsCFType.getPointer());
-                int length = valueAsCFData.getLength().intValue();
+                int length = valueAsCFData.getLength();
                 Pointer p = valueAsCFData.getBytePtr();
                 value = p.getByteArray(0, length);
                 valueAsCFType.release();

contrib/platform/test/com/sun/jna/platform/mac/CoreFoundationTest.java

@@ -141,9 +141,9 @@ public void testCFArray() {
         CFArrayRef cfPtrArray = CF.CFArrayCreate(null, contiguousArray, new CFIndex(refArray.length), null);
         assertEquals(CoreFoundation.ARRAY_TYPE_ID, cfPtrArray.getTypeID());
 
-        assertEquals(refArray.length, cfPtrArray.getCount().intValue());
+        assertEquals(refArray.length, cfPtrArray.getCount());
         for (int i = 0; i < refArray.length; i++) {
-            Pointer result = cfPtrArray.getValueAtIndex(new CFIndex(i));
+            Pointer result = cfPtrArray.getValueAtIndex(i);
             try {
                 new CFStringRef(result);
                 fail("Should have thrown a ClassCastExcpetion.");
@@ -173,7 +173,7 @@ public void testCFData() {
         CFDataRef cfData = CF.CFDataCreate(null, nativeBytes, new CFIndex(size));
         assertEquals(CoreFoundation.DATA_TYPE_ID, cfData.getTypeID());
 
-        int dataSize = cfData.getLength().intValue();
+        int dataSize = cfData.getLength();
         assertEquals(size, dataSize);
         // Read it back out and convert to an array
         Pointer bytes = cfData.getBytePtr();

contrib/platform/test/com/sun/jna/platform/mac/IOKitTest.java

@@ -41,7 +41,6 @@
 import com.sun.jna.platform.mac.CoreFoundation.CFArrayRef;
 import com.sun.jna.platform.mac.CoreFoundation.CFBooleanRef;
 import com.sun.jna.platform.mac.CoreFoundation.CFDictionaryRef;
-import com.sun.jna.platform.mac.CoreFoundation.CFIndex;
 import com.sun.jna.platform.mac.CoreFoundation.CFMutableDictionaryRef;
 import com.sun.jna.platform.mac.CoreFoundation.CFNumberRef;
 import com.sun.jna.platform.mac.CoreFoundation.CFStringRef;
@@ -108,8 +107,7 @@ public void testMatching() {
         // Get all the keys
         PointerByReference properties = new PointerByReference();
         assertEquals(0, platformExpert.createCFProperties(properties));
-        dict = new CFMutableDictionaryRef();
-        dict.setPointer(properties.getValue());
+        dict = new CFMutableDictionaryRef(properties.getValue());
         assertNotEquals(0, dict.getValueIfPresent(serialKey, null));
         result = dict.getValue(serialKey);
         cfSerial = new CFStringRef(result);
@@ -243,27 +241,26 @@ public void testPowerSources() {
         CFStringRef isPresentKey = CFStringRef.createCFString("Is Present");
         CFStringRef currentCapacityKey = CFStringRef.createCFString("Current Capacity");
         CFStringRef maxCapacityKey = CFStringRef.createCFString("Max Capacity");
-        int powerSourcesCount = powerSourcesList.getCount().intValue();
+        int powerSourcesCount = powerSourcesList.getCount();
         for (int ps = 0; ps < powerSourcesCount; ps++) {
             // Get the dictionary for that Power Source
-            Pointer pwrSrcPtr = powerSourcesList.getValueAtIndex(new CFIndex(ps));
-            CFTypeRef powerSource = new CFTypeRef();
-            powerSource.setPointer(pwrSrcPtr);
+            Pointer pwrSrcPtr = powerSourcesList.getValueAtIndex(ps);
+            CFTypeRef powerSource = new CFTypeRef(pwrSrcPtr);
             CFDictionaryRef dictionary = IOKit.INSTANCE.IOPSGetPowerSourceDescription(powerSourcesInfo, powerSource);
 
             // Get values from dictionary (See IOPSKeys.h)
             // Skip if not present
             PointerByReference result = new PointerByReference();
-            if (0 != dictionary.getValueIfPresent(isPresentKey, result)) {
+            if (dictionary.getValueIfPresent(isPresentKey, result)) {
                 CFBooleanRef isPresentRef = new CFBooleanRef(result.getValue());
                 if (isPresentRef.booleanValue()) {
                     int currentCapacity = 0;
-                    if (0 != dictionary.getValueIfPresent(currentCapacityKey, result)) {
+                    if (dictionary.getValueIfPresent(currentCapacityKey, result)) {
                         CFNumberRef cap = new CFNumberRef(result.getValue());
                         currentCapacity = cap.intValue();
                     }
                     int maxCapacity = 100;
-                    if (0 != dictionary.getValueIfPresent(maxCapacityKey, result)) {
+                    if (dictionary.getValueIfPresent(maxCapacityKey, result)) {
                         CFNumberRef cap = new CFNumberRef(result.getValue());
                         maxCapacity = cap.intValue();
                     }