From 25c8b4e886e886ffa79c3e63defd7622c19db801 Mon Sep 17 00:00:00 2001
From: hneemann <helmut.neemann@arcor.de>
Date: Mon, 13 May 2019 12:32:38 +0200
Subject: [PATCH] If an exception ocures while reconstructing the instance, no
 modification is made; see #155

---
 .../de/neemann/digital/undo/UndoManager.java  |  7 ++-
 .../neemann/digital/undo/UndoManagerTest.java | 59 ++++++++++++++++++-
 2 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/neemann/digital/undo/UndoManager.java b/src/main/java/de/neemann/digital/undo/UndoManager.java
index 3e67b2f30..9c1cb0a76 100644
--- a/src/main/java/de/neemann/digital/undo/UndoManager.java
+++ b/src/main/java/de/neemann/digital/undo/UndoManager.java
@@ -103,10 +103,11 @@ public class UndoManager<A extends HistoryComponent<A>> {
     public void undo() throws ModifyException {
         if (undoAvailable()) {
             try {
+                A newActual = initial.createDeepCopy();
+                for (int i = 0; i < modificationCounter - 1; i++)
+                    modifications.get(i).modify(newActual);
                 modificationCounter--;
-                actual = initial.createDeepCopy();
-                for (int i = 0; i < modificationCounter; i++)
-                    modifications.get(i).modify(actual);
+                actual = newActual;
                 fireChangedEvent();
             } catch (ModifyException e) {
                 throw createTrace(e);
diff --git a/src/test/java/de/neemann/digital/undo/UndoManagerTest.java b/src/test/java/de/neemann/digital/undo/UndoManagerTest.java
index 83953e667..5bdd2baab 100644
--- a/src/test/java/de/neemann/digital/undo/UndoManagerTest.java
+++ b/src/test/java/de/neemann/digital/undo/UndoManagerTest.java
@@ -9,6 +9,8 @@ import junit.framework.TestCase;
 
 public class UndoManagerTest extends TestCase {
 
+    private int changedCount;
+
     public static class MyString implements HistoryComponent<MyString> {
         private String text;
 
@@ -44,6 +46,21 @@ public class UndoManagerTest extends TestCase {
         }
     }
 
+    public static class Error implements Modification<MyString> {
+        private int count;
+
+        @Override
+        public void modify(MyString myString) throws ModifyException {
+            if (count++ > 0)
+                throw new ModifyException("Error");
+        }
+
+        @Override
+        public String toString() {
+            return "Error";
+        }
+    }
+
     public void testSimple() throws ModifyException {
         UndoManager<MyString> mm = new UndoManager<>(new MyString("initial"));
 
@@ -53,7 +70,7 @@ public class UndoManagerTest extends TestCase {
 
         mm.apply(new Append("_1"));
         assertEquals("initial_1", mm.getActual().text);
-        assertEquals("Append _1",mm.getUndoModification().toString());
+        assertEquals("Append _1", mm.getUndoModification().toString());
         assertTrue(mm.undoAvailable());
         assertFalse(mm.redoAvailable());
 
@@ -67,7 +84,7 @@ public class UndoManagerTest extends TestCase {
         assertTrue(mm.undoAvailable());
         assertTrue(mm.redoAvailable());
 
-        assertEquals("Append _2",mm.getRedoModification().toString());
+        assertEquals("Append _2", mm.getRedoModification().toString());
         mm.redo();
         assertEquals("initial_1_2", mm.getActual().text);
         assertTrue(mm.undoAvailable());
@@ -141,4 +158,42 @@ public class UndoManagerTest extends TestCase {
         mm.undo();
         assertEquals("initial", mm.getActual().text);
     }
+
+    public void testListener() throws ModifyException {
+        UndoManager<MyString> mm = new UndoManager<>(new MyString("initial"));
+        mm.addListener(() -> changedCount++);
+        mm.apply(new Append("_1"));
+        assertEquals(1, changedCount);
+        assertEquals("initial_1", mm.getActual().text);
+        mm.undo();
+        assertEquals(2, changedCount);
+        assertEquals("initial", mm.getActual().text);
+        mm.apply(new Append("_5"));
+        assertEquals(3, changedCount);
+        assertEquals("initial_5", mm.getActual().text);
+        mm.undo();
+        assertEquals(4, changedCount);
+        assertEquals("initial", mm.getActual().text);
+    }
+
+    public void testUndoError() throws ModifyException {
+        UndoManager<MyString> mm = new UndoManager<>(new MyString("initial"));
+        mm.apply(new Append("_1"));
+        mm.apply(new Append("_2"));
+        mm.apply(new Error());
+        mm.apply(new Append("_3"));
+        mm.apply(new Append("_4"));
+        try {
+            mm.undo();
+            fail();
+        } catch (ModifyException e) {
+            assertEquals("initial_1_2_3_4", mm.getActual().text);
+            String m = e.getMessage();
+            assertTrue(m.contains("Append _1"));
+            assertTrue(m.contains("Append _2"));
+            assertTrue(m.contains("Append _3"));
+            assertTrue(m.contains("Append _4"));
+        }
+    }
+
 }
\ No newline at end of file