summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-04-03 12:00:59 +0300
committerArtur Signell <artur@vaadin.com>2012-04-05 00:08:53 +0300
commit28bdc6a011c1cf149c824569bb5ff7757fd709f9 (patch)
tree35cba11c36e986bf552d8b804bec0b9a1c69d948 /tests
parent8c598ccfada6a54a5733935544e41056198d6d7c (diff)
downloadvaadin-framework-28bdc6a011c1cf149c824569bb5ff7757fd709f9.tar.gz
vaadin-framework-28bdc6a011c1cf149c824569bb5ff7757fd709f9.zip
ServerConnector is no longer a Paintable, components using updateFromUidl are
Diffstat (limited to 'tests')
-rw-r--r--tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java6
-rw-r--r--tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java7
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
index 05698ec195..6076657708 100644
--- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
@@ -6,17 +6,17 @@ package com.vaadin.tests.dd;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Widget;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
import com.vaadin.terminal.gwt.client.UIDL;
import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
import com.vaadin.terminal.gwt.client.ui.Component;
import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource;
@Component(MyDragSource.class)
-public class MyDragSourceConnector extends AbstractComponentConnector {
+public class MyDragSourceConnector extends AbstractComponentConnector implements
+ Paintable {
- @Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
- super.updateFromUIDL(uidl, client);
if (!isRealUpdate(uidl)) {
return;
}
diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
index 648d5d0430..6299eac14f 100644
--- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
@@ -6,18 +6,19 @@ package com.vaadin.tests.dd;
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Widget;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
import com.vaadin.terminal.gwt.client.UIDL;
import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
+<<<<<<< HEAD
import com.vaadin.terminal.gwt.client.ui.Component;
import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget;
@Component(MyDropTarget.class)
-public class MyDropTargetConnector extends AbstractComponentConnector {
+public class MyDropTargetConnector extends AbstractComponentConnector implements
+ Paintable {
- @Override
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
- super.updateFromUIDL(uidl, client);
if (!isRealUpdate(uidl)) {
return;
}