reuse LogEntry DateTimeFormatters

Author: chrisrueger

bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogEntry.java

@@ -31,9 +31,9 @@ public class LogEntry extends AbstractEntry {
 
 	public static final String SPACE = " "; //$NON-NLS-1$
 	public static final String F_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$
-	private static final DateTimeFormatter GREGORIAN_SDF = DateTimeFormatter.ofPattern(F_DATE_FORMAT, Locale.ENGLISH)
+	static final DateTimeFormatter GREGORIAN_SDF = DateTimeFormatter.ofPattern(F_DATE_FORMAT, Locale.ENGLISH)
 			.withZone(ZoneId.systemDefault());
-	private static final DateTimeFormatter LOCAL_SDF = DateTimeFormatter.ofPattern(F_DATE_FORMAT)
+	static final DateTimeFormatter LOCAL_SDF = DateTimeFormatter.ofPattern(F_DATE_FORMAT)
 			.withZone(ZoneId.systemDefault());
 
 	private String pluginId;

bundles/org.eclipse.ui.views.log/src/org/eclipse/ui/internal/views/log/LogSession.java

@@ -15,11 +15,11 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.views.log;
 
+import static org.eclipse.ui.internal.views.log.LogEntry.GREGORIAN_SDF;
+import static org.eclipse.ui.internal.views.log.LogEntry.LOCAL_SDF;
+
 import java.io.PrintWriter;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
+import java.time.Instant;
 import java.util.Date;
 
 /**
@@ -33,8 +33,6 @@ public class LogSession extends Group {
 	 * @since 3.5
 	 */
 	public static final String SESSION = "!SESSION"; //$NON-NLS-1$
-	private static final DateTimeFormatter LOCAL_SDF = DateTimeFormatter.ofPattern(LogEntry.F_DATE_FORMAT)
-			.withZone(ZoneId.systemDefault());
 
 	private String sessionData;
 	private Date date;
@@ -62,9 +60,12 @@ public String getFormattedDate() {
 
 	public void setDate(String dateString) {
 		try {
-			LocalDateTime ldt = LocalDateTime.parse(dateString, LOCAL_SDF);
-			this.date = Date.from(ldt.atZone(ZoneId.systemDefault()).toInstant());
-		} catch (DateTimeParseException e) {
+			Date parsed = Date.from(Instant.from(GREGORIAN_SDF.parse(dateString)));
+			if (parsed != null) {
+				this.date = parsed;
+				fDateString = LOCAL_SDF.format(parsed.toInstant());
+			}
+		} catch (Exception e) {
 			// do nothing
 		}
 	}