Exchanged SimpleDateFormat through TimeZoneDateFormat where possible

CDerksen · CDerksen · commit 0ed5becc3dbd · 2022-01-04T15:39:03.000+01:00
diff --git a/eclipseProjects/org.agentgui/bundles/de.enflexit.common/src/de/enflexit/common/swing/TimeZoneDateFormat.java b/eclipseProjects/org.agentgui/bundles/de.enflexit.common/src/de/enflexit/common/swing/TimeZoneDateFormat.java
@@ -4,6 +4,7 @@
 import java.text.DateFormatSymbols;
 import java.text.SimpleDateFormat;
 import java.time.ZoneId;
+import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -101,7 +102,7 @@ public TimeZoneDateFormat(String pattern, ZoneId zoneId) {
 		this.setZoneId(zoneId);
 	}
 
-    
+	
     /**
      * Sets the {@link ZoneId}.
      * @param zoneId the new zone id
@@ -116,5 +117,16 @@ public void setZoneId(ZoneId zoneId) {
     public ZoneId getZoneId() {
     	return this.getTimeZone().toZoneId();
     }
+ 
+    
+    /**
+     * Formats the specified UTC time stamp into a date-time string.
+     *
+     * @param utcTimeStamp the UTC time stamp value to be formatted into a date-time string.
+     * @return the formatted date-time string.
+    */
+	public String format(long utcTimeStamp) {
+		return this.format(new Date(utcTimeStamp));
+	}
     
 }
diff --git a/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/core/gui/options/UpdateOptions.java b/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/core/gui/options/UpdateOptions.java
@@ -348,8 +348,7 @@ private void setGlobalData2Form() {
 		// --- Set when the update check was done the last time -----
 		String titlePrefix = Language.translate("Nach Updates suchen");
 		long dateChecked = Application.getGlobalInfo().getUpdateDateLastChecked();
-		SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yy HH:mm:ss");
-		this.getJLabelUpdateTitle().setText("<html><b>" + titlePrefix + ":</b> (Last check: " + sdf.format(new Date(dateChecked)) + ")</html>");
+		this.getJLabelUpdateTitle().setText("<html><b>" + titlePrefix + ":</b> (Last check: " + new SimpleDateFormat("dd.MM.yy HH:mm:ss").format(new Date(dateChecked)) + ")</html>");
 		
 	}
 	
diff --git a/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/core/update/ProjectRepositoryExport.java b/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/core/update/ProjectRepositoryExport.java
@@ -242,8 +242,7 @@ public static String getVersionQualifierForTimeStamp(long timeStamp) {
 	 * @return the version qualifier for time stamp
 	 */
 	public static String getVersionQualifierForDate(Date currTime) {
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd-HHmm");
-		return sdf.format(currTime);
+		return new SimpleDateFormat("yyyyMMdd-HHmm").format(currTime);
 	}
 	
 }
diff --git a/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeFormat.java b/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeFormat.java
@@ -41,8 +41,8 @@ public class TimeFormat implements Serializable {
 
 	private static final long serialVersionUID = 6691784575006563592L;
 
-	private String format = null;
-	private Date displayFormat = null;
+	private String format;
+	private Date dateDisplay;
 	
 	
 	/**
@@ -66,10 +66,10 @@ public String toString() {
 	 * @return the date to display
 	 */
 	private Date getDateDisplay() {
-		if (displayFormat==null) {
-			displayFormat = new Date();
+		if (dateDisplay==null) {
+			dateDisplay = new Date();
 		}
-		return displayFormat;
+		return dateDisplay;
 	}
 	
 	/**
diff --git a/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeModelBaseExecutionElements.java b/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeModelBaseExecutionElements.java
@@ -32,8 +32,7 @@
 import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.ZoneId;
 import java.util.Vector;
 
 import javax.swing.BorderFactory;
@@ -45,9 +44,10 @@
 import javax.swing.border.EtchedBorder;
 
 import agentgui.core.application.Language;
+import de.enflexit.common.swing.TimeZoneDateFormat;
 
 /**
- * The Class JToolBarElements4TimeModelExecution has to be extended in order to
+ * The Class TimeModelBaseExecutionElements has to be extended in order to
  * provide a specific display for a TimeModel during the execution of an agency.
  * 
  * @see TimeModel
@@ -172,18 +172,20 @@ protected  void removeAllSeparator() {
 	 * Returns a time formatted.
 	 *
 	 * @param time the time
+	 * @param zoneId the ZoneId
 	 * @param timeFormat the time format
-	 * @return the time formated
+	 * @return the time formatted
 	 */
-	protected String getTimeFormatted(long time, String timeFormat) {
+	protected String getTimeFormatted(long time, ZoneId zoneId, String timeFormat) {
+		
+		if (zoneId==null) zoneId = ZoneId.systemDefault();
+		if (timeFormat==null || timeFormat.isBlank()) timeFormat = TimeModelDateBased.DEFAULT_TIME_FORMAT;
+		
 		String timeString = null;
 		try {
-			timeString = new SimpleDateFormat(timeFormat).format(new Date(time));	
+			timeString = new TimeZoneDateFormat(timeFormat, zoneId).format(time);	
 		} catch (Exception ex) {
-			// Retry below
-		}
-		if (timeString==null) {
-			timeString = new SimpleDateFormat(TimeModelDateBased.DEFAULT_TIME_FORMAT).format(new Date(time));
+			ex.printStackTrace();
 		}
 		return timeString;
 	}
diff --git a/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeModelContinuousExecutionElements.java b/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeModelContinuousExecutionElements.java
@@ -103,7 +103,7 @@ public void setTimeModel(TimeModel timeModel) {
 				
 			default:
 				// --- timer view -----------------------------------
-				this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, timeFormat));
+				this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, this.timeModelContinuous.getZoneId(), timeFormat));
 				this.getJButtonTimeConfig().setText(this.getJMenuItemViewTimer().getText());
 				break;
 			}
diff --git a/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeModelDiscreteExecutionElements.java b/eclipseProjects/org.agentgui/bundles/org.agentgui.core/src/agentgui/simulationService/time/TimeModelDiscreteExecutionElements.java
@@ -97,7 +97,7 @@ public void setTimeModel(TimeModel timeModel) {
 				
 			default:
 				// --- timer view -------------------------
-				this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, timeFormat));
+				this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, this.timeModelDiscrete.getZoneId(), timeFormat));
 				this.getJButtonTimeConfig().setText(this.getJMenuItemViewTimer().getText());
 				break;
 			}

Original file line number	Diff line number	Diff line change
`@@ -348,8 +348,7 @@ private void setGlobalData2Form() {`
`348`	`348`	`// --- Set when the update check was done the last time -----`
`349`	`349`	`String titlePrefix = Language.translate("Nach Updates suchen");`
`350`	`350`	`long dateChecked = Application.getGlobalInfo().getUpdateDateLastChecked();`
`351`		`- SimpleDateFormat sdf = new SimpleDateFormat("dd.MM.yy HH:mm:ss");`
`352`		`- this.getJLabelUpdateTitle().setText("<html><b>" + titlePrefix + ":</b> (Last check: " + sdf.format(new Date(dateChecked)) + ")</html>");`
	`351`	`+ this.getJLabelUpdateTitle().setText("<html><b>" + titlePrefix + ":</b> (Last check: " + new SimpleDateFormat("dd.MM.yy HH:mm:ss").format(new Date(dateChecked)) + ")</html>");`
`353`	`352`
`354`	`353`	`}`
`355`	`354`
Original file line number	Diff line number	Diff line change
`@@ -242,8 +242,7 @@ public static String getVersionQualifierForTimeStamp(long timeStamp) {`
`242`	`242`	`* @return the version qualifier for time stamp`
`243`	`243`	`*/`
`244`	`244`	`public static String getVersionQualifierForDate(Date currTime) {`
`245`		`- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd-HHmm");`
`246`		`- return sdf.format(currTime);`
	`245`	`+ return new SimpleDateFormat("yyyyMMdd-HHmm").format(currTime);`
`247`	`246`	`}`
`248`	`247`
`249`	`248`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void setTimeModel(TimeModel timeModel) {`
`103`	`103`
`104`	`104`	`default:`
`105`	`105`	`// --- timer view -----------------------------------`
`106`		`- this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, timeFormat));`
	`106`	`+ this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, this.timeModelContinuous.getZoneId(), timeFormat));`
`107`	`107`	`this.getJButtonTimeConfig().setText(this.getJMenuItemViewTimer().getText());`
`108`	`108`	`break;`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void setTimeModel(TimeModel timeModel) {`
`97`	`97`
`98`	`98`	`default:`
`99`	`99`	`// --- timer view -------------------------`
`100`		`- this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, timeFormat));`
	`100`	`+ this.getJLabelTimeDisplay().setText(this.getTimeFormatted(time, this.timeModelDiscrete.getZoneId(), timeFormat));`
`101`	`101`	`this.getJButtonTimeConfig().setText(this.getJMenuItemViewTimer().getText());`
`102`	`102`	`break;`
`103`	`103`	`}`