cleanup of Errors

Author: Torsten-Mumme

src/main/java/net/itarray/automotion/internal/Errors.java

@@ -9,45 +9,43 @@ public class Errors {
 
     private final JSONArray messages = new JSONArray();
     private String lastMessage;
-    private UIElement lastElement;
 
     public String getLastMessage() {
         return lastMessage;
     }
 
-    public UIElement getLastElement() {
-        return lastElement;
+    public void add(String message) {
+        internalAdd(message, null, null);
     }
 
-    public void add(String message) {
+    public void add(String message, UIElement element) {
+        internalAdd(message, element, encode(element));
+    }
+
+    private void internalAdd(String message, UIElement element, JSONObject encodedElement) {
         lastMessage = message;
-        lastElement = null;
         JSONObject details = new JSONObject();
         JSONObject messageObject = new JSONObject();
         messageObject.put(MESSAGE, message);
+        if (encodedElement != null) {
+            messageObject.put(ELEMENT, encodedElement);
+        }
         details.put(REASON, messageObject);
         messages.add(details);
     }
 
-    public void add(String message, UIElement element) {
-        lastMessage = message;
-        lastElement = element;
+    private JSONObject encode(UIElement element) {
         float xContainer = element.getX().intValue();
         float yContainer = element.getY().intValue();
         float widthContainer = element.getWidth().intValue();
         float heightContainer = element.getHeight().intValue();
 
-        JSONObject details = new JSONObject();
         JSONObject elDetails = new JSONObject();
         elDetails.put(X, xContainer);
         elDetails.put(Y, yContainer);
         elDetails.put(WIDTH, widthContainer);
         elDetails.put(HEIGHT, heightContainer);
-        JSONObject mes = new JSONObject();
-        mes.put(MESSAGE, message);
-        mes.put(ELEMENT, elDetails);
-        details.put(REASON, mes);
-        messages.add(details);
+        return elDetails;
     }