From c6b44ac8adc9b2ffd6290c98643a633f405dd6c6 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 18 Aug 2016 23:19:41 +0300
Subject: Move and rename server classes which go into the compatibility
 package

* Use com.vaadin.v7
* Use the same class name as in Vaadin 7
* Use a "vaadin7-" declarative prefix for Vaadin 7 components

Change-Id: I19a27f3835b18980b91a4f8f9464b2adde1a5fd5
---
 .../java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java  | 4 ++--
 .../com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java     | 4 ++--
 .../client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java      | 4 ++--
 .../com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'client')

diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java
index eca56612cb..19b13f53d6 100644
--- a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java
@@ -16,10 +16,10 @@
 package com.vaadin.client.legacy.ui;
 
 import com.vaadin.client.ui.customfield.CustomFieldConnector;
-import com.vaadin.legacy.ui.LegacyCustomField;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.v7.ui.CustomField;
 
-@Connect(value = LegacyCustomField.class)
+@Connect(value = CustomField.class)
 public class LegacyCustomFieldConnector extends CustomFieldConnector {
 
 }
diff --git a/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java
index c8a4762928..f3e46e9b01 100644
--- a/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java
+++ b/client/src/main/java/com/vaadin/client/v7/ui/checkbox/LegacyCheckBoxConnector.java
@@ -17,9 +17,9 @@ package com.vaadin.client.v7.ui.checkbox;
 
 import com.vaadin.client.ui.checkbox.CheckBoxConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.ui.LegacyCheckBox;
+import com.vaadin.v7.ui.CheckBox;
 
-@Connect(LegacyCheckBox.class)
+@Connect(CheckBox.class)
 public class LegacyCheckBoxConnector extends CheckBoxConnector {
 
 }
diff --git a/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java
index 1c3f89d693..d2fda689f1 100644
--- a/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/v7/ui/passwordfield/LegacyPasswordFieldConnector.java
@@ -19,10 +19,10 @@ package com.vaadin.client.v7.ui.passwordfield;
 import com.vaadin.client.v7.ui.VLegacyPasswordField;
 import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.v7.ui.LegacyPasswordField;
+import com.vaadin.v7.ui.PasswordField;
 
 @Deprecated
-@Connect(LegacyPasswordField.class)
+@Connect(PasswordField.class)
 public class LegacyPasswordFieldConnector extends LegacyTextFieldConnector {
 
     @Override
diff --git a/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java b/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java
index 7a2c583779..92ae3a47da 100644
--- a/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java
@@ -28,10 +28,10 @@ import com.vaadin.shared.ui.Connect;
 import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState;
 import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants;
-import com.vaadin.v7.ui.LegacyTextField;
+import com.vaadin.v7.ui.TextField;
 
 @Deprecated
-@Connect(value = LegacyTextField.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = TextField.class, loadStyle = LoadStyle.EAGER)
 public class LegacyTextFieldConnector extends AbstractFieldConnector
         implements Paintable {
 
-- 
cgit v1.2.3