[svn-r30315] HDFFV-9972: Fix test reference and change default for H5Iget_name in JNI API.

5 files changed, 14 insertions, 14 deletions

diff --git a/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReference.txt b/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReference.txt
index 827c042..d8afa56 100644
--- a/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReference.txt
+++ b/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReference.txt
@@ -1,4 +1,4 @@
 DS1[0]:
-  ->H5G_GROUP: 
+  ->H5G_GROUP: /G1
 DS1[1]:
-  ->H5G_DATASET: 
+  ->H5G_DATASET: /DS2
diff --git a/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReferenceAttribute.txt b/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReferenceAttribute.txt
index fe3cdc0..3fabd66 100644
--- a/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReferenceAttribute.txt
+++ b/java/examples/testfiles/examples.datatypes.H5Ex_T_ObjectReferenceAttribute.txt
@@ -1,4 +1,4 @@
 A1[0]:
-  ->H5G_GROUP: 
+  ->H5G_GROUP: /G1
 A1[1]:
-  ->H5G_DATASET: 
+  ->H5G_DATASET: /DS2
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index e5defe3..7614292 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -3352,7 +3352,7 @@ public class H5 implements java.io.Serializable {
     public synchronized static native long H5Iget_file_id(long obj_id) throws HDF5LibraryException;
 
     @Deprecated
-    public synchronized static native long H5Iget_name(long obj_id, String[] name, long size)
+    public synchronized static native long H5Iget_name_long(long obj_id, String[] name, long size)
             throws HDF5LibraryException, NullPointerException;
     /**
      * H5Iget_name_str retrieves the name of an object specified by the identifier, obj_id.
@@ -3365,7 +3365,7 @@ public class H5 implements java.io.Serializable {
      * @exception HDF5LibraryException
      *                - Error from the HDF-5 Library.
      **/
-    public synchronized static native String H5Iget_name_str(long obj_id)
+    public synchronized static native String H5Iget_name(long obj_id)
             throws HDF5LibraryException;
 
     public synchronized static native int H5Iget_ref(long obj_id) throws HDF5LibraryException, NullPointerException;
diff --git a/java/src/jni/h5iImp.c b/java/src/jni/h5iImp.c
index d2f845a..71e1b71 100644
--- a/java/src/jni/h5iImp.c
+++ b/java/src/jni/h5iImp.c
@@ -52,11 +52,11 @@ Java_hdf_hdf5lib_H5_H5Iget_1type
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Iget_name
+ * Method:    H5Iget_name_long
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name
+Java_hdf_hdf5lib_H5_H5Iget_1name_1long
     (JNIEnv *env, jclass clss, jlong obj_id, jobjectArray name, jlong buf_size)
 {
     char *aName;
@@ -91,11 +91,11 @@ Java_hdf_hdf5lib_H5_H5Iget_1name
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Iget_name_str
+ * Method:    H5Iget_name
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name_1str
+Java_hdf_hdf5lib_H5_H5Iget_1name
     (JNIEnv *env, jclass clss, jlong obj_id)
 {
     char *aName;
diff --git a/java/src/jni/h5iImp.h b/java/src/jni/h5iImp.h
index f6fe56b..2bf839bc 100644
--- a/java/src/jni/h5iImp.h
+++ b/java/src/jni/h5iImp.h
@@ -34,20 +34,20 @@ Java_hdf_hdf5lib_H5_H5Iget_1type
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Iget_name
+ * Method:    H5Iget_name_long
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name
+Java_hdf_hdf5lib_H5_H5Iget_1name_1long
   (JNIEnv*, jclass, jlong, jobjectArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Iget_name_str
+ * Method:    H5Iget_name
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name_1str
+Java_hdf_hdf5lib_H5_H5Iget_1name
   (JNIEnv*, jclass, jlong);
 
 /*