diff options
author | Artur Signell <artur@vaadin.com> | 2016-08-25 19:37:57 +0300 |
---|---|---|
committer | Artur Signell <artur@vaadin.com> | 2016-08-26 19:49:06 +0300 |
commit | d13ca5506a2f7eb3dce75b98238bdb280ec7fa20 (patch) | |
tree | 02575981ecfeecd07561337e8f5e04ce8eca8236 | |
parent | 818f7d1cb8a92473f685144fed55facdc960697d (diff) | |
download | vaadin-framework-d13ca5506a2f7eb3dce75b98238bdb280ec7fa20.tar.gz vaadin-framework-d13ca5506a2f7eb3dce75b98238bdb280ec7fa20.zip |
Implement new Label
Label does intentionally not implement HasValue as it
cannot provide a value to a model
Change-Id: I36b8e1794d64caf566fa802177051ae2eb637bf9
97 files changed, 998 insertions, 702 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/label/LabelConnector.java b/client/src/main/java/com/vaadin/client/ui/label/LabelConnector.java index 40734a7a61..0d66a06941 100644 --- a/client/src/main/java/com/vaadin/client/ui/label/LabelConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/label/LabelConnector.java @@ -55,15 +55,9 @@ public class LabelConnector extends AbstractComponentConnector { break; case HTML: - case RAW: sinkOnloads = true; - case XML: getWidget().setHTML(getState().text); break; - default: - getWidget().setText(""); - break; - } Profiler.leave("LabelConnector.onStateChanged update content"); diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java new file mode 100644 index 0000000000..d8c35a275d --- /dev/null +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/label/LabelConnector.java @@ -0,0 +1,82 @@ +/* + * 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.client.ui.label; + +import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.PreElement; +import com.vaadin.client.Profiler; +import com.vaadin.client.WidgetUtil; +import com.vaadin.client.communication.StateChangeEvent; +import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.VLabel; +import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.v7.shared.ui.label.LabelState; +import com.vaadin.v7.ui.Label; + +@Connect(value = Label.class, loadStyle = LoadStyle.EAGER) +public class LabelConnector extends AbstractComponentConnector { + + @Override + public LabelState getState() { + return (LabelState) super.getState(); + } + + @Override + public void onStateChanged(StateChangeEvent stateChangeEvent) { + super.onStateChanged(stateChangeEvent); + boolean sinkOnloads = false; + Profiler.enter("LabelConnector.onStateChanged update content"); + switch (getState().contentMode) { + case PREFORMATTED: + PreElement preElement = Document.get().createPreElement(); + preElement.setInnerText(getState().text); + // clear existing content + getWidget().setHTML(""); + // add preformatted text to dom + getWidget().getElement().appendChild(preElement); + break; + + case TEXT: + getWidget().setText(getState().text); + break; + + case HTML: + case RAW: + sinkOnloads = true; + case XML: + getWidget().setHTML(getState().text); + break; + default: + getWidget().setText(""); + break; + + } + Profiler.leave("LabelConnector.onStateChanged update content"); + + if (sinkOnloads) { + Profiler.enter("LabelConnector.onStateChanged sinkOnloads"); + WidgetUtil.sinkOnloadForImages(getWidget().getElement()); + Profiler.leave("LabelConnector.onStateChanged sinkOnloads"); + } + } + + @Override + public VLabel getWidget() { + return (VLabel) super.getWidget(); + } + +} diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java new file mode 100644 index 0000000000..dc89fffabf --- /dev/null +++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Label.java @@ -0,0 +1,624 @@ +/* + * 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.ui; + +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.Locale; + +import org.jsoup.nodes.Element; + +import com.vaadin.shared.util.SharedUtil; +import com.vaadin.ui.AbstractComponent; +import com.vaadin.ui.Component; +import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.ui.declarative.DesignFormatter; +import com.vaadin.v7.data.Property; +import com.vaadin.v7.data.util.converter.Converter; +import com.vaadin.v7.data.util.converter.ConverterUtil; +import com.vaadin.v7.shared.ui.label.ContentMode; +import com.vaadin.v7.shared.ui.label.LabelState; + +/** + * Label component for showing non-editable short texts. + * + * The label content can be set to the modes specified by {@link ContentMode} + * + * <p> + * The contents of the label may contain simple formatting: + * <ul> + * <li><b><b></b> Bold + * <li><b><i></b> Italic + * <li><b><u></b> Underlined + * <li><b><br/></b> Linebreak + * <li><b><ul><li>item 1</li><li>item 2</li></ul></b> List of + * items + * </ul> + * The <b>b</b>,<b>i</b>,<b>u</b> and <b>li</b> tags can contain all the tags in + * the list recursively. + * </p> + * + * @author Vaadin Ltd. + * @since 3.0 + */ +@SuppressWarnings("serial") +public class Label extends AbstractComponent implements Property<String>, + Property.Viewer, Property.ValueChangeListener, + Property.ValueChangeNotifier, Comparable<Label> { + + /** + * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead + */ + @Deprecated + public static final ContentMode CONTENT_TEXT = ContentMode.TEXT; + + /** + * @deprecated As of 7.0, use {@link ContentMode#PREFORMATTED} instead + */ + @Deprecated + public static final ContentMode CONTENT_PREFORMATTED = ContentMode.PREFORMATTED; + + /** + * @deprecated As of 7.0, use {@link ContentMode#HTML} instead + */ + @Deprecated + public static final ContentMode CONTENT_XHTML = ContentMode.HTML; + + /** + * @deprecated As of 7.0, use {@link ContentMode#XML} instead + */ + @Deprecated + public static final ContentMode CONTENT_XML = ContentMode.XML; + + /** + * @deprecated As of 7.0, use {@link ContentMode#RAW} instead + */ + @Deprecated + public static final ContentMode CONTENT_RAW = ContentMode.RAW; + + /** + * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead + */ + @Deprecated + public static final ContentMode CONTENT_DEFAULT = ContentMode.TEXT; + + /** + * A converter used to convert from the data model type to the field type + * and vice versa. Label type is always String. + */ + private Converter<String, Object> converter = null; + + private Property<String> dataSource = null; + + /** + * Creates an empty Label. + */ + public Label() { + this(""); + } + + /** + * Creates a new instance of Label with text-contents. + * + * @param content + */ + public Label(String content) { + this(content, ContentMode.TEXT); + } + + /** + * Creates a new instance of Label with text-contents read from given + * datasource. + * + * @param contentSource + */ + public Label(Property contentSource) { + this(contentSource, ContentMode.TEXT); + } + + /** + * Creates a new instance of Label with text-contents. + * + * @param content + * @param contentMode + */ + public Label(String content, ContentMode contentMode) { + setValue(content); + setContentMode(contentMode); + setWidth(100, Unit.PERCENTAGE); + } + + /** + * Creates a new instance of Label with text-contents read from given + * datasource. + * + * @param contentSource + * @param contentMode + */ + public Label(Property contentSource, ContentMode contentMode) { + setPropertyDataSource(contentSource); + setContentMode(contentMode); + setWidth(100, Unit.PERCENTAGE); + } + + @Override + protected LabelState getState() { + return (LabelState) super.getState(); + } + + @Override + protected LabelState getState(boolean markAsDirty) { + return (LabelState) super.getState(markAsDirty); + } + + /** + * Gets the value of the label. + * <p> + * The value of the label is the text that is shown to the end user. + * Depending on the {@link ContentMode} it is plain text or markup. + * </p> + * + * @return the value of the label. + */ + @Override + public String getValue() { + if (getPropertyDataSource() == null) { + // Use internal value if we are running without a data source + return getState(false).text; + } + return getDataSourceValue(); + } + + /** + * Returns the current value of the data source converted using the current + * locale. + * + * @return + */ + private String getDataSourceValue() { + return ConverterUtil.convertFromModel( + getPropertyDataSource().getValue(), String.class, + getConverter(), getLocale()); + } + + /** + * Set the value of the label. Value of the label is the XML contents of the + * label. Since Vaadin 7.2, changing the value of Label instance with that + * method will fire ValueChangeEvent. + * + * @param newStringValue + * the New value of the label. + */ + @Override + public void setValue(String newStringValue) { + if (getPropertyDataSource() == null) { + + LabelState state = getState(false); + String oldTextValue = state.text; + if (!SharedUtil.equals(oldTextValue, newStringValue)) { + getState().text = newStringValue; + fireValueChange(); + } + } else { + throw new IllegalStateException( + "Label is only a Property.Viewer and cannot update its data source"); + } + } + + /** + * Gets the type of the Property. + * + * @see com.vaadin.v7.data.Property#getType() + */ + @Override + public Class<String> getType() { + return String.class; + } + + /** + * Gets the viewing data-source property. + * + * @return the data source property. + * @see com.vaadin.v7.data.Property.Viewer#getPropertyDataSource() + */ + @Override + public Property getPropertyDataSource() { + return dataSource; + } + + /** + * Sets the property as data-source for viewing. Since Vaadin 7.2 a + * ValueChangeEvent is fired if the new value is different from previous. + * + * @param newDataSource + * the new data source Property + * @see com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(com.vaadin.v7.data.Property) + */ + @Override + public void setPropertyDataSource(Property newDataSource) { + // Stops listening the old data source changes + if (dataSource != null && Property.ValueChangeNotifier.class + .isAssignableFrom(dataSource.getClass())) { + ((Property.ValueChangeNotifier) dataSource).removeListener(this); + } + + // Check if the current converter is compatible. + if (newDataSource != null + && !ConverterUtil.canConverterPossiblyHandle(getConverter(), + getType(), newDataSource.getType())) { + // There is no converter set or there is no way the current + // converter can be compatible. + Converter<String, ?> c = ConverterUtil.getConverter(String.class, + newDataSource.getType(), getSession()); + setConverter(c); + } + + dataSource = newDataSource; + if (dataSource != null) { + // Update the value from the data source. If data source was set to + // null, retain the old value + updateValueFromDataSource(); + } + + // Listens the new data source if possible + if (dataSource != null && Property.ValueChangeNotifier.class + .isAssignableFrom(dataSource.getClass())) { + ((Property.ValueChangeNotifier) dataSource).addListener(this); + } + markAsDirty(); + } + + /** + * Gets the content mode of the Label. + * + * @return the Content mode of the label. + * + * @see ContentMode + */ + public ContentMode getContentMode() { + return getState(false).contentMode; + } + + /** + * Sets the content mode of the Label. + * + * @param contentMode + * the New content mode of the label. + * + * @see ContentMode + */ + public void setContentMode(ContentMode contentMode) { + if (contentMode == null) { + throw new IllegalArgumentException("Content mode can not be null"); + } + + getState().contentMode = contentMode; + } + + /* Value change events */ + + private static final Method VALUE_CHANGE_METHOD; + + static { + try { + VALUE_CHANGE_METHOD = Property.ValueChangeListener.class + .getDeclaredMethod("valueChange", + new Class[] { Property.ValueChangeEvent.class }); + } catch (final java.lang.NoSuchMethodException e) { + // This should never happen + throw new java.lang.RuntimeException( + "Internal error finding methods in Label"); + } + } + + /** + * Value change event + * + * @author Vaadin Ltd. + * @since 3.0 + */ + public static class ValueChangeEvent extends Component.Event + implements Property.ValueChangeEvent { + + /** + * New instance of text change event + * + * @param source + * the Source of the event. + */ + public ValueChangeEvent(Label source) { + super(source); + } + + /** + * Gets the Property that has been modified. + * + * @see com.vaadin.v7.data.Property.ValueChangeEvent#getProperty() + */ + @Override + public Property getProperty() { + return (Property) getSource(); + } + } + + /** + * Adds the value change listener. + * + * @param listener + * the Listener to be added. + * @see com.vaadin.v7.data.Property.ValueChangeNotifier#addListener(com.vaadin.v7.data.Property.ValueChangeListener) + */ + @Override + public void addValueChangeListener(Property.ValueChangeListener listener) { + addListener(Label.ValueChangeEvent.class, listener, + VALUE_CHANGE_METHOD); + } + + /** + * @deprecated As of 7.0, replaced by + * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + **/ + @Override + @Deprecated + public void addListener(Property.ValueChangeListener listener) { + addValueChangeListener(listener); + } + + /** + * Removes the value change listener. + * + * @param listener + * the Listener to be removed. + * @see com.vaadin.v7.data.Property.ValueChangeNotifier#removeListener(com.vaadin.v7.data.Property.ValueChangeListener) + */ + @Override + public void removeValueChangeListener( + Property.ValueChangeListener listener) { + removeListener(Label.ValueChangeEvent.class, listener, + VALUE_CHANGE_METHOD); + } + + /** + * @deprecated As of 7.0, replaced by + * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} + **/ + @Override + @Deprecated + public void removeListener(Property.ValueChangeListener listener) { + removeValueChangeListener(listener); + } + + /** + * Emits the options change event. + */ + protected void fireValueChange() { + // Set the error message + fireEvent(new Label.ValueChangeEvent(this)); + } + + /** + * Listens the value change events from data source. + * + * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + */ + @Override + public void valueChange(Property.ValueChangeEvent event) { + updateValueFromDataSource(); + } + + private void updateValueFromDataSource() { + // Update the internal value from the data source + String newConvertedValue = getDataSourceValue(); + if (!SharedUtil.equals(newConvertedValue, getState(false).text)) { + getState().text = newConvertedValue; + fireValueChange(); + } + } + + @Override + public void attach() { + super.attach(); + localeMightHaveChanged(); + } + + @Override + public void setLocale(Locale locale) { + super.setLocale(locale); + localeMightHaveChanged(); + } + + private void localeMightHaveChanged() { + if (getPropertyDataSource() != null) { + updateValueFromDataSource(); + } + } + + private String getComparableValue() { + String stringValue = getValue(); + if (stringValue == null) { + stringValue = ""; + } + + if (getContentMode() == ContentMode.HTML + || getContentMode() == ContentMode.XML) { + return stripTags(stringValue); + } else { + return stringValue; + } + + } + + /** + * Compares the Label to other objects. + * + * <p> + * Labels can be compared to other labels for sorting label contents. This + * is especially handy for sorting table columns. + * </p> + * + * <p> + * In RAW, PREFORMATTED and TEXT modes, the label contents are compared as + * is. In XML, UIDL and HTML modes, only CDATA is compared and tags ignored. + * If the other object is not a Label, its toString() return value is used + * in comparison. + * </p> + * + * @param other + * the Other object to compare to. + * @return a negative integer, zero, or a positive integer as this object is + * less than, equal to, or greater than the specified object. + * @see java.lang.Comparable#compareTo(java.lang.Object) + */ + @Override + public int compareTo(Label other) { + + String thisValue = getComparableValue(); + String otherValue = other.getComparableValue(); + + return thisValue.compareTo(otherValue); + } + + /** + * Strips the tags from the XML. + * + * @param xml + * the String containing a XML snippet. + * @return the original XML without tags. + */ + private String stripTags(String xml) { + + final StringBuffer res = new StringBuffer(); + + int processed = 0; + final int xmlLen = xml.length(); + while (processed < xmlLen) { + int next = xml.indexOf('<', processed); + if (next < 0) { + next = xmlLen; + } + res.append(xml.substring(processed, next)); + if (processed < xmlLen) { + next = xml.indexOf('>', processed); + if (next < 0) { + next = xmlLen; + } + processed = next + 1; + } + } + + return res.toString(); + } + + /** + * Gets the converter used to convert the property data source value to the + * label value. + * + * @return The converter or null if none is set. + */ + public Converter<String, Object> getConverter() { + return converter; + } + + /** + * Sets the converter used to convert the label value to the property data + * source type. The converter must have a presentation type of String. + * + * @param converter + * The new converter to use. + */ + public void setConverter(Converter<String, ?> converter) { + this.converter = (Converter<String, Object>) converter; + markAsDirty(); + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element, + * com.vaadin.ui.declarative.DesignContext) + */ + @Override + public void readDesign(Element design, DesignContext designContext) { + super.readDesign(design, designContext); + String innerHtml = design.html(); + boolean plainText = design.hasAttr(DESIGN_ATTR_PLAIN_TEXT); + if (plainText) { + setContentMode(ContentMode.TEXT); + } else { + setContentMode(ContentMode.HTML); + } + if (innerHtml != null && !"".equals(innerHtml)) { + if (plainText) { + innerHtml = DesignFormatter.decodeFromTextNode(innerHtml); + } + setValue(innerHtml); + } + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.ui.AbstractComponent#getCustomAttributes() + */ + @Override + protected Collection<String> getCustomAttributes() { + Collection<String> result = super.getCustomAttributes(); + result.add("value"); + result.add("content-mode"); + result.add("plain-text"); + return result; + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element + * , com.vaadin.ui.declarative.DesignContext) + */ + @Override + public void writeDesign(Element design, DesignContext designContext) { + super.writeDesign(design, designContext); + String content = getValue(); + if (content != null) { + switch (getContentMode()) { + case TEXT: + case PREFORMATTED: + case XML: + case RAW: { + // FIXME This attribute is not enough to be able to restore the + // content mode in readDesign. The content mode should instead + // be written directly in the attribute and restored in + // readDesign. See ticket #19435 + design.attr(DESIGN_ATTR_PLAIN_TEXT, true); + String encodeForTextNode = DesignFormatter + .encodeForTextNode(content); + if (encodeForTextNode != null) { + design.html(encodeForTextNode); + } + } + break; + case HTML: + design.html(content); + break; + default: + throw new IllegalStateException( + "ContentMode " + getContentMode() + + " is not supported by writeDesign"); + } + } + } +} diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java index 3c80f11b36..22f45c6bc6 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelConvertersTest.java @@ -25,10 +25,10 @@ import org.junit.Test; import com.vaadin.server.VaadinSession; import com.vaadin.tests.data.bean.Person; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -import com.vaadin.ui.Label; import com.vaadin.util.CurrentInstance; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.MethodProperty; +import com.vaadin.v7.ui.Label; public class LabelConvertersTest { @Before diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java b/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java index 212187e7ec..7c19c9c968 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java +++ b/compatibility-server/src/test/java/com/vaadin/tests/server/component/label/LabelListenersTest.java @@ -10,10 +10,10 @@ import org.easymock.EasyMock; import org.junit.Test; import com.vaadin.tests.server.component.AbstractListenerMethodsTestBase; -import com.vaadin.ui.Label; -import com.vaadin.ui.Label.ValueChangeEvent; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.v7.ui.Label; +import com.vaadin.v7.ui.Label.ValueChangeEvent; public class LabelListenersTest extends AbstractListenerMethodsTestBase { diff --git a/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java b/compatibility-server/src/test/java/com/vaadin/v7/ui/LabelDataSourceTest.java index e164534918..42d0d72867 100644 --- a/server/src/test/java/com/vaadin/ui/LabelDataSourceTest.java +++ b/compatibility-server/src/test/java/com/vaadin/v7/ui/LabelDataSourceTest.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.ui; import java.util.Locale; @@ -24,6 +24,7 @@ import org.junit.Test; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; import com.vaadin.tests.util.MockUI; +import com.vaadin.ui.UI; import com.vaadin.v7.data.util.ObjectProperty; public class LabelDataSourceTest { diff --git a/server/src/main/java/com/vaadin/server/FontIcon.java b/server/src/main/java/com/vaadin/server/FontIcon.java index c7aeec2987..68a6f40269 100644 --- a/server/src/main/java/com/vaadin/server/FontIcon.java +++ b/server/src/main/java/com/vaadin/server/FontIcon.java @@ -16,8 +16,8 @@ package com.vaadin.server; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; +import com.vaadin.v7.shared.ui.label.ContentMode; /** * A font icon is a type of icon that is made by displaying one character from a diff --git a/server/src/main/java/com/vaadin/ui/Label.java b/server/src/main/java/com/vaadin/ui/Label.java index 21aa7bdcbe..161d4ddc73 100644 --- a/server/src/main/java/com/vaadin/ui/Label.java +++ b/server/src/main/java/com/vaadin/ui/Label.java @@ -16,91 +16,26 @@ package com.vaadin.ui; -import java.lang.reflect.Method; import java.util.Collection; -import java.util.Locale; import org.jsoup.nodes.Element; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.label.LabelState; -import com.vaadin.shared.util.SharedUtil; import com.vaadin.ui.declarative.DesignContext; import com.vaadin.ui.declarative.DesignFormatter; -import com.vaadin.v7.data.Property; -import com.vaadin.v7.data.util.converter.Converter; -import com.vaadin.v7.data.util.converter.ConverterUtil; /** * Label component for showing non-editable short texts. - * - * The label content can be set to the modes specified by {@link ContentMode} - * * <p> - * The contents of the label may contain simple formatting: - * <ul> - * <li><b><b></b> Bold - * <li><b><i></b> Italic - * <li><b><u></b> Underlined - * <li><b><br/></b> Linebreak - * <li><b><ul><li>item 1</li><li>item 2</li></ul></b> List of - * items - * </ul> - * The <b>b</b>,<b>i</b>,<b>u</b> and <b>li</b> tags can contain all the tags in - * the list recursively. - * </p> + * The label content can be set to the modes specified by {@link ContentMode}. + * If content mode is set to HTML, any HTML content is allowed. * * @author Vaadin Ltd. * @since 3.0 */ @SuppressWarnings("serial") -public class Label extends AbstractComponent implements Property<String>, - Property.Viewer, Property.ValueChangeListener, - Property.ValueChangeNotifier, Comparable<Label> { - - /** - * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead - */ - @Deprecated - public static final ContentMode CONTENT_TEXT = ContentMode.TEXT; - - /** - * @deprecated As of 7.0, use {@link ContentMode#PREFORMATTED} instead - */ - @Deprecated - public static final ContentMode CONTENT_PREFORMATTED = ContentMode.PREFORMATTED; - - /** - * @deprecated As of 7.0, use {@link ContentMode#HTML} instead - */ - @Deprecated - public static final ContentMode CONTENT_XHTML = ContentMode.HTML; - - /** - * @deprecated As of 7.0, use {@link ContentMode#XML} instead - */ - @Deprecated - public static final ContentMode CONTENT_XML = ContentMode.XML; - - /** - * @deprecated As of 7.0, use {@link ContentMode#RAW} instead - */ - @Deprecated - public static final ContentMode CONTENT_RAW = ContentMode.RAW; - - /** - * @deprecated As of 7.0, use {@link ContentMode#TEXT} instead - */ - @Deprecated - public static final ContentMode CONTENT_DEFAULT = ContentMode.TEXT; - - /** - * A converter used to convert from the data model type to the field type - * and vice versa. Label type is always String. - */ - private Converter<String, Object> converter = null; - - private Property<String> dataSource = null; +public class Label extends AbstractComponent { /** * Creates an empty Label. @@ -110,47 +45,27 @@ public class Label extends AbstractComponent implements Property<String>, } /** - * Creates a new instance of Label with text-contents. - * - * @param content - */ - public Label(String content) { - this(content, ContentMode.TEXT); - } - - /** - * Creates a new instance of Label with text-contents read from given - * datasource. - * - * @param contentSource - */ - public Label(Property contentSource) { - this(contentSource, ContentMode.TEXT); - } - - /** - * Creates a new instance of Label with text-contents. + * Creates a new instance with text content mode and the given text. * - * @param content - * @param contentMode + * @param text + * the text to set */ - public Label(String content, ContentMode contentMode) { - setValue(content); - setContentMode(contentMode); - setWidth(100, Unit.PERCENTAGE); + public Label(String text) { + this(text, ContentMode.TEXT); } /** - * Creates a new instance of Label with text-contents read from given - * datasource. + * Creates a new instance with the given text and content mode. * - * @param contentSource + * @param text + * the text to set * @param contentMode + * the content mode to use */ - public Label(Property contentSource, ContentMode contentMode) { - setPropertyDataSource(contentSource); + public Label(String text, ContentMode contentMode) { + setValue(text); setContentMode(contentMode); - setWidth(100, Unit.PERCENTAGE); + setWidth("100%"); } @Override @@ -164,126 +79,9 @@ public class Label extends AbstractComponent implements Property<String>, } /** - * Gets the value of the label. - * <p> - * The value of the label is the text that is shown to the end user. - * Depending on the {@link ContentMode} it is plain text or markup. - * </p> - * - * @return the value of the label. - */ - @Override - public String getValue() { - if (getPropertyDataSource() == null) { - // Use internal value if we are running without a data source - return getState(false).text; - } - return getDataSourceValue(); - } - - /** - * Returns the current value of the data source converted using the current - * locale. + * Gets the content mode of the label. * - * @return - */ - private String getDataSourceValue() { - return ConverterUtil.convertFromModel( - getPropertyDataSource().getValue(), String.class, - getConverter(), getLocale()); - } - - /** - * Set the value of the label. Value of the label is the XML contents of the - * label. Since Vaadin 7.2, changing the value of Label instance with that - * method will fire ValueChangeEvent. - * - * @param newStringValue - * the New value of the label. - */ - @Override - public void setValue(String newStringValue) { - if (getPropertyDataSource() == null) { - - LabelState state = getState(false); - String oldTextValue = state.text; - if (!SharedUtil.equals(oldTextValue, newStringValue)) { - getState().text = newStringValue; - fireValueChange(); - } - } else { - throw new IllegalStateException( - "Label is only a Property.Viewer and cannot update its data source"); - } - } - - /** - * Gets the type of the Property. - * - * @see com.vaadin.v7.data.Property#getType() - */ - @Override - public Class<String> getType() { - return String.class; - } - - /** - * Gets the viewing data-source property. - * - * @return the data source property. - * @see com.vaadin.v7.data.Property.Viewer#getPropertyDataSource() - */ - @Override - public Property getPropertyDataSource() { - return dataSource; - } - - /** - * Sets the property as data-source for viewing. Since Vaadin 7.2 a - * ValueChangeEvent is fired if the new value is different from previous. - * - * @param newDataSource - * the new data source Property - * @see com.vaadin.v7.data.Property.Viewer#setPropertyDataSource(com.vaadin.v7.data.Property) - */ - @Override - public void setPropertyDataSource(Property newDataSource) { - // Stops listening the old data source changes - if (dataSource != null && Property.ValueChangeNotifier.class - .isAssignableFrom(dataSource.getClass())) { - ((Property.ValueChangeNotifier) dataSource).removeListener(this); - } - - // Check if the current converter is compatible. - if (newDataSource != null - && !ConverterUtil.canConverterPossiblyHandle( - getConverter(), getType(), newDataSource.getType())) { - // There is no converter set or there is no way the current - // converter can be compatible. - Converter<String, ?> c = ConverterUtil.getConverter( - String.class, newDataSource.getType(), getSession()); - setConverter(c); - } - - dataSource = newDataSource; - if (dataSource != null) { - // Update the value from the data source. If data source was set to - // null, retain the old value - updateValueFromDataSource(); - } - - // Listens the new data source if possible - if (dataSource != null && Property.ValueChangeNotifier.class - .isAssignableFrom(dataSource.getClass())) { - ((Property.ValueChangeNotifier) dataSource).addListener(this); - } - markAsDirty(); - } - - /** - * Gets the content mode of the Label. - * - * @return the Content mode of the label. + * @return the content mode of the label * * @see ContentMode */ @@ -292,10 +90,10 @@ public class Label extends AbstractComponent implements Property<String>, } /** - * Sets the content mode of the Label. + * Sets the content mode of the label. * * @param contentMode - * the New content mode of the label. + * the content mode to set * * @see ContentMode */ @@ -307,248 +105,30 @@ public class Label extends AbstractComponent implements Property<String>, getState().contentMode = contentMode; } - /* Value change events */ - - private static final Method VALUE_CHANGE_METHOD; - - static { - try { - VALUE_CHANGE_METHOD = Property.ValueChangeListener.class - .getDeclaredMethod("valueChange", - new Class[] { Property.ValueChangeEvent.class }); - } catch (final java.lang.NoSuchMethodException e) { - // This should never happen - throw new java.lang.RuntimeException( - "Internal error finding methods in Label"); - } - } - - /** - * Value change event - * - * @author Vaadin Ltd. - * @since 3.0 - */ - public static class ValueChangeEvent extends Component.Event - implements Property.ValueChangeEvent { - - /** - * New instance of text change event - * - * @param source - * the Source of the event. - */ - public ValueChangeEvent(Label source) { - super(source); - } - - /** - * Gets the Property that has been modified. - * - * @see com.vaadin.v7.data.Property.ValueChangeEvent#getProperty() - */ - @Override - public Property getProperty() { - return (Property) getSource(); - } - } - - /** - * Adds the value change listener. - * - * @param listener - * the Listener to be added. - * @see com.vaadin.v7.data.Property.ValueChangeNotifier#addListener(com.vaadin.v7.data.Property.ValueChangeListener) - */ - @Override - public void addValueChangeListener(Property.ValueChangeListener listener) { - addListener(Label.ValueChangeEvent.class, listener, - VALUE_CHANGE_METHOD); - } - - /** - * @deprecated As of 7.0, replaced by - * {@link #addValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} - **/ - @Override - @Deprecated - public void addListener(Property.ValueChangeListener listener) { - addValueChangeListener(listener); - } - - /** - * Removes the value change listener. - * - * @param listener - * the Listener to be removed. - * @see com.vaadin.v7.data.Property.ValueChangeNotifier#removeListener(com.vaadin.v7.data.Property.ValueChangeListener) - */ - @Override - public void removeValueChangeListener( - Property.ValueChangeListener listener) { - removeListener(Label.ValueChangeEvent.class, listener, - VALUE_CHANGE_METHOD); - } - - /** - * @deprecated As of 7.0, replaced by - * {@link #removeValueChangeListener(com.vaadin.v7.data.Property.ValueChangeListener)} - **/ - @Override - @Deprecated - public void removeListener(Property.ValueChangeListener listener) { - removeValueChangeListener(listener); - } - - /** - * Emits the options change event. - */ - protected void fireValueChange() { - // Set the error message - fireEvent(new Label.ValueChangeEvent(this)); - } - /** - * Listens the value change events from data source. + * Sets the text to be shown in the label. * - * @see com.vaadin.v7.data.Property.ValueChangeListener#valueChange(Property.ValueChangeEvent) + * @param value + * the text to show in the label, null is converted to an empty + * string */ - @Override - public void valueChange(Property.ValueChangeEvent event) { - updateValueFromDataSource(); - } - - private void updateValueFromDataSource() { - // Update the internal value from the data source - String newConvertedValue = getDataSourceValue(); - if (!SharedUtil.equals(newConvertedValue, getState(false).text)) { - getState().text = newConvertedValue; - fireValueChange(); - } - } - - @Override - public void attach() { - super.attach(); - localeMightHaveChanged(); - } - - @Override - public void setLocale(Locale locale) { - super.setLocale(locale); - localeMightHaveChanged(); - } - - private void localeMightHaveChanged() { - if (getPropertyDataSource() != null) { - updateValueFromDataSource(); - } - } - - private String getComparableValue() { - String stringValue = getValue(); - if (stringValue == null) { - stringValue = ""; - } - - if (getContentMode() == ContentMode.HTML - || getContentMode() == ContentMode.XML) { - return stripTags(stringValue); + public void setValue(String value) { + if (value == null) { + getState().text = ""; } else { - return stringValue; + getState().text = value; } - - } - - /** - * Compares the Label to other objects. - * - * <p> - * Labels can be compared to other labels for sorting label contents. This - * is especially handy for sorting table columns. - * </p> - * - * <p> - * In RAW, PREFORMATTED and TEXT modes, the label contents are compared as - * is. In XML, UIDL and HTML modes, only CDATA is compared and tags ignored. - * If the other object is not a Label, its toString() return value is used - * in comparison. - * </p> - * - * @param other - * the Other object to compare to. - * @return a negative integer, zero, or a positive integer as this object is - * less than, equal to, or greater than the specified object. - * @see java.lang.Comparable#compareTo(java.lang.Object) - */ - @Override - public int compareTo(Label other) { - - String thisValue = getComparableValue(); - String otherValue = other.getComparableValue(); - - return thisValue.compareTo(otherValue); } /** - * Strips the tags from the XML. + * Gets the text shown in the label. * - * @param xml - * the String containing a XML snippet. - * @return the original XML without tags. + * @return the text shown in the label, not null */ - private String stripTags(String xml) { - - final StringBuffer res = new StringBuffer(); - - int processed = 0; - final int xmlLen = xml.length(); - while (processed < xmlLen) { - int next = xml.indexOf('<', processed); - if (next < 0) { - next = xmlLen; - } - res.append(xml.substring(processed, next)); - if (processed < xmlLen) { - next = xml.indexOf('>', processed); - if (next < 0) { - next = xmlLen; - } - processed = next + 1; - } - } - - return res.toString(); - } - - /** - * Gets the converter used to convert the property data source value to the - * label value. - * - * @return The converter or null if none is set. - */ - public Converter<String, Object> getConverter() { - return converter; - } - - /** - * Sets the converter used to convert the label value to the property data - * source type. The converter must have a presentation type of String. - * - * @param converter - * The new converter to use. - */ - public void setConverter(Converter<String, ?> converter) { - this.converter = (Converter<String, Object>) converter; - markAsDirty(); + public String getValue() { + return getState(false).text; } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractComponent#readDesign(org.jsoup.nodes .Element, - * com.vaadin.ui.declarative.DesignContext) - */ @Override public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); @@ -567,11 +147,6 @@ public class Label extends AbstractComponent implements Property<String>, } } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractComponent#getCustomAttributes() - */ @Override protected Collection<String> getCustomAttributes() { Collection<String> result = super.getCustomAttributes(); @@ -581,12 +156,6 @@ public class Label extends AbstractComponent implements Property<String>, return result; } - /* - * (non-Javadoc) - * - * @see com.vaadin.ui.AbstractComponent#writeDesign(org.jsoup.nodes.Element - * , com.vaadin.ui.declarative.DesignContext) - */ @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); @@ -594,9 +163,7 @@ public class Label extends AbstractComponent implements Property<String>, if (content != null) { switch (getContentMode()) { case TEXT: - case PREFORMATTED: - case XML: - case RAW: { + case PREFORMATTED: { // FIXME This attribute is not enough to be able to restore the // content mode in readDesign. The content mode should instead // be written directly in the attribute and restored in @@ -612,11 +179,8 @@ public class Label extends AbstractComponent implements Property<String>, case HTML: design.html(content); break; - default: - throw new IllegalStateException( - "ContentMode " + getContentMode() - + " is not supported by writeDesign"); } } } + } diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java index 7cbe33233a..3822251de3 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractcomponent/AbstractComponentDeclarativeTest.java @@ -41,6 +41,7 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.ui.Panel; import com.vaadin.ui.declarative.Design; import com.vaadin.ui.declarative.DesignContext; @@ -151,7 +152,8 @@ public class AbstractComponentDeclarativeTest @Test public void testSizeAuto() { - String design = "<vaadin-label size-auto />"; + component = new Panel(); + String design = "<vaadin-panel size-auto />"; component.setSizeUndefined(); testRead(design, component); testWrite(design, component); @@ -191,7 +193,8 @@ public class AbstractComponentDeclarativeTest @Test public void testWidthAuto() { - String design = "<vaadin-label height=\"20px\"/ width-auto />"; + component = new Panel(); + String design = "<vaadin-panel height=\"20px\"/ width-auto />"; component.setCaptionAsHtml(false); component.setHeight("20px"); component.setWidth(null); diff --git a/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java index a8988ae057..ae8e5c6878 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/label/LabelDeclarativeTest.java @@ -113,22 +113,6 @@ public class LabelDeclarativeTest extends DeclarativeTestBase<Label> { Assert.assertEquals("& Test", root.html()); } - @Test - public void testNullValue() { - Label label = new Label(); - label.setValue(null); - - label.setContentMode(ContentMode.TEXT); - Element root = new Element(Tag.valueOf("vaadin-label"), ""); - label.writeDesign(root, new DesignContext()); - Assert.assertEquals("", root.html()); - - label.setContentMode(ContentMode.HTML); - root = new Element(Tag.valueOf("vaadin-label"), ""); - label.writeDesign(root, new DesignContext()); - Assert.assertEquals("", root.html()); - } - /** * FIXME Using another content mode than TEXT OR HTML is currently not * supported and will cause the content mode to fallback without the users diff --git a/server/src/test/java/com/vaadin/ui/LabelTest.java b/server/src/test/java/com/vaadin/ui/LabelTest.java new file mode 100644 index 0000000000..5bf082f659 --- /dev/null +++ b/server/src/test/java/com/vaadin/ui/LabelTest.java @@ -0,0 +1,25 @@ +package com.vaadin.ui; + +import org.junit.Assert; +import org.junit.Test; + +public class LabelTest { + + @Test + public void emptyLabelValue() { + Assert.assertEquals("", new Label().getValue()); + } + + @Test + public void labelInitialValue() { + Assert.assertEquals("initial", new Label("initial").getValue()); + } + + @Test + public void labelSetValue() { + Label label = new Label(); + label.setValue("foo"); + Assert.assertEquals("foo", label.getValue()); + } + +} diff --git a/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java index 56a6ced226..f5d31fe46f 100644 --- a/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java +++ b/shared/src/main/java/com/vaadin/shared/ui/label/ContentMode.java @@ -18,7 +18,7 @@ package com.vaadin.shared.ui.label; /** * Content modes defining how the client should interpret a Label's value. * - * @since 7.0.0 + * @since 7.0 */ public enum ContentMode { /** @@ -35,23 +35,6 @@ public enum ContentMode { /** * Content mode, where the label contains HTML. */ - HTML, + HTML - /** - * Content mode, where the label contains well-formed or well-balanced XML. - * This is handled in the same way as {@link #HTML}. - * - * @deprecated Use {@link #HTML} instead - */ - @Deprecated - XML, - - /** - * Legacy content mode, where the label contains RAW output. This is handled - * in exactly the same way as {@link #HTML}. - * - * @deprecated Use {@link #HTML} instead - */ - @Deprecated - RAW; } diff --git a/shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java b/shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java new file mode 100644 index 0000000000..e6292b47c5 --- /dev/null +++ b/shared/src/main/java/com/vaadin/v7/shared/ui/label/ContentMode.java @@ -0,0 +1,57 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.v7.shared.ui.label; + +/** + * Content modes defining how the client should interpret a Label's value. + * + * @since 7.0.0 + */ +public enum ContentMode { + /** + * Content mode, where the label contains only plain text. + */ + TEXT, + + /** + * Content mode, where the label contains preformatted text. In this mode + * newlines are preserved when rendered on the screen. + */ + PREFORMATTED, + + /** + * Content mode, where the label contains HTML. + */ + HTML, + + /** + * Content mode, where the label contains well-formed or well-balanced XML. + * This is handled in the same way as {@link #HTML}. + * + * @deprecated Use {@link #HTML} instead + */ + @Deprecated + XML, + + /** + * Legacy content mode, where the label contains RAW output. This is handled + * in exactly the same way as {@link #HTML}. + * + * @deprecated Use {@link #HTML} instead + */ + @Deprecated + RAW; +} diff --git a/shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java b/shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java new file mode 100644 index 0000000000..64cc3b5ee5 --- /dev/null +++ b/shared/src/main/java/com/vaadin/v7/shared/ui/label/LabelState.java @@ -0,0 +1,26 @@ +/* + * Copyright 2000-2016 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.v7.shared.ui.label; + +import com.vaadin.shared.AbstractComponentState; + +public class LabelState extends AbstractComponentState { + { + primaryStyleName = "v-label"; + } + public ContentMode contentMode = ContentMode.TEXT; + public String text = ""; +} diff --git a/uitest/src/main/java/com/vaadin/tests/Components.java b/uitest/src/main/java/com/vaadin/tests/Components.java index d16afa1232..767084bc52 100644 --- a/uitest/src/main/java/com/vaadin/tests/Components.java +++ b/uitest/src/main/java/com/vaadin/tests/Components.java @@ -13,7 +13,6 @@ import com.vaadin.server.ExternalResource; import com.vaadin.server.LegacyApplication; import com.vaadin.server.Sizeable; import com.vaadin.shared.MouseEventDetails.MouseButton; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Component; @@ -27,6 +26,7 @@ import com.vaadin.v7.data.util.DefaultItemSorter; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.Tree.ItemStyleGenerator; diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java index 580faf9be3..76ade94d60 100644 --- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java +++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java @@ -16,7 +16,6 @@ package com.vaadin.tests; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component.Event; @@ -28,6 +27,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.PasswordField; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Tree; diff --git a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java index 0be5305708..6d6ea68e3e 100644 --- a/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java +++ b/uitest/src/main/java/com/vaadin/tests/LayoutDemo.java @@ -17,7 +17,6 @@ package com.vaadin.tests; import com.vaadin.server.ClassResource; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; @@ -28,6 +27,7 @@ import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; /** * This example demonstrates layouts. Layouts are populated with sample Vaadin diff --git a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java index 4d60ea4279..9953caa723 100644 --- a/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/NativeWindowing.java @@ -20,9 +20,9 @@ import java.net.MalformedURLException; import java.net.URL; import com.vaadin.server.LegacyApplication; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java index 2617da651e..8048c1997d 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestBasicComponentRendering.java @@ -20,13 +20,13 @@ import java.util.Date; import java.util.Map; import com.vaadin.server.UserError; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.DateField; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index 44ec2927ab..9ca07e2579 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -18,11 +18,11 @@ package com.vaadin.tests; import java.util.Date; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java index 5d22ddf2a4..dd3e1d8fda 100644 --- a/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/uitest/src/main/java/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -18,12 +18,12 @@ package com.vaadin.tests; import java.util.Date; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; public class PerformanceTestSubTreeCaching extends CustomComponent { diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java index 43960ef70c..1e5aca115f 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java @@ -20,7 +20,6 @@ import com.vaadin.server.ClassResource; import com.vaadin.server.ErrorMessage; import com.vaadin.server.ExternalResource; import com.vaadin.server.UserError; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; @@ -38,6 +37,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Upload; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.OptionGroup; import com.vaadin.v7.ui.ProgressIndicator; diff --git a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java index 18db338f81..845542c1d3 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForNativeWindowing.java @@ -20,9 +20,9 @@ import java.net.MalformedURLException; import java.net.URL; import com.vaadin.server.LegacyApplication; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java index 5ad1032879..bfaf702258 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForRichTextEditor.java @@ -16,7 +16,6 @@ package com.vaadin.tests; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; @@ -24,6 +23,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.RichTextArea; /** diff --git a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java index 3f53686071..cc694757cc 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForStyledUpload.java @@ -28,7 +28,6 @@ import java.lang.management.MemoryMXBean; import com.vaadin.server.LegacyApplication; import com.vaadin.server.StreamResource; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; @@ -46,6 +45,7 @@ import com.vaadin.ui.Upload.StartedListener; import com.vaadin.ui.Upload.SucceededEvent; import com.vaadin.ui.Upload.SucceededListener; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ProgressIndicator; public class TestForStyledUpload extends LegacyApplication diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java index 5014dcfac4..e9106caa7d 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java @@ -29,7 +29,6 @@ import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; import com.vaadin.server.StreamResource; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; @@ -45,6 +44,7 @@ import com.vaadin.ui.Upload.StartedEvent; import com.vaadin.ui.Upload.StartedListener; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.AbstractField; import com.vaadin.v7.ui.ProgressIndicator; import com.vaadin.v7.ui.Select; diff --git a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java index d04bbc7f4a..f11e62c9c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestIFrames.java +++ b/uitest/src/main/java/com/vaadin/tests/TestIFrames.java @@ -16,10 +16,10 @@ package com.vaadin.tests; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; public class TestIFrames extends CustomComponent { diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java index 7f5c6da809..f648899a6b 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystem.java @@ -19,13 +19,13 @@ package com.vaadin.tests; import java.io.File; import com.vaadin.server.VaadinSession; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.util.SampleDirectory; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Item; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Tree; import com.vaadin.v7.ui.Tree.ExpandEvent; diff --git a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java index d2058fd886..6afc3326fe 100644 --- a/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java +++ b/uitest/src/main/java/com/vaadin/tests/UsingObjectsInSelect.java @@ -19,13 +19,13 @@ package com.vaadin.tests; import java.util.LinkedList; import java.util.Random; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Select; public class UsingObjectsInSelect extends com.vaadin.server.LegacyApplication diff --git a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java index c3ba0adb0b..15cd30108e 100644 --- a/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/uitest/src/main/java/com/vaadin/tests/application/ApplicationCloseTest.java @@ -1,9 +1,9 @@ package com.vaadin.tests.application; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; diff --git a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java index e2e9488a1a..9af17a6d9c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/AbstractTestUI.java @@ -7,7 +7,6 @@ import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinServlet; import com.vaadin.server.WebBrowser; import com.vaadin.shared.communication.PushMode; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.ui.Transport; import com.vaadin.shared.ui.ui.UIState.PushConfigurationState; import com.vaadin.ui.Button; @@ -15,6 +14,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Notification; import com.vaadin.ui.Notification.Type; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.PushConfiguration; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java index f2d48a9ffa..e1adf36056 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/TestBase.java +++ b/uitest/src/main/java/com/vaadin/tests/components/TestBase.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java index 1b6a81551a..8c166c33d6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java +++ b/uitest/src/main/java/com/vaadin/tests/components/button/ButtonMouseDetails.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components.button; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; public class ButtonMouseDetails extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java index f4cc2e5560..6a62e023f8 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java +++ b/uitest/src/main/java/com/vaadin/tests/components/caption/IconsInCaption.java @@ -1,7 +1,6 @@ package com.vaadin.tests.components.caption; import com.vaadin.server.ThemeResource; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.VaadinClasses; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; @@ -11,6 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ComboBox; public class IconsInCaption extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java index 950634039f..3b3a9e87cb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/components/colorpicker/ColorPickerTestUI.java @@ -29,7 +29,6 @@ import javax.imageio.ImageIO; import com.vaadin.server.StreamResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.colorpicker.Color; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Alignment; import com.vaadin.ui.CheckBox; @@ -39,6 +38,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.AbstractColorPicker; import com.vaadin.v7.ui.ColorPicker; import com.vaadin.v7.ui.ColorPickerArea; diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java index 3fbe2d02a7..84141e0785 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboFocusBlurEvents.java @@ -6,11 +6,11 @@ import java.util.List; import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.FocusEvent; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.Label; import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ComboBox; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.TextField; public class ComboFocusBlurEvents extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java index 7e3c493c2d..e6c70dafb6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java +++ b/uitest/src/main/java/com/vaadin/tests/components/combobox/ComboPushTiming.java @@ -10,11 +10,11 @@ import com.vaadin.event.FieldEvents; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.server.VaadinSession; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.Label; import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ComboBox; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.ProgressIndicator; import com.vaadin.v7.ui.TextField; @@ -75,6 +75,7 @@ public class ComboPushTiming extends TestBase { private void changeValue(final ComboBox cb) { executor.execute(new Runnable() { + @Override public void run() { VaadinSession.getCurrent().lock(); try { diff --git a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java index df666e0ad6..2efe104b35 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/customcomponent/ClipContent.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.customcomponent; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.TextField; public class ClipContent extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java index 2b660b8b0b..2e046127ac 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldEmptyValid.java @@ -5,7 +5,6 @@ import java.util.Date; import java.util.Locale; import com.vaadin.shared.ui.datefield.Resolution; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; @@ -15,6 +14,7 @@ import com.vaadin.ui.Label; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.PopupDateField; @SuppressWarnings("serial") diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java index 45df14eea1..98e94c49ee 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java +++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/ValueThroughProperty.java @@ -4,15 +4,15 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Label; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.shared.ui.label.ContentMode; import com.vaadin.v7.ui.DateField; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.PopupDateField; public class ValueThroughProperty extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java index b3285e948c..9671b849f0 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/DragAndDropBatchUpload.java @@ -27,11 +27,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.StreamVariable; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Html5File; import com.vaadin.ui.Label; diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java index fc27254539..bec5eae949 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/SingleUseDragAndDropUpload.java @@ -28,11 +28,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.server.FontAwesome; import com.vaadin.server.StreamVariable; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Button; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Html5File; import com.vaadin.ui.Label; diff --git a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java index 93f559f4e7..168cf25acc 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java +++ b/uitest/src/main/java/com/vaadin/tests/components/draganddropwrapper/TooltipHandlingWhenNotDefined.java @@ -1,5 +1,6 @@ package com.vaadin.tests.components.draganddropwrapper; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DragAndDropWrapper; @@ -14,7 +15,7 @@ public class TooltipHandlingWhenNotDefined extends TestBase { CssLayout wrapperLayout = new CssLayout(); wrapperLayout.setWidth("100%"); - Label label = new Label("Can I has the tooltip?", Label.CONTENT_XHTML); + Label label = new Label("Can I has the tooltip?", ContentMode.HTML); label.setId("tooltipLabel"); label.setDescription("Good! Tooltip works!"); label.setSizeUndefined(); diff --git a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java index 22d8cf5097..f80f219c95 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java +++ b/uitest/src/main/java/com/vaadin/tests/components/grid/GridWithLabelEditor.java @@ -19,11 +19,11 @@ import java.util.Collection; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.Label; import com.vaadin.v7.data.Validator; import com.vaadin.v7.data.Validator.InvalidValueException; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Grid; +import com.vaadin.v7.ui.Label; public class GridWithLabelEditor extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java index d70fd5ab4c..6c61e16402 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelModes.java @@ -37,12 +37,6 @@ public class LabelModes extends ComponentTestCase<Label> { l.setWidth(null); addTestComponent(l); - l = createLabel( - "This label contains\nnewlines and spaces\nand is in\nraw mode"); - l.setContentMode(ContentMode.RAW); - l.setWidth(null); - addTestComponent(l); - } private Label createLabel(String text, String caption) { diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java index 10bdd40515..bbce7b7744 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelPropertySourceValue.java @@ -5,8 +5,8 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; -import com.vaadin.ui.Label; import com.vaadin.v7.data.util.ObjectProperty; +import com.vaadin.v7.ui.Label; public class LabelPropertySourceValue extends AbstractTestUI { private Label label; diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java index 6dbc3398cb..0fe39fb6b1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/LabelTest.java @@ -7,10 +7,8 @@ import java.util.List; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractComponentTest; import com.vaadin.ui.Label; -import com.vaadin.v7.data.Property.ValueChangeListener; -public class LabelTest extends AbstractComponentTest<Label> - implements ValueChangeListener { +public class LabelTest extends AbstractComponentTest<Label> { private Command<Label, String> setValueCommand = new Command<Label, String>() { @@ -20,18 +18,6 @@ public class LabelTest extends AbstractComponentTest<Label> } }; - private Command<Label, Boolean> valueChangeListenerCommand = new Command<Label, Boolean>() { - @Override - public void execute(Label c, Boolean value, Object data) { - if (value) { - c.addListener(LabelTest.this); - } else { - c.removeListener(LabelTest.this); - - } - } - }; - private Command<Label, ContentMode> contentModeCommand = new Command<Label, ContentMode>() { @Override public void execute(Label c, ContentMode value, Object data) { @@ -50,7 +36,6 @@ public class LabelTest extends AbstractComponentTest<Label> createContentModeSelect(CATEGORY_FEATURES); createValueSelect(CATEGORY_FEATURES); - createValueChangeListener(CATEGORY_LISTENERS); } private void createValueSelect(String category) { @@ -77,32 +62,10 @@ public class LabelTest extends AbstractComponentTest<Label> LinkedHashMap<String, ContentMode> options = new LinkedHashMap<String, ContentMode>(); options.put("Text", ContentMode.TEXT); options.put("Preformatted", ContentMode.PREFORMATTED); - options.put("Raw", ContentMode.RAW); - options.put("UIDL", ContentMode.XML); // Deprecated UIDL mode still used - // to avoid breaking old tests options.put("XHTML", ContentMode.HTML); - options.put("XML", ContentMode.XML); createSelectAction("Content mode", category, options, "Text", contentModeCommand); } - private void createValueChangeListener(String category) { - createBooleanAction("Value change listener", category, false, - valueChangeListenerCommand); - } - - @Override - public void valueChange(com.vaadin.v7.data.Property.ValueChangeEvent event) { - Object o = event.getProperty().getValue(); - - // Distinguish between null and 'null' - String value = "null"; - if (o != null) { - value = "'" + o.toString() + "'"; - } - - log(event.getClass().getSimpleName() + ", new value: " + value); - } - } diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java index 0d296b1b92..c7f8f98289 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/Labels.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components.label; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; public class Labels extends ComponentTestCase<Label> { diff --git a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java index b18b92dfc8..65f542bd27 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java +++ b/uitest/src/main/java/com/vaadin/tests/components/label/MarginsInLabels.java @@ -1,7 +1,6 @@ package com.vaadin.tests.components.label; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.Accordion; @@ -9,6 +8,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; public class MarginsInLabels extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java index 9c446befd9..2bce0ac8c9 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java +++ b/uitest/src/main/java/com/vaadin/tests/components/listselect/ListSelectJump.java @@ -4,10 +4,10 @@ import java.util.ArrayList; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.ListSelect; diff --git a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java index d430774b91..c1c9a25548 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java +++ b/uitest/src/main/java/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.optiongroup; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; import com.vaadin.v7.data.Property; import com.vaadin.v7.data.Property.ValueChangeEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.OptionGroup; public class OptionGroupMultipleValueChange extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java index fe8cafa1a1..8011dcb971 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/BoxLayoutTest.java @@ -10,7 +10,6 @@ import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractOrderedLayout; @@ -26,6 +25,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.AbstractField; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java index 931ebfa5e1..56d99b7d03 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/orderedlayout/LayoutResizeTest.java @@ -1,7 +1,6 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.server.ThemeResource; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -13,6 +12,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.VerticalSplitPanel; import com.vaadin.ui.themes.Reindeer; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; public class LayoutResizeTest extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java index 15ca0d521e..d2f502d2c1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java +++ b/uitest/src/main/java/com/vaadin/tests/components/panel/PanelShouldNotScroll.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.panel; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; diff --git a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java index 9e214e2598..9d79d94c9c 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java +++ b/uitest/src/main/java/com/vaadin/tests/components/popupview/PopupViewOffScreen.java @@ -3,7 +3,6 @@ package com.vaadin.tests.components.popupview; import java.util.ArrayList; import java.util.List; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Button; @@ -16,6 +15,7 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.BaseTheme; +import com.vaadin.shared.ui.label.ContentMode; public class PopupViewOffScreen extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java index 17a8c2ea51..3914351735 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java +++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaEmptyString.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components.richtextarea; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.RichTextArea; public class RichTextAreaEmptyString extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java index ae4c83e789..b0aef8ed9a 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/EditableTableLeak.java @@ -6,7 +6,6 @@ import java.io.OutputStream; import java.io.Serializable; import java.util.HashMap; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.Button; @@ -16,6 +15,7 @@ import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.v7.data.Container; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.DefaultFieldFactory; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.Table; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java index c6cba16f91..fc0e15aa40 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/HeaderRightClickAfterDrag.java @@ -2,11 +2,11 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Label; import com.vaadin.ui.Window; import com.vaadin.v7.data.util.BeanItemContainer; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; public class HeaderRightClickAfterDrag extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index d398c0c325..7b6f9c858f 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -2,7 +2,6 @@ package com.vaadin.tests.components.table; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Component; import com.vaadin.ui.Embedded; @@ -10,6 +9,7 @@ import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; import com.vaadin.v7.event.ItemClickEvent; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; public class LabelEmbeddedClickThroughForTable extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java index d0e592c018..3222491ab6 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/SortLabelsInTable.java @@ -17,8 +17,8 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.Label; import com.vaadin.v7.data.Item; +import com.vaadin.v7.ui.Label; import com.vaadin.v7.ui.Table; public class SortLabelsInTable extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java index cb6509c110..92d353daa1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableInTabsheet.java @@ -3,7 +3,6 @@ package com.vaadin.tests.components.table; import java.net.MalformedURLException; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.HorizontalLayout; @@ -11,6 +10,7 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.Reindeer; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.Align; diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java index 267e8a5b03..1842449a57 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableMatchesMouseDownMouseUpElement.java @@ -1,7 +1,6 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -10,6 +9,7 @@ import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Item; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; public class TableMatchesMouseDownMouseUpElement extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java index 963038661a..e8797cbae1 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/TableRowScrolledBottom.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.table; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; public class TableRowScrolledBottom extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java index 898733129a..34ec27ea8e 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/Tables.java @@ -9,13 +9,13 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.server.Resource; import com.vaadin.shared.ui.MultiSelectMode; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.table.CollapseMenuContent; import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.tests.components.select.AbstractSelectTestCase; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.v7.event.ItemClickEvent.ItemClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.Table.Align; import com.vaadin.v7.ui.Table.CellStyleGenerator; diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java index 3a0e2812e4..4e30b13b97 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java @@ -1,5 +1,6 @@ package com.vaadin.tests.components.treetable; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Component; @@ -32,7 +33,7 @@ public class ComponentsInTreeTable extends TestBase { tt.addItem(new Object[] { l, "VerticalLayout" }, 2); Label lbl = new Label("<b>foo</b><br/><i>bar</i>"); - lbl.setContentMode(Label.CONTENT_XHTML); + lbl.setContentMode(ContentMode.HTML); tt.addItem(new Object[] { lbl, "Label" }, 3); tt.addItem(new Object[] { new Button("Test"), "Button" }, 4); diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java index aa4fee34f1..47aded8f38 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/LazyInitUIs.java @@ -6,12 +6,12 @@ import com.vaadin.server.UIClassSelectionEvent; import com.vaadin.server.UICreateEvent; import com.vaadin.server.UIProviderEvent; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUIProvider; import com.vaadin.ui.Label; import com.vaadin.ui.Link; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; public class LazyInitUIs extends AbstractTestUIProvider { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java index 7f85b22fac..aecd5375eb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UISerialization.java @@ -26,12 +26,12 @@ import java.io.StringWriter; import java.util.Date; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; public class UISerialization extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java index 70d83a466b..6dfda77a65 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java +++ b/uitest/src/main/java/com/vaadin/tests/components/window/LazyWindowResize.java @@ -2,7 +2,6 @@ package com.vaadin.tests.components.window; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.tests.util.LoremIpsum; @@ -13,6 +12,7 @@ import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; import com.vaadin.ui.Window.ResizeEvent; import com.vaadin.ui.Window.ResizeListener; +import com.vaadin.shared.ui.label.ContentMode; public class LazyWindowResize extends AbstractTestCase { diff --git a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java index 76afc417d2..22e9e3b730 100644 --- a/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java +++ b/uitest/src/main/java/com/vaadin/tests/extensions/ResponsiveUI.java @@ -19,11 +19,11 @@ package com.vaadin.tests.extensions; import com.vaadin.annotations.Theme; import com.vaadin.server.Responsive; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.CssLayout; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; @Theme("tests-responsive") public class ResponsiveUI extends AbstractTestUI { diff --git a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java index 7ba28c46f7..29b22b4a76 100644 --- a/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java +++ b/uitest/src/main/java/com/vaadin/tests/fieldgroup/AbstractBasicCrud.java @@ -20,7 +20,6 @@ import java.util.Map; import com.vaadin.annotations.Theme; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.util.SharedUtil; import com.vaadin.tests.components.AbstractTestUIWithLog; import com.vaadin.ui.Alignment; @@ -44,6 +43,7 @@ import com.vaadin.v7.data.fieldgroup.PropertyId; import com.vaadin.v7.data.util.BeanItem; import com.vaadin.v7.data.util.BeanItemContainer; import com.vaadin.v7.data.validator.IntegerRangeValidator; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.Field; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java index c747272606..1f348b0cd2 100644 --- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java @@ -24,7 +24,6 @@ import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.Position; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; @@ -45,6 +44,7 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.TextField; import com.vaadin.ui.Upload; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.AbstractSelect; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.ListSelect; diff --git a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java index f09b790bc8..6b760d4a43 100644 --- a/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java +++ b/uitest/src/main/java/com/vaadin/tests/integration/JSR286Portlet.java @@ -27,7 +27,6 @@ import com.vaadin.server.VaadinPortletService; import com.vaadin.server.VaadinPortletSession; import com.vaadin.server.VaadinPortletSession.PortletListener; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.Link; @@ -37,6 +36,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.Upload; import com.vaadin.ui.Upload.Receiver; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.TextField; /** diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java index ba3716eec8..fad186ea0d 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/HiddenHorizontalLayout.java @@ -1,9 +1,9 @@ package com.vaadin.tests.layouts; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java index 72be418a22..7a4e132cf3 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/TestLayoutPerformance.java @@ -1,6 +1,5 @@ package com.vaadin.tests.layouts; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; @@ -12,6 +11,7 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java index ebdb8fdcff..713fb91656 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseAddReplaceMove.java @@ -16,7 +16,6 @@ package com.vaadin.tests.layouts.layouttester; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.Button; @@ -24,6 +23,7 @@ import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java index 6295bbce70..3124806a2e 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutForSpacingMargin.java @@ -16,12 +16,12 @@ package com.vaadin.tests.layouts.layouttester; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractLayout; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; /** diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java index 4c1d9a1b3a..e10c3974f8 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/BaseLayoutTestUI.java @@ -19,7 +19,6 @@ import com.vaadin.server.Resource; import com.vaadin.server.ThemeResource; import com.vaadin.server.UserError; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractLayout; @@ -33,6 +32,7 @@ import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java index a07e97ab1f..6db347ba9a 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridAddReplaceMove.java @@ -16,13 +16,13 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java index ffd4e2abe1..b6e88ea18e 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridBaseLayoutTestUI.java @@ -16,12 +16,12 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.layouts.layouttester.BaseLayoutTestUI; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; diff --git a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java index 8287f443a8..3a56e23978 100644 --- a/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java +++ b/uitest/src/main/java/com/vaadin/tests/layouts/layouttester/GridLayout/GridLayoutMarginSpacing.java @@ -16,11 +16,11 @@ package com.vaadin.tests.layouts.layouttester.GridLayout; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.Table; /** diff --git a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java index 9c7fe6378e..32fd52c633 100644 --- a/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java +++ b/uitest/src/main/java/com/vaadin/tests/minitutorials/v71beta/CSSInjectWithColorpicker.java @@ -7,7 +7,6 @@ import com.vaadin.server.Page.Styles; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; import com.vaadin.shared.ui.colorpicker.Color; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; @@ -17,6 +16,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.ColorPicker; import com.vaadin.v7.ui.ComboBox; import com.vaadin.v7.ui.TextArea; diff --git a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java index 2819eb00fe..6b0d0d0403 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java +++ b/uitest/src/main/java/com/vaadin/tests/push/BasicPush.java @@ -24,8 +24,8 @@ import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Label; -import com.vaadin.v7.data.util.ObjectProperty; @Push public class BasicPush extends AbstractTestUI { @@ -40,10 +40,8 @@ public class BasicPush extends AbstractTestUI { public static final String INCREMENT_BUTTON_ID = "incrementCounter"; - private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0); - - private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0); - + private int clientCounter = 0; + private int serverCounter = 0; private final Timer timer = new Timer(true); private TimerTask task; @@ -56,7 +54,7 @@ public class BasicPush extends AbstractTestUI { /* * Client initiated push. */ - Label lbl = new Label(counter); + Label lbl = new Label("0"); lbl.setCaption("Client counter (click 'increment' to update):"); lbl.setId(CLIENT_COUNTER_ID); addComponent(lbl); @@ -66,7 +64,8 @@ public class BasicPush extends AbstractTestUI { @Override public void buttonClick(ClickEvent event) { - counter.setValue(counter.getValue() + 1); + clientCounter++; + lbl.setValue(String.valueOf(clientCounter)); } }); incrementButton.setId(INCREMENT_BUTTON_ID); @@ -77,36 +76,31 @@ public class BasicPush extends AbstractTestUI { /* * Server initiated push. */ - lbl = new Label(counter2); - lbl.setCaption("Server counter (updates each 3s by server thread) :"); - lbl.setId(SERVER_COUNTER_ID); - addComponent(lbl); - - Button startTimer = new Button("Start timer", - new Button.ClickListener() { - - @Override - public void buttonClick(ClickEvent event) { - counter2.setValue(0); - if (task != null) { - task.cancel(); - } - task = new TimerTask() { - - @Override - public void run() { - access(new Runnable() { - @Override - public void run() { - counter2.setValue( - counter2.getValue() + 1); - } - }); - } - }; - timer.scheduleAtFixedRate(task, 3000, 3000); - } - }); + Label serverCounterLabel = new Label("0"); + serverCounterLabel.setCaption( + "Server counter (updates each 3s by server thread) :"); + serverCounterLabel.setId(SERVER_COUNTER_ID); + addComponent(serverCounterLabel); + + Button startTimer = new Button("Start timer", (ClickListener) event -> { + serverCounter = 0; + serverCounterLabel.setValue(String.valueOf(serverCounter)); + if (task != null) { + task.cancel(); + } + task = new TimerTask() { + + @Override + public void run() { + access(() -> { + serverCounter++; + serverCounterLabel + .setValue(String.valueOf(serverCounter)); + }); + } + }; + timer.scheduleAtFixedRate(task, 3000, 3000); + }); startTimer.setId(START_TIMER_ID); addComponent(startTimer); diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java index ca4f325bce..7916081865 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfiguration.java @@ -25,14 +25,11 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; -import com.vaadin.v7.data.util.ObjectProperty; public class PushConfiguration extends AbstractTestUI { - private ObjectProperty<Integer> counter = new ObjectProperty<Integer>(0); - - private ObjectProperty<Integer> counter2 = new ObjectProperty<Integer>(0); - + private int counter = 0; + private int counter2 = 0; private final Timer timer = new Timer(true); private final TimerTask task = new TimerTask() { @@ -42,11 +39,13 @@ public class PushConfiguration extends AbstractTestUI { access(new Runnable() { @Override public void run() { - counter2.setValue(counter2.getValue() + 1); + counter2++; + serverCounterLabel.setValue("" + counter2); } }); } }; + private Label serverCounterLabel; @Override protected void setup(VaadinRequest request) { @@ -56,32 +55,32 @@ public class PushConfiguration extends AbstractTestUI { /* * Client initiated push. */ - Label lbl = new Label(counter); - lbl.setCaption("Client counter (click 'increment' to update):"); - addComponent(lbl); + Label clientCounterLabel = new Label("0"); + clientCounterLabel + .setCaption("Client counter (click 'increment' to update):"); + addComponent(clientCounterLabel); addComponent(new Button("Increment", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - counter.setValue(counter.getValue() + 1); + clientCounterLabel.setValue("" + counter++); } })); spacer(); - /* - * Server initiated push. - */ - lbl = new Label(counter2); - lbl.setCaption("Server counter (updates each 1s by server thread) :"); - addComponent(lbl); + serverCounterLabel = new Label(String.valueOf(counter2)); + serverCounterLabel.setCaption( + "Server counter (updates each 1s by server thread) :"); + addComponent(serverCounterLabel); addComponent(new Button("Reset", new Button.ClickListener() { @Override public void buttonClick(ClickEvent event) { - counter2.setValue(0); + counter2 = 0; + serverCounterLabel.setValue("0"); } })); } diff --git a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java index 73fec4026c..65c4df06e8 100644 --- a/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java +++ b/uitest/src/main/java/com/vaadin/tests/push/PushConfigurator.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Collections; import com.vaadin.shared.communication.PushMode; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.shared.ui.ui.Transport; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; @@ -36,6 +35,7 @@ import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.NativeSelect; import com.vaadin.v7.ui.TextField; diff --git a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java index ab0e251563..e07abaa9f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java +++ b/uitest/src/main/java/com/vaadin/tests/serialization/SerializerTest.java @@ -1,4 +1,4 @@ -/* +/* * Copyright 2000-2016 Vaadin Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not @@ -258,13 +258,13 @@ public class SerializerTest extends AbstractTestUI { }; rpc.sendEnum(ContentMode.TEXT, - new ContentMode[] { ContentMode.PREFORMATTED, ContentMode.XML }, - Arrays.asList(ContentMode.HTML, ContentMode.RAW)); + new ContentMode[] { ContentMode.PREFORMATTED, + ContentMode.TEXT }, + Arrays.asList(ContentMode.HTML, ContentMode.TEXT)); state.contentMode = ContentMode.TEXT; - state.array = new ContentMode[] { ContentMode.PREFORMATTED, - ContentMode.XML }; - state.list = Arrays.asList(ContentMode.HTML, ContentMode.RAW); + state.array = new ContentMode[] { ContentMode.PREFORMATTED }; + state.list = Arrays.asList(ContentMode.HTML); rpc.sendDate(new Date(1)); rpc.sendDate(new Date(2013 - 1900, 5 - 1, 31, 11, 12, 13)); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java index fec4399d63..7f2d42172e 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/CSSInjectTest.java @@ -7,11 +7,11 @@ import java.util.UUID; import com.vaadin.server.Page; import com.vaadin.server.Page.Styles; import com.vaadin.server.StreamResource; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.TextArea; public class CSSInjectTest extends TestBase { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java index ef394353af..245dcd8b03 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/Labels.java @@ -18,12 +18,12 @@ package com.vaadin.tests.themes.valo; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; import com.vaadin.shared.ui.MarginInfo; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.ValoTheme; +import com.vaadin.shared.ui.label.ContentMode; /** * diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java index 2bcbf1ab7a..70a87faf0c 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/PopupViews.java @@ -17,7 +17,6 @@ package com.vaadin.tests.themes.valo; import com.vaadin.navigator.View; import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -25,6 +24,7 @@ import com.vaadin.ui.PopupView; import com.vaadin.ui.PopupView.Content; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.themes.ValoTheme; +import com.vaadin.shared.ui.label.ContentMode; public class PopupViews extends VerticalLayout implements View { public PopupViews() { diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java index db4e36e49a..f8543d2aa6 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ValoThemeUI.java @@ -34,7 +34,6 @@ import com.vaadin.server.ThemeResource; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.server.WebBrowser; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; @@ -56,6 +55,7 @@ import com.vaadin.v7.data.Property.ValueChangeEvent; import com.vaadin.v7.data.Property.ValueChangeListener; import com.vaadin.v7.data.util.HierarchicalContainer; import com.vaadin.v7.data.util.IndexedContainer; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.NativeSelect; @Theme("tests-valo") diff --git a/uitest/src/main/java/com/vaadin/tests/util/Log.java b/uitest/src/main/java/com/vaadin/tests/util/Log.java index 54e266fa40..b8e6cccd91 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/Log.java +++ b/uitest/src/main/java/com/vaadin/tests/util/Log.java @@ -3,9 +3,9 @@ package com.vaadin.tests.util; import java.util.ArrayList; import java.util.List; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; public class Log extends VerticalLayout { List<Label> eventLabels = new ArrayList<Label>(); diff --git a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java index d2048b528f..fa898d708d 100644 --- a/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java +++ b/uitest/src/main/java/com/vaadin/tests/util/SampleDirectory.java @@ -21,11 +21,11 @@ import java.io.File; import com.vaadin.server.SystemError; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinSession; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Label; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; +import com.vaadin.shared.ui.label.ContentMode; /** * Provides sample directory based on application directory. If this fails then diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java index 2d78375ffe..7465989fb0 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/ClientRpcClassConnector.java @@ -15,10 +15,10 @@ */ package com.vaadin.tests.widgetset.client; -import com.vaadin.client.ui.label.LabelConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.MediaControl; import com.vaadin.tests.widgetset.server.ClientRpcClassComponent; +import com.vaadin.v7.client.ui.label.LabelConnector; @Connect(ClientRpcClassComponent.class) public class ClientRpcClassConnector extends LabelConnector { diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java index 7a165d2dfa..4f2f9c1e97 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/IdTestLabelConnector.java @@ -1,7 +1,7 @@ package com.vaadin.tests.widgetset.client; -import com.vaadin.client.ui.label.LabelConnector; import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.client.ui.label.LabelConnector; /** * Connects server-side <code>IdTestLabel</code> component to client-side diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java index ed0152aebb..4d321a5972 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/LabelState.java @@ -20,7 +20,7 @@ import com.vaadin.shared.AbstractComponentState; /** * State class with the same simple name as - * {@link com.vaadin.shared.ui.label.LabelState} to test #8683 + * {@link com.vaadin.v7.shared.ui.label.LabelState} to test #8683 * * @author Vaadin Ltd * @version @VERSION@ diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java index 745af93b11..d2c5517554 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/client/SerializerTestConnector.java @@ -32,8 +32,8 @@ import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.extensions.AbstractExtensionConnector; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.Connect; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.widgetset.server.SerializerTestExtension; +import com.vaadin.shared.ui.label.ContentMode; import elemental.json.Json; import elemental.json.JsonBoolean; diff --git a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java index 459a36865e..91c65cccaf 100644 --- a/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java +++ b/uitest/src/main/java/com/vaadin/tests/widgetset/server/grid/GridClientColumnRenderers.java @@ -19,7 +19,6 @@ import java.util.Arrays; import com.vaadin.annotations.Widgetset; import com.vaadin.server.VaadinRequest; -import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.tests.widgetset.TestingWidgetSet; import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererConnector.Renderers; import com.vaadin.tests.widgetset.client.grid.GridClientColumnRendererRpc; @@ -32,6 +31,7 @@ import com.vaadin.ui.NativeButton; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; import com.vaadin.v7.ui.AbstractSelect.ItemCaptionMode; +import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.v7.ui.NativeSelect; @Widgetset(TestingWidgetSet.NAME) diff --git a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java index f3e3d3836a..db3bdd7a36 100644 --- a/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java +++ b/uitest/src/test/java/com/vaadin/tests/serialization/SerializerTestTest.java @@ -38,7 +38,7 @@ public class SerializerTestTest extends MultiBrowserTest { Assert.assertEquals("sendDate: January 1, 1970 12:00:00 AM UTC", getLogRow(logRow++)); Assert.assertEquals( - "sendEnum: PREFORMATTED, [HTML, RAW], [PREFORMATTED, XML]", + "sendEnum: PREFORMATTED, [HTML, TEXT], [PREFORMATTED, TEXT]", getLogRow(logRow++)); Assert.assertEquals( "sendWrappedGenerics: {[SimpleTestBean(1)]={1=[SimpleTestBean(42)]}}", |