Part of bobbylight#211: undo buffer should be empty after TextEditorPane.load()

Author: bobbylight

src/main/java/org/fife/ui/rsyntaxtextarea/TextEditorPane.java

@@ -18,6 +18,9 @@
 import java.nio.charset.Charset;
 import java.nio.charset.UnsupportedCharsetException;
 
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.Document;
@@ -26,7 +29,6 @@
 import org.fife.io.UnicodeWriter;
 import org.fife.ui.rtextarea.RTextAreaEditorKit;
 
-
 /**
  * An extension of {@link org.fife.ui.rsyntaxtextarea.RSyntaxTextArea}
  * that adds information about the file being edited, such as:
@@ -482,6 +484,7 @@ public void load(FileLocation loc, String defaultEnc) throws IOException {
 		this.loc = loc;
 		setDirty(false);
 		setCaretPosition(0);
+		discardAllEdits();
 		firePropertyChange(FULL_PATH_PROPERTY, old, getFileFullPath());
 
 	}
@@ -748,4 +751,22 @@ public void syncLastSaveOrLoadTimeToActualFile() {
 	}
 
 
+	public static void main(String[] args) throws Exception {
+		try {
+			TextEditorPane textArea = new TextEditorPane();
+			textArea.load(FileLocation.create("d:/temp/test.txt"), "UTF-8");
+			JPanel cp = new JPanel();
+			cp.setPreferredSize(new java.awt.Dimension(300, 300));
+			cp.setLayout(new java.awt.BorderLayout());
+			cp.add(new JScrollPane(textArea));
+			JFrame frame = new JFrame();
+			frame.setContentPane(cp);
+			frame.pack();
+			frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+			frame.setLocationByPlatform(true);
+			frame.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 }

src/main/java/org/fife/ui/rtextarea/RTextAreaEditorKit.java

@@ -1705,7 +1705,7 @@ public final String getMacroID() {
 
 		private void moveLineDown(RTextArea textArea, int line, int lineCount)
 									throws BadLocationException {
-System.out.println("--- " + line + ", " + lineCount + ", " + textArea.getLineCount());
+
 			// If we'd be moving lines past the end of the document, stop.
 			// We could perhaps just decide to move the lines to the end of the
 			// file, but this just keeps things simple.
@@ -1730,13 +1730,11 @@ private void moveLineDown(RTextArea textArea, int line, int lineCount)
 				doc.remove(start, end - start);
 
 				int insertLine = Math.min(line + 1, textArea.getLineCount());
-				System.out.println("insertLine == " + insertLine);
 				boolean newlineInserted = false;
 				if (insertLine == textArea.getLineCount()) {
 					textArea.append("\n");
 					newlineInserted = true;
 				}
-				System.out.println("... " + newlineInserted);
 
 				int insertOffs = textArea.getLineStartOffset(insertLine);
 				doc.insertString(insertOffs, text, null);
@@ -1776,14 +1774,11 @@ private void moveLineUp(RTextArea textArea, int line, int moveCount)
 			textArea.beginAtomicEdit();
 			try {
 
-				System.out.println("*** " + start + ", " + (end - start));
 				String text = doc.getText(start, end - start);
 				if (movingLastLine) {
 					text += '\n';
 				}
-				System.out.println("*** *** '" + text + "'");
 				doc.remove(start, end - start);
-				System.out.println("*** *** *** good");
 
 				int insertOffs = textArea.getLineStartOffset(insertLine);
 				doc.insertString(insertOffs, text, null);

src/test/java/org/fife/ui/rsyntaxtextarea/TextEditorPaneTest.java

@@ -0,0 +1,73 @@
+/*
+ * 12/09/2016
+ *
+ * This library is distributed under a modified BSD license.  See the included
+ * RSyntaxTextArea.License.txt file for details.
+ */
+package org.fife.ui.rsyntaxtextarea;
+
+import java.nio.charset.UnsupportedCharsetException;
+
+import org.fife.ui.SwingRunner;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Unit tests for {@link TextEditorPane}.
+ *
+ * @author Robert Futrell
+ * @version 1.0
+ */
+@RunWith(SwingRunner.class)
+public class TextEditorPaneTest {
+
+
+	@Test
+	public void testConstructor_zeroArg() {
+		TextEditorPane textArea = new TextEditorPane();
+		Assert.assertEquals(TextEditorPane.INSERT_MODE, textArea.getTextMode());
+		Assert.assertFalse(textArea.getLineWrap());
+	}
+
+
+	@Test
+	public void testConstructor_oneArg() {
+		TextEditorPane textArea = new TextEditorPane(TextEditorPane.OVERWRITE_MODE);
+		Assert.assertEquals(TextEditorPane.OVERWRITE_MODE, textArea.getTextMode());
+		Assert.assertFalse(textArea.getLineWrap());
+	}
+
+
+	@Test
+	public void testGetSetEncoding() {
+
+		TextEditorPane textArea = new TextEditorPane();
+		Assert.assertFalse(textArea.isDirty());
+
+		textArea.setEncoding("UTF-16");
+		Assert.assertEquals("UTF-16", textArea.getEncoding());
+		Assert.assertTrue(textArea.isDirty());
+		textArea.setDirty(false);
+
+		textArea.setEncoding("UTF-8");
+		Assert.assertEquals("UTF-8", textArea.getEncoding());
+		Assert.assertTrue(textArea.isDirty());
+
+	}
+
+
+	@Test(expected = NullPointerException.class)
+	public void testSetEncoding_invalidArg_null() {
+		new TextEditorPane().setEncoding(null);
+	}
+
+
+	@Test(expected = UnsupportedCharsetException.class)
+	public void testSetEncoding_invalidArg_unsupportedCharset() {
+		new TextEditorPane().setEncoding("xxx");
+	}
+
+
+}