diff options
11 files changed, 41 insertions, 11 deletions
diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/AbstractFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/AbstractFieldConnector.java index 063852279d..36d8f17d00 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/AbstractFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/AbstractFieldConnector.java @@ -19,7 +19,7 @@ import com.vaadin.client.StyleConstants; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.HasErrorIndicator; import com.vaadin.client.ui.HasRequiredIndicator; -import com.vaadin.shared.AbstractFieldState; +import com.vaadin.v7.shared.AbstractFieldState; @Deprecated public abstract class AbstractFieldConnector extends AbstractComponentConnector diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java index 9da418279d..2d26c7c040 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java @@ -24,8 +24,8 @@ import com.vaadin.client.ComponentConnector; import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler; import com.vaadin.client.HasComponentsConnector; -import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VCustomComponent; import com.vaadin.v7.ui.CustomField; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java index a7c11cb550..18e1361352 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java @@ -22,9 +22,9 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VTextField; import com.vaadin.v7.shared.ui.textfield.AbstractTextFieldState; import com.vaadin.v7.shared.ui.textfield.TextFieldConstants; diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java index 33f262d581..b051eaf666 100644 --- a/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractField.java @@ -36,7 +36,6 @@ import com.vaadin.event.ShortcutListener; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.CompositeErrorMessage; import com.vaadin.server.ErrorMessage; -import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; @@ -49,6 +48,7 @@ import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.data.util.converter.Converter; import com.vaadin.v7.data.util.converter.Converter.ConversionException; +import com.vaadin.v7.shared.AbstractFieldState; import com.vaadin.v7.data.util.converter.ConverterUtil; /** 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 new file mode 100644 index 0000000000..4ba42eba46 --- /dev/null +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/AbstractFieldState.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.ui.TabIndexState; + +/** + * Shared state for {@link com.vaadin.ui.AbstractField}. + * + * @author Vaadin Ltd + * @since 7.0.0 + * + */ +public class AbstractFieldState extends TabIndexState { + public boolean propertyReadOnly = false; + public boolean hideErrors = false; + public boolean required = false; + public boolean modified = false; +} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java index 58b52ee97c..45fa24c3cc 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/checkbox/CheckBoxState.java @@ -15,7 +15,7 @@ */ package com.vaadin.v7.shared.ui.checkbox; -import com.vaadin.shared.AbstractFieldState; +import com.vaadin.v7.shared.AbstractFieldState; public class CheckBoxState extends AbstractFieldState { { diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/InlineDateFieldState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/InlineDateFieldState.java index ab780091df..483d6b4051 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/InlineDateFieldState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/InlineDateFieldState.java @@ -15,8 +15,6 @@ */ package com.vaadin.v7.shared.ui.datefield; -import com.vaadin.shared.ui.datefield.TextualDateFieldState; - public class InlineDateFieldState extends TextualDateFieldState { { primaryStyleName = "v-inline-datefield"; diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/TextualDateFieldState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/TextualDateFieldState.java index f9362dc358..006642e3ee 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/TextualDateFieldState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/datefield/TextualDateFieldState.java @@ -17,8 +17,8 @@ package com.vaadin.v7.shared.ui.datefield; import java.util.Date; -import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.annotations.NoLayout; +import com.vaadin.v7.shared.AbstractFieldState; public class TextualDateFieldState extends AbstractFieldState { { diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java index c5b07dd3e4..b3e510b43d 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/progressindicator/ProgressBarState.java @@ -16,9 +16,9 @@ package com.vaadin.v7.shared.ui.progressindicator; -import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.annotations.NoLayout; import com.vaadin.shared.communication.SharedState; +import com.vaadin.v7.shared.AbstractFieldState; /** * {@link SharedState} for {@link com.vaadin.ui.ProgressBar} diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java index 624a20162a..4d2c69bebc 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/select/AbstractSelectState.java @@ -15,7 +15,7 @@ */ package com.vaadin.v7.shared.ui.select; -import com.vaadin.shared.AbstractFieldState; +import com.vaadin.v7.shared.AbstractFieldState; /** * Shared state for the AbstractSelect component. diff --git a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java index c25694ff2e..c74684d19a 100644 --- a/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java +++ b/compatibility-shared/src/main/java/com/vaadin/v7/shared/ui/textfield/AbstractTextFieldState.java @@ -15,8 +15,8 @@ */ package com.vaadin.v7.shared.ui.textfield; -import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.annotations.NoLayout; +import com.vaadin.v7.shared.AbstractFieldState; @Deprecated public class AbstractTextFieldState extends AbstractFieldState { |