Enhance DSS pathname sorting logic

Enhance DSS pathname sorting logic to account for non-gridded records in the DSS file. Use a common utility method to sort records among all Vortex utilities.
HydrologicEngineeringCenter · Mar 17, 2023 · 44cc253 · 44cc253
1 parent 616f150
commit 44cc253
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 184 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -19,6 +19,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.4.2")

diff --git a/calculator/build.gradle.kts b/calculator/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/calculator/src/main/java/calculator/WizardData.java b/calculator/src/main/java/calculator/WizardData.java
@@ -2,13 +2,9 @@
 
 import javafx.beans.property.*;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.util.Comparator;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class WizardData {
@@ -50,15 +46,7 @@ public SimpleListProperty<String> availableVariablesProperty() {
 
     public void setAvailableVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (Exception e) {
-                logger.log(Level.SEVERE, e, e::getMessage);
-            }
+            Util.sortDssVariables(grids);
         }
         availableVariables.set(grids);
     }
@@ -69,15 +57,7 @@ public SimpleListProperty<String> selectedVariablesProperty() {
 
     public void setSelectedVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (Exception e) {
-                logger.log(Level.SEVERE, e, e::getMessage);
-            }
+            Util.sortDssVariables(grids);
         }
         selectedVariables.set(grids);
     }

diff --git a/clipper/build.gradle.kts b/clipper/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/grid-to-point-converter/build.gradle.kts b/grid-to-point-converter/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("org.openjfx:javafx-fxml:11")
     implementation("com.google.inject:guice:5.0.1")

diff --git a/grid-to-point-converter/src/main/java/converter/WizardData.java b/grid-to-point-converter/src/main/java/converter/WizardData.java
@@ -4,12 +4,8 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
-import java.util.Comparator;
 import java.util.List;
 
 public class WizardData {
@@ -39,15 +35,7 @@ public SimpleListProperty<String> availableVariablesProperty() {
 
     public void setAvailableVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (DateTimeParseException e) {
-                e.printStackTrace();
-            }
+            Util.sortDssVariables(grids);
         }
         availableVariables.set(grids);
     }
@@ -57,6 +45,9 @@ public SimpleListProperty<String> selectedVariablesProperty() {
     }
 
     public void setSelectedVariables(ObservableList<String> grids) {
+        if(getInFile().endsWith("dss")) {
+            Util.sortDssVariables(grids);
+        }
         selectedVariables.set(grids);
     }
 

diff --git a/image-exporter/build.gradle.kts b/image-exporter/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/image-exporter/src/main/java/image/exporter/WizardData.java b/image-exporter/src/main/java/image/exporter/WizardData.java
@@ -4,12 +4,8 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
-import java.util.Comparator;
 import java.util.List;
 
 public class WizardData {
@@ -37,15 +33,7 @@ public SimpleListProperty<String> availableVariablesProperty() {
 
     public void setAvailableVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (DateTimeParseException e) {
-                e.printStackTrace();
-            }
+            Util.sortDssVariables(grids);
         }
         availableVariables.set(grids);
     }
@@ -55,6 +43,9 @@ public SimpleListProperty<String> selectedVariablesProperty() {
     }
 
     public void setSelectedVariables(ObservableList<String> grids) {
+        if(getInFile().endsWith("dss")) {
+            Util.sortDssVariables(grids);
+        }
         selectedVariables.set(grids);
     }
 

diff --git a/importer/build.gradle.kts b/importer/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/importer/src/main/java/importer/WizardData.java b/importer/src/main/java/importer/WizardData.java
@@ -5,11 +5,8 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -62,24 +59,7 @@ public void setAvailableVariables(ObservableList<String> variables) {
                 .collect(Collectors.toSet());
 
         if(extensions.size() == 1 && extensions.iterator().next().equals("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                //Sort based on D part
-                variables.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/", 7)[4], formatter)));
-                //Sort based on A part
-                variables.sort(Comparator.comparing(s -> s.split("/", 7)[1]));
-                //Sort based on B part
-                variables.sort(Comparator.comparing(s -> s.split("/", 7)[2]));
-                //Sort based on C part
-                variables.sort(Comparator.comparing(s -> s.split("/", 7)[3]));
-                //Sort based on F part
-                variables.sort(Comparator.comparing(s -> s.split("/", 7)[6]));
-            } catch (DateTimeParseException e) {
-                e.printStackTrace();
-            }
+            Util.sortDssVariables(variables);
         }
         availableVariables.set(variables);
     }

diff --git a/normalizer/build.gradle.kts b/normalizer/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/normalizer/src/main/java/normalizer/WizardData.java b/normalizer/src/main/java/normalizer/WizardData.java
@@ -5,13 +5,9 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
-import java.util.Comparator;
 import java.util.List;
 
 public class WizardData {
@@ -63,15 +59,7 @@ public SimpleListProperty<String> availableSourceGridsProperty() {
 
     public void setAvailableSourceGrids(ObservableList<String> grids) {
         if(getSourceFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (DateTimeParseException e) {
-                e.printStackTrace();
-            }
+            Util.sortDssVariables(grids);
         }
         availableSourceGrids.set(grids);
     }
@@ -85,6 +73,9 @@ public SimpleListProperty<String> selectedSourceGridsProperty() {
     }
 
     public void setSelectedSourceGrids(ObservableList<String> grids) {
+        if(getSourceFile().endsWith("dss")) {
+            Util.sortDssVariables(grids);
+        }
         selectedSourceGrids.set(grids);
     }
 
@@ -106,15 +97,7 @@ public SimpleListProperty<String> availableNormalGridsProperty() {
 
     public void setAvailableNormalGrids(ObservableList<String> grids) {
         if(getNormalsFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (DateTimeParseException e) {
-                e.printStackTrace();
-            }
+            Util.sortDssVariables(grids);
         }
         availableNormalGrids.set(grids);
     }

diff --git a/sanitizer/build.gradle.kts b/sanitizer/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/sanitizer/src/main/java/sanitizer/WizardData.java b/sanitizer/src/main/java/sanitizer/WizardData.java
@@ -4,13 +4,9 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.util.Comparator;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class WizardData {
@@ -44,15 +40,7 @@ public SimpleListProperty<String> availableVariablesProperty() {
 
     public void setAvailableVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (Exception e) {
-                logger.log(Level.SEVERE, e, e::getMessage);
-            }
+            Util.sortDssVariables(grids);
         }
         availableVariables.set(grids);
     }
@@ -63,15 +51,7 @@ public SimpleListProperty<String> selectedVariablesProperty() {
 
     public void setSelectedVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (Exception e) {
-                logger.log(Level.SEVERE, e, e::getMessage);
-            }
+            Util.sortDssVariables(grids);
         }
         selectedVariables.set(grids);
     }

diff --git a/time-shifter/build.gradle.kts b/time-shifter/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")

diff --git a/time-shifter/src/main/java/shifter/WizardData.java b/time-shifter/src/main/java/shifter/WizardData.java
@@ -4,12 +4,8 @@
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
+import mil.army.usace.hec.vortex.ui.Util;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeFormatterBuilder;
-import java.time.format.DateTimeParseException;
-import java.util.Comparator;
 import java.util.List;
 
 public class WizardData {
@@ -39,15 +35,7 @@ public SimpleListProperty<String> availableVariablesProperty() {
 
     public void setAvailableVariables(ObservableList<String> grids) {
         if(getInFile().endsWith("dss")) {
-            try {
-                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
-                        .parseCaseInsensitive()
-                        .appendPattern("ddMMMuuuu:HHmm")
-                        .toFormatter();
-                grids.sort(Comparator.comparing(s -> LocalDateTime.parse(s.split("/")[4], formatter)));
-            } catch (DateTimeParseException e) {
-                e.printStackTrace();
-            }
+            Util.sortDssVariables(grids);
         }
         availableVariables.set(grids);
     }
@@ -57,6 +45,9 @@ public SimpleListProperty<String> selectedVariablesProperty() {
     }
 
     public void setSelectedVariables(ObservableList<String> grids) {
+        if(getInFile().endsWith("dss")) {
+            Util.sortDssVariables(grids);
+        }
         selectedVariables.set(grids);
     }
 

diff --git a/transposer/build.gradle.kts b/transposer/build.gradle.kts
@@ -15,6 +15,7 @@ repositories {
 
 dependencies {
     implementation(project(":vortex-api"))
+    implementation(project(":vortex-ui"))
     implementation("org.slf4j:slf4j-simple:1.7.25")
     implementation("com.google.inject:guice:5.0.1")
     testImplementation("org.junit.jupiter:junit-jupiter:5.4.2")