Support for MS at fight reports

Author: extremeCrazyCoder

Core/src/main/java/de/tor/tribes/ui/models/ReportManagerTableModel.java

@@ -84,7 +84,7 @@ public Object getValueAt(int rowIndex, int columnIndex) {
                 case 0:
                     return r.getStatus();
                 case 1:
-                    return new Date(r.getTimestamp());//new SimpleDateFormat("dd.MM.yy HH:mm").format(new Date(r.getTimestamp()));
+                    return new Date(r.getTimestamp());
                 case 2:
                     return r.getAttacker();
                 case 3:

Core/src/main/java/de/tor/tribes/ui/panels/ReportTableTab.java

@@ -109,7 +109,7 @@ public enum TRANSFER_TYPE {
         jxReportTable.setColumnControlVisible(true);
         jxReportTable.setDefaultRenderer(UnitHolder.class, new UnitCellRenderer());
         jxReportTable.setDefaultRenderer(Integer.class, new NoteIconCellRenderer(NoteIconCellRenderer.ICON_TYPE.NOTE));
-        jxReportTable.setDefaultRenderer(Date.class, new DateCellRenderer("dd.MM.yy HH:mm"));
+        jxReportTable.setDefaultRenderer(Date.class, new DateCellRenderer("dd.MM.yy HH:mm:ss:SSS"));
         jxReportTable.setDefaultRenderer(Tribe.class, new TribeCellRenderer());
         jxReportTable.setDefaultRenderer(Village.class, new VillageCellRenderer());
         reportModel = new ReportManagerTableModel(ReportManager.DEFAULT_GROUP);

Core/src/main/java/de/tor/tribes/util/html/FightReportHTMLToolTipGenerator.java

@@ -84,7 +84,7 @@ public class FightReportHTMLToolTipGenerator {
     public static String buildToolTip(FightReport pReport) {
         String res = pTemplateData;
         String[] tables = buildUnitTables(pReport);
-        SimpleDateFormat f = new SimpleDateFormat("dd.MM.yy HH:mm:ss");
+        SimpleDateFormat f = new SimpleDateFormat("dd.MM.yy HH:mm:ss:SSS");
         NumberFormat nf = NumberFormat.getInstance();
         nf.setMinimumFractionDigits(0);
         nf.setMaximumFractionDigits(0);

ParserPlugin/src/main/java/de/tor/tribes/util/parser/OBSTServerReportHandler.java

@@ -194,7 +194,14 @@ private FightReport parseReport(String pData) {
             try {
                 //16.03.12 21:00:33
                 String date = m.group(1).trim();
-                Date sent = new SimpleDateFormat(getVariable("report.date.format")).parse(date);
+                
+                SimpleDateFormat f;
+                if (ServerSettings.getSingleton().isMillisArrival()) {
+                    f = new SimpleDateFormat(getVariable("report.date.format.ms"));
+                } else {
+                    f = new SimpleDateFormat(getVariable("report.date.format"));
+                }
+                Date sent = f.parse(date);
                 report.setTimestamp(sent.getTime());
             } catch (Exception e) {
                 logger.warn("Failed to set report timestamp. Using '0'");

ParserPlugin/src/main/java/de/tor/tribes/util/parser/ReportParser.java

@@ -85,7 +85,13 @@ private FightReport parseReport(String pData) {
             if (line.startsWith(getVariable("report.fight.time"))) {
                 logger.debug("Found send line");
                 line = line.replaceAll(getVariable("report.fight.time"), "").trim();
-                SimpleDateFormat f = new SimpleDateFormat(getVariable("report.date.format"));
+                
+                SimpleDateFormat f;
+                if (ServerSettings.getSingleton().isMillisArrival()) {
+                    f = new SimpleDateFormat(getVariable("report.date.format.ms"));
+                } else {
+                    f = new SimpleDateFormat(getVariable("report.date.format"));
+                }
                 try {
                     Date d = f.parse(line);
                     result.setTimestamp(d.getTime());

resources/templates/Parser Lang/ch.parserprop

@@ -44,6 +44,7 @@ movement.date.format.ms='am' dd.MM. 'um' HH:mm:ss:SSS
 movement.date.format.ouput='am' dd.MM.
 report.fight.time=Kampfziit
 report.date.format=dd.MM.yy HH:mm:ss
+report.date.format.ms=dd.MM.yy HH:mm:ss:SSS
 report.has.won=het gwunne
 report.spy=gsp\u00E4ht
 report.att.luck=Agrifergl\u00fcck

resources/templates/Parser Lang/de.parserprop

@@ -43,6 +43,7 @@ movement.date.format.ms='am' dd.MM. 'um' HH:mm:ss:SSS
 movement.date.format.ouput='am' dd.MM.
 report.fight.time=Kampfzeit
 report.date.format=dd.MM.yy HH:mm:ss
+report.date.format.ms=dd.MM.yy HH:mm:ss:SSS
 report.has.won=hat gewonnen
 report.spy=ausgekundschaftet
 report.att.luck=Angreifergl\u00fcck

resources/templates/Parser Lang/en.parserprop

@@ -49,6 +49,7 @@ movement.date.format.ouput='am' dd.MM.
 
 report.fight.time=Battle time
 report.date.format=dd.MM.yy HH:mm:ss
+report.date.format.ms=dd.MM.yy HH:mm:ss:SSS
 report.has.won=has won
 report.spy=scouted
 report.att.luck=Attacker's luck