From: Artur Signell <artur@vaadin.com>
Date: Fri, 9 May 2014 08:07:56 +0000 (+0300)
Subject: Rename base on API review (#13557)
X-Git-Tag: 7.2.0~7^2~15
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5a4c888dbd85d1a902b6657774a019e2d13551df;p=vaadin-framework.git

Rename base on API review (#13557)

Change-Id: I3174d19d2595232b66f4120ba8fb6fbb1c6d8be8
---

diff --git a/client/src/com/vaadin/client/ui/VTextArea.java b/client/src/com/vaadin/client/ui/VTextArea.java
index cc77306100..edcb207bf9 100644
--- a/client/src/com/vaadin/client/ui/VTextArea.java
+++ b/client/src/com/vaadin/client/ui/VTextArea.java
@@ -33,7 +33,7 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.vaadin.client.BrowserInfo;
 import com.vaadin.client.Util;
-import com.vaadin.client.ui.dd.VDragCloneAware;
+import com.vaadin.client.ui.dd.DragImageModifier;
 
 /**
  * This class represents a multiline textfield (textarea).
@@ -44,7 +44,7 @@ import com.vaadin.client.ui.dd.VDragCloneAware;
  * @author Vaadin Ltd.
  * 
  */
-public class VTextArea extends VTextField implements VDragCloneAware {
+public class VTextArea extends VTextField implements DragImageModifier {
 
     public static final String CLASSNAME = "v-textarea";
     private boolean wordwrap = true;
@@ -321,7 +321,7 @@ public class VTextArea extends VTextField implements VDragCloneAware {
     }
 
     @Override
-    public void initDragImageCopy(Element element) {
+    public void modifyDragImage(Element element) {
         // Fix for #13557 - drag image doesn't show original text area text.
         // It happens because "value" property is not copied into the cloned
         // element
diff --git a/client/src/com/vaadin/client/ui/dd/DragImageModifier.java b/client/src/com/vaadin/client/ui/dd/DragImageModifier.java
new file mode 100644
index 0000000000..f08c082a70
--- /dev/null
+++ b/client/src/com/vaadin/client/ui/dd/DragImageModifier.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.client.ui.dd;
+
+import com.google.gwt.dom.client.Element;
+
+/**
+ * Interface implemented by widgets if the drag image used for drag'n'drop
+ * requires additional initialization/configuration. The method
+ * {@link #modifyDragImage(Element)} is called for each element in the automatically generated drag image.
+ * 
+ * @since 7.2
+ * @author Vaadin Ltd
+ */
+public interface DragImageModifier {
+
+    /**
+     * This method is called for cloned <code>element</code> which corresponds
+     * to the widget element. One could modify/correct this <code>element</code>
+     * for drag image.
+     * 
+     * @param element
+     *            cloned element of drag image
+     */
+    void modifyDragImage(Element element);
+}
diff --git a/client/src/com/vaadin/client/ui/dd/VDragCloneAware.java b/client/src/com/vaadin/client/ui/dd/VDragCloneAware.java
deleted file mode 100644
index 8c1b17daec..0000000000
--- a/client/src/com/vaadin/client/ui/dd/VDragCloneAware.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.client.ui.dd;
-
-import com.google.gwt.dom.client.Element;
-
-/**
- * Widget could implement this interface if drag image requires additional
- * initialization/configuration. Method {@link #initDragImageCopy(Element)}
- * allows to change/correct drag image element when element is dragged via DnD.
- * 
- * @since 7.2
- * @author Vaadin Ltd
- */
-public interface VDragCloneAware {
-
-    /**
-     * This method is called for cloned <code>element</code> which corresponds
-     * to the widget element. One could modify/correct this <code>element</code>
-     * for drag image.
-     * 
-     * @param element
-     *            cloned element of drag image
-     */
-    void initDragImageCopy(Element element);
-}
diff --git a/client/src/com/vaadin/client/ui/dd/VDragEvent.java b/client/src/com/vaadin/client/ui/dd/VDragEvent.java
index dc234de46d..d4b6c6da69 100644
--- a/client/src/com/vaadin/client/ui/dd/VDragEvent.java
+++ b/client/src/com/vaadin/client/ui/dd/VDragEvent.java
@@ -303,8 +303,8 @@ public class VDragEvent {
 
     private void doSyncContent(Element original, Element copy) {
         EventListener eventListener = Event.getEventListener(original);
-        if (eventListener instanceof VDragCloneAware) {
-            ((VDragCloneAware) eventListener).initDragImageCopy(copy);
+        if (eventListener instanceof DragImageModifier) {
+            ((DragImageModifier) eventListener).modifyDragImage(copy);
         }
     }