Updates for v2 arch

Author: karlnicholas

src/main/java/org/hdf5javalib/dataclass/reference/HdfObjectReference.java

@@ -107,7 +107,7 @@ public HdfObjectReference(byte[] bytes, ReferenceDatatype dt, boolean external)
 //            }
 //            Collections.reverse(parents);
 //            String objectPathString = '/' + currentNode.getObjectName() + String.join("/", parents);
-            String objectPathString = HdfDisplayUtils.getDataObjectFullName(hdfDataObject);
+            String objectPathString = hdfDataObject.getObjectPath();
 
             this.hdfDataHolder = HdfDataHolder.ofScalar(
                     new HdfString(objectPathString, new StringDatatype(

src/main/java/org/hdf5javalib/hdfjava/HdfDataObject.java

@@ -42,6 +42,7 @@ public String getObjectPath() {
             path.insert(0, parent.getObjectName());
             parent=parent.getParent();
         }
+        path.insert(0, '/');
         return path.toString();
     }
 

src/main/java/org/hdf5javalib/hdfjava/HdfFileReader.java

@@ -210,7 +210,7 @@ private void readV2Arch(SeekableByteChannel fileChannel, HdfGroup rootGroup) thr
             if ( objectHeader != null && objectHeader.findMessageByType(DataLayoutMessage.class).isEmpty() ) {
                 HdfGroup groupObject = new HdfGroup(groupName, objectHeader, rootGroup, hardLink);
                 rootGroup.addChild(groupObject);
-    System.out.println("ADDED GROUP: " +  HdfDisplayUtils.getDataObjectFullName(groupObject));
+    System.out.println("ADDED GROUP: " +  groupObject.getObjectPath());
 
                 if ( hardLink == null ) {
                     LinkInfoMessage linkInfoMessage = objectHeader.findMessageByType(LinkInfoMessage.class).orElseThrow();
@@ -222,7 +222,7 @@ private void readV2Arch(SeekableByteChannel fileChannel, HdfGroup rootGroup) thr
             } else {
                 HdfDataset datasetObject = new HdfDataset(groupName, objectHeader, rootGroup, hardLink);
                 rootGroup.addChild(datasetObject);
-System.out.println("ADDED DATASET: " + HdfDisplayUtils.getDataObjectFullName(datasetObject));
+System.out.println("ADDED DATASET: " + datasetObject.getObjectPath());
             }
 
 

src/main/java/org/hdf5javalib/utils/HdfDisplayUtils.java

@@ -94,17 +94,17 @@ public static void displayAttributes(HdfDataset dataSet) throws InvocationTarget
         }
     }
 
-    public static String getDataObjectFullName(HdfDataObject hdfDataObject) {
-        List<String> parents = new ArrayList<>();
-        HdfDataObject currentNode = hdfDataObject;
-        while(currentNode.getParent() != null) {
-            parents.add(currentNode.getObjectName());
-            currentNode = currentNode.getParent().getDataObject();
-        }
-        Collections.reverse(parents);
-        String objectPathString = '/' + currentNode.getObjectName() + String.join("/", parents);
-        return objectPathString;
-    }
+//    public static String getDataObjectFullName(HdfDataObject hdfDataObject) {
+//        List<String> parents = new ArrayList<>();
+//        HdfDataObject currentNode = hdfDataObject;
+//        while(currentNode.getParent() != null) {
+//            parents.add(currentNode.getObjectName());
+//            currentNode = currentNode.getParent().getDataObject();
+//        }
+//        Collections.reverse(parents);
+//        String objectPathString = '/' + currentNode.getObjectName() + String.join("/", parents);
+//        return objectPathString;
+//    }
 
     public static void displayData(SeekableByteChannel channel, HdfDataset ds, HdfFileReader reader) throws Exception {
         log.debug("Dataset path: {}", ds.getObjectPath());