V2.02.09

douggillespie · douggillespie · commit 84f2bd7ad702 · 2023-06-29T11:44:00.000+01:00
Fix to display time zone problem.
diff --git a/README.html b/README.html
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
   <name>Pamguard Java12+</name>
-  <version>2.02.08</version>
+  <version>2.02.09</version>
   <description>Pamguard for Java 12+, using Maven to control dependcies</description>
   <url>www.pamguard.org</url>
   <organization>
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
-  <version>2.02.08</version>
+  <version>2.02.09</version>
   <name>Pamguard Java12+</name>
   <description>Pamguard for Java 12+, using Maven to control dependcies</description>
 	<url>www.pamguard.org</url>
diff --git a/src/PamController/PamguardVersionInfo.java b/src/PamController/PamguardVersionInfo.java
@@ -31,12 +31,12 @@ static public ReleaseType getReleaseType() {
 	 * Version number, major version.minorversion.sub-release.
 	 * Note: can't go higher than sub-release 'f'
 	 */
-	static public final String version = "2.02.08a";
+	static public final String version = "2.02.09";
 	
 	/**
 	 * Release date
 	 */
-	static public final String date = "30 May 2023";
+	static public final String date = "29 June 2023";
 	
 //	/**
 //	 * Release type - Beta or Core
diff --git a/src/PamUtils/time/TimeDisplayParameters.java b/src/PamUtils/time/TimeDisplayParameters.java
@@ -11,8 +11,8 @@ public class TimeDisplayParameters implements Serializable, Cloneable, ManagedPa
 	public static final long serialVersionUID = 1L;
 	
 	public static final int TIME_ZONE_UTC = 0;
-	public static final int TIME_ZONE_PC = 1;
 	public static final int TIME_ZONE_OTHER = 1;
+	public static final int TIME_ZONE_PC = 2;
 	
 	public int zoneType = TIME_ZONE_UTC;
 
diff --git a/src/PamUtils/time/TimeZoneDisplayDialog.java b/src/PamUtils/time/TimeZoneDisplayDialog.java
@@ -29,7 +29,7 @@ public class TimeZoneDisplayDialog extends PamDialog {
 	private JLabel pcTimeZone;
 	private String[] timeZoneIds;
 	private TimeDisplayParameters timeDisplayParameters;
-	private TimeZone thisTimeZone;
+//	private TimeZone thisTimeZone;
 	private int utcTZIndex, pcTZIndex;
 	private static TimeZoneDisplayDialog singleInstance;
 
@@ -57,16 +57,16 @@ private TimeZoneDisplayDialog(Window parentFrame) {
 		c.gridy++;
 		c.gridx = 0;
 		JLabel ta = new JLabel();
-		ta.setText("<html>Note that all processing and data storage will continue to <p>use UTC, the selection " +
-		"you make here \nwill only affect what is displayed on the screen");
+		ta.setText("<html>Note that all processing and data storage will continue to use UTC. <p>The selection " +
+		"you make here will only affect what is displayed on the screen.");
 		tzPanel.add(ta, c);
 		
 		ButtonGroup bg = new ButtonGroup();
 		bg.add(useUTC);
 		bg.add(usePC);
 		bg.add(useOther);
 
-		thisTimeZone = Calendar.getInstance().getTimeZone();
+		TimeZone pcTimeZone = TimeZone.getDefault();
 		timeZoneIds = TimeZone.getAvailableIDs();
 		Arrays.sort(timeZoneIds, new TimeZoneComparator());
 		TimeZone tz;
@@ -76,7 +76,7 @@ private TimeZoneDisplayDialog(Window parentFrame) {
 			if (timeZoneIds[i].equals(PamCalendar.defaultTimeZone.getID())) {
 				utcTZIndex = i;
 			}
-			if (timeZoneIds[i].equals(thisTimeZone.getID())) {
+			if (timeZoneIds[i].equals(pcTimeZone.getID())) {
 				pcTZIndex = i;
 			}
 			if (tz.getRawOffset() < 0) {
@@ -118,7 +118,8 @@ private void setParams(TimeDisplayParameters timeDisplayParameters) {
 		useUTC.setSelected(timeDisplayParameters.zoneType == TimeDisplayParameters.TIME_ZONE_UTC);
 		usePC.setSelected(timeDisplayParameters.zoneType == TimeDisplayParameters.TIME_ZONE_PC);
 		useOther.setSelected(timeDisplayParameters.zoneType == TimeDisplayParameters.TIME_ZONE_OTHER);
-		pcTimeZone.setText(String.format("(%s / %s)", thisTimeZone.getID(), thisTimeZone.getDisplayName()));
+		TimeZone defaultTimeZone = TimeZone.getDefault();
+		pcTimeZone.setText(String.format("(%s / %s)", defaultTimeZone.getID(), defaultTimeZone.getDisplayName()));
 		enableControls();
 		showSelection();
 	}
@@ -165,7 +166,7 @@ public boolean getParams() {
 		}
 		else if (usePC.isSelected()) {
 			timeDisplayParameters.zoneType = TimeDisplayParameters.TIME_ZONE_PC;
-			timeDisplayParameters.timeZone = thisTimeZone;
+			timeDisplayParameters.timeZone = TimeZone.getDefault();
 		}
 		else if (useOther.isSelected()) {
 			timeDisplayParameters.zoneType = TimeDisplayParameters.TIME_ZONE_OTHER;
