From 1e8a4199fd40641b38c056bc391c98c6fcb2917b Mon Sep 17 00:00:00 2001
From: Markus Koivisto <markus@vaadin.com>
Date: Thu, 28 Aug 2014 15:46:04 +0300
Subject: Revert "Make getMouseEvent() method available in the
 TargetDetailsImpl (#13416)."

This reverts commit 9ea4409bbe7079887a5a3c497494d4986ddabefd.
The commit fails its own tests on IE and Firefox.

Change-Id: I443f8d1b9ce322124b19d74bbeb2e6780bbff201
---
 server/src/com/vaadin/event/dd/TargetDetailsImpl.java | 10 ----------
 server/src/com/vaadin/ui/Calendar.java                |  3 +--
 server/src/com/vaadin/ui/DragAndDropWrapper.java      |  9 +++++++++
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'server')

diff --git a/server/src/com/vaadin/event/dd/TargetDetailsImpl.java b/server/src/com/vaadin/event/dd/TargetDetailsImpl.java
index 8a6ec506ba..1138215f3f 100644
--- a/server/src/com/vaadin/event/dd/TargetDetailsImpl.java
+++ b/server/src/com/vaadin/event/dd/TargetDetailsImpl.java
@@ -18,8 +18,6 @@ package com.vaadin.event.dd;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.vaadin.shared.MouseEventDetails;
-
 /**
  * A HashMap backed implementation of {@link TargetDetails} for terminal
  * implementation and for extension.
@@ -43,14 +41,6 @@ public class TargetDetailsImpl implements TargetDetails {
         this.dropTarget = dropTarget;
     }
 
-    /**
-     * @return details about the actual event that caused the event details.
-     *         Practically mouse move or mouse up.
-     */
-    public MouseEventDetails getMouseEvent() {
-        return MouseEventDetails.deSerialize((String) getData("mouseEvent"));
-    }
-
     @Override
     public Object getData(String key) {
         return data.get(key);
diff --git a/server/src/com/vaadin/ui/Calendar.java b/server/src/com/vaadin/ui/Calendar.java
index 888a443be3..59dfceec9b 100644
--- a/server/src/com/vaadin/ui/Calendar.java
+++ b/server/src/com/vaadin/ui/Calendar.java
@@ -1430,7 +1430,7 @@ public class Calendar extends AbstractComponent implements
     @Override
     public TargetDetails translateDropTargetDetails(
             Map<String, Object> clientVariables) {
-        Map<String, Object> serverVariables = new HashMap<String, Object>();
+        Map<String, Object> serverVariables = new HashMap<String, Object>(1);
 
         if (clientVariables.containsKey("dropSlotIndex")) {
             int slotIndex = (Integer) clientVariables.get("dropSlotIndex");
@@ -1450,7 +1450,6 @@ public class Calendar extends AbstractComponent implements
             currentCalendar.add(java.util.Calendar.DATE, dayIndex);
             serverVariables.put("dropDay", currentCalendar.getTime());
         }
-        serverVariables.put("mouseEvent", clientVariables.get("mouseEvent"));
 
         CalendarTargetDetails td = new CalendarTargetDetails(serverVariables,
                 this);
diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java
index 6e4ec903d2..0e2e8f6d2f 100644
--- a/server/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java
@@ -131,6 +131,15 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget,
             return (Integer) getData("absoluteTop");
         }
 
+        /**
+         * @return details about the actual event that caused the event details.
+         *         Practically mouse move or mouse up.
+         */
+        public MouseEventDetails getMouseEvent() {
+            return MouseEventDetails
+                    .deSerialize((String) getData("mouseEvent"));
+        }
+
         /**
          * @return a detail about the drags vertical position over the wrapper.
          */
-- 
cgit v1.2.3