Merge pull request #8 from Vukan-Markovic/develop

1.8
vukan-markovic · Jan 14, 2019 · e56d381 · e56d381
2 parents d73a998 + 1f9e81b
commit e56d381
Show file tree

Hide file tree

Showing 35 changed files with 22 additions and 32 deletions.
diff --git a/bin/adapter/HexagonAdapter.class b/bin/adapter/HexagonAdapter.class
diff --git a/bin/commands/CmdBringToFront.class b/bin/commands/CmdBringToFront.class
diff --git a/bin/commands/CmdUpdateHexagon.class b/bin/commands/CmdUpdateHexagon.class
diff --git a/bin/commands/CmdUpdateLine.class b/bin/commands/CmdUpdateLine.class
diff --git a/bin/commands/CmdUpdatePoint.class b/bin/commands/CmdUpdatePoint.class
diff --git a/bin/commands/CmdUpdateRectangle.class b/bin/commands/CmdUpdateRectangle.class
diff --git a/bin/commands/CmdUpdateSquare.class b/bin/commands/CmdUpdateSquare.class
diff --git a/bin/frame/DrawingFrame$1.class b/bin/frame/DrawingFrame$1.class
diff --git a/bin/frame/DrawingFrame$10.class b/bin/frame/DrawingFrame$10.class
diff --git a/bin/frame/DrawingFrame$11.class b/bin/frame/DrawingFrame$11.class
diff --git a/bin/frame/DrawingFrame$12.class b/bin/frame/DrawingFrame$12.class
diff --git a/bin/frame/DrawingFrame$13.class b/bin/frame/DrawingFrame$13.class
diff --git a/bin/frame/DrawingFrame$14.class b/bin/frame/DrawingFrame$14.class
diff --git a/bin/frame/DrawingFrame$15.class b/bin/frame/DrawingFrame$15.class
diff --git a/bin/frame/DrawingFrame$2.class b/bin/frame/DrawingFrame$2.class
diff --git a/bin/frame/DrawingFrame$3.class b/bin/frame/DrawingFrame$3.class
diff --git a/bin/frame/DrawingFrame$4.class b/bin/frame/DrawingFrame$4.class
diff --git a/bin/frame/DrawingFrame$5.class b/bin/frame/DrawingFrame$5.class
diff --git a/bin/frame/DrawingFrame$6.class b/bin/frame/DrawingFrame$6.class
diff --git a/bin/frame/DrawingFrame$7.class b/bin/frame/DrawingFrame$7.class
diff --git a/bin/frame/DrawingFrame$8.class b/bin/frame/DrawingFrame$8.class
diff --git a/bin/frame/DrawingFrame$9.class b/bin/frame/DrawingFrame$9.class
diff --git a/bin/frame/DrawingFrame.class b/bin/frame/DrawingFrame.class
diff --git a/bin/strategy/FileLog.class b/bin/strategy/FileLog.class
diff --git a/src/adapter/HexagonAdapter.java b/src/adapter/HexagonAdapter.java
@@ -99,7 +99,7 @@ public HexagonAdapter clone() {
 		Hexagon h = new Hexagon(getXcoordinate(), getYcoordinate(), getR());
 		h.setBorderColor(getColor());
 		h.setAreaColor(getInteriorColor());
-		return new HexagonAdapter(hexagon);
+		return new HexagonAdapter(h);
 	}
 
 	/**
@@ -126,17 +126,17 @@ public Color getColor() {
 	}
 
 	public void setColor(Color color) {
-		super.setColor(color);
 		hexagon.setBorderColor(color);
+		super.setColor(color);
 	}
 
 	public Color getInteriorColor() {
 		return hexagon.getAreaColor();
 	}
 
 	public void setInteriorColor(Color color) {
-		super.setInteriorColor(color);
 		hexagon.setAreaColor(color);
+		super.setInteriorColor(color);
 	}
 
 	public int getR() {

diff --git a/src/commands/CmdBringToFront.java b/src/commands/CmdBringToFront.java
@@ -9,8 +9,8 @@
 public class CmdBringToFront implements Command {
 	private DrawingModel model;
 	private Shape shape;
-	private int index;
 	private int size;
+	private int index;
 
 	public CmdBringToFront(DrawingModel model, Shape shape, int size) {
 		this.model = model;
@@ -33,7 +33,7 @@ public void execute() {
 	 */
 	@Override
 	public void unexecute() {
-		model.removeAtIndex(model.getAll().size() - 1);
+		model.removeAtIndex(size);
 		model.addToIndex(index, shape);
 	}
 }
diff --git a/src/commands/CmdUpdateHexagon.java b/src/commands/CmdUpdateHexagon.java
@@ -32,7 +32,7 @@ public void execute() {
 	 */
 	@Override
 	public void unexecute() {
-		oldState.moveTo(originalState.getXcoordinate(), newState.getYcoordinate());
+		oldState.moveTo(originalState.getXcoordinate(), originalState.getYcoordinate());
 		oldState.setColor(originalState.getColor());
 		oldState.setInteriorColor(originalState.getInteriorColor());
 		oldState.setR(originalState.getR());

diff --git a/src/commands/CmdUpdateLine.java b/src/commands/CmdUpdateLine.java
@@ -31,8 +31,8 @@ public void execute() {
 	 */
 	@Override
 	public void unexecute() {
-		oldState.setInitial(originalState.getInitial());
-		oldState.setLast(originalState.getLast());
+		oldState.setInitial(originalState.getInitial().clone());
+		oldState.setLast(originalState.getLast().clone());
 		oldState.setColor(originalState.getColor());
 	}
 }
diff --git a/src/commands/CmdUpdatePoint.java b/src/commands/CmdUpdatePoint.java
@@ -30,8 +30,7 @@ public void execute() {
 	 */
 	@Override
 	public void unexecute() {
-		oldState.setXcoordinate(originalState.getXcoordinate());
-		oldState.setYcoordinate(originalState.getYcoordinate());
+		oldState.moveTo(originalState.getXcoordinate(), originalState.getYcoordinate());
 		oldState.setColor(originalState.getColor());
 	}
 }
diff --git a/src/commands/CmdUpdateRectangle.java b/src/commands/CmdUpdateRectangle.java
@@ -3,8 +3,6 @@
 import shapes.Rectangle;
 
 /**
- * @author Vukan Marković
- *
  * Class that represent command for update existing rectangle from the draw.
  */
 public class CmdUpdateRectangle implements Command {
@@ -35,7 +33,7 @@ public void execute() {
 	 */
 	@Override
 	public void unexecute() {
-		oldState.setUpLeft(originalState.getUpLeft());
+		oldState.setUpLeft(originalState.getUpLeft().clone());
 		oldState.setWidth(originalState.getWidth());
 		oldState.setSide(originalState.getSide());
 		oldState.setColor(originalState.getColor());

diff --git a/src/commands/CmdUpdateSquare.java b/src/commands/CmdUpdateSquare.java
@@ -32,7 +32,7 @@ public void execute() {
 	 */
 	@Override
 	public void unexecute() {
-		oldState.setUpLeft(originalState.getUpLeft());
+		oldState.setUpLeft(originalState.getUpLeft().clone());
 		oldState.setSide(originalState.getSide());
 		oldState.setColor(originalState.getColor());
 		oldState.setInteriorColor(originalState.getInteriorColor());

diff --git a/src/frame/DrawingFrame.java b/src/frame/DrawingFrame.java
@@ -9,9 +9,7 @@
 import java.awt.event.*;
 
 /**
- * @author Vukan Markovic
- * @version 1.0
- * @since 11.01.2019.
+ * Class that contains view, all GUI elements of the application and communicate with controller.
  */
 public class DrawingFrame extends JFrame {
 	private static final long serialVersionUID = 1L;
@@ -468,15 +466,6 @@ public MouseAdapter getMouseAdapterBringToFront() {
 	public MouseAdapter getMouseAdapterBringToBack() {
 		return mouseAdapterBringToBack;
 	}
-
-	public void setController(DrawingController controller) {
-		this.controller = controller;
-		controller.addPropertyChangedListener(new DrawingObserver(this));
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
 
 	public JToggleButton getTglBtnDrawPoint() {
 		return tglBtnDrawPoint;
@@ -517,8 +506,9 @@ public MouseAdapter getMouseAdapterEdgeColor() {
 	public MouseAdapter getMouseAdapterInteriorColor() {
 		return mouseAdapterInteriorColor;
 	}
-
-	public JList<String> getActivityLog() {
-		return activityLog;
+
+	public void setController(DrawingController controller) {
+		this.controller = controller;
+		controller.addPropertyChangedListener(new DrawingObserver(this));
 	}
 }
diff --git a/src/strategy/FileDraw.java b/src/strategy/FileDraw.java
@@ -10,7 +10,7 @@
 import shapes.Shape;
 
 /**
- * 
+ * Class that is responsible to save and open draw as serializable file.
  */
 public class FileDraw implements FileHandler {
 	private FileOutputStream fileOutputStream;

diff --git a/src/strategy/FileLog.java b/src/strategy/FileLog.java
@@ -34,6 +34,9 @@
 import shapes.Shape;
 import shapes.Square;
 
+/**
+ * Class that is responsible to save and parse log of executed commands.
+ */
 public class FileLog implements FileHandler {
 	private BufferedWriter writer;
 	private BufferedReader reader;

diff --git a/src/strategy/FilePicture.java b/src/strategy/FilePicture.java
@@ -27,8 +27,8 @@ public void save(File file) {
 		 BufferedImage imagebuffer = null;
 		    try {
 		        imagebuffer = new Robot().createScreenCapture(frame.getView().getBounds());
-		    } catch (AWTException e1) {
-		        e1.printStackTrace();
+		    } catch (AWTException e) {
+		    	System.out.println(e.getMessage());
 		    }  
 		    frame.getView().paint(imagebuffer.createGraphics());
 		    try {