Object marquee tool semantics now uses undo. ChangeObjectEdit refacto…

…red to use memento pattern

src/tiled/mapeditor/selection/ObjectSelectionToolSemantic.java

@@ -13,17 +13,20 @@
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionAdapter;
 import java.awt.event.MouseMotionListener;
+import javax.swing.undo.UndoableEdit;
 import tiled.core.MapLayer;
 import tiled.core.MapObject;
 import tiled.core.ObjectGroup;
 import tiled.mapeditor.MapEditor;
+import tiled.mapeditor.undo.ChangeObjectEdit;
 import tiled.view.MapView;
 
 /**
  *
  * @author upachler
  */
 public class ObjectSelectionToolSemantic extends ToolSemantic{
+    private UndoableEdit undoableEdit = null;;
 
     private enum Mode {
         IDLE,
@@ -236,6 +239,7 @@ private void startMoveObject(int x, int y){
             return;
         mode = Mode.MOVE_OBJECT;
         this.object = o;
+        undoableEdit = new ChangeObjectEdit(object);
         MapView mapView = getEditor().getMapView();
         selectedLayer = getEditor().getCurrentLayer();
         selectionStart = mapView.screenToPixelCoords(selectedLayer, x, y);
@@ -262,6 +266,8 @@ private void updateMoveObject(int x, int y){
     private void finishMoveObject(int x, int y){
         if(mode != Mode.MOVE_OBJECT)
             return;
+        getEditor().getUndoSupport().postEdit(undoableEdit);
+        undoableEdit = null;
         mode = Mode.IDLE;
     }
 
@@ -271,6 +277,7 @@ private void startResizeObject(int x, int y) {
             return;
         mode = Mode.RESIZE_OBJECT;
         this.object = o;
+        undoableEdit = new ChangeObjectEdit(object);
         MapView mapView = getEditor().getMapView();
         selectedLayer = getEditor().getCurrentLayer();
         selectionStart = mapView.screenToPixelCoords(selectedLayer, x, y);
@@ -284,6 +291,7 @@ private void finishResizeObject(int x, int y) {
         if(mode != Mode.RESIZE_OBJECT)
             return;
         mode = Mode.IDLE;
+        getEditor().getUndoSupport().postEdit(undoableEdit);
     }
 
     private void updateResizeObject(int x, int y) {

src/tiled/mapeditor/undo/ChangeObjectEdit.java

@@ -12,6 +12,7 @@
 
 package tiled.mapeditor.undo;
 
+import java.awt.Rectangle;
 import java.util.Properties;
 import javax.swing.undo.AbstractUndoableEdit;
 import javax.swing.undo.CannotRedoException;
@@ -26,66 +27,62 @@
 public class ChangeObjectEdit extends AbstractUndoableEdit
 {
     private final MapObject mapObject;
+    private State state;
 
-    private final String prevName;
-    private final String prevType;
-    private final String prevImageSource;
-    private final int prevWidth;
-    private final int prevHeight;
-    private final Properties prevProperties = new Properties();
-
-    private String newName;
-    private String newType;
-    private String newImageSource;
-    private int newWidth;
-    private int newHeight;
-    private final Properties newProperties = new Properties();
-
+    class State{
+        private String name;
+        private String type;
+        private String imageSource;
+        private Rectangle bounds;
+        private final Properties properties = new Properties();
+
+        public void retreive(MapObject o){
+            name = mapObject.getName();
+            type = mapObject.getType();
+            imageSource = mapObject.getImageSource();
+            bounds = new Rectangle(mapObject.getBounds());
+            properties.clear();
+            properties.putAll(mapObject.getProperties());
+        }
+
+        public void apply(MapObject mapObject){
+            mapObject.setName(name);
+            mapObject.setType(type);
+            mapObject.setImageSource(imageSource);
+            mapObject.setBounds(new Rectangle(bounds));
+            mapObject.getProperties().clear();
+            mapObject.getProperties().putAll(properties);
+        }
+    };
+
     public ChangeObjectEdit(MapObject mapObject) {
         this.mapObject = mapObject;
 
         // Store the previous state so we can undo changes
-        prevName = mapObject.getName();
-        prevType = mapObject.getType();
-        prevImageSource = mapObject.getImageSource();
-        prevWidth = mapObject.getWidth();
-        prevHeight = mapObject.getHeight();
-        prevProperties.putAll(mapObject.getProperties());
+        state = new State();
+        state.retreive(mapObject);
     }
 
     public void undo() throws CannotUndoException {
         super.undo();
 
         // Store the current state so we can redo changes
-        newName = mapObject.getName();
-        newType = mapObject.getType();
-        newImageSource = mapObject.getImageSource();
-        newWidth = mapObject.getWidth();
-        newHeight = mapObject.getHeight();
-        newProperties.clear();
-        newProperties.putAll(mapObject.getProperties());
-
-        mapObject.setName(prevName);
-        mapObject.setType(prevType);
-        mapObject.setImageSource(prevImageSource);
-        mapObject.setWidth(prevWidth);
-        mapObject.setHeight(prevHeight);
-        mapObject.getProperties().clear();
-        mapObject.getProperties().putAll(prevProperties);
+        swap();
     }
 
     public void redo() throws CannotRedoException {
         super.redo();
 
-        mapObject.setName(newName);
-        mapObject.setType(newType);
-        mapObject.setImageSource(newImageSource);
-        mapObject.setWidth(newWidth);
-        mapObject.setHeight(newHeight);
-        mapObject.getProperties().clear();
-        mapObject.getProperties().putAll(newProperties);
+        swap();
     }
 
+    private void swap() {
+        State s = new State();
+        s.retreive(mapObject);
+        state.apply(mapObject);
+        state = s;
+    }
+
     public String getPresentationName() {
         return Resources.getString("action.object.change.name");
     }