Remove Joda DateTime library and update to java.time package (#575)

* remove joda time Signed-off-by: Emily Gouge <[email protected]> * removal of joda time Signed-off-by: Emily Gouge <[email protected]> * fix up manifest files Signed-off-by: Emily Gouge <[email protected]> * fix up manifest files Signed-off-by: Emily Gouge <[email protected]> * fix up manifest files Signed-off-by: Emily Gouge <[email protected]> * [EMF] update EMF-Model to use LocalDataTime rather than org.joda.time.DataTime Signed-off-by: Frank Gasdorf <[email protected]> * fix and update emf model Signed-off-by: Emily Gouge <[email protected]> * remove timestep and elevation from viewport model Signed-off-by: Emily Gouge <[email protected]> * remove datetime data type Signed-off-by: Emily Gouge <[email protected]> * upgrade emf diagram files to new format Signed-off-by: Emily Gouge <[email protected]> * updating sphinx version to see if it resolves build issue Signed-off-by: Emily Gouge <[email protected]> Co-authored-by: Frank Gasdorf <[email protected]>
locationtech · Oct 29, 2021 · bfd630e · bfd630e
1 parent 201cf0e
commit bfd630e
Show file tree

Hide file tree

Showing 116 changed files with 7,115 additions and 5,650 deletions.
diff --git a/.github/workflows/maven-jdk8-linux.yml b/.github/workflows/maven-jdk8-linux.yml
@@ -34,7 +34,7 @@ jobs:
     - uses: BSFishy/pip-action@v1
       with:
         packages: |
-          sphinx==1.8.5
+          sphinx==4.2.0
     - name: Build docs with sphinx
       run: mvn install -B -f docs/pom.xml -Dtycho.mode=maven -Pdocs
     - name: Run uDig product & sdk build (parallel)

diff --git a/...org.locationtech.udig.omsbox/src/org/locationtech/udig/omsbox/core/OmsScriptExecutor.java b/...org.locationtech.udig.omsbox/src/org/locationtech/udig/omsbox/core/OmsScriptExecutor.java
@@ -18,6 +18,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -28,7 +29,6 @@
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.core.runtime.Platform;
-import org.joda.time.DateTime;
 
 import org.locationtech.udig.omsbox.OmsBoxPlugin;
 import org.locationtech.udig.omsbox.utils.OmsBoxConstants;
@@ -180,7 +180,7 @@ public Process exec( String script, final PrintStream internalStream, final Prin
         // environment.put("CLASSPATH", classPath);
 
         final Process process = processBuilder.start();
-        internalStream.println("Process started: " + new DateTime().toString(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS));
+        internalStream.println("Process started: " + LocalDateTime.now().format(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS));
         internalStream.println("");
 
         // command launched
@@ -247,7 +247,7 @@ public void run() {
                 internalStream.println("");
                 internalStream.println("");
                 internalStream.println("Process finished: "
-                        + new DateTime().toString(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS));
+                        + LocalDateTime.now().format(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS));
             };
         }.start();
 

diff --git a/.../org.locationtech.udig.omsbox/src/org/locationtech/udig/omsbox/utils/OmsBoxConstants.java b/.../org.locationtech.udig.omsbox/src/org/locationtech/udig/omsbox/utils/OmsBoxConstants.java
@@ -9,10 +9,9 @@
  */
 package org.locationtech.udig.omsbox.utils;
 
+import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 
 public class OmsBoxConstants {
     public static final String CATEGORY_OTHERS = "Others";
@@ -38,8 +37,8 @@ public class OmsBoxConstants {
     public static final String STATISTICS = "Statistics";
 
     public static String dateTimeFormatterYYYYMMDDHHMMSS_string = "yyyy-MM-dd HH:mm:ss";
-    public static DateTimeFormatter dateTimeFormatterYYYYMMDDHHMMSS = DateTimeFormat
-            .forPattern(dateTimeFormatterYYYYMMDDHHMMSS_string);
+    public static DateTimeFormatter dateTimeFormatterYYYYMMDDHHMMSS = DateTimeFormatter
+            .ofPattern(dateTimeFormatterYYYYMMDDHHMMSS_string);
 
     public static String LOGLEVEL_GUI_ON = "ON";
     public static String LOGLEVEL_GUI_OFF = "OFF";

diff --git a/...omsbox/org.locationtech.udig.omsbox/src/org/locationtech/udig/omsbox/view/OmsBoxView.java b/...omsbox/org.locationtech.udig.omsbox/src/org/locationtech/udig/omsbox/view/OmsBoxView.java
@@ -12,6 +12,7 @@
 import i18n.omsbox.Messages;
 
 import java.lang.reflect.InvocationTargetException;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -47,7 +48,6 @@
 import org.eclipse.ui.dialogs.FilteredTree;
 import org.eclipse.ui.dialogs.PatternFilter;
 import org.eclipse.ui.part.ViewPart;
-import org.joda.time.DateTime;
 
 import org.locationtech.udig.omsbox.OmsBoxPlugin;
 import org.locationtech.udig.omsbox.core.ModuleDescription;
@@ -397,9 +397,9 @@ public void runSelectedModule() throws Exception {
         if (script == null) {
             return;
         }
-
+        
         String scriptID = currentSelectedModuleGui.getModuleDescription().getName() + " "
-                + new DateTime().toString(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS);
+        		+ LocalDateTime.now().format(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS);
         handler.runModule(scriptID, script);
     }
 

diff --git a/...h.udig.omsbox/src/org/locationtech/udig/omsbox/view/actions/OmsScriptExecutionAction.java b/...h.udig.omsbox/src/org/locationtech/udig/omsbox/view/actions/OmsScriptExecutionAction.java
@@ -14,6 +14,7 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintStream;
+import java.time.LocalDateTime;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
@@ -23,8 +24,6 @@
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.console.IConsole;
 import org.eclipse.ui.console.IConsoleManager;
-import org.joda.time.DateTime;
-
 import org.locationtech.udig.omsbox.OmsBoxPlugin;
 import org.locationtech.udig.omsbox.core.IProcessListener;
 import org.locationtech.udig.omsbox.core.JConsoleOutputConsole;
@@ -83,7 +82,7 @@ private void execute( String path ) {
             Process process = executor.exec(path, internalStream, errorStream, loggerLevelGui, ramLevel);
 
             File scriptFile = new File(path);
-            scriptID = scriptFile.getName() + " " + new DateTime().toString(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS);
+            scriptID = scriptFile.getName() + " " + LocalDateTime.now().format(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS);
             OmsBoxPlugin.getDefault().addProcess(process, scriptID);
 
             // cleanup when leaving uDig

diff --git a/....udig.omsbox/src/org/locationtech/udig/omsbox/view/actions/OmsScriptGenerationAction.java b/....udig.omsbox/src/org/locationtech/udig/omsbox/view/actions/OmsScriptGenerationAction.java
@@ -10,24 +10,21 @@
 package org.locationtech.udig.omsbox.view.actions;
 
 import java.io.File;
-
-import org.locationtech.udig.ui.ExceptionDetailsDialog;
+import java.time.LocalDateTime;
 
 import org.apache.commons.io.FileUtils;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.program.Program;
 import org.eclipse.swt.widgets.FileDialog;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
-import org.joda.time.DateTime;
-
 import org.locationtech.udig.omsbox.OmsBoxPlugin;
 import org.locationtech.udig.omsbox.utils.OmsBoxConstants;
 import org.locationtech.udig.omsbox.view.OmsBoxView;
+import org.locationtech.udig.ui.ExceptionDetailsDialog;
 
 /**
  * @author Andrea Antonello (www.hydrologis.com)
@@ -53,7 +50,7 @@ public void run( IAction action ) {
                     File tempFile = File.createTempFile("omsbox_", ".oms");
                     if (tempFile == null || !tempFile.exists() || tempFile.getAbsolutePath() == null) {
                         // try with user's home folder
-                        String ts = new DateTime().toString(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS);
+                        String ts = LocalDateTime.now().format(OmsBoxConstants.dateTimeFormatterYYYYMMDDHHMMSS);
                         String userHomePath = System.getProperty("user.home"); //$NON-NLS-1$
 
                         File userHomeFile = new File(userHomePath);

diff --git a/...g.catalog.kml/src/main/java/org/locationtech/udig/catalog/kml/wizard/KmlExportWizard.java b/...g.catalog.kml/src/main/java/org/locationtech/udig/catalog/kml/wizard/KmlExportWizard.java
@@ -13,10 +13,6 @@
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
-import org.locationtech.udig.catalog.IGeoResource;
-import org.locationtech.udig.ui.ExceptionDetailsDialog;
-import org.locationtech.udig.ui.PlatformGIS;
-
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.operation.IRunnableWithProgress;
@@ -25,13 +21,13 @@
 import org.eclipse.ui.IExportWizard;
 import org.eclipse.ui.IWorkbench;
 import org.geotools.data.simple.SimpleFeatureSource;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
+import org.locationtech.udig.catalog.IGeoResource;
 import org.locationtech.udig.catalog.kml.core.KmlToolPlugin;
 import org.locationtech.udig.catalog.kml.core.KmlUtils;
 import org.locationtech.udig.catalog.kml.internal.Messages;
 import org.locationtech.udig.catalog.kml.internal.ui.ImageConstants;
+import org.locationtech.udig.ui.ExceptionDetailsDialog;
+import org.locationtech.udig.ui.PlatformGIS;
 
 /**
  * @author Andrea Antonello (www.hydrologis.com)
@@ -41,7 +37,6 @@ public class KmlExportWizard extends Wizard implements IExportWizard {
 
     public static boolean canFinish = false;
     private KmlExportWizardPage mainPage;
-    public static DateTimeFormatter dateTimeFormatter = DateTimeFormat.forPattern("yyyyMMddHHmm"); //$NON-NLS-1$
 
     public KmlExportWizard() {
         super();