Repository from CVS
https://osdn.net/cvs/view/gokigen/MeMoMa/
| Révision | 5ed725dd11b4ed9fa5d786bd30db97ca2e02370a (tree) |
|---|---|
| l'heure | 2018-07-22 23:40:49 |
| Auteur | MRSa <mrsa@myad...> |
| Commiter | MRSa |
オブジェクトの削除についても記録に残すようにした。
app/src/main/java/jp/sourceforge/gokigen/memoma/MeMoMaListener.java (diff) app/src/main/java/jp/sourceforge/gokigen/memoma/holders/IOperationHistoryHolder.java (diff) app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaConnectLineHolder.java (diff) app/src/main/java/jp/sourceforge/gokigen/memoma/holders/MeMoMaObjectHolder.java (diff) app/src/main/java/jp/sourceforge/gokigen/memoma/holders/OperationHistoryHolder.java (diff)| @@ -1104,6 +1104,9 @@ public class MeMoMaListener implements OnClickListener, OnTouchListener, OnKeyLi | ||
| 1104 | 1104 | objectDrawer.resetScaleAndLocation(zoomBar); |
| 1105 | 1105 | } |
| 1106 | 1106 | |
| 1107 | + // 操作履歴をクリアする | |
| 1108 | + historyHolder.reset(); | |
| 1109 | + | |
| 1107 | 1110 | /* |
| 1108 | 1111 | // 題名を "無題"に変更し、関係情報をクリアする |
| 1109 | 1112 | String newName = parent.getString(R.string.no_name); |
| @@ -16,7 +16,9 @@ interface IOperationHistoryHolder | ||
| 16 | 16 | STROKE_WIDTH, |
| 17 | 17 | FONT_SIZE, |
| 18 | 18 | NEW_OBJECT, |
| 19 | + DELETE_OBJECT, | |
| 19 | 20 | NEW_CONNECT_LINE, |
| 21 | + DELETE_CONNECT_LINE, | |
| 20 | 22 | CONNECT_LINE_FROM_KEY, |
| 21 | 23 | CONNECT_LINE_TO_KEY, |
| 22 | 24 | CONNECT_LINE_STYLE, |
| @@ -26,6 +28,7 @@ interface IOperationHistoryHolder | ||
| 26 | 28 | |
| 27 | 29 | |
| 28 | 30 | void addHistory(int key, ChangeKind kind, Object object); |
| 31 | + void reset(); | |
| 29 | 32 | void undo(); |
| 30 | 33 | |
| 31 | 34 | } |
| @@ -39,7 +39,11 @@ public class MeMoMaConnectLineHolder | ||
| 39 | 39 | |
| 40 | 40 | public boolean disconnectLines(Integer key) |
| 41 | 41 | { |
| 42 | - connectLines.remove(key); | |
| 42 | + ObjectConnector removeTarget = connectLines.remove(key); | |
| 43 | + if (removeTarget != null) | |
| 44 | + { | |
| 45 | + historyHolder.addHistory(key, IOperationHistoryHolder.ChangeKind.DELETE_CONNECT_LINE, removeTarget); | |
| 46 | + } | |
| 43 | 47 | Log.v(Main.APP_IDENTIFIER, "DISCONNECT LINES : " + key); |
| 44 | 48 | return (true); |
| 45 | 49 | } |
| @@ -132,7 +132,11 @@ public class MeMoMaObjectHolder | ||
| 132 | 132 | |
| 133 | 133 | public boolean removePosition(Integer key) |
| 134 | 134 | { |
| 135 | - objectPoints.remove(key); | |
| 135 | + PositionObject removeTarget = objectPoints.remove(key); | |
| 136 | + if (removeTarget != null) | |
| 137 | + { | |
| 138 | + historyHolder.addHistory(key, IOperationHistoryHolder.ChangeKind.DELETE_OBJECT, removeTarget); | |
| 139 | + } | |
| 136 | 140 | Log.v(Main.APP_IDENTIFIER, "REMOVE : " + key); |
| 137 | 141 | return (true); |
| 138 | 142 | } |
| @@ -17,6 +17,12 @@ public class OperationHistoryHolder implements IOperationHistoryHolder | ||
| 17 | 17 | Log.v(TAG, "addHistory() KEY : " + key + " KIND : " + kind.toString() + " OBJ : " + object.toString()); |
| 18 | 18 | } |
| 19 | 19 | |
| 20 | + public void reset() | |
| 21 | + { | |
| 22 | + Log.v(TAG, "Histry Reset() "); | |
| 23 | + | |
| 24 | + } | |
| 25 | + | |
| 20 | 26 | public void undo() |
| 21 | 27 | { |
| 22 | 28 | Log.v(TAG, "undo() "); |
Fork