From 5ed725dd11b4ed9fa5d786bd30db97ca2e02370a Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Sun, 22 Jul 2018 23:40:49 +0900
Subject: [PATCH] =?utf8?q?=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7=E3=82=AF?=
 =?utf8?q?=E3=83=88=E3=81=AE=E5=89=8A=E9=99=A4=E3=81=AB=E3=81=A4=E3=81=84?=
 =?utf8?q?=E3=81=A6=E3=82=82=E8=A8=98=E9=8C=B2=E3=81=AB=E6=AE=8B=E3=81=99?=
 =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java | 3 +++
 .../sourceforge/gokigen/memoma/holders/IOperationHistoryHolder.java | 3 +++
 .../sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java | 6 +++++-
 .../jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java   | 6 +++++-
 .../sourceforge/gokigen/memoma/holders/OperationHistoryHolder.java  | 6 ++++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java
index 69f2bef..6d7a3cb 100644
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java
@@ -1104,6 +1104,9 @@ public class MeMoMaListener implements OnClickListener, OnTouchListener, OnKeyLi
             objectDrawer.resetScaleAndLocation(zoomBar);
         }
 
+        // 操作履歴をクリアする
+        historyHolder.reset();
+
         	/*
         	// 題名を "無題"に変更し、関係情報をクリアする
         	String newName = parent.getString(R.string.no_name);
diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/IOperationHistoryHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/IOperationHistoryHolder.java
index 3a009d2..db296a5 100644
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/IOperationHistoryHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/IOperationHistoryHolder.java
@@ -16,7 +16,9 @@ interface IOperationHistoryHolder
         STROKE_WIDTH,
         FONT_SIZE,
         NEW_OBJECT,
+        DELETE_OBJECT,
         NEW_CONNECT_LINE,
+        DELETE_CONNECT_LINE,
         CONNECT_LINE_FROM_KEY,
         CONNECT_LINE_TO_KEY,
         CONNECT_LINE_STYLE,
@@ -26,6 +28,7 @@ interface IOperationHistoryHolder
 
 
     void addHistory(int key, ChangeKind kind, Object object);
+    void reset();
     void undo();
 
 }
diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java
index a7e8f59..fd7e124 100644
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java
@@ -39,7 +39,11 @@ public class MeMoMaConnectLineHolder
 
     public boolean disconnectLines(Integer key)
     {
-        connectLines.remove(key);
+        ObjectConnector removeTarget = connectLines.remove(key);
+        if (removeTarget != null)
+        {
+            historyHolder.addHistory(key, IOperationHistoryHolder.ChangeKind.DELETE_CONNECT_LINE, removeTarget);
+        }
         Log.v(Main.APP_IDENTIFIER, "DISCONNECT LINES : " + key);
         return (true);
     }
diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java
index b636a05..2c2c2c5 100644
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java
@@ -132,7 +132,11 @@ public class MeMoMaObjectHolder
 
     public boolean removePosition(Integer key)
     {
-    	objectPoints.remove(key);
+        PositionObject removeTarget = objectPoints.remove(key);
+        if (removeTarget != null)
+        {
+            historyHolder.addHistory(key, IOperationHistoryHolder.ChangeKind.DELETE_OBJECT, removeTarget);
+        }
     	Log.v(Main.APP_IDENTIFIER, "REMOVE : " + key);
     	return (true);
     }
diff --git a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationHistoryHolder.java b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationHistoryHolder.java
index 3642eef..7d876c1 100644
--- a/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationHistoryHolder.java
+++ b/app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationHistoryHolder.java
@@ -17,6 +17,12 @@ public class OperationHistoryHolder implements IOperationHistoryHolder
         Log.v(TAG, "addHistory() KEY : " + key + " KIND : " + kind.toString() + " OBJ : " + object.toString());
     }
 
+    public void reset()
+    {
+        Log.v(TAG, "Histry Reset() ");
+
+    }
+
     public void undo()
     {
         Log.v(TAG, "undo() ");
-- 
2.11.0