Browse Source

Do the output the correct way round.

pull/340/head
Greg Holmes 9 years ago
parent
commit
0ad1462fd0

+ 3
- 1
logging/src/com/dmdirc/addons/logging/HistoryWindow.java View File

@@ -39,6 +39,7 @@ import java.text.ParsePosition;
39 39
 import java.text.SimpleDateFormat;
40 40
 import java.util.Collections;
41 41
 import java.util.Date;
42
+import java.util.List;
42 43
 import java.util.Optional;
43 44
 
44 45
 /**
@@ -79,7 +80,8 @@ public class HistoryWindow extends FrameContainer {
79 80
     @VisibleForTesting
80 81
     void outputLoggingBackBuffer(final int limit) {
81 82
         try (final ReverseFileReader reader = new ReverseFileReader(logFile)) {
82
-            final Iterable<String> lines = reader.getLines(Math.min(limit, numLines));
83
+            final List<String> lines = reader.getLines(Math.min(limit, numLines));
84
+            Collections.reverse(lines);
83 85
             lines.forEach(l -> {
84 86
                 final ParsePosition pos = new ParsePosition(0);
85 87
                 final Date date = new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]").parse(l, pos);

+ 7
- 7
logging/test/com/dmdirc/addons/logging/HistoryWindowTest.java View File

@@ -83,17 +83,17 @@ public class HistoryWindowTest {
83 83
         instance.outputLoggingBackBuffer(4);
84 84
         final InOrder inOrder = inOrder(document);
85 85
         inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
86
-                .parse("[21/12/2015 13:01:05]").getTime()), eq
87
-                (DisplayPropertyMap.EMPTY), eq("RAAAAAR"));
88
-        inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
89
-                .parse("[21/12/2015 13:00:04]").getTime()), eq
90
-                (DisplayPropertyMap.EMPTY), eq("RAAAAR"));
86
+                .parse("[21/12/2015 12:58:02]").getTime()), eq
87
+                (DisplayPropertyMap.EMPTY), eq("RAAR"));
91 88
         inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
92 89
                 .parse("[21/12/2015 12:59:03]").getTime()), eq
93 90
                 (DisplayPropertyMap.EMPTY), eq("RAAAR"));
94 91
         inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
95
-                .parse("[21/12/2015 12:58:02]").getTime()), eq
96
-                (DisplayPropertyMap.EMPTY), eq("RAAR"));
92
+                .parse("[21/12/2015 13:00:04]").getTime()), eq
93
+                (DisplayPropertyMap.EMPTY), eq("RAAAAR"));
94
+        inOrder.verify(document).addText(eq(new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]")
95
+                .parse("[21/12/2015 13:01:05]").getTime()), eq
96
+                (DisplayPropertyMap.EMPTY), eq("RAAAAAR"));
97 97
         inOrder.verifyNoMoreInteractions();
98 98
     }
99 99
 }

Loading…
Cancel
Save