From 693a629db64b68f049b7ddacf1230782400d5a76 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Wed, 2 Apr 2014 15:14:53 +0000
Subject: [PATCH] Updated some stuff in NetLog

---
 src/zutil/log/net/NetLogClient.fxml            | 1 +
 src/zutil/log/net/NetLogClientInstance.fxml    | 2 +-
 src/zutil/log/net/NetLogExceptionMessage.java  | 2 +-
 src/zutil/log/net/NetLogGuiClient.java         | 5 +++--
 src/zutil/log/net/NetLogGuiClientInstance.java | 2 +-
 src/zutil/log/net/NetLogMessage.java           | 8 ++++++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/zutil/log/net/NetLogClient.fxml b/src/zutil/log/net/NetLogClient.fxml
index 22d9abf..5c6a5e8 100644
--- a/src/zutil/log/net/NetLogClient.fxml
+++ b/src/zutil/log/net/NetLogClient.fxml
@@ -36,6 +36,7 @@
       <menus>
         <Menu mnemonicParsing="false" text="File">
           <items>
+            <MenuItem mnemonicParsing="false" text="Open File" />
             <MenuItem mnemonicParsing="false" onAction="#handleConnectAction" text="Connect" />
             <Menu mnemonicParsing="false" text="Previous">
               <items>
diff --git a/src/zutil/log/net/NetLogClientInstance.fxml b/src/zutil/log/net/NetLogClientInstance.fxml
index 66cfac8..0e6bce3 100644
--- a/src/zutil/log/net/NetLogClientInstance.fxml
+++ b/src/zutil/log/net/NetLogClientInstance.fxml
@@ -62,7 +62,7 @@
           <children>
             <TableView fx:id="logTable" prefHeight="146.0" prefWidth="598.0" tableMenuButtonVisible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
               <columns>
-                <TableColumn editable="false" prefWidth="75.0" sortable="false" text="Timestamp" fx:id="logTimestampColumn" />
+                <TableColumn editable="false" prefWidth="130.0" sortable="false" text="Timestamp" fx:id="logTimestampColumn" />
                 <TableColumn editable="false" prefWidth="75.0" sortable="false" text="Level" fx:id="logLevelColumn" />
                 <TableColumn editable="false" prefWidth="400.0" sortable="false" text="Log" fx:id="logColumn" />
               </columns>
diff --git a/src/zutil/log/net/NetLogExceptionMessage.java b/src/zutil/log/net/NetLogExceptionMessage.java
index c9febed..ebaa3cf 100644
--- a/src/zutil/log/net/NetLogExceptionMessage.java
+++ b/src/zutil/log/net/NetLogExceptionMessage.java
@@ -74,7 +74,7 @@ public class NetLogExceptionMessage extends Message {
 			return false;
 		
 		NetLogExceptionMessage other = (NetLogExceptionMessage) obj;
-		if (name.equals(other.name) || message.equals(other.message) || 
+		if (name.equals(other.name) && message.equals(other.message) &&
 				stackTrace.equals(other.stackTrace)) {
 			return true;
 		}
diff --git a/src/zutil/log/net/NetLogGuiClient.java b/src/zutil/log/net/NetLogGuiClient.java
index 7fa03cf..584e3e4 100644
--- a/src/zutil/log/net/NetLogGuiClient.java
+++ b/src/zutil/log/net/NetLogGuiClient.java
@@ -79,8 +79,9 @@ public class NetLogGuiClient extends Application{
 	private class NetLoggerClientTab extends Tab{
 		public NetLoggerClientTab(String host, int port) throws IOException{
 			this.setText( host+":"+port );
-			
-			Parent tabRoot = FXMLLoader.load(getClass().getResource("NetLogClientInstance.fxml"));
+
+            FXMLLoader loader = new FXMLLoader();
+			Parent tabRoot = loader.load(getClass().getResource("NetLogClientInstance.fxml"));
 			this.setContent(tabRoot);
 			AnchorPane.setRightAnchor(tabRoot, 0.0);
 			//this.setOnClosed(new EventHandler<Event>() {
diff --git a/src/zutil/log/net/NetLogGuiClientInstance.java b/src/zutil/log/net/NetLogGuiClientInstance.java
index ff0e943..daeff09 100644
--- a/src/zutil/log/net/NetLogGuiClientInstance.java
+++ b/src/zutil/log/net/NetLogGuiClientInstance.java
@@ -113,7 +113,7 @@ public class NetLogGuiClientInstance implements Initializable, NetLogListener {
 	public void handleExceptionMessage(NetLogExceptionMessage msg) {
 		if(status == Status.RUNNING){
 			exceptionTable.getItems().remove(msg);
-			exceptionTable.getItems().add(msg);	
+			exceptionTable.getItems().add(msg);
 		}	
 	}
 
diff --git a/src/zutil/log/net/NetLogMessage.java b/src/zutil/log/net/NetLogMessage.java
index a4ab250..bc0390a 100644
--- a/src/zutil/log/net/NetLogMessage.java
+++ b/src/zutil/log/net/NetLogMessage.java
@@ -22,12 +22,16 @@
 
 package zutil.log.net;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.logging.LogRecord;
 
 import zutil.net.nio.message.Message;
 
 public class NetLogMessage extends Message {
 	private static final long serialVersionUID = 1L;
+    private static final SimpleDateFormat dataFormat =
+            new SimpleDateFormat("yyyy--MM-dd HH:mm:ss");
 	
 	private long   timestamp;
 	private String level;
@@ -53,8 +57,8 @@ public class NetLogMessage extends Message {
 
 	
 	
-	public long getTimestamp() {
-		return timestamp;
+	public String getTimestamp() {
+		return dataFormat.format(new Date(timestamp));
 	}
 
 	public void setTimestamp(long timestamp) {