ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Updated some stuff in NetLog

Browse source
This commit is contained in:
Ziver Koc 2014-04-02 15:14:53 +00:00
parent d713c74832
commit 693a629db6
6 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/zutil/log/net/NetLogClient.fxml
View file

@ -36,6 +36,7 @@
<menus> <menus>
<Menu mnemonicParsing="false" text="File"> <Menu mnemonicParsing="false" text="File">
<items> <items>
<MenuItem mnemonicParsing="false" text="Open File" />
<MenuItem mnemonicParsing="false" onAction="#handleConnectAction" text="Connect" /> <MenuItem mnemonicParsing="false" onAction="#handleConnectAction" text="Connect" />
<Menu mnemonicParsing="false" text="Previous"> <Menu mnemonicParsing="false" text="Previous">
<items> <items>

2
src/zutil/log/net/NetLogClientInstance.fxml
View file

@ -62,7 +62,7 @@
<children> <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"> <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> <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="75.0" sortable="false" text="Level" fx:id="logLevelColumn" />
<TableColumn editable="false" prefWidth="400.0" sortable="false" text="Log" fx:id="logColumn" /> <TableColumn editable="false" prefWidth="400.0" sortable="false" text="Log" fx:id="logColumn" />
</columns> </columns>

2
src/zutil/log/net/NetLogExceptionMessage.java
View file

@ -74,7 +74,7 @@ public class NetLogExceptionMessage extends Message {
return false; return false;
NetLogExceptionMessage other = (NetLogExceptionMessage) obj; 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)) { stackTrace.equals(other.stackTrace)) {
return true; return true;
} }

5
src/zutil/log/net/NetLogGuiClient.java
View file

@ -79,8 +79,9 @@ public class NetLogGuiClient extends Application{
private class NetLoggerClientTab extends Tab{ private class NetLoggerClientTab extends Tab{
public NetLoggerClientTab(String host, int port) throws IOException{ public NetLoggerClientTab(String host, int port) throws IOException{
this.setText( host+":"+port ); 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); this.setContent(tabRoot);
AnchorPane.setRightAnchor(tabRoot, 0.0); AnchorPane.setRightAnchor(tabRoot, 0.0);
//this.setOnClosed(new EventHandler<Event>() { //this.setOnClosed(new EventHandler<Event>() {

2
src/zutil/log/net/NetLogGuiClientInstance.java
View file

@ -113,7 +113,7 @@ public class NetLogGuiClientInstance implements Initializable, NetLogListener {
public void handleExceptionMessage(NetLogExceptionMessage msg) { public void handleExceptionMessage(NetLogExceptionMessage msg) {
if(status == Status.RUNNING){ if(status == Status.RUNNING){
exceptionTable.getItems().remove(msg); exceptionTable.getItems().remove(msg);
exceptionTable.getItems().add(msg); exceptionTable.getItems().add(msg);
} }
} }

8
src/zutil/log/net/NetLogMessage.java
View file

@ -22,12 +22,16 @@
package zutil.log.net; package zutil.log.net;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.logging.LogRecord; import java.util.logging.LogRecord;
import zutil.net.nio.message.Message; import zutil.net.nio.message.Message;
public class NetLogMessage extends Message { public class NetLogMessage extends Message {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static final SimpleDateFormat dataFormat =
new SimpleDateFormat("yyyy--MM-dd HH:mm:ss");
private long timestamp; private long timestamp;
private String level; private String level;
@ -53,8 +57,8 @@ public class NetLogMessage extends Message {
public long getTimestamp() { public String getTimestamp() {
return timestamp; return dataFormat.format(new Date(timestamp));
} }
public void setTimestamp(long timestamp) { public void setTimestamp(long timestamp) {