Changeset 1282 for trunk/bindings

Timestamp:

14/10/09 14:12:05 (3 years ago)

Author:

Mark Koennecke

Message:

• Fixes for refs #193
• The problem with the one character attribute was in napi4.c, a char to short
• For the inconsistent attrdi I added NXinitattrdir and NXinitgroupdir for good measure to the native bindings and have them called in attrdir() and groupdir();

Location:

trunk/bindings/java

Files:

• native/NexusFile.c (modified) (2 diffs)
• org/nexusformat/NexusFile.java (modified) (4 diffs)

trunk/bindings/java/native/NexusFile.c

@@ -21 +21 @@
 
    Updated for 64 bit types, Mark Koennecke, August 2007
+
+   Added NXinitattrdir and NXinitgroupdir, Mark Koennecke, October 2009
 
    IMPLEMENTATION NOTES
@@ -1233 +1235 @@
     }
 }
+/*---------------------------------------------------------------------*/
+JNIEXPORT void JNICALL Java_org_nexusformat_NexusFile_initattrdir
+(JNIEnv *env, jobject obj, jint handle)
+{
+    NXhandle nxhandle;
+    int iRet;
+
+    /* set error handler */
+    NXMSetError(env,JapiError);
+
+    /* exchange the Java handler to a NXhandle */
+    nxhandle =  (NXhandle)HHGetPointer(handle);
+
+    iRet = NXinitattrdir(nxhandle);
+
+}
+/*---------------------------------------------------------------------*/
+JNIEXPORT void JNICALL Java_org_nexusformat_NexusFile_initgroupdir
+(JNIEnv *env, jobject obj, jint handle)
+{
+    NXhandle nxhandle;
+    int iRet;
+
+    /* set error handler */
+    NXMSetError(env,JapiError);
+
+    /* exchange the Java handler to a NXhandle */
+    nxhandle =  (NXhandle)HHGetPointer(handle);
+
+    iRet = NXinitgroupdir(nxhandle);
+}
 /*------------------------------------------------------------------------
                                debugstop

trunk/bindings/java/org/nexusformat/NexusFile.java

@@ -16 +16 @@
   *
   * copyright: see accompanying COPYRIGHT file
+  *
+  * added nxinitattrdir: Mark Koennecke, October 2009 
   */
 package org.nexusformat;
@@ -553 +555 @@
     protected native int nextentry(int handle, String names[]);
     protected native int nextattr(int handle, String names[], int args[]);
+    protected native void initattrdir(int handle);
+    protected native void initgroupdir(int handle);
     /**
      * setnumberformat sets the number format for printing number when
@@ -599 +603 @@
         String names[] = new String[2];
         int i;
+
+        initgroupdir(handle);
         while(nextentry(handle,names) != -1)
         {
@@ -621 +627 @@
         Hashtable h = new Hashtable();
         if(handle < 0) throw new NexusException("NAPI-ERROR: File not open");
+        initattrdir(handle);
         while(nextattr(handle,names,args) != -1)
         {