diff --git a/touchkit/src/main/java/org/vaadin/touchkit/extensions/Html5InputSettings.java b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/extensions/Html5InputSettings.java similarity index 98% rename from touchkit/src/main/java/org/vaadin/touchkit/extensions/Html5InputSettings.java rename to touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/extensions/Html5InputSettings.java index a6c26bbd..2dd746e9 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/extensions/Html5InputSettings.java +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/extensions/Html5InputSettings.java @@ -1,8 +1,8 @@ -package org.vaadin.touchkit.extensions; +package org.vaadin.touchkit.v7.extensions; import java.util.Locale; -import org.vaadin.touchkit.gwt.client.vcom.Html5InputSettingsState; +import org.vaadin.touchkit.v7.gwt.client.vcom.Html5InputSettingsState; import com.vaadin.server.AbstractExtension; import com.vaadin.v7.ui.TextField; diff --git a/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/TouchKitWidgetSet.gwt.xml b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/TouchKitWidgetSet.gwt.xml index ca2652a8..2032c86d 100644 --- a/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/TouchKitWidgetSet.gwt.xml +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/TouchKitWidgetSet.gwt.xml @@ -28,7 +28,7 @@ + class="org.vaadin.touchkit.v7.gwt.client.Android2NativeSelectReplacement"> diff --git a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/Android2NativeSelectReplacement.java b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/Android2NativeSelectReplacement.java similarity index 99% rename from touchkit/src/main/java/org/vaadin/touchkit/gwt/client/Android2NativeSelectReplacement.java rename to touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/Android2NativeSelectReplacement.java index ed0e0909..9ace95dc 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/Android2NativeSelectReplacement.java +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/Android2NativeSelectReplacement.java @@ -14,7 +14,7 @@ * the License. */ -package org.vaadin.touchkit.gwt.client; +package org.vaadin.touchkit.v7.gwt.client; import java.util.ArrayList; import java.util.Iterator; diff --git a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/theme/android2select.css b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/theme/android2select.css similarity index 100% rename from touchkit/src/main/java/org/vaadin/touchkit/gwt/client/theme/android2select.css rename to touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/theme/android2select.css diff --git a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/Html5InputSettingsConnector.java b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/Html5InputSettingsConnector.java similarity index 92% rename from touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/Html5InputSettingsConnector.java rename to touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/Html5InputSettingsConnector.java index a17c97ce..117c6e21 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/Html5InputSettingsConnector.java +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/Html5InputSettingsConnector.java @@ -1,8 +1,8 @@ -package org.vaadin.touchkit.gwt.client.vcom; +package org.vaadin.touchkit.v7.gwt.client.vcom; import java.util.Map.Entry; -import org.vaadin.touchkit.extensions.Html5InputSettings; +import org.vaadin.touchkit.v7.extensions.Html5InputSettings; import com.google.gwt.dom.client.InputElement; import com.vaadin.client.ServerConnector; diff --git a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/Html5InputSettingsState.java b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/Html5InputSettingsState.java similarity index 83% rename from touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/Html5InputSettingsState.java rename to touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/Html5InputSettingsState.java index adf9db65..9a32984b 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/Html5InputSettingsState.java +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/Html5InputSettingsState.java @@ -1,4 +1,4 @@ -package org.vaadin.touchkit.gwt.client.vcom; +package org.vaadin.touchkit.v7.gwt.client.vcom; import java.util.HashMap; import java.util.Map; diff --git a/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/VerticalComponentGroupConnector.java b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/VerticalComponentGroupConnector.java new file mode 100644 index 00000000..06865ae7 --- /dev/null +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/gwt/client/vcom/VerticalComponentGroupConnector.java @@ -0,0 +1,90 @@ +package org.vaadin.touchkit.v7.gwt.client.vcom; + +import java.util.List; + +import org.vaadin.touchkit.gwt.client.ui.VerticalComponentGroupWidget; +import org.vaadin.touchkit.v7.ui.VerticalComponentGroup; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.ComponentConnector; +import com.vaadin.client.ConnectorHierarchyChangeEvent; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractLayoutConnector; +import com.vaadin.client.ui.Icon; +import com.vaadin.shared.ComponentConstants; +import com.vaadin.shared.communication.URLReference; +import com.vaadin.shared.ui.ComponentStateUtil; +import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.client.ui.AbstractFieldConnector; + +@SuppressWarnings("serial") +@Connect(VerticalComponentGroup.class) +public class VerticalComponentGroupConnector extends AbstractLayoutConnector { + + @Override + public void onStateChanged(StateChangeEvent stateChangeEvent) { + super.onStateChanged(stateChangeEvent); + } + + @Override + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { + if (getParent() == null) { + // Component is removed, skip stuff to save user from JS exceptions + // and some milliseconds of lost life + return; + } + + List oldChildren = event.getOldChildren(); + + List children = getChildComponents(); + for (int i = 0; i < children.size(); ++i) { + ComponentConnector connector = children.get(i); + Widget widget = connector.getWidget(); + getWidget().addOrMove(widget, i); + oldChildren.remove(connector); + } + + for (ComponentConnector oldChild : event.getOldChildren()) { + if (oldChild.getParent() != this) { + getWidget().remove(oldChild.getWidget()); + } + } + } + + @Override + protected VerticalComponentGroupWidget createWidget() { + return GWT.create(VerticalComponentGroupWidget.class); + } + + @Override + public VerticalComponentGroupWidget getWidget() { + return (VerticalComponentGroupWidget) super.getWidget(); + } + + @Override + public void updateCaption(ComponentConnector connector) { + URLReference urlReference = connector.getState().resources + .get(ComponentConstants.ICON_RESOURCE); + Icon icon = null; + if (urlReference != null) { + icon = getConnection().getIcon(urlReference.getURL()); + } + Widget child = connector.getWidget(); + String style = "v-caption"; + if (ComponentStateUtil.hasStyles(connector.getState())) { + for (String customStyle : connector.getState().styles) { + style += " " + "v-caption-" + customStyle; + } + } + if (connector instanceof AbstractFieldConnector) { + AbstractFieldConnector field = (AbstractFieldConnector) connector; + if (field.isRequiredIndicatorVisible()) { + style += " v-caption-required"; + } + } + getWidget().updateCaption(child, connector.getState().caption, icon, + connector.getState().width, style); + } +} diff --git a/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/ui/VerticalComponentGroup.java b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/ui/VerticalComponentGroup.java new file mode 100644 index 00000000..09273e76 --- /dev/null +++ b/touchkit-compatibility/src/main/java/org/vaadin/touchkit/v7/ui/VerticalComponentGroup.java @@ -0,0 +1,62 @@ +package org.vaadin.touchkit.v7.ui; + +import org.vaadin.touchkit.ui.AbstractComponentGroup; + +import com.vaadin.ui.Component; +import com.vaadin.v7.ui.Field; + +/** + * The VerticalComponentGroup is a layout to group controls vertically. Unlike + * with default layouts, Components in a VerticalComponentGroup are visually + * decorated from other parts of the UI. + *

+ * Captions are rendered on the same row as the component. Relative widths are + * relative to the {@link VerticalComponentGroup} width except if the component + * has a caption, in which case a relative width is relative to the remaining + * available space. + *

+ * Most commonly {@link Field}s in {@link VerticalComponentGroup} should be full + * width, so {@link VerticalComponentGroup} automatically sets width to 100% + * when {@link Field}s are added to it, unless they have an explicit width + * defined. + */ +@SuppressWarnings("serial") +public class VerticalComponentGroup extends AbstractComponentGroup { + + /** + * Constructs a vertical component group. + */ + public VerticalComponentGroup() { + super(null); + } + + /** + * Creates a vertical component group with the provided caption. + * + * @param caption + * the caption. + */ + public VerticalComponentGroup(String caption) { + super(caption); + } + + /** + * In addition to normal component addition, as a side effect this method + * ensures {@link Field}s have sane width set. + * + * @see org.vaadin.touchkit.ui.AbstractComponentGroup#addComponent(com.vaadin.ui.Component, + * int) + */ + @Override + public void addComponent(Component component, int index) { + verifySaneFieldWidth(component); + super.addComponent(component, index); + } + + private void verifySaneFieldWidth(Component component) { + if ((component instanceof Field) && component.getWidth() < 0) { + component.setWidth("100%"); + } + } + +} diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/Html5InputExtensionTest.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/Html5InputExtensionTest.java similarity index 71% rename from touchkit/src/test/java/org/vaadin/touchkit/itest/Html5InputExtensionTest.java rename to touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/Html5InputExtensionTest.java index a7dfcf1a..609444b7 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/Html5InputExtensionTest.java +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/Html5InputExtensionTest.java @@ -1,15 +1,13 @@ -package org.vaadin.touchkit.itest; +package org.vaadin.touchkit.v7.itest; -import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; -import org.vaadin.touchkit.extensions.Html5InputSettings; import org.vaadin.touchkit.ui.VerticalComponentGroup; +import org.vaadin.touchkit.v7.AbstractTouchKitIntegrationTest; +import org.vaadin.touchkit.v7.extensions.Html5InputSettings; +import com.vaadin.ui.Button; import com.vaadin.v7.data.fieldgroup.FieldGroup; import com.vaadin.v7.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.v7.data.util.BeanItem; -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.v7.ui.TextField; public class Html5InputExtensionTest extends AbstractTouchKitIntegrationTest { @@ -53,24 +51,20 @@ public Html5InputExtensionTest() { verticalComponentGroup.addComponent(any); Button button = new Button(); button.setCaption("Apply"); - button.addClickListener(new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - try { - fieldGroup.commit(); - String value = any.getValue(); - if (value != null) { - String[] split = value.split(":"); - html5InputSettings.setProperty(split[0], split[1]); - any.setValue(null); - } - } catch (CommitException e) { - e.printStackTrace(); - } + button.addClickListener(event -> { + try { + fieldGroup.commit(); + String value = any.getValue(); + if (value != null) { + String[] split = value.split(":"); + html5InputSettings.setProperty(split[0], split[1]); + any.setValue(null); + } + } catch (CommitException e) { + e.printStackTrace(); + } - } - }); + }); verticalComponentGroup.addComponent(button); addComponent(verticalComponentGroup); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ContextMenu.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/ContextMenu.java similarity index 81% rename from touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ContextMenu.java rename to touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/ContextMenu.java index 768e13b7..88c636a4 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ContextMenu.java +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/ContextMenu.java @@ -1,8 +1,8 @@ -package org.vaadin.touchkit.itest.oldtests; +package org.vaadin.touchkit.v7.itest.oldtests; -import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.NavigationManager; import org.vaadin.touchkit.ui.NavigationView; +import org.vaadin.touchkit.v7.AbstractTouchKitIntegrationTest; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; @@ -29,11 +29,13 @@ public ContextMenu() { private Action[] actions = new Action[] { new Action("Copy"), new Action("Paste") }; - public void handleAction(Action action, Object sender, Object target) { + @Override + public void handleAction(Action action, Object sender, Object target) { getUI().showNotification("Just test"); } - public Action[] getActions(Object target, Object sender) { + @Override + public Action[] getActions(Object target, Object sender) { return actions; } }); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/JunkYard.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/JunkYard.java similarity index 98% rename from touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/JunkYard.java rename to touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/JunkYard.java index e512f4e5..c655e89c 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/JunkYard.java +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/JunkYard.java @@ -1,4 +1,4 @@ -package org.vaadin.touchkit.itest.oldtests; +package org.vaadin.touchkit.v7.itest.oldtests; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.HierarchicalContainer; diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MeetingRoomView.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/MeetingRoomView.java similarity index 96% rename from touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MeetingRoomView.java rename to touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/MeetingRoomView.java index 62ac131d..6ee0cb0b 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MeetingRoomView.java +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/MeetingRoomView.java @@ -1,14 +1,14 @@ -package org.vaadin.touchkit.itest.oldtests; +package org.vaadin.touchkit.v7.itest.oldtests; import java.io.Serializable; -import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.NavigationView; import org.vaadin.touchkit.ui.VerticalComponentGroup; +import org.vaadin.touchkit.v7.AbstractTouchKitIntegrationTest; +import com.vaadin.ui.Component; import com.vaadin.v7.data.Item; import com.vaadin.v7.data.util.BeanItem; -import com.vaadin.ui.Component; import com.vaadin.v7.ui.DefaultFieldFactory; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Form; diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/Selects.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/Selects.java similarity index 93% rename from touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/Selects.java rename to touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/Selects.java index 02bc083f..43a1d669 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/Selects.java +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/Selects.java @@ -1,8 +1,8 @@ -package org.vaadin.touchkit.itest.oldtests; +package org.vaadin.touchkit.v7.itest.oldtests; -import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.NavigationView; import org.vaadin.touchkit.ui.VerticalComponentGroup; +import org.vaadin.touchkit.v7.AbstractTouchKitIntegrationTest; import com.vaadin.ui.CssLayout; import com.vaadin.v7.ui.OptionGroup; diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/TabsheetTest.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/TabsheetTest.java similarity index 98% rename from touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/TabsheetTest.java rename to touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/TabsheetTest.java index f2b94735..b8561c5f 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/TabsheetTest.java +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/TabsheetTest.java @@ -1,4 +1,4 @@ -package org.vaadin.touchkit.itest.oldtests; +package org.vaadin.touchkit.v7.itest.oldtests; import org.junit.Ignore; import org.vaadin.touchkit.ui.NavigationButton; diff --git a/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/TestUtils.java b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/TestUtils.java new file mode 100644 index 00000000..4856ff77 --- /dev/null +++ b/touchkit-compatibility/src/test/java/org/vaadin/touchkit/v7/itest/oldtests/TestUtils.java @@ -0,0 +1,30 @@ +package org.vaadin.touchkit.v7.itest.oldtests; + +import org.junit.Ignore; + +import com.vaadin.annotations.JavaScript; +import com.vaadin.server.Page; +import com.vaadin.server.Sizeable; +import com.vaadin.ui.ComponentContainer; + +@Ignore +public class TestUtils { + public static void makeSmallTabletSize(ComponentContainer c) { + c.setWidth(450, Sizeable.UNITS_PIXELS); + c.setHeight(640, Sizeable.UNITS_PIXELS); + } + + public static void injectCss(String cssString) { + String script = "if ('\\v'=='v') /* ie only */ {\n" + + " document.createStyleSheet().cssText = '" + + cssString + + "';\n" + + " } else {var tag = document.createElement('style'); tag.type = 'text/css';" + + " document.getElementsByTagName('head')[0].appendChild(tag);tag[ (typeof " + + "document.body.style.WebkitAppearance=='string') /* webkit only */ ? 'innerText' " + + ": 'innerHTML'] = '" + cssString + "';}"; + + Page.getCurrent().getJavaScript().execute(script); + } + +} diff --git a/touchkit/src/main/java/org/vaadin/touchkit/gwt/TouchKitWidgetSet.gwt.xml b/touchkit/src/main/java/org/vaadin/touchkit/gwt/TouchKitWidgetSet.gwt.xml index 50fc9796..8a916d82 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/gwt/TouchKitWidgetSet.gwt.xml +++ b/touchkit/src/main/java/org/vaadin/touchkit/gwt/TouchKitWidgetSet.gwt.xml @@ -43,12 +43,6 @@ - - - - - diff --git a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/VerticalComponentGroupConnector.java b/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/VerticalComponentGroupConnector.java index 7634757d..9163620a 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/VerticalComponentGroupConnector.java +++ b/touchkit/src/main/java/org/vaadin/touchkit/gwt/client/vcom/VerticalComponentGroupConnector.java @@ -10,13 +10,13 @@ import com.vaadin.client.ComponentConnector; import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.client.ui.AbstractLayoutConnector; import com.vaadin.client.ui.Icon; import com.vaadin.shared.ComponentConstants; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.ComponentStateUtil; import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.client.ui.AbstractFieldConnector; @SuppressWarnings("serial") @Connect(VerticalComponentGroup.class) diff --git a/touchkit/src/main/java/org/vaadin/touchkit/ui/VerticalComponentGroup.java b/touchkit/src/main/java/org/vaadin/touchkit/ui/VerticalComponentGroup.java index 8f358574..469fc4ca 100644 --- a/touchkit/src/main/java/org/vaadin/touchkit/ui/VerticalComponentGroup.java +++ b/touchkit/src/main/java/org/vaadin/touchkit/ui/VerticalComponentGroup.java @@ -1,60 +1,60 @@ -package org.vaadin.touchkit.ui; - -import com.vaadin.ui.Component; -import com.vaadin.v7.ui.Field; - -/** - * The VerticalComponentGroup is a layout to group controls vertically. Unlike - * with default layouts, Components in a VerticalComponentGroup are visually - * decorated from other parts of the UI. - *

- * Captions are rendered on the same row as the component. Relative widths are - * relative to the {@link VerticalComponentGroup} width except if the component - * has a caption, in which case a relative width is relative to the remaining - * available space. - *

- * Most commonly {@link Field}s in {@link VerticalComponentGroup} should be full - * width, so {@link VerticalComponentGroup} automatically sets width to 100% - * when {@link Field}s are added to it, unless they have an explicit width - * defined. - */ -@SuppressWarnings("serial") -public class VerticalComponentGroup extends AbstractComponentGroup { - - /** - * Constructs a vertical component group. - */ - public VerticalComponentGroup() { - super(null); - } - - /** - * Creates a vertical component group with the provided caption. - * - * @param caption - * the caption. - */ - public VerticalComponentGroup(String caption) { - super(caption); - } - - /** - * In addition to normal component addition, as a side effect this method - * ensures {@link Field}s have sane width set. - * - * @see org.vaadin.touchkit.ui.AbstractComponentGroup#addComponent(com.vaadin.ui.Component, - * int) - */ - @Override - public void addComponent(Component component, int index) { - verifySaneFieldWidth(component); - super.addComponent(component, index); - } - - private void verifySaneFieldWidth(Component component) { - if ((component instanceof Field) && component.getWidth() < 0) { - component.setWidth("100%"); - } - } - -} +package org.vaadin.touchkit.ui; + +import com.vaadin.data.HasValue; +import com.vaadin.ui.Component; + +/** + * The VerticalComponentGroup is a layout to group controls vertically. Unlike + * with default layouts, Components in a VerticalComponentGroup are visually + * decorated from other parts of the UI. + *

+ * Captions are rendered on the same row as the component. Relative widths are + * relative to the {@link VerticalComponentGroup} width except if the component + * has a caption, in which case a relative width is relative to the remaining + * available space. + *

+ * Most commonly {@link Field}s in {@link VerticalComponentGroup} should be full + * width, so {@link VerticalComponentGroup} automatically sets width to 100% + * when {@link Field}s are added to it, unless they have an explicit width + * defined. + */ +@SuppressWarnings("serial") +public class VerticalComponentGroup extends AbstractComponentGroup { + + /** + * Constructs a vertical component group. + */ + public VerticalComponentGroup() { + super(null); + } + + /** + * Creates a vertical component group with the provided caption. + * + * @param caption + * the caption. + */ + public VerticalComponentGroup(String caption) { + super(caption); + } + + /** + * In addition to normal component addition, as a side effect this method + * ensures {@link Field}s have sane width set. + * + * @see org.vaadin.touchkit.ui.AbstractComponentGroup#addComponent(com.vaadin.ui.Component, + * int) + */ + @Override + public void addComponent(Component component, int index) { + verifySaneFieldWidth(component); + super.addComponent(component, index); + } + + private void verifySaneFieldWidth(Component component) { + if ((component instanceof HasValue) && component.getWidth() < 0) { + component.setWidth("100%"); + } + } + +} diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/ButtonTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/ButtonTest.java index 51d98e23..26d1fc73 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/ButtonTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/ButtonTest.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; -import com.vaadin.v7.ui.themes.BaseTheme; +import com.vaadin.ui.themes.ValoTheme;; public class ButtonTest extends AbstractTouchKitIntegrationTest implements ClickListener { @@ -21,7 +21,7 @@ public ButtonTest() { Button link = new Button(); link.setCaption("link caption"); - link.setStyleName(BaseTheme.BUTTON_LINK); + link.setStyleName(ValoTheme.BUTTON_LINK); link.addClickListener(this); addComponent(button); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/CacheManifestStatusIndicatorConfTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/CacheManifestStatusIndicatorConfTest.java index 8a9e6866..3b0e5cca 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/CacheManifestStatusIndicatorConfTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/CacheManifestStatusIndicatorConfTest.java @@ -6,7 +6,7 @@ import com.vaadin.server.VaadinServlet; import com.vaadin.ui.Button; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class CacheManifestStatusIndicatorConfTest extends AbstractTouchKitIntegrationTest { @@ -23,18 +23,15 @@ public CacheManifestStatusIndicatorConfTest() { updateCheckIntervalTF.setValue("1800"); Button commit = new Button("Commit"); - commit.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(Button.ClickEvent event) { - ApplicationCacheSettings applicationCacheSettings = ((TouchKitServlet) VaadinServlet - .getCurrent()).getTouchKitSettings() - .getApplicationCacheSettings(); - applicationCacheSettings.setUpdateNowMessage(updateNowMessageTF - .getValue()); - applicationCacheSettings.setUpdateCheckInterval(Integer - .valueOf(updateCheckIntervalTF.getValue())); - } - }); + commit.addClickListener(event -> { + ApplicationCacheSettings applicationCacheSettings = ((TouchKitServlet) VaadinServlet + .getCurrent()).getTouchKitSettings() + .getApplicationCacheSettings(); + applicationCacheSettings.setUpdateNowMessage(updateNowMessageTF + .getValue()); + applicationCacheSettings.setUpdateCheckInterval(Integer + .valueOf(updateCheckIntervalTF.getValue())); + }); addComponent(updateNowMessageTF); addComponent(updateCheckIntervalTF); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/ColorButtonsTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/ColorButtonsTest.java index 39544a4c..06c7898d 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/ColorButtonsTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/ColorButtonsTest.java @@ -7,7 +7,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.ComponentContainer; -import com.vaadin.v7.ui.VerticalLayout; +import com.vaadin.ui.VerticalLayout; public class ColorButtonsTest extends AbstractTouchKitIntegrationTest { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/ComboBoxTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/ComboBoxTest.java index b4933daf..6444b6b5 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/ComboBoxTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/ComboBoxTest.java @@ -1,29 +1,18 @@ package org.vaadin.touchkit.itest; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.ComboBox; - import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; -import com.vaadin.ui.Notification; +import com.vaadin.ui.ComboBox; -public class ComboBoxTest extends AbstractTouchKitIntegrationTest implements ClickListener { +public class ComboBoxTest extends AbstractTouchKitIntegrationTest { public ComboBoxTest() { setDescription("This is a button test"); - ComboBox comboBox = new ComboBox(); - comboBox.addItem("foo"); - comboBox.addItem("bar"); + ComboBox comboBox = new ComboBox<>(); + comboBox.setItems("foo", "bar"); comboBox.setWidth("200px"); addComponent(comboBox); } - - @Override - public void buttonClick(ClickEvent event) { - Notification.show("Clicked"); - } - } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/DatePickerTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/DatePickerTest.java index b42f4670..2cd4cde1 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/DatePickerTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/DatePickerTest.java @@ -12,16 +12,12 @@ import com.ibm.icu.util.Calendar; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.Property.ValueChangeEvent; -import com.vaadin.v7.data.Property.ValueChangeListener; -import com.vaadin.v7.ui.CheckBox; -import com.vaadin.v7.ui.HorizontalLayout; -import com.vaadin.v7.ui.Label; -import com.vaadin.v7.ui.NativeSelect; -import com.vaadin.v7.ui.OptionGroup; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.NativeSelect; +import com.vaadin.ui.RadioButtonGroup; @SuppressWarnings("serial") public class DatePickerTest extends AbstractTouchKitIntegrationTest { @@ -59,25 +55,12 @@ public DatePickerTest() { final CheckBox useNative = new CheckBox("Use native"); useNative.setId("usenative"); - useNative.setImmediate(true); + useNative.setValue(pickerA.isUseNative()); optionsLayout.addComponent(useNative); - useNative.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - pickerA.setUseNative((Boolean) event.getProperty().getValue()); - } + useNative.addValueChangeListener(event -> pickerA.setUseNative(event.getValue())); - }); - - addComponent(new Button("Toggle enabled state", new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - pickerA.setEnabled(!pickerA.isEnabled()); - } - })); + addComponent(new Button("Toggle enabled state", (ClickListener) event -> pickerA.setEnabled(!pickerA.isEnabled()))); HorizontalLayout buttonLayout = new HorizontalLayout(); buttonLayout.setWidth("100%"); @@ -90,63 +73,41 @@ public void buttonClick(ClickEvent event) { buttonLayout.addComponent(new Button("2015-06-23", dateButtonListener)); buttonLayout.addComponent(new Button("2078-12-25", dateButtonListener)); - OptionGroup mingroup = new OptionGroup("Min value"); - mingroup.setImmediate(true); - mingroup.addItem(NULL_VALUE); - mingroup.setValue(NULL_VALUE); - mingroup.addItem("1982-01-01"); - mingroup.addItem("2011-01-01"); - mingroup.addItem("2011-02-01"); - mingroup.addItem("2011-02-10"); - mingroup.addItem("2011-02-12"); - mingroup.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - String val = (String) event.getProperty().getValue(); - if (val.equals(NULL_VALUE)) { - System.out.println("Null min value"); - pickerA.setMin(null); - } else { - try { - System.out.println("Set min value to: " + val); - pickerA.setMin(df.parse(val)); - } catch (ParseException e) { - e.printStackTrace(); - } - } - } - - }); - - OptionGroup maxgroup = new OptionGroup("Max value"); - maxgroup.setImmediate(true); - maxgroup.addItem(NULL_VALUE); + RadioButtonGroup mingroup = new RadioButtonGroup<>("Min value"); + mingroup.setItems(NULL_VALUE, "1982-01-01", "2011-01-01", "2011-02-01", "2011-02-10", "2011-02-12"); + mingroup.setValue(NULL_VALUE); + mingroup.addValueChangeListener(event -> { + String val = event.getValue(); + if (val.equals(NULL_VALUE)) { + System.out.println("Null min value"); + pickerA.setMin(null); + } else { + try { + System.out.println("Set min value to: " + val); + pickerA.setMin(df.parse(val)); + } catch (ParseException e) { + e.printStackTrace(); + } + } + }); + + RadioButtonGroup maxgroup = new RadioButtonGroup<>("Max value"); maxgroup.setValue(NULL_VALUE); - maxgroup.addItem("1982-01-01"); - maxgroup.addItem("2011-02-01"); - maxgroup.addItem("2011-02-12"); - maxgroup.addItem("2011-02-27"); - maxgroup.addItem("2011-03-01"); - maxgroup.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - String val = (String) event.getProperty().getValue(); - if (val.equals(NULL_VALUE)) { - System.out.println("Null max value"); - pickerA.setMax(null); - } else { - try { - System.out.println("Set max value to: " + val); - pickerA.setMax(df.parse(val)); - } catch (ParseException e) { - e.printStackTrace(); - } - } - } - - }); + maxgroup.setItems(NULL_VALUE, "1982-01-01", "2011-02-01", "2011-02-12", "2011-02-27", "2011-03-01"); + maxgroup.addValueChangeListener(event -> { + String val = event.getValue(); + if (val.equals(NULL_VALUE)) { + System.out.println("Null max value"); + pickerA.setMax(null); + } else { + try { + System.out.println("Set max value to: " + val); + pickerA.setMax(df.parse(val)); + } catch (ParseException e) { + e.printStackTrace(); + } + } + }); HorizontalLayout minmax = new HorizontalLayout(); minmax.setSpacing(true); @@ -154,73 +115,65 @@ public void valueChange(ValueChangeEvent event) { addComponent(minmax); - final OptionGroup localeGroup = new OptionGroup("Change the locale"); + final RadioButtonGroup localeGroup = new RadioButtonGroup<>("Change the locale"); localeGroup.setId("locale"); localeGroup.setEnabled(!useNative.getValue()); - localeGroup.addContainerProperty("locale", Locale.class, null); - localeGroup.addItem("Default"); - localeGroup.addItem("Finnish").getItemProperty("locale").setValue(new Locale("fi", "FI")); - localeGroup.addItem("US").getItemProperty("locale").setValue(Locale.US); - localeGroup.addItem("UK").getItemProperty("locale").setValue(Locale.UK); - localeGroup.addValueChangeListener(new ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent event) { - Locale locale = (Locale) localeGroup.getItem(event.getProperty().getValue()).getItemProperty("locale").getValue(); - pickerA.setLocale(locale); - } - }); - useNative.addValueChangeListener(new ValueChangeListener() { - @Override - public void valueChange(ValueChangeEvent valueChangeEvent) { - localeGroup.setEnabled(!useNative.getValue()); - } - }); - - localeGroup.select("Default"); + Locale defaultLocale = Locale.getDefault(); + Locale finishLocale = new Locale("fi", "FI"); + localeGroup.setItems(defaultLocale, finishLocale, Locale.US, Locale.UK); + localeGroup.setItemCaptionGenerator(locale -> { + if (locale.equals(defaultLocale)) { + return "Default"; + } else if (locale.equals(finishLocale)) { + return "Finish"; + } else if (locale.equals(Locale.US)) { + return "US"; + } else if (locale.equals(Locale.UK)) { + return "UK"; + } else { + return locale.toString(); + } + }); + localeGroup.addValueChangeListener(event -> { + Locale locale = event.getValue(); + pickerA.setLocale(locale); + }); + useNative.addValueChangeListener(valueChangeEvent -> localeGroup.setEnabled(!useNative.getValue())); + + localeGroup.setValue(defaultLocale); addComponent(localeGroup); } - private final Button.ClickListener dateButtonListener = new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - try { - String caption = event.getButton().getCaption(); - if (caption.equals(NULL_VALUE)) { - pickerA.setValue(null); - } else { - pickerA.setValue(df.parse(caption)); - } - } catch (Exception e) { - e.printStackTrace(); - } - - } + private final Button.ClickListener dateButtonListener = event -> { + try { + String caption = event.getButton().getCaption(); + if (caption.equals(NULL_VALUE)) { + pickerA.setValue(null); + } else { + pickerA.setValue(df.parse(caption)); + } + } catch (Exception e) { + e.printStackTrace(); + } - }; + }; private void createResolutionOptions() { HorizontalLayout buttonLayout = new HorizontalLayout(); - NativeSelect resolution = new NativeSelect("Resolution"); - resolution.setNullSelectionAllowed(false); - resolution.setImmediate(true); + NativeSelect resolution = new NativeSelect<>("Resolution"); + resolution.setEmptySelectionAllowed(false); + buttonLayout.addComponent(resolution); - for (Resolution res : Resolution.values()) { - resolution.addItem(res); - } + resolution.setItems(Resolution.values()); resolution.setValue(pickerA.getResolution()); - resolution.addValueChangeListener(new Property.ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - Resolution res = (Resolution) event.getProperty().getValue(); + resolution.addValueChangeListener(event -> { + Resolution res = event.getValue(); System.out.println("Resolution: " + res); pickerA.setResolution(res); - } - }); + }); addComponent(buttonLayout); } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/IconButtonsTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/IconButtonsTest.java index f49e1a89..58434ef0 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/IconButtonsTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/IconButtonsTest.java @@ -4,11 +4,11 @@ import org.vaadin.touchkit.ui.NavigationButton; import org.vaadin.touchkit.ui.VerticalComponentGroup; -import com.vaadin.server.FontAwesome; +import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class IconButtonsTest extends AbstractTouchKitIntegrationTest implements ClickListener { @@ -23,7 +23,7 @@ public IconButtonsTest() { TextField textField = getTextFieldWithIcon(); componentGroup.addComponent(textField); - for (FontAwesome i : FontAwesome.values()) { + for (VaadinIcons i : VaadinIcons.values()) { NavigationButton button = new NavigationButton(i.name()); button.setIcon(i); componentGroup.addComponent(button); @@ -37,7 +37,7 @@ public IconButtonsTest() { private TextField getTextFieldWithIcon() { TextField textField = new TextField(); - textField.setIcon(FontAwesome.USER); + textField.setIcon(VaadinIcons.USER); textField.setCaption("User"); return textField; } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/MoveStuff.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/MoveStuff.java index 9e29e144..f3f04771 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/MoveStuff.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/MoveStuff.java @@ -6,10 +6,10 @@ import org.vaadin.touchkit.ui.NavigationView; import com.vaadin.ui.Button; -import com.vaadin.v7.ui.HorizontalLayout; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; public class MoveStuff extends AbstractTouchKitIntegrationTest implements ClickListener { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigatingBackAndForthTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigatingBackAndForthTest.java index f713aed8..8c260bd4 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigatingBackAndForthTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigatingBackAndForthTest.java @@ -4,10 +4,8 @@ import org.vaadin.touchkit.ui.NavigationButton; import org.vaadin.touchkit.ui.NavigationManager; import org.vaadin.touchkit.ui.NavigationView; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickEvent; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickListener; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class NavigatingBackAndForthTest extends AbstractTouchKitIntegrationTest { @@ -22,13 +20,7 @@ public NavigatingBackAndForthTest() { final NavigationView another = new NavigationView("Another"); NavigationButton navigationButton = new NavigationButton("Next"); - navigationButton.addClickListener(new NavigationButtonClickListener() { - - @Override - public void buttonClick(NavigationButtonClickEvent event) { - m.navigateTo(another); - } - }); + navigationButton.addClickListener(event -> m.navigateTo(another)); view.setRightComponent(navigationButton); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationButtonTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationButtonTest.java index 447c9897..1848af09 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationButtonTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationButtonTest.java @@ -9,7 +9,7 @@ import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class NavigationButtonTest extends AbstractTouchKitIntegrationTest { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationManagerTestAgain.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationManagerTestAgain.java index 5acab5a1..2904db5e 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationManagerTestAgain.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationManagerTestAgain.java @@ -8,10 +8,9 @@ import org.vaadin.touchkit.ui.VerticalComponentGroup; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.Label; -import com.vaadin.v7.ui.VerticalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.VerticalLayout; public class NavigationManagerTestAgain extends AbstractTouchKitIntegrationTest { @@ -23,28 +22,18 @@ public NavigationManagerTestAgain() { final NavigationView second = new NavigationView(); second.setContent(new Label("Content")); - second.setLeftComponent(new Button("Finnish", new Button.ClickListener() { - public void buttonClick(Button.ClickEvent event) { - final Popover popover = new Popover(); - VerticalLayout l = new VerticalLayout(); - l.setSpacing(true); - l.addComponent(new Button("Save and go back", new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - manager.navigateBack(); - popover.close(); - } - })); - l.addComponent(new Button("Cancel", new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - popover.close(); - } - })); - popover.setContent(l); - popover.showRelativeTo(event.getButton()); - } - })); + second.setLeftComponent(new Button("Finnish", (ClickListener) event -> { + final Popover popover = new Popover(); + VerticalLayout l = new VerticalLayout(); + l.setSpacing(true); + l.addComponent(new Button("Save and go back", (ClickListener) event1 -> { + manager.navigateBack(); + popover.close(); + })); + l.addComponent(new Button("Cancel", (ClickListener) event1 -> popover.close())); + popover.setContent(l); + popover.showRelativeTo(event.getButton()); + })); NavigationButton c = new NavigationButton("Go to second level",second); VerticalComponentGroup verticalComponentGroup = new VerticalComponentGroup(); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewBarTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewBarTest.java index 3a72115e..69d78d47 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewBarTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewBarTest.java @@ -1,23 +1,20 @@ package org.vaadin.touchkit.itest; +import java.util.ArrayList; +import java.util.List; import java.util.Random; import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.NavigationManager; import org.vaadin.touchkit.ui.NavigationView; import org.vaadin.touchkit.ui.VerticalComponentGroup; -import org.vaadin.touchkit.ui.NavigationManager.NavigationEvent; -import org.vaadin.touchkit.ui.NavigationManager.NavigationListener; -import com.vaadin.v7.data.Property.ValueChangeEvent; -import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; -import com.vaadin.v7.ui.NativeSelect; +import com.vaadin.ui.Label; +import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Notification; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class NavigationViewBarTest extends AbstractTouchKitIntegrationTest { @@ -43,52 +40,37 @@ NavigationManager makeNavigationManager() { addNextButton(navman, two, three); addNextButton(navman, three, four); - navman.addNavigationListener(new NavigationListener() { - @Override - public void navigate(NavigationEvent event) { - if (navman.getCurrentComponent() == one) { - navman.setNextComponent(two); - } else if (navman.getCurrentComponent() == two) { - navman.setNextComponent(three); - } else if (navman.getCurrentComponent() == three) { - navman.setNextComponent(four); - } - } - }); + navman.addNavigationListener(event -> { + if (navman.getCurrentComponent() == one) { + navman.setNextComponent(two); + } else if (navman.getCurrentComponent() == two) { + navman.setNextComponent(three); + } else if (navman.getCurrentComponent() == three) { + navman.setNextComponent(four); + } + }); return navman; } private static void addNextButton(final NavigationManager navman, final NavigationView view, final NavigationView next) { ((Button) view.getRightComponent()) - .addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navman.navigateTo(next); - } - }); + .addClickListener(event -> navman.navigateTo(next)); } NavigationView createView(String caption, String debugId, boolean hasNext) { final CssLayout layout = new CssLayout(); - NativeSelect nativeSelect = new NativeSelect(); - nativeSelect.addItem("FOO"); + NativeSelect nativeSelect = new NativeSelect<>(); + List items = new ArrayList<>(); + items.add("FOO"); for (int i = 0; i < 200; i++) { - nativeSelect.addItem("BAR " + i); + items.add("BAR " + i); } - nativeSelect - .addItem("CAaaaaaaaaaaaaaaaaa Rsdfs sfsdfsdfsdsd fdsf adsfdsf sdaf j sdlfkjs ld adsfsd f"); - nativeSelect.setImmediate(true); + items.add("CAaaaaaaaaaaaaaaaaa Rsdfs sfsdfsdfsdsd fdsf adsfdsf sdaf j sdlfkjs ld adsfsd f"); + nativeSelect.setItems(items); - nativeSelect.addValueChangeListener(new ValueChangeListener() { - - @Override - public void valueChange(ValueChangeEvent event) { - Notification.show("Value:" + event.getProperty().getValue()); - - } - }); + nativeSelect.addValueChangeListener(event -> Notification.show("Value:" + event.getValue())); VerticalComponentGroup verticalComponentGroup = new VerticalComponentGroup("Textifedf"); @@ -100,7 +82,7 @@ public void valueChange(ValueChangeEvent event) { layout.addComponent(nativeSelect); layout.setId(debugId); - int max = (int) (r.nextInt(100)); + int max = (r.nextInt(100)); for (int i = 0; i < max; i++) { Label l = new Label("Foo " + i); layout.addComponent(l); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithIndex.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithIndex.java index c5de7293..d63bc0f7 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithIndex.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithIndex.java @@ -6,7 +6,7 @@ import org.vaadin.touchkit.ui.VerticalComponentGroup; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class NavigationViewWithIndex extends AbstractTouchKitIntegrationTest { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithSaveCancelTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithSaveCancelTest.java index ef06ae24..566b1d7e 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithSaveCancelTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithSaveCancelTest.java @@ -4,9 +4,9 @@ import org.vaadin.touchkit.ui.NavigationView; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.Notification; public class NavigationViewWithSaveCancelTest extends @@ -27,21 +27,11 @@ NavigationView createView() { NavigationView navView = new NavigationView(); navView.setRightComponent(new Button("Save", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - Notification.show("Save! :)"); - } - })); + (ClickListener) event -> Notification.show("Save! :)"))); navView.setCaption("Save or Cancel?"); navView.setContent(layout); navView.setLeftComponent(new Button("Cancel", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - Notification.show("Cancel :("); - } - })); + (ClickListener) event -> Notification.show("Cancel :("))); return navView; } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithTablePopover.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithTablePopover.java index c93baf01..3c01e915 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithTablePopover.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/NavigationViewWithTablePopover.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.v7.ui.Table; public class NavigationViewWithTablePopover extends diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/PopoverTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/PopoverTest.java index 085e2fed..476c1814 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/PopoverTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/PopoverTest.java @@ -4,9 +4,7 @@ import org.vaadin.touchkit.ui.Popover; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; @SuppressWarnings("serial") public class PopoverTest extends AbstractTouchKitIntegrationTest { @@ -15,69 +13,61 @@ public PopoverTest() { setDescription("Popover test"); Button button = new Button("Contains buttons"); - button.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Popover popover = new Popover(); - popover.setWidth("360px"); - Button b = new Button("Save Draft"); - b.addStyleName("white"); - b.setWidth("100%"); - popover.addComponent(b); - b = new Button("Delete Draft"); - b.addStyleName("red"); - b.setWidth("100%"); - popover.addComponent(b); - b = new Button("Cancel"); - b.setWidth("100%"); - popover.addComponent(b); + button.addClickListener(event -> { + Popover popover = new Popover(); + popover.setWidth("360px"); + Button b = new Button("Save Draft"); + b.addStyleName("white"); + b.setWidth("100%"); + popover.addComponent(b); + b = new Button("Delete Draft"); + b.addStyleName("red"); + b.setWidth("100%"); + popover.addComponent(b); + b = new Button("Cancel"); + b.setWidth("100%"); + popover.addComponent(b); - popover.showRelativeTo(event.getButton()); - } - }); + popover.showRelativeTo(event.getButton()); + }); addComponent(button); button = new Button("Contains a NavigationView"); - button.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Popover popover = new Popover(); - popover.setWidth("360px"); - popover.setHeight("400px"); + button.addClickListener(event -> { + Popover popover = new Popover(); + popover.setWidth("360px"); + popover.setHeight("400px"); - popover.setContent(new NavigationViewBarTest().createView( - "foo", "foo", false)); + popover.setContent(new NavigationViewBarTest().createView( + "foo", "foo", false)); - popover.showRelativeTo(event.getButton()); - } - }); + popover.showRelativeTo(event.getButton()); + }); addComponent(button); button = new Button("Contains a NavigationManager"); - button.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Popover popover = new Popover(); - popover.setWidth("360px"); - popover.setHeight("400px"); + button.addClickListener(event -> { + Popover popover = new Popover(); + popover.setWidth("360px"); + popover.setHeight("400px"); - popover.setContent(new NavigationViewBarTest() - .makeNavigationManager()); + popover.setContent(new NavigationViewBarTest() + .makeNavigationManager()); - popover.showRelativeTo(event.getButton()); - } - }); + popover.showRelativeTo(event.getButton()); + }); addComponent(button); button = new Button("Just label"); - button.addClickListener(new ClickListener() { - public void buttonClick(ClickEvent event) { - Popover popover = new Popover(); - popover.setWidth("360px"); - popover.setHeight("400px"); + button.addClickListener(event -> { + Popover popover = new Popover(); + popover.setWidth("360px"); + popover.setHeight("400px"); - popover.setContent(new Label("Foobar")); + popover.setContent(new Label("Foobar")); - popover.showRelativeTo(event.getButton()); - } - }); + popover.showRelativeTo(event.getButton()); + }); addComponent(button); } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/ProgrammaticNavigation.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/ProgrammaticNavigation.java index fee4859b..ae899f09 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/ProgrammaticNavigation.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/ProgrammaticNavigation.java @@ -5,12 +5,10 @@ import org.vaadin.touchkit.ui.NavigationManager; import org.vaadin.touchkit.ui.NavigationView; import org.vaadin.touchkit.ui.VerticalComponentGroup; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickEvent; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickListener; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Label; public class ProgrammaticNavigation extends AbstractTouchKitIntegrationTest { @@ -23,11 +21,7 @@ public ProgrammaticNavigation() { final NavigationView second = new NavigationView("Second view"); second.setContent(new NavigationButton(first)); second.setContent(new Label("Second view")); - second.setLeftComponent(new Button("Back", new Button.ClickListener() { - public void buttonClick(Button.ClickEvent event) { - manager.navigateBack(); - } - })); + second.setLeftComponent(new Button("Back", (ClickListener) event -> manager.navigateBack())); VerticalComponentGroup verticalComponentGroup = new VerticalComponentGroup(); first.setContent(verticalComponentGroup); @@ -37,22 +31,11 @@ public void buttonClick(Button.ClickEvent event) { verticalComponentGroup.addComponent(nb); nb = new NavigationButton("NavigationButton, navigateTo()"); - nb.addClickListener(new NavigationButtonClickListener() { - @Override - public void buttonClick(NavigationButtonClickEvent event) { - manager.navigateTo(second); - } - }); + nb.addClickListener(event -> manager.navigateTo(second)); verticalComponentGroup.addComponent(nb); Button b = new Button("Button, navigateTo()", - new Button.ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - manager.navigateTo(second); - } - }); + (ClickListener) event -> manager.navigateTo(second)); verticalComponentGroup.addComponent(b); manager.navigateTo(first); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarInNavigationViewTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarInNavigationViewTest.java index c837c55c..8368b5af 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarInNavigationViewTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarInNavigationViewTest.java @@ -6,10 +6,8 @@ import org.vaadin.touchkit.ui.TabBarView; import com.vaadin.server.ThemeResource; -import com.vaadin.v7.shared.ui.label.ContentMode; -import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.Label; +import com.vaadin.shared.ui.ContentMode; +import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet.Tab; public class TabBarInNavigationViewTest extends AbstractTouchKitIntegrationTest { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarTest.java index 272830c0..29292b3e 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/TabBarTest.java @@ -5,10 +5,9 @@ import org.vaadin.touchkit.ui.TabBarView; import com.vaadin.server.ThemeResource; -import com.vaadin.v7.shared.ui.label.ContentMode; +import com.vaadin.shared.ui.ContentMode; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet.Tab; public class TabBarTest extends AbstractTouchKitIntegrationTest { @@ -23,22 +22,12 @@ public TabBarTest() { Button removeTab = new Button("Remove selected tab"); Button setSelected = new Button("Set selected"); - removeTab.addClickListener(new Button.ClickListener() { + removeTab.addClickListener(event -> { + Tab tab = bar.getSelelectedTab(); + bar.removeTab(tab); + }); - @Override - public void buttonClick(ClickEvent event) { - Tab tab = bar.getSelelectedTab(); - bar.removeTab(tab); - } - }); - - setSelected.addClickListener(new Button.ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - bar.setSelectedTab(lastTab); - } - }); + setSelected.addClickListener(event -> bar.setSelectedTab(lastTab)); for (int loop = 0; loop < 5; loop++) { String content = String.format("Tab%d", loop); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/ToolbarTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/ToolbarTest.java index e1990716..a28cb59d 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/ToolbarTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/ToolbarTest.java @@ -3,11 +3,9 @@ import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.Toolbar; -import com.vaadin.server.FontAwesome; -import com.vaadin.server.ThemeResource; +import com.vaadin.icons.VaadinIcons; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class ToolbarTest extends AbstractTouchKitIntegrationTest { public ToolbarTest() { @@ -19,22 +17,16 @@ public ToolbarTest() { for (int loop = 0; loop < 10; loop++) { Button button = new Button(); if (loop % 2 == 0) { - button.setIcon(FontAwesome.HOME); + button.setIcon(VaadinIcons.HOME); } else { - button.setIcon(new ThemeResource("../runo/icons/64/folder.png")); + button.setIcon(VaadinIcons.FOLDER_O); } if (loop % 3 == 0) { button.setCaption("Diipa"); } final int identifier = loop; - button.addClickListener(new Button.ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - label.setValue("Clicked: " + identifier); - } - }); + button.addClickListener(event -> label.setValue("Clicked: " + identifier)); tbar.addComponent(button); } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest.java index 1ec28d85..0d620d7a 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest.java @@ -13,10 +13,10 @@ import com.vaadin.server.ThemeResource; import com.vaadin.ui.Button; import com.vaadin.ui.Component; +import com.vaadin.ui.Label; import com.vaadin.ui.Link; -import com.vaadin.v7.ui.Label; -import com.vaadin.v7.ui.OptionGroup; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.RadioButtonGroup; +import com.vaadin.ui.TextField; public class VerticalComponentGroupTest extends AbstractTouchKitIntegrationTest { @@ -82,15 +82,12 @@ public VerticalComponentGroupTest() { addComponent(verticalComponentGroup); } - private OptionGroup getOptiongroup() { - OptionGroup languageSelect = new OptionGroup(); + private RadioButtonGroup getOptiongroup() { + RadioButtonGroup languageSelect = new RadioButtonGroup<>(); Locale[] availableLocales = new Locale[] { Locale.CANADA, Locale.ENGLISH, Locale.GERMAN }; - for (Locale locale : availableLocales) { - languageSelect.addItem(locale); - languageSelect.setItemCaption(locale, - locale.getDisplayLanguage(locale)); - } + languageSelect.setItems(availableLocales); + languageSelect.setItemCaptionGenerator(locale -> locale.getDisplayLanguage()); languageSelect.setValue(Locale.ENGLISH); return languageSelect; } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest2.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest2.java index 91150057..352206db 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest2.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalComponentGroupTest2.java @@ -4,7 +4,7 @@ import org.vaadin.touchkit.ui.VerticalComponentGroup; import com.vaadin.ui.FormLayout; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class VerticalComponentGroupTest2 extends AbstractTouchKitIntegrationTest { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalLayoutScrolling.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalLayoutScrolling.java index ca9f125d..5eddb1cf 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalLayoutScrolling.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/VerticalLayoutScrolling.java @@ -8,7 +8,7 @@ import org.vaadin.touchkit.ui.VerticalComponentGroup; import com.vaadin.ui.Button; -import com.vaadin.v7.ui.VerticalLayout; +import com.vaadin.ui.VerticalLayout; public class VerticalLayoutScrolling extends AbstractTouchKitIntegrationTest { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/GeolocationTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/GeolocationTest.java index 0d129937..d5d70866 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/GeolocationTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/GeolocationTest.java @@ -6,8 +6,8 @@ import org.vaadin.touchkit.gwt.client.vcom.Position; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Label; import com.vaadin.ui.Notification; @SuppressWarnings("serial") @@ -20,12 +20,7 @@ public GeolocationTest() { setDescription("Test Geolocation"); Button detectButton = new Button("Detect location", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - Geolocator.detect(GeolocationTest.this); - } - }); + (ClickListener) event -> Geolocator.detect(GeolocationTest.this)); addComponent(detectButton); locationLabel = new Label(); addComponent(locationLabel); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/LocalStorageTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/LocalStorageTest.java index 45404c4c..0c36d8df 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/LocalStorageTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/extensions/LocalStorageTest.java @@ -6,8 +6,9 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Notification; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; @SuppressWarnings("serial") public class LocalStorageTest extends AbstractTouchKitIntegrationTest { @@ -22,33 +23,23 @@ public LocalStorageTest() { addComponent(valueField); Button detectButton = new Button("Detect value", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - LocalStorage.detectValue(keyField.getValue(), - new LocalStorageCallback() { - @Override - public void onSuccess(String value) { - Notification.show("Value received:" + value); - valueField.setValue(value); - } + (ClickListener) event -> LocalStorage.detectValue(keyField.getValue(), + new LocalStorageCallback() { + @Override + public void onSuccess(String value) { + Notification.show("Value received:" + value); + valueField.setValue(value); + } - @Override - public void onFailure(FailureEvent error) { - Notification.show("Value retrieval failed: " + error.getMessage()); - } - }); - } - }); + @Override + public void onFailure(FailureEvent error) { + Notification.show("Value retrieval failed: " + error.getMessage()); + } + })); addComponent(detectButton); Button saveButton = new Button("Save value", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - LocalStorage.get().put(keyField.getValue(), - valueField.getValue()); - } - }); + (ClickListener) event -> LocalStorage.get().put(keyField.getValue(), + valueField.getValue())); addComponent(saveButton); Button saveInsaneButton = new Button("Save huge value (should fail)", diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTest.java index 7bff83bc..1a8fd730 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTest.java @@ -2,14 +2,11 @@ import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.NavigationManager; -import org.vaadin.touchkit.ui.NavigationManager.NavigationEvent; -import org.vaadin.touchkit.ui.NavigationManager.NavigationListener; import org.vaadin.touchkit.ui.NavigationManager.NavigationEvent.Direction; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class SimpleTest extends AbstractTouchKitIntegrationTest { @@ -36,74 +33,43 @@ public SimpleTest() { cL.addComponent(new Label("CURR")); Button button = new Button("-->"); cL.addComponent(button); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navigationManager.navigateTo(nL); - } - }); + button.addClickListener(event -> navigationManager.navigateTo(nL)); button = new Button("<--"); cL.addComponent(button); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navigationManager.navigateBack(); - } - }); + button.addClickListener(event -> navigationManager.navigateBack()); nL.addComponent(new Label("NEXT")); button = new Button("-->"); nL.addComponent(button); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navigationManager.navigateTo(yetAnother); - } - }); + button.addClickListener(event -> navigationManager.navigateTo(yetAnother)); button = new Button("<--"); nL.addComponent(button); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navigationManager.navigateBack(); - } - }); + button.addClickListener(event -> navigationManager.navigateBack()); yetAnother.addComponent(new Label("YET ANOTHER")); button = new Button("<--"); yetAnother.addComponent(button); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navigationManager.navigateBack(); - } - }); + button.addClickListener(event -> navigationManager.navigateBack()); pL.addComponent(new Label("PREV")); button = new Button("-->"); pL.addComponent(button); - button.addClickListener(new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - navigationManager.navigateTo(cL); - navigationManager.setNextComponent(nL); - } - }); + button.addClickListener(event -> { + navigationManager.navigateTo(cL); + navigationManager.setNextComponent(nL); + }); navigationManager.setPreviousComponent(pL); navigationManager.setCurrentComponent(cL); navigationManager.setNextComponent(nL); - navigationManager.addNavigationListener(new NavigationListener() { - @Override - public void navigate(NavigationEvent event) { - if (navigationManager.getCurrentComponent() == nL) { - if (event.getDirection() == Direction.FORWARD) { - navigationManager.setNextComponent(yetAnother); - } - } - } - }); + navigationManager.addNavigationListener(event -> { + if (navigationManager.getCurrentComponent() == nL) { + if (event.getDirection() == Direction.FORWARD) { + navigationManager.setNextComponent(yetAnother); + } + } + }); addComponent(navigationManager); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTestWithNavigationButtons.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTestWithNavigationButtons.java index 0e4cb88b..9cd7fa31 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTestWithNavigationButtons.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/navigationmanager/SimpleTestWithNavigationButtons.java @@ -3,14 +3,10 @@ import org.vaadin.touchkit.AbstractTouchKitIntegrationTest; import org.vaadin.touchkit.ui.NavigationButton; import org.vaadin.touchkit.ui.NavigationManager; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickEvent; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickListener; -import org.vaadin.touchkit.ui.NavigationManager.NavigationEvent; -import org.vaadin.touchkit.ui.NavigationManager.NavigationListener; import org.vaadin.touchkit.ui.NavigationManager.NavigationEvent.Direction; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class SimpleTestWithNavigationButtons extends AbstractTouchKitIntegrationTest { @@ -62,28 +58,19 @@ public SimpleTestWithNavigationButtons() { button = new NavigationButton("-->"); pL.addComponent(button); button.setTargetView(cL); - button.addClickListener(new NavigationButtonClickListener() { - - @Override - public void buttonClick(NavigationButtonClickEvent event) { - navigationManager.setNextComponent(nL); - } - }); + button.addClickListener(event -> navigationManager.setNextComponent(nL)); navigationManager.setPreviousComponent(pL); navigationManager.setCurrentComponent(cL); navigationManager.setNextComponent(nL); - navigationManager.addNavigationListener(new NavigationListener() { - @Override - public void navigate(NavigationEvent event) { - if (navigationManager.getCurrentComponent() == nL) { - if (event.getDirection() == Direction.FORWARD) { - navigationManager.setNextComponent(yetAnother); - } - } - } - }); + navigationManager.addNavigationListener(event -> { + if (navigationManager.getCurrentComponent() == nL) { + if (event.getDirection() == Direction.FORWARD) { + navigationManager.setNextComponent(yetAnother); + } + } + }); addComponent(navigationManager); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ButtonsInComponentGroups.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ButtonsInComponentGroups.java index 41232763..e74a59ed 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ButtonsInComponentGroups.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/ButtonsInComponentGroups.java @@ -9,13 +9,11 @@ import org.vaadin.touchkit.ui.VerticalComponentGroup; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.Notification; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.TextField; public class ButtonsInComponentGroups extends AbstractTouchKitIntegrationTest { @@ -26,47 +24,38 @@ public ButtonsInComponentGroups() { CssLayout l = new CssLayout(); Button button = new Button("Button not in a component group"); - button.addClickListener(new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - Notification.show("Clicked"); - } - }); + button.addClickListener(event -> { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Notification.show("Clicked"); + }); l.addComponent(button); button = new Button("Primary button"); button.setStyleName(StyleNames.BUTTON_BLUE); - button.addClickListener(new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - Notification.show("Clicked"); - } - }); + button.addClickListener(event -> { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Notification.show("Clicked"); + }); l.addComponent(button); button = new Button("Danger button"); button.setStyleName(StyleNames.BUTTON_RED); - button.addClickListener(new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - Notification.show("Clicked"); - } - }); + button.addClickListener(event -> { + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + e.printStackTrace(); + } + Notification.show("Clicked"); + }); l.addComponent(button); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/FallbackUI.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/FallbackUI.java index 6a8db562..ad89a805 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/FallbackUI.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/FallbackUI.java @@ -1,7 +1,7 @@ package org.vaadin.touchkit.itest.oldtests; import com.vaadin.server.VaadinRequest; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.UI; public class FallbackUI extends UI { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MoreButtonsInComponentGroups.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MoreButtonsInComponentGroups.java index b8c60a12..70968386 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MoreButtonsInComponentGroups.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/MoreButtonsInComponentGroups.java @@ -10,12 +10,10 @@ import com.vaadin.server.ClassResource; import com.vaadin.server.Resource; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; -import com.vaadin.v7.ui.TextField; +import com.vaadin.ui.Label; +import com.vaadin.ui.TextField; public class MoreButtonsInComponentGroups extends AbstractTouchKitIntegrationTest { @@ -100,17 +98,14 @@ public MoreButtonsInComponentGroups() { horizontalComponentGroup.addComponent(c); c = new Button("T"); - c.addClickListener(new ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - Button b = event.getButton(); - if(GREEN.equals(b.getStyleName())) { - b.setStyleName(null); - } else { - b.setStyleName(GREEN); - } - } - }); + c.addClickListener(event -> { + Button b = event.getButton(); + if(GREEN.equals(b.getStyleName())) { + b.setStyleName(null); + } else { + b.setStyleName(GREEN); + } + }); c.addStyleName(GREEN); horizontalComponentGroup.addComponent(c); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTest.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTest.java index 3a390f76..b57bb8f2 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTest.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTest.java @@ -8,7 +8,7 @@ import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.Notification; @Ignore @@ -43,7 +43,8 @@ private CssLayout getView() { return cssLayout; } - public void buttonClick(ClickEvent event) { + @Override + public void buttonClick(ClickEvent event) { if (event.getButton().getCaption().equals("Back")) { navigateBack(); } else { diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTestWithNavButtons.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTestWithNavButtons.java index ad64cc4c..198e3d4f 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTestWithNavButtons.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavPanelTestWithNavButtons.java @@ -2,12 +2,10 @@ import org.vaadin.touchkit.ui.NavigationButton; import org.vaadin.touchkit.ui.NavigationManager; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickEvent; -import org.vaadin.touchkit.ui.NavigationButton.NavigationButtonClickListener; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; public class NavPanelTestWithNavButtons extends NavigationManager implements ComponentContainer { @@ -64,24 +62,22 @@ public SimpleNavView() { addComponent(new Label("Nav view " + counter++)); addComponent(prev); addComponent(next); - prev.addClickListener(new NavigationButtonClickListener() { - public void buttonClick(NavigationButtonClickEvent event) { - /* - * Hack to make test somewhat working. - * addAttribute(Paintable) don't support painting un - * attached components properly. It works but breaks subtree - * caching in some cases. This is handled in - * NavigatioButton. Thats why we need to force repaint of - * prev button in next visible view. This will be - * automatically handled by NavigationManager for - * NavigationViews. - */ - SimpleNavView targetView = (SimpleNavView) prev - .getTargetView(); - targetView.prev.requestRepaint(); - targetView.next.requestRepaint(); - } - }); + prev.addClickListener(event -> { + /* + * Hack to make test somewhat working. + * addAttribute(Paintable) don't support painting un + * attached components properly. It works but breaks subtree + * caching in some cases. This is handled in + * NavigatioButton. Thats why we need to force repaint of + * prev button in next visible view. This will be + * automatically handled by NavigationManager for + * NavigationViews. + */ + SimpleNavView targetView = (SimpleNavView) prev + .getTargetView(); + targetView.prev.requestRepaint(); + targetView.next.requestRepaint(); + }); } } diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavViewWithButtons.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavViewWithButtons.java index b41c9e0a..64c27f39 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavViewWithButtons.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavViewWithButtons.java @@ -9,8 +9,7 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.HorizontalLayout; +import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Notification; @@ -83,7 +82,8 @@ class NavViewWithButtonsT extends NavigationView implements ClickListener { } - public void buttonClick(ClickEvent event) { + @Override + public void buttonClick(ClickEvent event) { Notification.show("clicked"); } } \ No newline at end of file diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavigationManagerView.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavigationManagerView.java index 1e2b69dd..b2f28dca 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavigationManagerView.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/NavigationManagerView.java @@ -10,10 +10,8 @@ import com.vaadin.server.ThemeResource; import com.vaadin.ui.Button; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.Notification; public class NavigationManagerView extends AbstractTouchKitIntegrationTest { @@ -36,13 +34,7 @@ public NavigationManagerView() { Button button2 = new Button("Normal Button (with nav theme)"); button2.setStyleName(StyleNames.BUTTON_NAVIGATION); verticalComponentGroup.addComponent(button2); - button2.addClickListener(new ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - Notification.show("Hi!"); - } - }); + button2.addClickListener(event -> Notification.show("Hi!")); navigationView.setContent(verticalComponentGroup); diff --git a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/PersonView.java b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/PersonView.java index 8cde219f..2baf99f1 100644 --- a/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/PersonView.java +++ b/touchkit/src/test/java/org/vaadin/touchkit/itest/oldtests/PersonView.java @@ -6,7 +6,7 @@ import com.vaadin.server.ExternalResource; import com.vaadin.ui.CssLayout; -import com.vaadin.v7.ui.Label; +import com.vaadin.ui.Label; import com.vaadin.ui.Link; public class PersonView extends AbstractTouchKitIntegrationTest {