aboutsummaryrefslogtreecommitdiffstats
path: root/compatibility-shared/src
diff options
context:
space:
mode:
Diffstat (limited to 'compatibility-shared/src')
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractFieldState.java9
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractLegacyComponentState.java32
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGradientState.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGridState.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerState.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java4
-rw-r--r--compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/upload/UploadState.java4
8 files changed, 51 insertions, 14 deletions
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractFieldState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractFieldState.java
index 4ba42eba46..36e65acabe 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractFieldState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractFieldState.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.v7.shared;
-import com.vaadin.shared.ui.TabIndexState;
+import com.vaadin.shared.annotations.NoLayout;
/**
* Shared state for {@link com.vaadin.ui.AbstractField}.
@@ -24,9 +24,14 @@ import com.vaadin.shared.ui.TabIndexState;
* @since 7.0.0
*
*/
-public class AbstractFieldState extends TabIndexState {
+public class AbstractFieldState extends AbstractLegacyComponentState {
public boolean propertyReadOnly = false;
public boolean hideErrors = false;
public boolean required = false;
public boolean modified = false;
+ /**
+ * The <i>tabulator index</i> of the field.
+ */
+ @NoLayout
+ public int tabIndex = 0;
}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractLegacyComponentState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractLegacyComponentState.java
new file mode 100644
index 0000000000..adb6d96ae2
--- /dev/null
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractLegacyComponentState.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2000-2016 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.v7.shared;
+
+import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.shared.annotations.NoLayout;
+
+/**
+ * Shared state for AbstractLegacyComponent.
+ *
+ * @author Vaadin Ltd
+ * @since 8.0
+ * @deprecated only used for Vaadin 7 compatiblity components
+ */
+@Deprecated
+public class AbstractLegacyComponentState extends AbstractComponentState {
+ @NoLayout
+ public boolean immediate = false;
+}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java
index df62f84bbd..dd15c09b7f 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/calendar/CalendarState.java
@@ -17,13 +17,13 @@ package com.vaadin.v7.shared.ui.calendar;
import java.util.List;
-import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.v7.shared.AbstractLegacyComponentState;
/**
* @since 7.1.0
* @author Vaadin Ltd.
*/
-public class CalendarState extends AbstractComponentState {
+public class CalendarState extends AbstractLegacyComponentState {
public boolean format24H;
public String[] dayNames;
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGradientState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGradientState.java
index 0e418504f7..ba6a404519 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGradientState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGradientState.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.v7.shared.ui.colorpicker;
-import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.v7.shared.AbstractLegacyComponentState;
/**
* Default shared state implementation for ColorPickerGradient.
@@ -23,7 +23,7 @@ import com.vaadin.shared.AbstractComponentState;
* @since 7.0.0
*/
@Deprecated
-public class ColorPickerGradientState extends AbstractComponentState {
+public class ColorPickerGradientState extends AbstractLegacyComponentState {
public int cursorX;
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGridState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGridState.java
index d822d6efc3..0dfcfadd94 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGridState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerGridState.java
@@ -15,7 +15,7 @@
*/
package com.vaadin.v7.shared.ui.colorpicker;
-import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.v7.shared.AbstractLegacyComponentState;
/**
* Default shared state implementation for ColorPickerGrid.
@@ -23,7 +23,7 @@ import com.vaadin.shared.AbstractComponentState;
* @since 7.0.0
*/
@Deprecated
-public class ColorPickerGridState extends AbstractComponentState {
+public class ColorPickerGridState extends AbstractLegacyComponentState {
public int rowCount;
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerState.java
index 84e3b846ca..be8fb79a18 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/colorpicker/ColorPickerState.java
@@ -15,8 +15,8 @@
*/
package com.vaadin.v7.shared.ui.colorpicker;
-import com.vaadin.shared.AbstractComponentState;
import com.vaadin.shared.annotations.DelegateToWidget;
+import com.vaadin.v7.shared.AbstractLegacyComponentState;
/**
* Default shared state implementation for AbstractColorPicker.
@@ -24,7 +24,7 @@ import com.vaadin.shared.annotations.DelegateToWidget;
* @since 7.0.0
*/
@Deprecated
-public class ColorPickerState extends AbstractComponentState {
+public class ColorPickerState extends AbstractLegacyComponentState {
{
primaryStyleName = "v-colorpicker";
}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java
index 64cc3b5ee5..2bded7f146 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java
@@ -15,9 +15,9 @@
*/
package com.vaadin.v7.shared.ui.label;
-import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.v7.shared.AbstractLegacyComponentState;
-public class LabelState extends AbstractComponentState {
+public class LabelState extends AbstractLegacyComponentState {
{
primaryStyleName = "v-label";
}
diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/upload/UploadState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/upload/UploadState.java
index 2a6cb0ea66..90e4f1358d 100644
--- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/upload/UploadState.java
+++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/upload/UploadState.java
@@ -15,14 +15,14 @@
*/
package com.vaadin.v7.shared.ui.upload;
-import com.vaadin.shared.AbstractComponentState;
+import com.vaadin.v7.shared.AbstractLegacyComponentState;
/**
* Shared state for the Upload component.
*
* @since 7.6
*/
-public class UploadState extends AbstractComponentState {
+public class UploadState extends AbstractLegacyComponentState {
{
primaryStyleName = "v-upload";