Version 0.2 refactor

Author: karlnicholas

src/main/java/org/hdf5javalib/datatype/StringDatatype.java

@@ -443,8 +443,8 @@ public enum CharacterSet {
          */
         RESERVED_15(15, "Reserved", "Reserved for future use.");
 
-        private final int value;
-        private final String name;
+        final int value;
+        final String name;
         private final String description;
 
         CharacterSet(int value, String name, String description) {

src/main/java/org/hdf5javalib/datatype/VariableLengthDatatype.java

@@ -101,7 +101,7 @@ public static VariableLengthDatatype parseVariableLengthDatatype(int classAndVer
      * @param charSet     the character set for strings (ASCII or UTF-8)
      * @return a BitSet encoding the type, padding, and character set
      */
-    public static BitSet createClassBitField(Type type, PaddingType paddingType, CharacterSet charSet) {
+    public static BitSet createClassBitField(Type type, PaddingType paddingType, StringDatatype.CharacterSet charSet) {
         long bitfield = ((long) charSet.value << 8) | ((long) paddingType.value << 4) | type.value;
         return BitSet.valueOf(new long[]{bitfield});
     }
@@ -176,7 +176,7 @@ public String toString(byte[] bytes) {
 
         byte[] workingBytes = globalHeap.getDataBytes(offset, index);
         if (getType() == Type.STRING) {
-            return new String(workingBytes, getCharacterSet() == CharacterSet.ASCII ? StandardCharsets.US_ASCII : StandardCharsets.UTF_8);
+            return new String(workingBytes, getCharacterSet() == StringDatatype.CharacterSet.ASCII ? StandardCharsets.US_ASCII : StandardCharsets.UTF_8);
         } else {
             int datatypeSize = datatype.getSize();
             String[] resultArray = new String[count];
@@ -307,8 +307,8 @@ public PaddingType getPaddingType() {
      *
      * @return the CharacterSet (ASCII or UTF8)
      */
-    public CharacterSet getCharacterSet() {
-        return CharacterSet.fromBitSet(classBitField);
+    public StringDatatype.CharacterSet getCharacterSet() {
+        return StringDatatype.CharacterSet.fromBitSet(classBitField);
     }
 
     /**
@@ -558,112 +558,6 @@ public static PaddingType fromBitSet(BitSet bits) {
         }
     }
 
-    /**
-     * Enum representing character sets for HDF5 variable-length strings.
-     */
-    public enum CharacterSet {
-        /**
-         * ASCII character set.
-         */
-        ASCII(0, "ASCII", "American Standard Code for Information Interchange"),
-        /**
-         * UTF-8 character set.
-         */
-        UTF8(1, "UTF-8", "Unicode Transformation Format, 8-bit"),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_2(2, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_3(3, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_4(4, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_5(5, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_6(6, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_7(7, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_8(8, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_9(9, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_10(10, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_11(11, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_12(12, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_13(13, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_14(14, "Reserved", "Reserved for future use."),
-        /**
-         * Reserved character set for future use.
-         */
-        RESERVED_15(15, "Reserved", "Reserved for future use.");
-
-        private final int value;
-        private final String name;
-        private final String description;
-
-        CharacterSet(int value, String name, String description) {
-            this.value = value;
-            this.name = name;
-            this.description = description;
-        }
-
-        /**
-         * Retrieves the CharacterSet corresponding to the given value.
-         *
-         * @param value the numeric value of the character set
-         * @return the corresponding CharacterSet
-         * @throws IllegalArgumentException if the value does not match any known character set
-         */
-        public static CharacterSet fromValue(int value) {
-            for (CharacterSet set : values()) {
-                if (set.value == value) return set;
-            }
-            throw new IllegalArgumentException("Invalid character set value: " + value);
-        }
-
-        /**
-         * Retrieves the CharacterSet from a BitSet.
-         *
-         * @param bits the BitSet containing character set information
-         * @return the corresponding CharacterSet
-         */
-        public static CharacterSet fromBitSet(BitSet bits) {
-            int value = (bits.get(8) ? 1 : 0) | (bits.get(9) ? 2 : 0) |
-                    (bits.get(10) ? 4 : 0) | (bits.get(11) ? 8 : 0);
-            return fromValue(value);
-        }
-    }
-
     @Override
     public List<ReferenceDatatype> getReferenceInstances() {
         return datatype.getReferenceInstances();

src/main/java/org/hdf5javalib/examples/read/VLenTypesRead.java

@@ -49,66 +49,4 @@ private void run() throws Exception {
             log.info("Superblock: {}", reader.getSuperblock());
         }
     }
-
-    /**
-     * A data class representing a basic compound dataset with two fields.
-     */
-    public static class Compound {
-        /** A short integer field. */
-        private Short a;
-        /** A double-precision floating-point field. */
-        private Double b;
-
-        public Short getA() {
-            return a;
-        }
-
-        public void setA(Short a) {
-            this.a = a;
-        }
-
-        public Double getB() {
-            return b;
-        }
-
-        public void setB(Double b) {
-            this.b = b;
-        }
-    }
-
-    /**
-     * A custom data class for a compound dataset with renamed fields.
-     */
-    public static class CustomCompound {
-        /** A name identifier for the compound. */
-        private String name;
-        /** A short integer field. */
-        private Short someShort;
-        /** A double-precision floating-point field. */
-        private Double someDouble;
-
-        public String getName() {
-            return name;
-        }
-
-        public void setName(String name) {
-            this.name = name;
-        }
-
-        public Short getSomeShort() {
-            return someShort;
-        }
-
-        public void setSomeShort(Short someShort) {
-            this.someShort = someShort;
-        }
-
-        public Double getSomeDouble() {
-            return someDouble;
-        }
-
-        public void setSomeDouble(Double someDouble) {
-            this.someDouble = someDouble;
-        }
-    }
 }