From 5a4c888dbd85d1a902b6657774a019e2d13551df Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Fri, 9 May 2014 11:07:56 +0300 Subject: [PATCH] Rename base on API review (#13557) Change-Id: I3174d19d2595232b66f4120ba8fb6fbb1c6d8be8 --- client/src/com/vaadin/client/ui/VTextArea.java | 6 +++--- .../{VDragCloneAware.java => DragImageModifier.java} | 10 +++++----- client/src/com/vaadin/client/ui/dd/VDragEvent.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename client/src/com/vaadin/client/ui/dd/{VDragCloneAware.java => DragImageModifier.java} (75%) 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/VDragCloneAware.java b/client/src/com/vaadin/client/ui/dd/DragImageModifier.java similarity index 75% rename from client/src/com/vaadin/client/ui/dd/VDragCloneAware.java rename to client/src/com/vaadin/client/ui/dd/DragImageModifier.java index 8c1b17daec..f08c082a70 100644 --- a/client/src/com/vaadin/client/ui/dd/VDragCloneAware.java +++ b/client/src/com/vaadin/client/ui/dd/DragImageModifier.java @@ -18,14 +18,14 @@ 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. + * 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 VDragCloneAware { +public interface DragImageModifier { /** * This method is called for cloned element which corresponds @@ -35,5 +35,5 @@ public interface VDragCloneAware { * @param element * cloned element of drag image */ - void initDragImageCopy(Element element); + void modifyDragImage(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); } } -- 2.39.5