From aa9a76317b4110fa326904ab407d70623b87ea48 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 14 Nov 2012 09:23:53 +0200 Subject: [PATCH] Move widget classes from c.v.c.ui. to c.v.c.ui (#9392) - fix native javascript methods Change-Id: Ib307c7eb0568690f9eaf59ce0bf039fe82634547 --- client/src/com/vaadin/client/ui/VCustomLayout.java | 2 +- .../src/com/vaadin/client/ui/VDragAndDropWrapper.java | 10 +++++----- .../com/vaadin/client/ui/VDragAndDropWrapperIE.java | 10 +++++----- client/src/com/vaadin/client/ui/VTextField.java | 2 +- client/src/com/vaadin/client/ui/VVideo.java | 2 +- .../client/ui/upload/UploadIFrameOnloadStrategy.java | 2 +- .../client/ui/upload/UploadIFrameOnloadStrategyIE.java | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/src/com/vaadin/client/ui/VCustomLayout.java b/client/src/com/vaadin/client/ui/VCustomLayout.java index aae82556a4..5882f0bb37 100644 --- a/client/src/com/vaadin/client/ui/VCustomLayout.java +++ b/client/src/com/vaadin/client/ui/VCustomLayout.java @@ -398,7 +398,7 @@ public class VCustomLayout extends ComplexPanel { /*-{ var self = this; element.notifyChildrenOfSizeChange = $entry(function() { - self.@com.vaadin.client.ui.customlayout.VCustomLayout::notifyChildrenOfSizeChange()(); + self.@com.vaadin.client.ui.VCustomLayout::notifyChildrenOfSizeChange()(); }); }-*/; diff --git a/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java b/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java index af728b3797..6542aa68a3 100644 --- a/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java +++ b/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java @@ -530,7 +530,7 @@ public class VDragAndDropWrapper extends VCustomComponent implements /*-{ var me = this; el.addEventListener("dragstart", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); }-*/; @@ -544,19 +544,19 @@ public class VDragAndDropWrapper extends VCustomComponent implements var me = this; el.addEventListener("dragenter", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); el.addEventListener("dragleave", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); el.addEventListener("dragover", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); el.addEventListener("drop", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); }), false); }-*/; diff --git a/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java b/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java index 8dcd64a658..c125568f25 100644 --- a/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java +++ b/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java @@ -52,7 +52,7 @@ public class VDragAndDropWrapperIE extends VDragAndDropWrapper { var me = this; el.attachEvent("ondragstart", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragStart(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); }-*/; @@ -62,19 +62,19 @@ public class VDragAndDropWrapperIE extends VDragAndDropWrapper { var me = this; el.attachEvent("ondragenter", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragEnter(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); el.attachEvent("ondragleave", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragLeave(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); el.attachEvent("ondragover", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragOver(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); el.attachEvent("ondrop", $entry(function(ev) { - return me.@com.vaadin.client.ui.draganddropwrapper.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); + return me.@com.vaadin.client.ui.VDragAndDropWrapper::html5DragDrop(Lcom/vaadin/client/ui/dd/VHtml5DragEvent;)(ev); })); }-*/; diff --git a/client/src/com/vaadin/client/ui/VTextField.java b/client/src/com/vaadin/client/ui/VTextField.java index f757b177f3..3cec1ab3e0 100644 --- a/client/src/com/vaadin/client/ui/VTextField.java +++ b/client/src/com/vaadin/client/ui/VTextField.java @@ -244,7 +244,7 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, /*-{ var me = this; el.oncut = $entry(function() { - me.@com.vaadin.client.ui.textfield.VTextField::onCut()(); + me.@com.vaadin.client.ui.VTextField::onCut()(); }); }-*/; diff --git a/client/src/com/vaadin/client/ui/VVideo.java b/client/src/com/vaadin/client/ui/VVideo.java index 754af8658f..e72e43bd3c 100644 --- a/client/src/com/vaadin/client/ui/VVideo.java +++ b/client/src/com/vaadin/client/ui/VVideo.java @@ -46,7 +46,7 @@ public class VVideo extends VMediaBase { /*-{ var self = this; el.addEventListener('loadedmetadata', $entry(function(e) { - self.@com.vaadin.client.ui.video.VVideo::updateElementDynamicSize(II)(el.videoWidth, el.videoHeight); + self.@com.vaadin.client.ui.VVideo::updateElementDynamicSize(II)(el.videoWidth, el.videoHeight); }), false); }-*/; diff --git a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java index 4ce50e7133..99be286394 100644 --- a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java +++ b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java @@ -23,7 +23,7 @@ public class UploadIFrameOnloadStrategy { VUpload upload) /*-{ iframe.onload = $entry(function() { - upload.@com.vaadin.client.ui.upload.VUpload::onSubmitComplete()(); + upload.@com.vaadin.client.ui.VUpload::onSubmitComplete()(); }); }-*/; diff --git a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java index cdbc41be93..a47f9c4f76 100644 --- a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java +++ b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java @@ -28,7 +28,7 @@ public class UploadIFrameOnloadStrategyIE extends UploadIFrameOnloadStrategy { /*-{ iframe.onreadystatechange = $entry(function() { if (iframe.readyState == 'complete') { - upload.@com.vaadin.client.ui.upload.VUpload::onSubmitComplete()(); + upload.@com.vaadin.client.ui.VUpload::onSubmitComplete()(); } }); }-*/; -- 2.39.5