Next development version, refactoring to netcdf 5 and other updates.

Author: nilshoffmann

cross-annotations/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cross</artifactId>
         <groupId>io.github.nilshoffmann</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>cross-annotations</artifactId>
     <packaging>jar</packaging>

cross-cache/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cross</artifactId>
         <groupId>io.github.nilshoffmann</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>cross-cache</artifactId>
     <packaging>jar</packaging>

cross-event/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cross</artifactId>
         <groupId>io.github.nilshoffmann</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>cross-event</artifactId>
     <packaging>jar</packaging>

cross-exception/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>cross</artifactId>
         <groupId>io.github.nilshoffmann</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>cross-exception</artifactId>
     <packaging>jar</packaging>

cross-main/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>cross</artifactId>
         <groupId>io.github.nilshoffmann</groupId>
-        <version>2.0.1</version>
+        <version>2.0.2-SNAPSHOT</version>
     </parent>
     <artifactId>cross-main</artifactId>
     <packaging>jar</packaging>
@@ -84,7 +84,7 @@
         </dependency>
         <dependency>
             <groupId>edu.ucar</groupId>
-            <artifactId>netcdfAll</artifactId>
+            <artifactId>cdm-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jdom</groupId>

cross-main/src/main/java/cross/Factory.java

@@ -152,8 +152,8 @@ public void dumpConfig(final String filename, final Date d) {
                     File configLocationNew = new File(location.getParentFile(), configLocation.getName());
                     FileUtils.copyFile(configLocation, configLocationNew);
                 }
-                LoggerFactory.getLogger(Factory.class).error("Saving configuration to: ");
-                LoggerFactory.getLogger(Factory.class).error("{}", location.getAbsolutePath());
+                LoggerFactory.getLogger(Factory.class).info("Saving configuration to: ");
+                LoggerFactory.getLogger(Factory.class).info("{}", location.getAbsolutePath());
                 saveConfiguration(cfg, location);
             } catch (IOException | ConfigurationException ex) {
                 LoggerFactory.getLogger(Factory.class).error("{}", ex);

cross-main/src/main/java/cross/datastructures/cache/SerializableArray.java

@@ -76,7 +76,7 @@ public SerializableArray(Array array) {
     @Override
     public void writeExternal(ObjectOutput oo) throws IOException {
         if (array != null) {
-            oo.writeObject(DataType.getType(array.getElementType()));
+            oo.writeObject(DataType.getType(array));
             oo.writeObject(array.getShape());
             oo.writeObject(array.getStorage());
         }

cross-main/src/main/java/cross/datastructures/fragments/VariableFragment.java

@@ -376,7 +376,7 @@ public void setArray(final Array a1) {
             ArrayList<Array> list = new ArrayList<>(1);
             list.add(a1);
             parent.getCache().put(this, list);
-            setDataType(DataType.getType(a1.getElementType()));
+            setDataType(DataType.getType(a1));
             if (getDimensions() == null) {
                 setDimensions(cross.datastructures.tools.ArrayTools.getDefaultDimensions(a1));
             }
@@ -437,7 +437,7 @@ protected void setIndexedArrayInternal(final List<Array> al1) {
         if (al1 != null && !al1.isEmpty()) {
             this.isModified = true;
             parent.getCache().put(this, al1);
-            setDataType(DataType.getType(al1.get(0).getElementType()));
+            setDataType(DataType.getType(al1.get(0)));
         } else {
             clear();
         }

cross-main/src/main/java/cross/datastructures/tools/FragmentTools.java

@@ -158,7 +158,7 @@ public static IVariableFragment createIntArrayD1(
         } else {
             vf = new VariableFragment(parent, varname);
         }
-        final ArrayInt.D1 a = new ArrayInt.D1(size);
+        final ArrayInt.D1 a = new ArrayInt.D1(size, false);
         vf.setArray(a);
         return vf;
     }

cross-main/src/main/java/cross/io/xml/FragmentXMLSerializer.java

@@ -506,7 +506,7 @@ public ArrayList<Array> readIndexed(final IVariableFragment f)
         // read in the full index_array
         log.debug("Reading index array {}", index);
         Array index_array = readSingle(index);
-        switch (DataType.getType(index_array.getElementType())) {
+        switch (DataType.getType(index_array)) {
             case LONG:
                 log.warn("Index array contains long values, this is currently only supported up to Integer.MAX_VALUE");
                 break;
@@ -588,7 +588,7 @@ public ArrayList<Array> readIndexed(final IVariableFragment f)
             data_end = Math.min(data_dim.getLength() - 1, data_end);
             if (data_start > data_end) {
                 log.warn("scan_index contains an invalid last scan offset. Inserting terminating array with length 0!");
-                al.add(Array.factory(DataType.getType(data_array.getElementType()), new int[0]));
+                al.add(Array.factory(DataType.getType(data_array), new int[0]));
             } else {
                 try {
                     log.debug("Reading array {}, from {} to {}", new Object[]{