Call addLine with a \n delimited string.

Issue 1242


git-svn-id: http://svn.dmdirc.com/trunk@4078 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -71,10 +71,7 @@ public class HistoryWindow extends FrameContainer {
                 "plugin-Logging", "history.lines", 50000);
         final int frameBufferSize = IdentityManager.getGlobalConfig().getOptionInt(
                 "ui", "frameBufferSize", 10000);
-        final Stack<String> lines = reader.getLines(Math.min(frameBufferSize, historyLineCount));
-        while (lines.size() > 0) {
-            window.addLine(lines.pop(), false);
-        }
+        window.addLine(reader.getLinesAsString(Math.min(frameBufferSize, historyLineCount)), false);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/addons/logging/ReverseFileReader.java

@@ -218,7 +218,7 @@ public class ReverseFileReader {
 	 * If the file is closed, an empty stack will be returned.
 	 *
 	 * @param numLines Number of lines to try and get.
-     * @return The requested lines
+	 * @return The requested lines
 	 */
 	public Stack<String> getLines(final int numLines) {
 		final Stack<String> result = new Stack<String>();
@@ -231,4 +231,27 @@ public class ReverseFileReader {
 		}
 		return result;
 	}
+	
+	/**
+	 * Try and get x number of lines and return a \n delimited String.
+	 * If the file is closed, an empty string will be returned.
+	 *
+	 * @param numLines Number of lines to try and get.
+	 * @return The requested lines
+	 */
+	public String getLinesAsString(final int numLines) {
+		final StringBuilder result = new StringBuilder();
+		for (int i = 0; i < numLines; ++i) {
+			try {
+				result.insert(0, "\n");
+				result.insert(0, getNextLine());
+			} catch (IOException e) {
+				break;
+			}
+		}
+		if (result.charAt(0) == '\n') {
+			result.deleteCharAt(0);
+		}
+		return result.toString();
+	}
 }