diff options
61 files changed, 214 insertions, 186 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VTextualDate.java b/client/src/main/java/com/vaadin/client/ui/VTextualDate.java index b6788d8516..45221dfce0 100644 --- a/client/src/main/java/com/vaadin/client/ui/VTextualDate.java +++ b/client/src/main/java/com/vaadin/client/ui/VTextualDate.java @@ -38,7 +38,6 @@ import com.vaadin.client.ui.aria.AriaHelper; import com.vaadin.client.ui.aria.HandlesAriaCaption; import com.vaadin.client.ui.aria.HandlesAriaInvalid; import com.vaadin.client.ui.aria.HandlesAriaRequired; -import com.vaadin.client.v7.ui.VLegacyTextField; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.datefield.Resolution; @@ -74,8 +73,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, text.addFocusHandler(new FocusHandler() { @Override public void onFocus(FocusEvent event) { - text.addStyleName(VLegacyTextField.CLASSNAME + "-" - + VLegacyTextField.CLASSNAME_FOCUS); + text.addStyleName(VTextField.CLASSNAME + "-" + + VTextField.CLASSNAME_FOCUS); if (prompting) { text.setText(""); setPrompting(false); @@ -93,8 +92,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, text.addBlurHandler(new BlurHandler() { @Override public void onBlur(BlurEvent event) { - text.removeStyleName(VLegacyTextField.CLASSNAME + "-" - + VLegacyTextField.CLASSNAME_FOCUS); + text.removeStyleName(VTextField.CLASSNAME + "-" + + VTextField.CLASSNAME_FOCUS); String value = getText(); setPrompting(inputPrompt != null && (value == null || "".equals(value))); @@ -118,7 +117,7 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, protected void updateStyleNames() { if (text != null) { - text.setStyleName(VLegacyTextField.CLASSNAME); + text.setStyleName(VTextField.CLASSNAME); text.addStyleName(getStylePrimaryName() + "-textfield"); } } @@ -364,8 +363,8 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, protected void setText(String text) { if (inputPrompt != null && (text == null || "".equals(text)) - && !this.text.getStyleName().contains(VLegacyTextField.CLASSNAME - + "-" + VLegacyTextField.CLASSNAME_FOCUS)) { + && !this.text.getStyleName().contains(VTextField.CLASSNAME + "-" + + VTextField.CLASSNAME_FOCUS)) { text = readonly ? "" : inputPrompt; setPrompting(true); } else { diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroupBase.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroupBase.java index 596828ecd5..94a92e2980 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroupBase.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VOptionGroupBase.java @@ -35,7 +35,6 @@ import com.vaadin.client.Focusable; import com.vaadin.client.UIDL; import com.vaadin.client.ui.Field; import com.vaadin.client.ui.VNativeButton; -import com.vaadin.client.v7.ui.VLegacyTextField; public abstract class VOptionGroupBase extends Composite implements Field, ClickHandler, ChangeHandler, KeyPressHandler, Focusable, HasEnabled { @@ -86,7 +85,7 @@ public abstract class VOptionGroupBase extends Composite implements Field, public final Panel container; /** For internal use only. May be removed or replaced in the future. */ - public VLegacyTextField newItemField; + public VTextField newItemField; /** For internal use only. May be removed or replaced in the future. */ public VNativeButton newItemButton; diff --git a/client/src/main/java/com/vaadin/client/v7/ui/VLegacyPasswordField.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPasswordField.java index ffc1422eb0..f565b8a9a0 100644 --- a/client/src/main/java/com/vaadin/client/v7/ui/VLegacyPasswordField.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VPasswordField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.v7.ui; +package com.vaadin.v7.client.ui; import com.google.gwt.user.client.DOM; @@ -25,9 +25,9 @@ import com.google.gwt.user.client.DOM; * */ @Deprecated -public class VLegacyPasswordField extends VLegacyTextField { +public class VPasswordField extends VTextField { - public VLegacyPasswordField() { + public VPasswordField() { super(DOM.createInputPassword()); } diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java index d15ae0b9fa..252f78ca86 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VScrollTable.java @@ -111,7 +111,6 @@ import com.vaadin.client.ui.dd.VDragAndDropManager; import com.vaadin.client.ui.dd.VDragEvent; import com.vaadin.client.ui.dd.VHasDropHandler; import com.vaadin.client.ui.dd.VTransferable; -import com.vaadin.client.v7.ui.VLegacyTextField; import com.vaadin.shared.AbstractComponentState; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; @@ -6494,8 +6493,8 @@ public class VScrollTable extends FlowPanel if (!(widget instanceof VLabel) && !(widget instanceof VEmbedded) - && !(widget instanceof VLegacyTextField - && ((VLegacyTextField) widget) + && !(widget instanceof VTextField + && ((VTextField) widget) .isReadOnly())) { return null; } diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java index 38f538fbdf..c5d229e153 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextArea.java @@ -33,7 +33,6 @@ import com.google.gwt.user.client.Event; import com.vaadin.client.BrowserInfo; import com.vaadin.client.WidgetUtil; import com.vaadin.client.ui.dd.DragImageModifier; -import com.vaadin.client.v7.ui.VLegacyTextField; /** * This class represents a multiline textfield (textarea). @@ -45,7 +44,7 @@ import com.vaadin.client.v7.ui.VLegacyTextField; * */ @Deprecated -public class VTextArea extends VLegacyTextField implements DragImageModifier { +public class VTextArea extends VTextField implements DragImageModifier { public static final String CLASSNAME = "v-textarea"; private boolean wordwrap = true; diff --git a/client/src/main/java/com/vaadin/client/v7/ui/VLegacyTextField.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java index 5768311960..9fb529ff20 100644 --- a/client/src/main/java/com/vaadin/client/v7/ui/VLegacyTextField.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/VTextField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.v7.ui; +package com.vaadin.v7.client.ui; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; @@ -46,8 +46,8 @@ import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; * */ @Deprecated -public class VLegacyTextField extends TextBoxBase implements Field, - ChangeHandler, FocusHandler, BlurHandler, KeyDownHandler { +public class VTextField extends TextBoxBase implements Field, ChangeHandler, + FocusHandler, BlurHandler, KeyDownHandler { /** * The input node CSS classname. @@ -87,11 +87,11 @@ public class VLegacyTextField extends TextBoxBase implements Field, // used while checking if FF has set input prompt as value private boolean possibleInputError = false; - public VLegacyTextField() { + public VTextField() { this(DOM.createInputText()); } - protected VLegacyTextField(Element node) { + protected VTextField(Element node) { super(node); setStyleName(CLASSNAME); addChangeHandler(this); @@ -249,7 +249,7 @@ public class VLegacyTextField extends TextBoxBase implements Field, /*-{ var me = this; el.oncut = $entry(function() { - me.@com.vaadin.client.v7.ui.VLegacyTextField::onCut()(); + me.@com.vaadin.v7.client.ui.VTextField::onCut()(); }); }-*/; @@ -291,7 +291,7 @@ public class VLegacyTextField extends TextBoxBase implements Field, /*-{ var me = this; el.ondrop = $entry(function() { - me.@com.vaadin.client.v7.ui.VLegacyTextField::scheduleOnDropEvent()(); + me.@com.vaadin.v7.client.ui.VTextField::scheduleOnDropEvent()(); }); }-*/; @@ -436,7 +436,7 @@ public class VLegacyTextField extends TextBoxBase implements Field, return false; } - private static VLegacyTextField focusedTextField; + private static VTextField focusedTextField; public static void flushChangesFromFocusedTextField() { if (focusedTextField != null) { @@ -515,7 +515,7 @@ public class VLegacyTextField extends TextBoxBase implements Field, /*-{ var self = this; el.oninput = $entry(function() { - self.@com.vaadin.client.v7.ui.VLegacyTextField::checkForInputError()(); + self.@com.vaadin.v7.client.ui.VTextField::checkForInputError()(); }); }-*/; diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java index 483abbc32b..fdeb2e08dd 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -21,10 +21,10 @@ import com.vaadin.client.Paintable; import com.vaadin.client.StyleConstants; import com.vaadin.client.UIDL; import com.vaadin.client.ui.VNativeButton; -import com.vaadin.client.v7.ui.VLegacyTextField; import com.vaadin.shared.ui.select.AbstractSelectState; import com.vaadin.v7.client.ui.AbstractFieldConnector; import com.vaadin.v7.client.ui.VOptionGroupBase; +import com.vaadin.v7.client.ui.VTextField; public abstract class OptionGroupBaseConnector extends AbstractFieldConnector implements Paintable { @@ -65,7 +65,7 @@ public abstract class OptionGroupBaseConnector extends AbstractFieldConnector getWidget().newItemButton.addClickHandler(getWidget()); getWidget().newItemButton .addStyleName(StyleConstants.UI_WIDGET); - getWidget().newItemField = new VLegacyTextField(); + getWidget().newItemField = new VTextField(); getWidget().newItemField.client = getConnection(); getWidget().newItemField.paintableId = getConnectorId(); getWidget().newItemField.addKeyPressHandler(getWidget()); diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/passwordfield/PasswordFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/passwordfield/PasswordFieldConnector.java index 033e879ff2..295eda7fa6 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/passwordfield/PasswordFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/passwordfield/PasswordFieldConnector.java @@ -16,17 +16,17 @@ package com.vaadin.v7.client.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.client.ui.VPasswordField; +import com.vaadin.v7.client.ui.textfield.TextFieldConnector; import com.vaadin.v7.ui.PasswordField; @Deprecated @Connect(PasswordField.class) -public class PasswordFieldConnector extends LegacyTextFieldConnector { +public class PasswordFieldConnector extends TextFieldConnector { @Override - public VLegacyPasswordField getWidget() { - return (VLegacyPasswordField) super.getWidget(); + public VPasswordField getWidget() { + return (VPasswordField) super.getWidget(); } } diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textarea/TextAreaConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textarea/TextAreaConnector.java index 61d86dee14..d183ec39c0 100644 --- a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textarea/TextAreaConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textarea/TextAreaConnector.java @@ -20,14 +20,14 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.MouseUpEvent; import com.google.gwt.event.dom.client.MouseUpHandler; import com.vaadin.client.WidgetUtil.CssSize; -import com.vaadin.client.v7.ui.textfield.LegacyTextFieldConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.v7.client.ui.VTextArea; +import com.vaadin.v7.client.ui.textfield.TextFieldConnector; import com.vaadin.v7.shared.ui.textarea.TextAreaState; import com.vaadin.v7.ui.TextArea; @Connect(TextArea.class) -public class TextAreaConnector extends LegacyTextFieldConnector { +public class TextAreaConnector extends TextFieldConnector { @Override public TextAreaState getState() { diff --git a/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java index 92ae3a47da..34f6c7068a 100644 --- a/client/src/main/java/com/vaadin/client/v7/ui/textfield/LegacyTextFieldConnector.java +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/textfield/TextFieldConnector.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.v7.ui.textfield; +package com.vaadin.v7.client.ui.textfield; import com.google.gwt.core.client.Scheduler; import com.google.gwt.user.client.Command; @@ -23,16 +23,16 @@ import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.ui.AbstractFieldConnector; -import com.vaadin.client.v7.ui.VLegacyTextField; 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.client.ui.VTextField; import com.vaadin.v7.ui.TextField; @Deprecated @Connect(value = TextField.class, loadStyle = LoadStyle.EAGER) -public class LegacyTextFieldConnector extends AbstractFieldConnector +public class TextFieldConnector extends AbstractFieldConnector implements Paintable { @Override @@ -72,7 +72,7 @@ public class LegacyTextFieldConnector extends AbstractFieldConnector getWidget().textChangeEventTimeout = 1; } } - getWidget().sinkEvents(VLegacyTextField.TEXTCHANGE_EVENTS); + getWidget().sinkEvents(VTextField.TEXTCHANGE_EVENTS); getWidget().attachCutEventListener(getWidget().getElement()); } getWidget().setColumns(getState().columns); @@ -112,8 +112,8 @@ public class LegacyTextFieldConnector extends AbstractFieldConnector } @Override - public VLegacyTextField getWidget() { - return (VLegacyTextField) super.getWidget(); + public VTextField getWidget() { + return (VTextField) super.getWidget(); } @Override diff --git a/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java b/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java new file mode 100644 index 0000000000..abd17df49b --- /dev/null +++ b/compatibility-server/src/main/java/com/vaadin/v7/event/FieldEvents.java @@ -0,0 +1,109 @@ +/* + * 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.event; + +import java.io.Serializable; +import java.lang.reflect.Method; + +import com.vaadin.event.ConnectorEventListener; +import com.vaadin.ui.Component; +import com.vaadin.util.ReflectTools; +import com.vaadin.v7.ui.Field; +import com.vaadin.v7.ui.Field.ValueChangeEvent; +import com.vaadin.v7.ui.TextField; + +/** + * Interface that serves as a wrapper for {@link Field} related events. + */ +public interface FieldEvents { + + /** + * TextChangeEvents are fired when the user is editing the text content of a + * field. Most commonly text change events are triggered by typing text with + * keyboard, but e.g. pasting content from clip board to a text field also + * triggers an event. + * <p> + * TextChangeEvents differ from {@link ValueChangeEvent}s so that they are + * triggered repeatedly while the end user is filling the field. + * ValueChangeEvents are not fired until the user for example hits enter or + * focuses another field. Also note the difference that TextChangeEvents are + * only fired if the change is triggered from the user, while + * ValueChangeEvents are also fired if the field value is set by the + * application code. + * <p> + * The {@link TextChangeNotifier}s implementation may decide when exactly + * TextChangeEvents are fired. TextChangeEvents are not necessary fire for + * example on each key press, but buffered with a small delay. The + * {@code TextField} component supports different modes for triggering + * TextChangeEvents. + * + * @see TextChangeListener + * @see TextChangeNotifier + * @see TextField#setTextChangeEventMode(com.vaadin.ui.TextField.TextChangeEventMode) + * @since 6.5 + */ + public static abstract class TextChangeEvent extends Component.Event { + + public TextChangeEvent(Component source) { + super(source); + } + + /** + * @return the text content of the field after the + * {@link TextChangeEvent} + */ + public abstract String getText(); + + /** + * @return the cursor position during after the {@link TextChangeEvent} + */ + public abstract int getCursorPosition(); + } + + /** + * A listener for {@link TextChangeEvent}s. + * + * @since 6.5 + */ + public interface TextChangeListener extends ConnectorEventListener { + + public static String EVENT_ID = "ie"; + public static Method EVENT_METHOD = ReflectTools.findMethod( + TextChangeListener.class, "textChange", TextChangeEvent.class); + + /** + * This method is called repeatedly while the text is edited by a user. + * + * @param event + * the event providing details of the text change + */ + public void textChange(TextChangeEvent event); + } + + /** + * An interface implemented by a {@link Field} supporting + * {@link TextChangeEvent}s. An example a {@link TextField} supports + * {@link TextChangeListener}s. + */ + public interface TextChangeNotifier extends Serializable { + public void addTextChangeListener(TextChangeListener listener); + + public void removeTextChangeListener(TextChangeListener listener); + + } + +} diff --git a/server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java index 3f2e62afff..f534662583 100644 --- a/server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/AbstractTextField.java @@ -28,9 +28,6 @@ import com.vaadin.event.FieldEvents.BlurNotifier; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; -import com.vaadin.event.FieldEvents.TextChangeNotifier; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.v7.ui.textfield.LegacyAbstractTextFieldState; @@ -38,11 +35,13 @@ import com.vaadin.shared.v7.ui.textfield.LegacyTextFieldConstants; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.declarative.DesignAttributeHandler; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeNotifier; @Deprecated -public abstract class AbstractTextField - extends AbstractField<String> implements BlurNotifier, - FocusNotifier, TextChangeNotifier, LegacyComponent { +public abstract class AbstractTextField extends AbstractField<String> implements + BlurNotifier, FocusNotifier, TextChangeNotifier, LegacyComponent { /** * Null representation. diff --git a/server/src/main/java/com/vaadin/v7/ui/TextField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextField.java index 0bd9511a71..0bd9511a71 100644 --- a/server/src/main/java/com/vaadin/v7/ui/TextField.java +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/TextField.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java index 4f0c286d2d..4f0c286d2d 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/AnyEnumToStringConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java index 1f3a64cbb7..1f3a64cbb7 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/ConverterFactoryTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/DateToLongConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/DateToLongConverterTest.java index 6300ed9479..6300ed9479 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/DateToLongConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/DateToLongConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/DateToSqlDateConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/DateToSqlDateConverterTest.java index 35a8c5dbec..35a8c5dbec 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/DateToSqlDateConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/DateToSqlDateConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/DefaultConverterFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/DefaultConverterFactoryTest.java index a157884376..a157884376 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/DefaultConverterFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/DefaultConverterFactoryTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java index 10b4a0065e..10b4a0065e 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/SpecificEnumToStringConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigDecimalConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigDecimalConverterTest.java index 00e384e594..00e384e594 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigDecimalConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigDecimalConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigIntegerConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigIntegerConverterTest.java index f613950c71..f613950c71 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigIntegerConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBigIntegerConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBooleanConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBooleanConverterTest.java index 9f94a4185e..9f94a4185e 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBooleanConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToBooleanConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToByteConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToByteConverterTest.java index 1ffc7a020e..1ffc7a020e 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToByteConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToByteConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToCollectionConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToCollectionConverterTest.java index f6dc22face..f6dc22face 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToCollectionConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToCollectionConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDateConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDateConverterTest.java index c778e9e731..c778e9e731 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDateConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDateConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDoubleConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDoubleConverterTest.java index a0891ecefe..a0891ecefe 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDoubleConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToDoubleConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToEnumConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToEnumConverterTest.java index a86b8b82e0..a86b8b82e0 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToEnumConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToEnumConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToFloatConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToFloatConverterTest.java index 70c408b808..70c408b808 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToFloatConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToFloatConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToIntegerConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToIntegerConverterTest.java index 0cc8e646dc..0cc8e646dc 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToIntegerConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToIntegerConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToLongConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToLongConverterTest.java index 5e5b9f1d86..5e5b9f1d86 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToLongConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToLongConverterTest.java diff --git a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToShortConverterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToShortConverterTest.java index a2a7332fd1..a2a7332fd1 100644 --- a/server/src/test/java/com/vaadin/v7/tests/data/converter/StringToShortConverterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/data/converter/StringToShortConverterTest.java diff --git a/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/EventRouterTest.java index 8c88257da4..7731941ca6 100644 --- a/server/src/test/java/com/vaadin/tests/server/EventRouterTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/EventRouterTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; import org.junit.Test; diff --git a/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/PropertysetItemListenersTest.java index 883130db32..8d1f432170 100644 --- a/compatibility-server/src/test/java/com/vaadin/tests/server/PropertysetItemListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/PropertysetItemListenersTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server; +package com.vaadin.v7.tests.server; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; import com.vaadin.v7.data.Item.PropertySetChangeEvent; diff --git a/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldDataSourceLocaleChangeTest.java index 96212ac085..5cc57a75b7 100644 --- a/server/src/test/java/com/vaadin/ui/AbsFieldDataSourceLocaleChangeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldDataSourceLocaleChangeTest.java @@ -1,4 +1,4 @@ -package com.vaadin.ui; +package com.vaadin.v7.tests.server.component.abstractfield; import java.text.NumberFormat; import java.util.Locale; @@ -10,6 +10,8 @@ import org.junit.Test; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; +import com.vaadin.ui.UI; +import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.util.converter.StringToIntegerConverter; import com.vaadin.v7.ui.TextField; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValidatorsTest.java index 478f1bf54e..09ab8fe65f 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValidatorsTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java index c022aed3da..4def8caca7 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionErrorTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import static org.junit.Assert.fail; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java index 235cfdb93e..6594ed9351 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValueConversionsTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java index c22be6812a..ea420100c2 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import org.junit.Test; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java index 775ef29292..9f0871106d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbstractFieldReadOnlyTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/DefaultConverterFactoryTest.java index a355e7ebfa..03b92aaa6e 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/DefaultConverterFactoryTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/DefaultConverterFactoryTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import static org.junit.Assert.assertEquals; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java index d956fc95a0..82cb2751ff 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstractfield; +package com.vaadin.v7.tests.server.component.abstractfield; import static org.junit.Assert.assertEquals; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java index f6924e9b0a..022bdd075b 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstracttextfield/AbstractTextFieldListenersTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.component.abstracttextfield; +package com.vaadin.v7.tests.server.component.abstracttextfield; import org.junit.Test; @@ -6,9 +6,9 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.v7.ui.TextField; public class AbstractTextFieldListenersTest diff --git a/server/src/test/java/com/vaadin/ui/TextFieldTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldTest.java index dbd2e82fdf..79f1640257 100644 --- a/server/src/test/java/com/vaadin/ui/TextFieldTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldTest.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.ui; +package com.vaadin.v7.tests.server.component.textfield; import org.junit.Assert; import org.junit.Test; diff --git a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldValueChangeTest.java index 971e075b2e..bb286296b4 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/textfield/TextFieldValueChangeTest.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.server.components; +package com.vaadin.v7.tests.server.component.textfield; import java.util.HashMap; import java.util.Map; @@ -8,6 +8,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import com.vaadin.tests.server.components.AbstractFieldValueChangeTestBase; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.util.ObjectProperty; import com.vaadin.v7.ui.AbstractField; diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index fa4b00cbca..a8e5ca8191 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -25,8 +25,6 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Component.Event; import com.vaadin.util.ReflectTools; import com.vaadin.v7.ui.Field; -import com.vaadin.v7.ui.Field.ValueChangeEvent; -import com.vaadin.v7.ui.TextField; /** * Interface that serves as a wrapper for {@link Field} related events. @@ -175,81 +173,6 @@ public interface FieldEvents { public void blur(BlurEvent event); } - /** - * TextChangeEvents are fired when the user is editing the text content of a - * field. Most commonly text change events are triggered by typing text with - * keyboard, but e.g. pasting content from clip board to a text field also - * triggers an event. - * <p> - * TextChangeEvents differ from {@link ValueChangeEvent}s so that they are - * triggered repeatedly while the end user is filling the field. - * ValueChangeEvents are not fired until the user for example hits enter or - * focuses another field. Also note the difference that TextChangeEvents are - * only fired if the change is triggered from the user, while - * ValueChangeEvents are also fired if the field value is set by the - * application code. - * <p> - * The {@link TextChangeNotifier}s implementation may decide when exactly - * TextChangeEvents are fired. TextChangeEvents are not necessary fire for - * example on each key press, but buffered with a small delay. The - * {@link TextField} component supports different modes for triggering - * TextChangeEvents. - * - * @see TextChangeListener - * @see TextChangeNotifier - * @see TextField#setTextChangeEventMode(com.vaadin.ui.TextField.TextChangeEventMode) - * @since 6.5 - */ - public static abstract class TextChangeEvent extends Component.Event { - - public TextChangeEvent(Component source) { - super(source); - } - - /** - * @return the text content of the field after the - * {@link TextChangeEvent} - */ - public abstract String getText(); - - /** - * @return the cursor position during after the {@link TextChangeEvent} - */ - public abstract int getCursorPosition(); - } - - /** - * A listener for {@link TextChangeEvent}s. - * - * @since 6.5 - */ - public interface TextChangeListener extends ConnectorEventListener { - - public static String EVENT_ID = "ie"; - public static Method EVENT_METHOD = ReflectTools.findMethod( - TextChangeListener.class, "textChange", TextChangeEvent.class); - - /** - * This method is called repeatedly while the text is edited by a user. - * - * @param event - * the event providing details of the text change - */ - public void textChange(TextChangeEvent event); - } - - /** - * An interface implemented by a {@link Field} supporting - * {@link TextChangeEvent}s. An example a {@link TextField} supports - * {@link TextChangeListener}s. - */ - public interface TextChangeNotifier extends Serializable { - public void addTextChangeListener(TextChangeListener listener); - - public void removeTextChangeListener(TextChangeListener listener); - - } - public static abstract class FocusAndBlurServerRpcImpl implements FocusAndBlurServerRpc { diff --git a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java index 80c2b12fc1..93bbbec693 100644 --- a/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java +++ b/server/src/test/java/com/vaadin/tests/server/ExtensionTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.AbstractExtension; import com.vaadin.ui.Label; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class ExtensionTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java index 0cb6f850d3..9b6368474f 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/gridlayout/DefaultAlignmentTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import com.vaadin.ui.Alignment; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class DefaultAlignmentTest { diff --git a/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java index 38d7924437..7560c21adb 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/orderedlayout/DefaultAlignmentTest.java @@ -8,8 +8,8 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Alignment; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import com.vaadin.v7.ui.TextField; public class DefaultAlignmentTest { diff --git a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java index 15933e1060..e5985641cd 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java @@ -1,11 +1,11 @@ -package com.vaadin.tests.components.passwordfield; +package com.vaadin.v7.tests.components.passwordfield; -import com.vaadin.event.FieldEvents.TextChangeListener; -import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest; import com.vaadin.v7.ui.PasswordField; public class PasswordFieldTest - extends LegacyAbstractTextFieldTest<PasswordField> + extends AbstractTextFieldTest<PasswordField> implements TextChangeListener { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java index 9eeab8905e..eb08a9494b 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.components.textarea; +package com.vaadin.v7.tests.components.textarea; import com.vaadin.shared.ui.textfield.ValueChangeMode; import com.vaadin.tests.components.TestBase; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java index 74a6e3a4d9..b4048fe9b2 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java @@ -1,11 +1,11 @@ -package com.vaadin.tests.components.textarea; +package com.vaadin.v7.tests.components.textarea; import java.util.LinkedHashMap; -import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest; +import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest; import com.vaadin.v7.ui.TextArea; -public class TextAreaTest extends LegacyAbstractTextFieldTest<TextArea> { +public class TextAreaTest extends AbstractTextFieldTest<TextArea> { private Command<TextArea, Boolean> wordwrapCommand = new Command<TextArea, Boolean>() { @Override diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java index 71ed46eb66..604eb707ee 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java @@ -1,15 +1,16 @@ -package com.vaadin.tests.components.abstractfield; +package com.vaadin.v7.tests.components.textfield; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.v7.ui.AbstractTextField; import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode; -public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField> +public abstract class AbstractTextFieldTest<T extends AbstractTextField> extends LegacyAbstractFieldTest<T> implements TextChangeListener { private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() { @@ -46,11 +47,10 @@ public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField> @Override public void execute(T c, Boolean value, Object data) { if (value) { - c.addListener( - (TextChangeListener) LegacyAbstractTextFieldTest.this); + c.addListener((TextChangeListener) AbstractTextFieldTest.this); } else { c.removeListener( - (TextChangeListener) LegacyAbstractTextFieldTest.this); + (TextChangeListener) AbstractTextFieldTest.this); } } }; @@ -245,8 +245,7 @@ public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField> @Override public void textChange(TextChangeEvent event) { - AbstractTextField tf = (AbstractTextField) event - .getComponent(); + AbstractTextField tf = (AbstractTextField) event.getComponent(); log("TextChangeEvent: text='" + event.getText() + "', cursor position=" + event.getCursorPosition() + " (field cursor pos: " + tf.getCursorPosition() + ")"); diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java index 961c88374c..16e5d59a48 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java @@ -1,7 +1,7 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.shared.ui.textfield.ValueChangeMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java index ee1b1b08db..f59f5aeb38 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java @@ -1,11 +1,11 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java index 1c10817add..9ca79a3ed1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java @@ -1,4 +1,4 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java index c0745aac00..8cd6cbed8f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java @@ -1,7 +1,7 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.v7.data.Property.ValueChangeEvent; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java index 206ef8e41b..458ac5f265 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java @@ -1,7 +1,7 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java index bac833f626..8fe5757649 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java @@ -14,10 +14,10 @@ * the License. */ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.v7.ui.AbstractTextField; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java index b6d16ab5fe..e546695844 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java @@ -1,7 +1,7 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java index a719515aa3..2a98224789 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java @@ -1,7 +1,7 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeEvent; -import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.v7.event.FieldEvents.TextChangeEvent; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.tests.components.TestBase; import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java index 35f61f7419..fd26995abf 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java +++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java @@ -1,10 +1,9 @@ -package com.vaadin.tests.components.textfield; +package com.vaadin.v7.tests.components.textfield; -import com.vaadin.event.FieldEvents.TextChangeListener; -import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest; +import com.vaadin.v7.event.FieldEvents.TextChangeListener; import com.vaadin.v7.ui.TextField; -public class TextFieldTest extends LegacyAbstractTextFieldTest<TextField> +public class TextFieldTest extends AbstractTextFieldTest<TextField> implements TextChangeListener { @Override |