diff options
408 files changed, 1601 insertions, 1813 deletions
diff --git a/src/com/vaadin/data/Buffered.java b/src/com/vaadin/data/Buffered.java index 9bf3bba317..13844c1101 100644 --- a/src/com/vaadin/data/Buffered.java +++ b/src/com/vaadin/data/Buffered.java @@ -247,8 +247,7 @@ public interface Buffered extends Serializable { for (int i = 0; i < causes.length; i++) { final int causeLevel = (causes[i] instanceof ErrorMessage) ? ((ErrorMessage) causes[i]) - .getErrorLevel() - : ErrorMessage.ERROR; + .getErrorLevel() : ErrorMessage.ERROR; if (causeLevel > level) { level = causeLevel; } diff --git a/src/com/vaadin/data/Validator.java b/src/com/vaadin/data/Validator.java index 21a9da9f97..8c96bcba49 100644 --- a/src/com/vaadin/data/Validator.java +++ b/src/com/vaadin/data/Validator.java @@ -6,6 +6,7 @@ package com.vaadin.data; import java.io.Serializable; +import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.terminal.ErrorMessage; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; diff --git a/src/com/vaadin/data/util/DefaultItemSorter.java b/src/com/vaadin/data/util/DefaultItemSorter.java index a2ecd38ef8..372e94a5f9 100644 --- a/src/com/vaadin/data/util/DefaultItemSorter.java +++ b/src/com/vaadin/data/util/DefaultItemSorter.java @@ -10,9 +10,9 @@ import java.util.Comparator; import java.util.List; import com.vaadin.data.Container; +import com.vaadin.data.Container.Sortable; import com.vaadin.data.Item; import com.vaadin.data.Property; -import com.vaadin.data.Container.Sortable; /** * Provides a default implementation of an ItemSorter. The @@ -115,8 +115,8 @@ public class DefaultItemSorter implements ItemSorter { * The second item to compare. * @return a negative, zero, or positive integer if the property value in * the first item is less than, equal to, or greater than the - * property value in the second item. Negated if {@code - * sortDirection} is false. + * property value in the second item. Negated if + * {@code sortDirection} is false. */ protected int compareProperty(Object propertyId, boolean sortDirection, Item item1, Item item2) { diff --git a/src/com/vaadin/data/util/Filter.java b/src/com/vaadin/data/util/Filter.java index 0fad1a6e1b..433fce5ea9 100644 --- a/src/com/vaadin/data/util/Filter.java +++ b/src/com/vaadin/data/util/Filter.java @@ -59,13 +59,13 @@ public class Filter implements Serializable { @Override public boolean equals(Object obj) { - // Only ones of the objects of the same class can be equal
+ // Only ones of the objects of the same class can be equal if (!(obj instanceof Filter)) { return false; } final Filter o = (Filter) obj; - // Checks the properties one by one
+ // Checks the properties one by one if (propertyId != o.propertyId && o.propertyId != null && !o.propertyId.equals(propertyId)) { return false; diff --git a/src/com/vaadin/data/util/IndexedContainer.java b/src/com/vaadin/data/util/IndexedContainer.java index 2f6bae9851..6d1d3cdad8 100644 --- a/src/com/vaadin/data/util/IndexedContainer.java +++ b/src/com/vaadin/data/util/IndexedContainer.java @@ -1472,22 +1472,17 @@ public class IndexedContainer implements Container.Indexed, // Clone the shallow properties nc.itemIds = itemIds != null ? (ArrayList) itemIds.clone() : null; nc.itemSetChangeListeners = itemSetChangeListeners != null ? (LinkedList) itemSetChangeListeners - .clone() - : null; + .clone() : null; nc.propertyIds = propertyIds != null ? (ArrayList) propertyIds.clone() : null; nc.propertySetChangeListeners = propertySetChangeListeners != null ? (LinkedList) propertySetChangeListeners - .clone() - : null; + .clone() : null; nc.propertyValueChangeListeners = propertyValueChangeListeners != null ? (LinkedList) propertyValueChangeListeners - .clone() - : null; + .clone() : null; nc.readOnlyProperties = readOnlyProperties != null ? (HashSet) readOnlyProperties - .clone() - : null; + .clone() : null; nc.singlePropertyValueChangeListeners = singlePropertyValueChangeListeners != null ? (Hashtable) singlePropertyValueChangeListeners - .clone() - : null; + .clone() : null; nc.types = types != null ? (Hashtable) types.clone() : null; diff --git a/src/com/vaadin/data/util/PropertysetItem.java b/src/com/vaadin/data/util/PropertysetItem.java index 83eb15b6ad..1f1398983c 100644 --- a/src/com/vaadin/data/util/PropertysetItem.java +++ b/src/com/vaadin/data/util/PropertysetItem.java @@ -248,8 +248,7 @@ public class PropertysetItem implements Item, Item.PropertySetChangeNotifier, npsi.list = list != null ? (LinkedList) list.clone() : null; npsi.propertySetChangeListeners = propertySetChangeListeners != null ? (LinkedList) propertySetChangeListeners - .clone() - : null; + .clone() : null; npsi.map = (HashMap) map.clone(); return npsi; diff --git a/src/com/vaadin/data/util/QueryContainer.java b/src/com/vaadin/data/util/QueryContainer.java index 96788947a9..21aef731b0 100644 --- a/src/com/vaadin/data/util/QueryContainer.java +++ b/src/com/vaadin/data/util/QueryContainer.java @@ -134,8 +134,8 @@ public class QueryContainer implements Container, Container.Ordered, final String columnName = metadata.getColumnName(i); list.add(columnName); final Property p = getContainerProperty(new Integer(1), columnName); - propertyTypes.put(columnName, p == null ? Object.class : p - .getType()); + propertyTypes.put(columnName, + p == null ? Object.class : p.getType()); } propertyIds = Collections.unmodifiableCollection(list); } diff --git a/src/com/vaadin/event/MouseEvents.java b/src/com/vaadin/event/MouseEvents.java index 547a56a9ea..0825961a9c 100644 --- a/src/com/vaadin/event/MouseEvents.java +++ b/src/com/vaadin/event/MouseEvents.java @@ -6,6 +6,7 @@ package com.vaadin.event; import java.lang.reflect.Method; +import com.vaadin.event.MouseEvents.ClickListener; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.Component; diff --git a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java index 69aa033262..c35baf059b 100644 --- a/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java +++ b/src/com/vaadin/event/dd/acceptcriteria/ContainsDataFlavor.java @@ -42,8 +42,8 @@ public class ContainsDataFlavor extends ClientSideCriterion { } public boolean accept(DragAndDropEvent dragEvent) { - return dragEvent.getTransferable().getDataFlavors().contains( - dataFlavorId); + return dragEvent.getTransferable().getDataFlavors() + .contains(dataFlavorId); } @Override diff --git a/src/com/vaadin/launcher/util/BrowserLauncher.java b/src/com/vaadin/launcher/util/BrowserLauncher.java index f30a717cf6..9b7448c9ca 100644 --- a/src/com/vaadin/launcher/util/BrowserLauncher.java +++ b/src/com/vaadin/launcher/util/BrowserLauncher.java @@ -37,8 +37,8 @@ public class BrowserLauncher { try {
// Find out the location of the x-www-browser link from path.
Process process = runtime.exec("which x-www-browser");
- BufferedInputStream ins = new BufferedInputStream(process
- .getInputStream());
+ BufferedInputStream ins = new BufferedInputStream(
+ process.getInputStream());
BufferedReader bufreader = new BufferedReader(
new InputStreamReader(ins));
String defaultLinkPath = bufreader.readLine();
diff --git a/src/com/vaadin/terminal/ClassResource.java b/src/com/vaadin/terminal/ClassResource.java index 6d604aeea2..740660933c 100644 --- a/src/com/vaadin/terminal/ClassResource.java +++ b/src/com/vaadin/terminal/ClassResource.java @@ -130,9 +130,9 @@ public class ClassResource implements ApplicationResource, Serializable { * @see com.vaadin.terminal.ApplicationResource#getStream() */ public DownloadStream getStream() { - final DownloadStream ds = new DownloadStream(associatedClass - .getResourceAsStream(resourceName), getMIMEType(), - getFilename()); + final DownloadStream ds = new DownloadStream( + associatedClass.getResourceAsStream(resourceName), + getMIMEType(), getFilename()); ds.setBufferSize(getBufferSize()); ds.setCacheTime(cacheTime); return ds; diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 7bf0a4c5ea..1ddbd9bdd0 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -36,8 +36,8 @@ import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.ui.Field; import com.vaadin.terminal.gwt.client.ui.VContextMenu; import com.vaadin.terminal.gwt.client.ui.VNotification; -import com.vaadin.terminal.gwt.client.ui.VView; import com.vaadin.terminal.gwt.client.ui.VNotification.HideEvent; +import com.vaadin.terminal.gwt.client.ui.VView; import com.vaadin.terminal.gwt.client.ui.dd.VDragAndDropManager; import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; @@ -481,16 +481,14 @@ public class ApplicationConnection { handleWhenCSSLoaded(response); } }).schedule(50); - console - .log("Assuming CSS loading is not complete, " - + "postponing render phase. " - + "(.v-loading-indicator height == 0)"); + console.log("Assuming CSS loading is not complete, " + + "postponing render phase. " + + "(.v-loading-indicator height == 0)"); cssWaits++; } else { handleReceivedJSONMessage(response); if (cssWaits >= MAX_CSS_WAITS) { - console - .error("CSS files may have not loaded properly."); + console.error("CSS files may have not loaded properly."); } } } @@ -522,8 +520,8 @@ public class ApplicationConnection { private void showCommunicationError(String details) { console.error("Communication error: " + details); showError(details, configuration.getCommunicationErrorCaption(), - configuration.getCommunicationErrorMessage(), configuration - .getCommunicationErrorUrl()); + configuration.getCommunicationErrorMessage(), + configuration.getCommunicationErrorUrl()); } /** @@ -535,8 +533,8 @@ public class ApplicationConnection { private void showAuthenticationError(String details) { console.error("Authentication error: " + details); showError(details, configuration.getAuthorizationErrorCaption(), - configuration.getAuthorizationErrorMessage(), configuration - .getAuthorizationErrorUrl()); + configuration.getAuthorizationErrorMessage(), + configuration.getAuthorizationErrorUrl()); } /** @@ -925,8 +923,8 @@ public class ApplicationConnection { .get(getPid(paintable)); Widget widget = (Widget) paintable; Size oldSize = detail.getOffsetSize(); - Size newSize = new Size(widget.getOffsetWidth(), widget - .getOffsetHeight()); + Size newSize = new Size(widget.getOffsetWidth(), + widget.getOffsetHeight()); if (oldSize == null || !oldSize.equals(newSize)) { sizeUpdatedWidgets.add(paintable); @@ -1864,8 +1862,8 @@ public class ApplicationConnection { // Parent-less components (like sub-windows) are relative to browser // window. if (parent == null) { - renderSpace = new RenderSpace(Window.getClientWidth(), Window - .getClientHeight()); + renderSpace = new RenderSpace(Window.getClientWidth(), + Window.getClientHeight()); } else { renderSpace = parent.getAllocatedSpace(widget); } @@ -1902,22 +1900,20 @@ public class ApplicationConnection { if (debugSizes) { getConsole() - .log( - "Widget " - + Util.getSimpleName(widget) - + "/" - + getPid(widget.getElement()) - + " relative height " - + relativeSize.getHeight() - + "% of " - + renderSpace.getHeight() - + "px (reported by " - - + Util.getSimpleName(parent) - + "/" - + (parent == null ? "?" : parent - .hashCode()) + ") : " - + height + "px"); + .log("Widget " + + Util.getSimpleName(widget) + + "/" + + getPid(widget.getElement()) + + " relative height " + + relativeSize.getHeight() + + "% of " + + renderSpace.getHeight() + + "px (reported by " + + + Util.getSimpleName(parent) + + "/" + + (parent == null ? "?" : parent.hashCode()) + + ") : " + height + "px"); } widget.setHeight(height + "px"); } else { @@ -2085,9 +2081,8 @@ public class ApplicationConnection { if (uidlUri.startsWith("theme://")) { final String themeUri = configuration.getThemeUri(); if (themeUri == null) { - console - .error("Theme not set: ThemeResource will not be found. (" - + uidlUri + ")"); + console.error("Theme not set: ThemeResource will not be found. (" + + uidlUri + ")"); } uidlUri = themeUri + uidlUri.substring(7); } diff --git a/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java index 955deb4d8f..0f97e47d13 100644 --- a/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ClientExceptionHandler.java @@ -16,8 +16,8 @@ public class ClientExceptionHandler { if (console != null) { console.error(msg); - // } else {
- // System.err.println(msg);
+ // } else { + // System.err.println(msg); } } diff --git a/src/com/vaadin/terminal/gwt/client/ComponentLocator.java b/src/com/vaadin/terminal/gwt/client/ComponentLocator.java index e25dabbbe4..0c11064707 100644 --- a/src/com/vaadin/terminal/gwt/client/ComponentLocator.java +++ b/src/com/vaadin/terminal/gwt/client/ComponentLocator.java @@ -59,12 +59,12 @@ public class ComponentLocator { * The {@link #getElementByPath(String)} method can be used for the inverse * operation, i.e. locating an element based on the return value from this * method. - *<p> + * <p> * Note that getElementByPath(getPathForElement(element)) == element is not * always true as {@link #getPathForElement(Element)} can return a path to * another element if the widget determines an action on the other element * will give the same result as the action on the target element. - *</p> + * </p> * * @since 5.4 * @param targetElement @@ -153,8 +153,8 @@ public class ComponentLocator { * * @param targetElement * @param ancestorWidget - * @return The widget whose root element is a parent of {@code - * targetElement}. + * @return The widget whose root element is a parent of + * {@code targetElement}. */ private Widget findParentWidget(Element targetElement, Widget ancestorWidget) { /* diff --git a/src/com/vaadin/terminal/gwt/client/DateTimeService.java b/src/com/vaadin/terminal/gwt/client/DateTimeService.java index e7b93475bc..f572411a83 100644 --- a/src/com/vaadin/terminal/gwt/client/DateTimeService.java +++ b/src/com/vaadin/terminal/gwt/client/DateTimeService.java @@ -129,8 +129,8 @@ public class DateTimeService { }
public int getStartWeekDay(Date date) {
- final Date dateForFirstOfThisMonth = new Date(date.getYear(), date
- .getMonth(), 1);
+ final Date dateForFirstOfThisMonth = new Date(date.getYear(),
+ date.getMonth(), 1);
int firstDay;
try {
firstDay = LocaleService.getFirstDayOfWeek(currentLocale);
@@ -153,7 +153,7 @@ public class DateTimeService { if (date == null) {
return 0;
}
-
+
return (int) (date.getTime() - date.getTime() / 1000 * 1000);
}
diff --git a/src/com/vaadin/terminal/gwt/client/RenderInformation.java b/src/com/vaadin/terminal/gwt/client/RenderInformation.java index f9195c8bf8..a1dd1f32ad 100644 --- a/src/com/vaadin/terminal/gwt/client/RenderInformation.java +++ b/src/com/vaadin/terminal/gwt/client/RenderInformation.java @@ -41,8 +41,8 @@ public class RenderInformation { * @return true if the size has changed since last update */ public boolean updateSize(Element element) { - Size newSize = new Size(element.getOffsetWidth(), element - .getOffsetHeight()); + Size newSize = new Size(element.getOffsetWidth(), + element.getOffsetHeight()); if (newSize.equals(renderedSize)) { return false; } else { diff --git a/src/com/vaadin/terminal/gwt/client/Util.java b/src/com/vaadin/terminal/gwt/client/Util.java index 13cb3b0955..19ba535bef 100644 --- a/src/com/vaadin/terminal/gwt/client/Util.java +++ b/src/com/vaadin/terminal/gwt/client/Util.java @@ -406,8 +406,8 @@ public class Util { setHeight(widget, ""); return paddingBorderGuess; } else if (height.endsWith("px")) { - int pixelHeight = Integer.parseInt(height.substring(0, height - .length() - 2)); + int pixelHeight = Integer.parseInt(height.substring(0, + height.length() - 2)); return setHeightExcludingPaddingAndBorder(widget.getElement(), pixelHeight, paddingBorderGuess, false); } else { diff --git a/src/com/vaadin/terminal/gwt/client/VCaption.java b/src/com/vaadin/terminal/gwt/client/VCaption.java index af0cdecfea..25c1d34ea4 100644 --- a/src/com/vaadin/terminal/gwt/client/VCaption.java +++ b/src/com/vaadin/terminal/gwt/client/VCaption.java @@ -277,8 +277,7 @@ public class VCaption extends HTML { } else { ApplicationConnection .getConsole() - .log( - "Warning: Icon load event was not propagated because VCaption owner is unknown."); + .log("Warning: Icon load event was not propagated because VCaption owner is unknown."); } } } diff --git a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java index 427cd097b1..4ded0f69a2 100755 --- a/src/com/vaadin/terminal/gwt/client/VDebugConsole.java +++ b/src/com/vaadin/terminal/gwt/client/VDebugConsole.java @@ -289,8 +289,8 @@ public final class VDebugConsole extends VOverlay implements Console { private void minimize() { setPixelSize(400, 150); - setPopupPosition(Window.getClientWidth() - 410, Window - .getClientHeight() - 160); + setPopupPosition(Window.getClientWidth() - 410, + Window.getClientHeight() - 160); } @Override @@ -500,8 +500,8 @@ public final class VDebugConsole extends VOverlay implements Console { public void onClick(ClickEvent event) { if (paintable != null) { Element element2 = ((Widget) paintable).getElement(); - Widget.setStyleName(element2, "invalidlayout", emphasisInUi - .getValue()); + Widget.setStyleName(element2, "invalidlayout", + emphasisInUi.getValue()); } } }); diff --git a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java b/src/com/vaadin/terminal/gwt/client/VErrorMessage.java index ba5d5a9d24..d7ab581092 100644 --- a/src/com/vaadin/terminal/gwt/client/VErrorMessage.java +++ b/src/com/vaadin/terminal/gwt/client/VErrorMessage.java @@ -58,9 +58,11 @@ public class VErrorMessage extends FlowPanel { errorContainer = new VOverlay(); errorContainer.setWidget(this); } - errorContainer.setPopupPosition(DOM.getAbsoluteLeft(indicatorElement) - + 2 - * DOM.getElementPropertyInt(indicatorElement, "offsetHeight"), + errorContainer.setPopupPosition( + DOM.getAbsoluteLeft(indicatorElement) + + 2 + * DOM.getElementPropertyInt(indicatorElement, + "offsetHeight"), DOM.getAbsoluteTop(indicatorElement) + 2 * DOM.getElementPropertyInt(indicatorElement, diff --git a/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java b/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java index 1c6c11ec95..cbc3467d09 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java @@ -40,12 +40,12 @@ public abstract class ClickEventHandler implements DoubleClickHandler, public void handleEventHandlerRegistration(ApplicationConnection client) { this.client = client; - // Handle registering/unregistering of click handler depending on if
- // server side listeners have been added or removed.
+ // Handle registering/unregistering of click handler depending on if + // server side listeners have been added or removed. if (hasEventListener()) { if (mouseUpHandlerRegistration == null) { - mouseUpHandlerRegistration = registerHandler(this, MouseUpEvent - .getType()); + mouseUpHandlerRegistration = registerHandler(this, + MouseUpEvent.getType()); contextMenuHandlerRegistration = registerHandler(this, ContextMenuEvent.getType()); doubleClickHandlerRegistration = registerHandler(this, @@ -53,7 +53,7 @@ public abstract class ClickEventHandler implements DoubleClickHandler, } } else { if (mouseUpHandlerRegistration != null) { - // Remove existing handlers
+ // Remove existing handlers doubleClickHandlerRegistration.removeHandler(); mouseUpHandlerRegistration.removeHandler(); contextMenuHandlerRegistration.removeHandler(); @@ -94,19 +94,19 @@ public abstract class ClickEventHandler implements DoubleClickHandler, public void onContextMenu(ContextMenuEvent event) { if (hasEventListener()) { - // Prevent showing the browser's context menu when there is a right
- // click listener.
+ // Prevent showing the browser's context menu when there is a right + // click listener. event.preventDefault(); } } public void onMouseUp(MouseUpEvent event) { - // TODO For perfect accuracy we should check that a mousedown has
- // occured on this element before this mouseup and that no mouseup
- // has occured anywhere after that.
+ // TODO For perfect accuracy we should check that a mousedown has + // occured on this element before this mouseup and that no mouseup + // has occured anywhere after that. if (hasEventListener()) { - // "Click" with left, right or middle button
+ // "Click" with left, right or middle button fireClick(event.getNativeEvent()); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java index 5d10044d64..d20f617bc1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/MenuBar.java @@ -411,12 +411,12 @@ public class MenuBar extends Widget implements PopupListener { popup.addPopupListener(this); if (vertical) { - popup.setPopupPosition(item.getAbsoluteLeft() - + item.getOffsetWidth(), item.getAbsoluteTop()); + popup.setPopupPosition( + item.getAbsoluteLeft() + item.getOffsetWidth(), + item.getAbsoluteTop()); } else { - popup.setPopupPosition(item.getAbsoluteLeft(), item - .getAbsoluteTop() - + item.getOffsetHeight()); + popup.setPopupPosition(item.getAbsoluteLeft(), + item.getAbsoluteTop() + item.getOffsetHeight()); } shownChildMenu = item.getSubMenu(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java index 8caf64ea79..0817d3d6e0 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java +++ b/src/com/vaadin/terminal/gwt/client/ui/ShortcutActionHandler.java @@ -103,8 +103,8 @@ public class ShortcutActionHandler { modifiers = action.getIntArrayAttribute("mk"); } - final ShortcutKeyCombination kc = new ShortcutKeyCombination(action - .getIntAttribute("kc"), modifiers); + final ShortcutKeyCombination kc = new ShortcutKeyCombination( + action.getIntAttribute("kc"), modifiers); final String key = action.getStringAttribute("key"); final String caption = action.getStringAttribute("caption"); actions.add(new ShortcutAction(key, kc, caption)); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java index cd227b2e03..0b5356a17e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAbsoluteLayout.java @@ -7,8 +7,8 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Map; -import java.util.Set; import java.util.Map.Entry; +import java.util.Set; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Document; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java index f12d089ab2..d6fa5f5551 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java @@ -238,9 +238,7 @@ public class VAccordion extends VTabsheetBase implements if (index != activeTabIndex && !disabled && !readonly && !disabledTabKeys.contains(tabKeys.get(index))) { addStyleDependentName("loading"); - client - .updateVariable(id, "selected", "" + tabKeys.get(index), - true); + client.updateVariable(id, "selected", "" + tabKeys.get(index), true); } } @@ -367,9 +365,7 @@ public class VAccordion extends VTabsheetBase implements } else { super.setHeight((height + getCaptionHeight()) + "px"); DOM.setStyleAttribute(content, "height", height + "px"); - DOM - .setStyleAttribute(content, "top", getCaptionHeight() - + "px"); + DOM.setStyleAttribute(content, "top", getCaptionHeight() + "px"); } } @@ -408,8 +404,8 @@ public class VAccordion extends VTabsheetBase implements } int captionWidth = caption.getRequiredWidth(); - int padding = Util.measureHorizontalPaddingAndBorder(caption - .getElement(), 18); + int padding = Util.measureHorizontalPaddingAndBorder( + caption.getElement(), 18); return captionWidth + padding; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java index f971a17043..500a6ea869 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCalendarPanel.java @@ -1511,9 +1511,9 @@ public class VCalendarPanel extends FocusableFlexTable implements }
value.setHours(h);
if (timeChangeListener != null) {
- timeChangeListener.changed(h, value.getMinutes(), value
- .getSeconds(), DateTimeService
- .getMilliseconds(value));
+ timeChangeListener.changed(h, value.getMinutes(),
+ value.getSeconds(),
+ DateTimeService.getMilliseconds(value));
}
event.preventDefault();
event.stopPropagation();
@@ -1521,9 +1521,9 @@ public class VCalendarPanel extends FocusableFlexTable implements final int m = mins.getSelectedIndex();
value.setMinutes(m);
if (timeChangeListener != null) {
- timeChangeListener.changed(value.getHours(), m, value
- .getSeconds(), DateTimeService
- .getMilliseconds(value));
+ timeChangeListener.changed(value.getHours(), m,
+ value.getSeconds(),
+ DateTimeService.getMilliseconds(value));
}
event.preventDefault();
event.stopPropagation();
@@ -1531,9 +1531,9 @@ public class VCalendarPanel extends FocusableFlexTable implements final int s = sec.getSelectedIndex();
value.setSeconds(s);
if (timeChangeListener != null) {
- timeChangeListener.changed(value.getHours(), value
- .getMinutes(), s, DateTimeService
- .getMilliseconds(value));
+ timeChangeListener.changed(value.getHours(),
+ value.getMinutes(), s,
+ DateTimeService.getMilliseconds(value));
}
event.preventDefault();
event.stopPropagation();
@@ -1541,8 +1541,8 @@ public class VCalendarPanel extends FocusableFlexTable implements final int ms = msec.getSelectedIndex();
DateTimeService.setMilliseconds(value, ms);
if (timeChangeListener != null) {
- timeChangeListener.changed(value.getHours(), value
- .getMinutes(), value.getSeconds(), ms);
+ timeChangeListener.changed(value.getHours(),
+ value.getMinutes(), value.getSeconds(), ms);
}
event.preventDefault();
event.stopPropagation();
@@ -1551,9 +1551,9 @@ public class VCalendarPanel extends FocusableFlexTable implements + (ampm.getSelectedIndex() * 12);
value.setHours(h);
if (timeChangeListener != null) {
- timeChangeListener.changed(h, value.getMinutes(), value
- .getSeconds(), DateTimeService
- .getMilliseconds(value));
+ timeChangeListener.changed(h, value.getMinutes(),
+ value.getSeconds(),
+ DateTimeService.getMilliseconds(value));
}
event.preventDefault();
event.stopPropagation();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java index 5307234869..d5d8d3627d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java @@ -99,8 +99,8 @@ public class VCssLayout extends SimplePanel implements Paintable, Container { } clickEventHandler.handleEventHandlerRegistration(client); - final VMarginInfo margins = new VMarginInfo(uidl - .getIntAttribute("margins")); + final VMarginInfo margins = new VMarginInfo( + uidl.getIntAttribute("margins")); setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_TOP, margins.hasTop()); setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_RIGHT, @@ -110,8 +110,8 @@ public class VCssLayout extends SimplePanel implements Paintable, Container { setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_LEFT, margins.hasLeft()); - setStyleName(margin, CLASSNAME + "-" + "spacing", uidl - .hasAttribute("spacing")); + setStyleName(margin, CLASSNAME + "-" + "spacing", + uidl.hasAttribute("spacing")); panel.updateFromUIDL(uidl, client); rendering = false; } @@ -184,8 +184,8 @@ public class VCssLayout extends SimplePanel implements Paintable, Container { continue; } else { style.setProperty( - makeCamelCase(rule[0].trim()), rule[1] - .trim()); + makeCamelCase(rule[0].trim()), + rule[1].trim()); } } } catch (Exception e) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java index 7cfe627492..e67c9e6a44 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCustomLayout.java @@ -21,12 +21,12 @@ import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Container; import com.vaadin.terminal.gwt.client.ContainerResizedListener; import com.vaadin.terminal.gwt.client.Paintable; +import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; import com.vaadin.terminal.gwt.client.RenderSpace; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VCaption; import com.vaadin.terminal.gwt.client.VCaptionWrapper; -import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; /** * Custom Layout implements complex layout defined with HTML template. @@ -530,9 +530,9 @@ public class VCustomLayout extends ComplexPanel implements Paintable, .getParentElement(); FloatSize extra = locationToExtraSize.get(getLocation(child)); - return new RenderSpace(pe.getOffsetWidth() - (int) extra.getWidth(), pe - .getOffsetHeight() - - (int) extra.getHeight(), Util.mayHaveScrollBars(pe)); + return new RenderSpace(pe.getOffsetWidth() - (int) extra.getWidth(), + pe.getOffsetHeight() - (int) extra.getHeight(), + Util.mayHaveScrollBars(pe)); } @Override @@ -604,8 +604,8 @@ public class VCustomLayout extends ComplexPanel implements Paintable, || (relativeHeight && (relativeSize.getHeight() >= 0.0f))) { relativeSizeWidgets.add(widget); - widget.getElement().getStyle().setProperty("position", - "absolute"); + widget.getElement().getStyle() + .setProperty("position", "absolute"); } } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java b/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java index ce7cba03e8..ffbe25e9a7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VDragAndDropWrapper.java @@ -20,9 +20,9 @@ import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.RenderInformation; +import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; -import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.ui.dd.DDUtil; import com.vaadin.terminal.gwt.client.ui.dd.HorizontalDropLocation; import com.vaadin.terminal.gwt.client.ui.dd.VAbstractDropHandler; @@ -33,9 +33,9 @@ import com.vaadin.terminal.gwt.client.ui.dd.VDropHandler; import com.vaadin.terminal.gwt.client.ui.dd.VHasDropHandler; import com.vaadin.terminal.gwt.client.ui.dd.VHtml5DragEvent; import com.vaadin.terminal.gwt.client.ui.dd.VHtml5File; +import com.vaadin.terminal.gwt.client.ui.dd.VHtml5File.Callback; import com.vaadin.terminal.gwt.client.ui.dd.VTransferable; import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; -import com.vaadin.terminal.gwt.client.ui.dd.VHtml5File.Callback; /** * @@ -77,8 +77,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements if (dragStarMode == WRAPPER) { startDrag.createDragImage(getElement(), true); } else { - startDrag.createDragImage(((Widget) paintable) - .getElement(), true); + startDrag.createDragImage( + ((Widget) paintable).getElement(), true); } event.preventDefault(); // prevent text selection diff --git a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java index 49b3123bbf..0735f0049f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VEmbedded.java @@ -121,8 +121,8 @@ public class VEmbedded extends HTML implements Paintable { + uidl.getId() + "\"></iframe>"); browserElement = DOM.getFirstChild(getElement()); } else { - DOM.setElementAttribute(browserElement, "src", getSrc(uidl, - client)); + DOM.setElementAttribute(browserElement, "src", + getSrc(uidl, client)); } clearBrowserElement = false; } else { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VForm.java b/src/com/vaadin/terminal/gwt/client/ui/VForm.java index 090063f007..9872dd0c1b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VForm.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VForm.java @@ -180,8 +180,8 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler { if (childUidl != null) {
if (shortcutHandler == null) {
shortcutHandler = new ShortcutActionHandler(id, client);
- keyDownRegistration = addDomHandler(this, KeyDownEvent
- .getType());
+ keyDownRegistration = addDomHandler(this,
+ KeyDownEvent.getType());
}
shortcutHandler.updateActionMap(childUidl);
}
@@ -199,14 +199,12 @@ public class VForm extends ComplexPanel implements Container, KeyDownHandler { renderInformation.updateSize(getElement());
renderInformation.setContentAreaHeight(renderInformation
- .getRenderedSize().getHeight()
- - getSpaceConsumedVertically());
+ .getRenderedSize().getHeight() - getSpaceConsumedVertically());
if (BrowserInfo.get().isIE6()) {
getElement().getStyle().setProperty("overflow", "hidden");
}
renderInformation.setContentAreaWidth(renderInformation
- .getRenderedSize().getWidth()
- - borderPaddingHorizontal);
+ .getRenderedSize().getWidth() - borderPaddingHorizontal);
}
public RenderSpace getAllocatedSpace(Widget child) {
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java index 43a09a7dee..798fb01edf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java @@ -89,8 +89,8 @@ public class VFormLayout extends SimplePanel implements Container { } public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { - final VMarginInfo margins = new VMarginInfo(uidl - .getIntAttribute("margins")); + final VMarginInfo margins = new VMarginInfo( + uidl.getIntAttribute("margins")); Element margin = getElement(); setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_TOP, @@ -98,13 +98,13 @@ public class VFormLayout extends SimplePanel implements Container { setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_RIGHT, margins.hasRight()); setStyleName(margin, - CLASSNAME + "-" + StyleConstants.MARGIN_BOTTOM, margins - .hasBottom()); + CLASSNAME + "-" + StyleConstants.MARGIN_BOTTOM, + margins.hasBottom()); setStyleName(margin, CLASSNAME + "-" + StyleConstants.MARGIN_LEFT, margins.hasLeft()); - setStyleName(margin, CLASSNAME + "-" + "spacing", uidl - .hasAttribute("spacing")); + setStyleName(margin, CLASSNAME + "-" + "spacing", + uidl.hasAttribute("spacing")); int i = 0; for (final Iterator it = uidl.getChildIterator(); it.hasNext(); i++) { @@ -336,8 +336,8 @@ public class VFormLayout extends SimplePanel implements Container { public void updateCaption(UIDL uidl) { setVisible(!uidl.getBooleanAttribute("invisible")); - setStyleName(getElement(), "v-disabled", uidl - .hasAttribute("disabled")); + setStyleName(getElement(), "v-disabled", + uidl.hasAttribute("disabled")); boolean isEmpty = true; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java index 17233728e5..9927e000e6 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java @@ -285,8 +285,8 @@ public class VGridLayout extends SimplePanel implements Paintable, Container { Cell c = column[j]; if (c != null && c.cc != null && c.widthCanAffectHeight()) { - c.cc.setContainerSize(c.getAvailableWidth(), c - .getAvailableHeight()); + c.cc.setContainerSize(c.getAvailableWidth(), + c.getAvailableHeight()); client.handleComponentRelativeSize(c.cc .getWidget()); c.cc.updateWidgetSize(); @@ -621,8 +621,8 @@ public class VGridLayout extends SimplePanel implements Paintable, Container { } private void handleMargins(UIDL uidl) { - final VMarginInfo margins = new VMarginInfo(uidl - .getIntAttribute("margins")); + final VMarginInfo margins = new VMarginInfo( + uidl.getIntAttribute("margins")); String styles = CLASSNAME + "-margin"; if (margins.hasTop()) { @@ -657,8 +657,8 @@ public class VGridLayout extends SimplePanel implements Paintable, Container { componentContainer.setWidget(newComponent); widgetToComponentContainer.put(newComponent, componentContainer); - paintableToCell.put((Paintable) newComponent, paintableToCell - .get(oldComponent)); + paintableToCell.put((Paintable) newComponent, + paintableToCell.get(oldComponent)); } public void updateCaption(Paintable component, UIDL uidl) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java index 480685345f..a6fc0107c3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VListSelect.java @@ -48,8 +48,8 @@ public class VListSelect extends VOptionGroupBase { } for (final Iterator i = uidl.getChildIterator(); i.hasNext();) { final UIDL optionUidl = (UIDL) i.next(); - select.addItem(optionUidl.getStringAttribute("caption"), optionUidl - .getStringAttribute("key")); + select.addItem(optionUidl.getStringAttribute("caption"), + optionUidl.getStringAttribute("key")); if (optionUidl.hasAttribute("selected")) { select.setItemSelected(select.getItemCount() - 1, true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index ab32d93f17..6899a2ca9f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -226,12 +226,10 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, itemHTML.append("<span class=\"" + CLASSNAME + "-menuitem-caption\">"); if (item.hasAttribute("icon")) { - itemHTML - .append("<img src=\"" - + client.translateVaadinUri(item - .getStringAttribute("icon")) - + "\" class=\"" + Icon.CLASSNAME - + "\" alt=\"\" />"); + itemHTML.append("<img src=\"" + + client.translateVaadinUri(item + .getStringAttribute("icon")) + + "\" class=\"" + Icon.CLASSNAME + "\" alt=\"\" />"); } itemHTML.append(Util.escapeHTML(itemText) + "</span>"); @@ -381,8 +379,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, if (items.contains(item)) { int index = items.indexOf(item); - DOM.removeChild(getContainerElement(), DOM.getChild( - getContainerElement(), index)); + DOM.removeChild(getContainerElement(), + DOM.getChild(getContainerElement(), index)); items.remove(index); } } @@ -551,8 +549,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, popup.show(); if (left + popup.getOffsetWidth() >= RootPanel.getBodyElement() - .getOffsetWidth() - - shadowSpace) { + .getOffsetWidth() - shadowSpace) { if (subMenu) { left = item.getParentMenu().getAbsoluteLeft() - popup.getOffsetWidth() - shadowSpace; @@ -580,8 +577,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } if (popup.getElement().getStyle().getProperty("width") == null - || popup.getElement().getStyle().getProperty( - "width") == "") { + || popup.getElement().getStyle() + .getProperty("width") == "") { popup.setWidth(popup.getOffsetWidth() + "px"); } popup.getElement().getStyle().setProperty("zoom", "1"); @@ -920,9 +917,9 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, * .gwt.event.dom.client.KeyPressEvent) */ public void onKeyPress(KeyPressEvent event) { - if (handleNavigation(event.getNativeEvent().getKeyCode(), event - .isControlKeyDown() - || event.isMetaKeyDown(), event.isShiftKeyDown())) { + if (handleNavigation(event.getNativeEvent().getKeyCode(), + event.isControlKeyDown() || event.isMetaKeyDown(), + event.isShiftKeyDown())) { event.preventDefault(); } } @@ -935,9 +932,9 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, * .event.dom.client.KeyDownEvent) */ public void onKeyDown(KeyDownEvent event) { - if (handleNavigation(event.getNativeEvent().getKeyCode(), event - .isControlKeyDown() - || event.isMetaKeyDown(), event.isShiftKeyDown())) { + if (handleNavigation(event.getNativeEvent().getKeyCode(), + event.isControlKeyDown() || event.isMetaKeyDown(), + event.isShiftKeyDown())) { event.preventDefault(); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java index 8c00e9c1a7..a1c4e0ba01 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VNativeSelect.java @@ -40,8 +40,8 @@ public class VNativeSelect extends VOptionGroupBase implements Field { boolean selected = false; for (final Iterator i = uidl.getChildIterator(); i.hasNext();) { final UIDL optionUidl = (UIDL) i.next(); - select.addItem(optionUidl.getStringAttribute("caption"), optionUidl - .getStringAttribute("key")); + select.addItem(optionUidl.getStringAttribute("caption"), + optionUidl.getStringAttribute("key")); if (optionUidl.hasAttribute("selected")) { select.setItemSelected(select.getItemCount() - 1, true); selected = true; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java index 115c415289..1f3789239d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOptionGroupBase.java @@ -197,9 +197,7 @@ abstract class VOptionGroupBase extends Composite implements Paintable, Field, public void onChange(ChangeEvent event) {
if (multiselect) {
- client
- .updateVariable(id, "selected", getSelectedItems(),
- immediate);
+ client.updateVariable(id, "selected", getSelectedItems(), immediate);
} else {
client.updateVariable(id, "selected", new String[] { ""
+ getSelectedItem() }, immediate);
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java index 9df038f93c..2ceeb3366b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOrderedLayout.java @@ -16,12 +16,12 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Paintable; +import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; +import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.RenderSpace; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ValueMap; -import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; -import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.ui.layout.CellBasedLayout; import com.vaadin.terminal.gwt.client.ui.layout.ChildComponentContainer; @@ -33,7 +33,7 @@ public class VOrderedLayout extends CellBasedLayout { private int orientation; - // Can be removed once OrderedLayout is removed
+ // Can be removed once OrderedLayout is removed private boolean allowOrientationUpdate = false; /** @@ -91,7 +91,7 @@ public class VOrderedLayout extends CellBasedLayout { isRendering = true; super.updateFromUIDL(uidl, client); - // Only non-cached, visible UIDL:s can introduce changes
+ // Only non-cached, visible UIDL:s can introduce changes if (uidl.getBooleanAttribute("cached") || uidl.getBooleanAttribute("invisible")) { isRendering = false; @@ -104,10 +104,10 @@ public class VOrderedLayout extends CellBasedLayout { handleOrientationUpdate(uidl); } - // IStopWatch w = new IStopWatch("OrderedLayout.updateFromUIDL");
+ // IStopWatch w = new IStopWatch("OrderedLayout.updateFromUIDL"); - ArrayList<Widget> uidlWidgets = new ArrayList<Widget>(uidl - .getChildCount()); + ArrayList<Widget> uidlWidgets = new ArrayList<Widget>( + uidl.getChildCount()); ArrayList<ChildComponentContainer> relativeSizeComponents = new ArrayList<ChildComponentContainer>(); ArrayList<UIDL> relativeSizeComponentUIDL = new ArrayList<UIDL>(); @@ -117,11 +117,11 @@ public class VOrderedLayout extends CellBasedLayout { final Paintable child = client.getPaintable(childUIDL); Widget widget = (Widget) child; - // Create container for component
+ // Create container for component ChildComponentContainer childComponentContainer = getComponentContainer(widget); if (childComponentContainer == null) { - // This is a new component
+ // This is a new component childComponentContainer = createChildContainer(widget); } @@ -148,8 +148,8 @@ public class VOrderedLayout extends CellBasedLayout { activeLayoutSize.getWidth()); } if (sizeHasChangedDuringRendering && Util.isCached(childUIDL)) { - // notify cached relative sized component about size
- // chance
+ // notify cached relative sized component about size + // chance client.handleComponentRelativeSize(childComponentContainer .getWidget()); } @@ -159,9 +159,9 @@ public class VOrderedLayout extends CellBasedLayout { } - // w.mark("Rendering of "
- // + (uidlWidgets.size() - relativeSizeComponents.size())
- // + " absolute size components done");
+ // w.mark("Rendering of " + // + (uidlWidgets.size() - relativeSizeComponents.size()) + // + " absolute size components done"); /* * Remove any children after pos. These are the ones that previously @@ -169,20 +169,20 @@ public class VOrderedLayout extends CellBasedLayout { */ removeChildrenAfter(pos); - // w.mark("Old children removed");
+ // w.mark("Old children removed"); /* Fetch alignments and expand ratio from UIDL */ updateAlignmentsAndExpandRatios(uidl, uidlWidgets); - // w.mark("Alignments and expand ratios updated");
+ // w.mark("Alignments and expand ratios updated"); /* Fetch widget sizes from rendered components */ updateWidgetSizes(); - // w.mark("Widget sizes updated");
+ // w.mark("Widget sizes updated"); recalculateLayout(); - // w.mark("Layout size calculated (" + activeLayoutSize +
- // ") offsetSize: "
- // + getOffsetWidth() + "," + getOffsetHeight());
+ // w.mark("Layout size calculated (" + activeLayoutSize + + // ") offsetSize: " + // + getOffsetWidth() + "," + getOffsetHeight()); /* Render relative size components */ for (int i = 0; i < relativeSizeComponents.size(); i++) { @@ -207,11 +207,11 @@ public class VOrderedLayout extends CellBasedLayout { .getWidget()); } - // childComponentContainer.updateWidgetSize();
+ // childComponentContainer.updateWidgetSize(); } - // w.mark("Rendering of " + (relativeSizeComponents.size())
- // + " relative size components done");
+ // w.mark("Rendering of " + (relativeSizeComponents.size()) + // + " relative size components done"); /* Fetch widget sizes for relative size components */ for (ChildComponentContainer childComponentContainer : widgetToComponentContainer @@ -221,7 +221,7 @@ public class VOrderedLayout extends CellBasedLayout { childComponentContainer.updateWidgetSize(); } - // w.mark("Widget sizes updated");
+ // w.mark("Widget sizes updated"); /* * Components with relative size in main direction may affect the layout @@ -231,7 +231,7 @@ public class VOrderedLayout extends CellBasedLayout { || (isVertical() && isDynamicWidth())) { layoutSizeMightHaveChanged(); } - // w.mark("Layout dimensions updated");
+ // w.mark("Layout dimensions updated"); /* Update component spacing */ updateContainerMargins(); @@ -241,13 +241,13 @@ public class VOrderedLayout extends CellBasedLayout { * direction */ if (updateRelativeSizesInNonMainDirection()) { - // Sizes updated - might affect the other dimension so we need to
- // recheck the widget sizes and recalculate layout dimensions
+ // Sizes updated - might affect the other dimension so we need to + // recheck the widget sizes and recalculate layout dimensions updateWidgetSizes(); layoutSizeMightHaveChanged(); } calculateAlignments(); - // w.mark("recalculateComponentSizesAndAlignments done");
+ // w.mark("recalculateComponentSizesAndAlignments done"); setRootSize(); @@ -260,14 +260,14 @@ public class VOrderedLayout extends CellBasedLayout { root.getStyle().setProperty("zoom", "1"); } - // w.mark("runDescendentsLayout done");
+ // w.mark("runDescendentsLayout done"); isRendering = false; sizeHasChangedDuringRendering = false; } private void layoutSizeMightHaveChanged() { - Size oldSize = new Size(activeLayoutSize.getWidth(), activeLayoutSize - .getHeight()); + Size oldSize = new Size(activeLayoutSize.getWidth(), + activeLayoutSize.getHeight()); calculateLayoutDimensions(); /* @@ -314,11 +314,11 @@ public class VOrderedLayout extends CellBasedLayout { if (remaining > 0) { - // Some left-over pixels due to rounding errors
+ // Some left-over pixels due to rounding errors - // Add one pixel to each container until there are no pixels left
- // FIXME extra pixels should be divided among expanded widgets if
- // such a widgets exists
+ // Add one pixel to each container until there are no pixels left + // FIXME extra pixels should be divided among expanded widgets if + // such a widgets exists Iterator<Widget> widgetIterator = iterator(); while (widgetIterator.hasNext() && remaining-- > 0) { @@ -381,7 +381,7 @@ public class VOrderedLayout extends CellBasedLayout { int maxWidgetWidth = 0; int maxWidgetHeight = 0; - // Calculate layout dimensions from component dimensions
+ // Calculate layout dimensions from component dimensions for (ChildComponentContainer childComponentContainer : widgetToComponentContainer .values()) { @@ -426,8 +426,8 @@ public class VOrderedLayout extends CellBasedLayout { remainingSpace = 0; } - // ApplicationConnection.getConsole().log(
- // "Layout size: " + activeLayoutSize);
+ // ApplicationConnection.getConsole().log( + // "Layout size: " + activeLayoutSize); return remainingSpace; } @@ -463,14 +463,14 @@ public class VOrderedLayout extends CellBasedLayout { int h = 0; if (isHorizontal()) { - // HORIZONTAL
+ // HORIZONTAL h = activeLayoutSize.getHeight(); if (!isDynamicWidth()) { w = -1; } } else { - // VERTICAL
+ // VERTICAL w = activeLayoutSize.getWidth(); if (!isDynamicHeight()) { h = -1; @@ -519,9 +519,9 @@ public class VOrderedLayout extends CellBasedLayout { .widgetHasSizeSpecified(orientation)) { int captionWidth = childComponentContainer .getCaptionRequiredWidth(); - // ApplicationConnection.getConsole().log(
- // "Component width: " + width
- // + ", caption width: " + captionWidth);
+ // ApplicationConnection.getConsole().log( + // "Component width: " + width + // + ", caption width: " + captionWidth); if (captionWidth > width) { width = captionWidth; } @@ -536,8 +536,8 @@ public class VOrderedLayout extends CellBasedLayout { * Let the overflowing components overflow. IE has * problems with zero sizes. */ - // width = 0;
- // height = 0;
+ // width = 0; + // height = 0; } else if (width > availableWidth) { width = availableWidth; @@ -596,9 +596,9 @@ public class VOrderedLayout extends CellBasedLayout { int activeLayoutWidth = 0; int activeLayoutHeight = 0; - // Update layout dimensions
+ // Update layout dimensions if (isHorizontal()) { - // Horizontal
+ // Horizontal if (isDynamicWidth()) { activeLayoutWidth = totalComponentWidth; } @@ -608,7 +608,7 @@ public class VOrderedLayout extends CellBasedLayout { } } else { - // Vertical
+ // Vertical if (isDynamicWidth()) { activeLayoutWidth = maxComponentWidth; } @@ -693,7 +693,7 @@ public class VOrderedLayout extends CellBasedLayout { private ChildComponentContainer createChildContainer(Widget child) { - // Create a container DIV for the child
+ // Create a container DIV for the child ChildComponentContainer childComponent = new ChildComponentContainer( child, orientation); @@ -705,29 +705,29 @@ public class VOrderedLayout extends CellBasedLayout { int width = 0; int height = 0; ChildComponentContainer childComponentContainer = getComponentContainer(child); - // WIDTH CALCULATION
+ // WIDTH CALCULATION if (isVertical()) { width = activeLayoutSize.getWidth(); width -= childComponentContainer.getCaptionWidthAfterComponent(); } else if (!isDynamicWidth()) { - // HORIZONTAL
+ // HORIZONTAL width = childComponentContainer.getContSize().getWidth(); width -= childComponentContainer.getCaptionWidthAfterComponent(); } - // HEIGHT CALCULATION
+ // HEIGHT CALCULATION if (isHorizontal()) { height = activeLayoutSize.getHeight(); height -= childComponentContainer.getCaptionHeightAboveComponent(); } else if (!isDynamicHeight()) { - // VERTICAL
+ // VERTICAL height = childComponentContainer.getContSize().getHeight(); height -= childComponentContainer.getCaptionHeightAboveComponent(); } - // ApplicationConnection.getConsole().log(
- // "allocatedSpace for " + Util.getSimpleName(child) + ": "
- // + width + "," + height);
+ // ApplicationConnection.getConsole().log( + // "allocatedSpace for " + Util.getSimpleName(child) + ": " + // + width + "," + height); RenderSpace space = new RenderSpace(width, height); return space; } @@ -742,7 +742,7 @@ public class VOrderedLayout extends CellBasedLayout { client.handleComponentRelativeSize(componentContainer .getWidget()); - // Update widget size from DOM
+ // Update widget size from DOM componentContainer.updateWidgetSize(); } } @@ -778,13 +778,13 @@ public class VOrderedLayout extends CellBasedLayout { for (Paintable p : children) { /* Update widget size from DOM */ ChildComponentContainer componentContainer = getComponentContainer((Widget) p); - // This should no longer be needed (after #2563)
- // if (isDynamicWidth()) {
- // componentContainer.setUnlimitedContainerWidth();
- // } else {
- // componentContainer.setLimitedContainerWidth(activeLayoutSize
- // .getWidth());
- // }
+ // This should no longer be needed (after #2563) + // if (isDynamicWidth()) { + // componentContainer.setUnlimitedContainerWidth(); + // } else { + // componentContainer.setLimitedContainerWidth(activeLayoutSize + // .getWidth()); + // } componentContainer.updateWidgetSize(); @@ -890,10 +890,10 @@ public class VOrderedLayout extends CellBasedLayout { ChildComponentContainer container = getComponentContainer(widget); - // Calculate alignment info
+ // Calculate alignment info container.setAlignment(getAlignment(pid)); - // Update expand ratio
+ // Update expand ratio container.setNormalizedExpandRatio(getExpandRatio(pid)); } } @@ -915,7 +915,7 @@ public class VOrderedLayout extends CellBasedLayout { expandRatioSum += expandRatios.getRawNumber(keyArray.get(i)); } if (expandRatioSum == 0) { - // by default split equally among components
+ // by default split equally among components defaultExpandRatio = 1.0 / widgetToComponentContainer.size(); } else { defaultExpandRatio = 0; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index 43f08b6a0c..9e4e167060 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -271,12 +271,18 @@ public class VOverlay extends PopupPanel { // Opera fix, part 2 (ticket #2704) if (BrowserInfo.get().isOpera()) { // We'll fix the height of all the middle elements - DOM.getChild(shadow, 3).getStyle().setPropertyPx("height", - DOM.getChild(shadow, 3).getOffsetHeight()); - DOM.getChild(shadow, 4).getStyle().setPropertyPx("height", - DOM.getChild(shadow, 4).getOffsetHeight()); - DOM.getChild(shadow, 5).getStyle().setPropertyPx("height", - DOM.getChild(shadow, 5).getOffsetHeight()); + DOM.getChild(shadow, 3) + .getStyle() + .setPropertyPx("height", + DOM.getChild(shadow, 3).getOffsetHeight()); + DOM.getChild(shadow, 4) + .getStyle() + .setPropertyPx("height", + DOM.getChild(shadow, 4).getOffsetHeight()); + DOM.getChild(shadow, 5) + .getStyle() + .setPropertyPx("height", + DOM.getChild(shadow, 5).getOffsetHeight()); } // Attach to dom if not there already diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java index 4ec7221522..e0ade0c428 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPanel.java @@ -405,9 +405,7 @@ public class VPanel extends SimplePanel implements Container, if (containerHeight < 0) { containerHeight = 0; } - DOM - .setStyleAttribute(contentNode, "height", containerHeight - + "px"); + DOM.setStyleAttribute(contentNode, "height", containerHeight + "px"); } else { DOM.setStyleAttribute(contentNode, "height", ""); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java index 5482301b0c..98f16e44c7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java @@ -268,8 +268,8 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, popup.setWidth(w + "px");
popup.setHeight(h + "px");
- popup.setPopupPosition(l, t
- + calendarToggle.getOffsetHeight() + 2);
+ popup.setPopupPosition(l,
+ t + calendarToggle.getOffsetHeight() + 2);
Date end = new Date();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java index 93f6b313ee..72846e85cf 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java @@ -26,13 +26,13 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Container; import com.vaadin.terminal.gwt.client.Paintable; +import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.RenderSpace; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VCaption; import com.vaadin.terminal.gwt.client.VCaptionWrapper; import com.vaadin.terminal.gwt.client.VTooltip; -import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.ui.richtextarea.VRichTextArea; public class VPopupView extends HTML implements Container, Iterable<Widget> { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 7224ef0c90..4dee108b32 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -485,13 +485,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } // Send the selected row ranges - client.updateVariable(paintableId, "selectedRanges", ranges - .toArray(new String[selectedRowRanges.size()]), false); + client.updateVariable(paintableId, "selectedRanges", + ranges.toArray(new String[selectedRowRanges.size()]), false); } // Send the selected rows - client.updateVariable(paintableId, "selected", selectedRowKeys - .toArray(new String[selectedRowKeys.size()]), immediate); + client.updateVariable(paintableId, "selected", + selectedRowKeys.toArray(new String[selectedRowKeys.size()]), + immediate); } @@ -758,8 +759,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, updateFooter(uidl.getStringArrayAttribute("vcolorder")); if (!recalcWidths && initializedAndAttached) { - updateBody(rowData, uidl.getIntAttribute("firstrow"), uidl - .getIntAttribute("rows")); + updateBody(rowData, uidl.getIntAttribute("firstrow"), + uidl.getIntAttribute("rows")); if (headerChangedDuringUpdate) { lazyAdjustColumnWidths.schedule(1); } else { @@ -780,8 +781,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } scrollBody = createScrollBody(); - scrollBody.renderInitialRows(rowData, uidl - .getIntAttribute("firstrow"), uidl.getIntAttribute("rows")); + scrollBody.renderInitialRows(rowData, + uidl.getIntAttribute("firstrow"), + uidl.getIntAttribute("rows")); scrollBodyPanel.add(scrollBody); initialContentReceived = true; if (isAttached()) { @@ -1833,8 +1835,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, .getChild(floatingCopyOfHeaderCell, 1); DOM.setElementProperty(floatingCopyOfHeaderCell, "className", CLASSNAME + "-header-drag"); - updateFloatingCopysPosition(DOM.getAbsoluteLeft(td), DOM - .getAbsoluteTop(td)); + updateFloatingCopysPosition(DOM.getAbsoluteLeft(td), + DOM.getAbsoluteTop(td)); DOM.appendChild(RootPanel.get().getElement(), floatingCopyOfHeaderCell); } @@ -1866,8 +1868,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (client.hasEventListeners(VScrollTable.this, HEADER_CLICK_EVENT_ID)) { MouseEventDetails details = new MouseEventDetails(event); - client.updateVariable(paintableId, "headerClickEvent", details - .toString(), false); + client.updateVariable(paintableId, "headerClickEvent", + details.toString(), false); client.updateVariable(paintableId, "headerClickCID", cid, true); } } @@ -2052,8 +2054,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, // cols) final int hw = ((Element) getElement().getLastChild()) - .getOffsetWidth() - + scrollBody.getCellExtraWidth(); + .getOffsetWidth() + scrollBody.getCellExtraWidth(); if (columnIndex < 0) { columnIndex = 0; for (Iterator<Widget> it = tHead.iterator(); it @@ -2340,13 +2341,15 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, private void focusSlot(int index) { removeSlotFocus(); if (index > 0) { - DOM.setElementProperty(DOM.getFirstChild(DOM.getChild(tr, - index - 1)), "className", CLASSNAME + "-resizer " - + CLASSNAME + "-focus-slot-right"); + DOM.setElementProperty( + DOM.getFirstChild(DOM.getChild(tr, index - 1)), + "className", CLASSNAME + "-resizer " + CLASSNAME + + "-focus-slot-right"); } else { - DOM.setElementProperty(DOM.getFirstChild(DOM - .getChild(tr, index)), "className", CLASSNAME - + "-resizer " + CLASSNAME + "-focus-slot-left"); + DOM.setElementProperty( + DOM.getFirstChild(DOM.getChild(tr, index)), + "className", CLASSNAME + "-resizer " + CLASSNAME + + "-focus-slot-left"); } focusedSlot = index; } @@ -2356,11 +2359,13 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, return; } if (focusedSlot == 0) { - DOM.setElementProperty(DOM.getFirstChild(DOM.getChild(tr, - focusedSlot)), "className", CLASSNAME + "-resizer"); + DOM.setElementProperty( + DOM.getFirstChild(DOM.getChild(tr, focusedSlot)), + "className", CLASSNAME + "-resizer"); } else if (focusedSlot > 0) { - DOM.setElementProperty(DOM.getFirstChild(DOM.getChild(tr, - focusedSlot - 1)), "className", CLASSNAME + "-resizer"); + DOM.setElementProperty( + DOM.getFirstChild(DOM.getChild(tr, focusedSlot - 1)), + "className", CLASSNAME + "-resizer"); } focusedSlot = -1; } @@ -2467,8 +2472,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, for (int i = 0; i < cols.length; i++) { final String cid = (String) cols[i]; final HeaderCell c = getHeaderCell(cid); - final VisibleColumnAction a = new VisibleColumnAction(c - .getColKey()); + final VisibleColumnAction a = new VisibleColumnAction( + c.getColKey()); a.setCaption(c.getCaption()); if (!c.isEnabled()) { a.setCollapsed(true); @@ -2740,8 +2745,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (client.hasEventListeners(VScrollTable.this, FOOTER_CLICK_EVENT_ID)) { MouseEventDetails details = new MouseEventDetails(event); - client.updateVariable(paintableId, "footerClickEvent", details - .toString(), false); + client.updateVariable(paintableId, "footerClickEvent", + details.toString(), false); client.updateVariable(paintableId, "footerClickCID", cid, true); } } @@ -2775,8 +2780,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, // cols) final int hw = ((Element) getElement().getLastChild()) - .getOffsetWidth() - + scrollBody.getCellExtraWidth(); + .getOffsetWidth() + scrollBody.getCellExtraWidth(); if (columnIndex < 0) { columnIndex = 0; for (Iterator<Widget> it = tHead.iterator(); it @@ -3285,8 +3289,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (row.isSelected()) { row.addStyleName("v-selected"); } - tBodyElement.insertBefore(row.getElement(), tBodyElement - .getFirstChild()); + tBodyElement.insertBefore(row.getElement(), + tBodyElement.getFirstChild()); adopt(row); renderedRows.add(0, row); } @@ -3737,8 +3741,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, public boolean remove(Widget w) { if (childWidgets.contains(w)) { orphan(w); - DOM.removeChild(DOM.getParent(w.getElement()), w - .getElement()); + DOM.removeChild(DOM.getParent(w.getElement()), + w.getElement()); childWidgets.remove(w); return true; } else { @@ -3771,14 +3775,13 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, // select event, even though nullselectionallowed wont let // the change trough. Will need to be updated if that is // changed. - client - .updateVariable( - paintableId, - "clickEvent", - details.toString(), - !(event.getButton() == Event.BUTTON_LEFT - && !doubleClick - && selectMode > Table.SELECT_MODE_NONE && immediate)); + client.updateVariable( + paintableId, + "clickEvent", + details.toString(), + !(event.getButton() == Event.BUTTON_LEFT + && !doubleClick + && selectMode > Table.SELECT_MODE_NONE && immediate)); } } @@ -4167,8 +4170,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, final Action[] actions = new Action[actionKeys.length]; for (int i = 0; i < actions.length; i++) { final String actionKey = actionKeys[i]; - final TreeAction a = new TreeAction(this, String - .valueOf(rowKey), actionKey); + final TreeAction a = new TreeAction(this, + String.valueOf(rowKey), actionKey); a.setCaption(getActionCaption(actionKey)); a.setIconUrl(getActionIcon(actionKey)); actions[i] = a; @@ -4569,8 +4572,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, String s = uidl.getStringAttribute("caption"); if (uidl.hasAttribute("icon")) { s = "<img src=\"" - + client - .translateVaadinUri(uidl.getStringAttribute("icon")) + + client.translateVaadinUri(uidl.getStringAttribute("icon")) + "\" alt=\"icon\" class=\"v-icon\">" + s; } return s; @@ -4947,8 +4949,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, // Down navigation if (selectMode == SELECT_MODE_NONE && keycode == getNavigationDownKey()) { scrollBodyPanel.setScrollPosition(scrollBodyPanel - .getScrollPosition() - + scrollingVelocity); + .getScrollPosition() + scrollingVelocity); return true; } else if (keycode == getNavigationDownKey()) { if (selectMode == SELECT_MODE_MULTI && moveFocusDown()) { @@ -4964,8 +4965,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, // Up navigation if (selectMode == SELECT_MODE_NONE && keycode == getNavigationUpKey()) { scrollBodyPanel.setScrollPosition(scrollBodyPanel - .getScrollPosition() - - scrollingVelocity); + .getScrollPosition() - scrollingVelocity); return true; } else if (keycode == getNavigationUpKey()) { if (selectMode == SELECT_MODE_MULTI && moveFocusUp()) { @@ -4980,15 +4980,13 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (keycode == getNavigationLeftKey()) { // Left navigation scrollBodyPanel.setHorizontalScrollPosition(scrollBodyPanel - .getHorizontalScrollPosition() - - scrollingVelocity); + .getHorizontalScrollPosition() - scrollingVelocity); return true; } else if (keycode == getNavigationRightKey()) { // Right navigation scrollBodyPanel.setHorizontalScrollPosition(scrollBodyPanel - .getHorizontalScrollPosition() - + scrollingVelocity); + .getHorizontalScrollPosition() + scrollingVelocity); return true; } @@ -5014,8 +5012,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, int rowHeight = (int) scrollBody.getRowHeight(); int offset = pageLength * rowHeight - rowHeight; scrollBodyPanel.setScrollPosition(scrollBodyPanel - .getScrollPosition() - + offset); + .getScrollPosition() + offset); if (selectMode > SELECT_MODE_NONE) { if (!moveFocusDown(pageLength - 2)) { final int lastRendered = scrollBody.getLastRendered(); @@ -5037,8 +5034,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, int rowHeight = (int) scrollBody.getRowHeight(); int offset = pageLength * rowHeight - rowHeight; scrollBodyPanel.setScrollPosition(scrollBodyPanel - .getScrollPosition() - - offset); + .getScrollPosition() - offset); if (selectMode > SELECT_MODE_NONE) { if (!moveFocusUp(pageLength - 2)) { final int firstRendered = scrollBody.getFirstRendered(); @@ -5101,9 +5097,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, */ public void onKeyPress(KeyPressEvent event) { if (hasFocus) { - if (handleNavigation(event.getNativeEvent().getKeyCode(), event - .isControlKeyDown() - || event.isMetaKeyDown(), event.isShiftKeyDown())) { + if (handleNavigation(event.getNativeEvent().getKeyCode(), + event.isControlKeyDown() || event.isMetaKeyDown(), + event.isShiftKeyDown())) { event.preventDefault(); } @@ -5129,9 +5125,9 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, */ public void onKeyDown(KeyDownEvent event) { if (hasFocus) { - if (handleNavigation(event.getNativeEvent().getKeyCode(), event - .isControlKeyDown() - || event.isMetaKeyDown(), event.isShiftKeyDown())) { + if (handleNavigation(event.getNativeEvent().getKeyCode(), + event.isControlKeyDown() || event.isMetaKeyDown(), + event.isShiftKeyDown())) { event.preventDefault(); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java index 3a42780c96..5715e0bb7b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VSlider.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VSlider.java @@ -181,16 +181,16 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, private void updateFeedbackPosition() {
if (vertical) {
- feedbackPopup.setPopupPosition(DOM.getAbsoluteLeft(handle)
- + handle.getOffsetWidth(), DOM.getAbsoluteTop(handle)
- + handle.getOffsetHeight() / 2
- - feedbackPopup.getOffsetHeight() / 2);
+ feedbackPopup.setPopupPosition(
+ DOM.getAbsoluteLeft(handle) + handle.getOffsetWidth(),
+ DOM.getAbsoluteTop(handle) + handle.getOffsetHeight() / 2
+ - feedbackPopup.getOffsetHeight() / 2);
} else {
- feedbackPopup.setPopupPosition(DOM.getAbsoluteLeft(handle)
- + handle.getOffsetWidth() / 2
- - feedbackPopup.getOffsetWidth() / 2, DOM
- .getAbsoluteTop(handle)
- - feedbackPopup.getOffsetHeight());
+ feedbackPopup.setPopupPosition(
+ DOM.getAbsoluteLeft(handle) + handle.getOffsetWidth() / 2
+ - feedbackPopup.getOffsetWidth() / 2,
+ DOM.getAbsoluteTop(handle)
+ - feedbackPopup.getOffsetHeight());
}
}
@@ -279,8 +279,7 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, final int handleSize = Integer.parseInt(DOM.getElementProperty(handle,
domProperty));
final int baseSize = Integer.parseInt(DOM.getElementProperty(base,
- domProperty))
- - (2 * BASE_BORDER_WIDTH);
+ domProperty)) - (2 * BASE_BORDER_WIDTH);
final int range = baseSize - handleSize;
double v = value.doubleValue();
@@ -338,8 +337,8 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, } else if ((BrowserInfo.get().isGecko() && DOM.eventGetType(event) == Event.ONKEYPRESS)
|| (!BrowserInfo.get().isGecko() && DOM.eventGetType(event) == Event.ONKEYDOWN)) {
- if (handleNavigation(event.getKeyCode(), event.getCtrlKey(), event
- .getShiftKey())) {
+ if (handleNavigation(event.getKeyCode(), event.getCtrlKey(),
+ event.getShiftKey())) {
feedbackPopup.show();
@@ -465,7 +464,9 @@ public class VSlider extends SimpleFocusablePanel implements Paintable, Field, final double baseOffset = vertical ? DOM.getAbsoluteTop(base)
- Window.getScrollTop() - handleSize / 2 : DOM
.getAbsoluteLeft(base)
- - Window.getScrollLeft() + handleSize / 2;
+ - Window.getScrollLeft()
+ + handleSize
+ / 2;
if (vertical) {
v = ((baseSize - (coord - baseOffset)) / (baseSize - handleSize))
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java index 977f3855ca..0b0a9befa3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VSplitPanel.java @@ -320,9 +320,7 @@ public class VSplitPanel extends ComplexPanel implements Container, return; } - DOM - .setStyleAttribute(firstContainer, "width", pixelPosition - + "px"); + DOM.setStyleAttribute(firstContainer, "width", pixelPosition + "px"); int secondContainerWidth = (wholeSize - pixelPosition - getSplitterSize()); if (secondContainerWidth < 0) { secondContainerWidth = 0; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTablePaging.java b/src/com/vaadin/terminal/gwt/client/ui/VTablePaging.java index 638f4b9be9..24999aaa25 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTablePaging.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTablePaging.java @@ -154,8 +154,8 @@ public class VTablePaging extends Composite implements Table, Paintable, final UIDL col = (UIDL) it.next(); final String cid = col.getStringAttribute("cid"); if (!col.hasAttribute("collapsed")) { - tBody.setWidget(0, colIndex, new HeaderCell(cid, col - .getStringAttribute("caption"))); + tBody.setWidget(0, colIndex, + new HeaderCell(cid, col.getStringAttribute("caption"))); } colIndex++; @@ -183,9 +183,9 @@ public class VTablePaging extends Composite implements Table, Paintable, int curRowIndex = 1; while (it.hasNext()) { final UIDL rowUidl = (UIDL) it.next(); - final TableRow row = new TableRow(curRowIndex, String - .valueOf(rowUidl.getIntAttribute("key")), rowUidl - .hasAttribute("selected")); + final TableRow row = new TableRow(curRowIndex, + String.valueOf(rowUidl.getIntAttribute("key")), + rowUidl.hasAttribute("selected")); int colIndex = 0; if (rowHeaders) { tBody.setWidget(curRowIndex, colIndex, new BodyCell(row, @@ -363,13 +363,15 @@ public class VTablePaging extends Composite implements Table, Paintable, selected = sel; if (selected) { selectedRowKeys.add(key); - DOM.setStyleAttribute(tBody.getRowFormatter().getElement( - rowIndex), "background", "yellow"); + DOM.setStyleAttribute( + tBody.getRowFormatter().getElement(rowIndex), + "background", "yellow"); } else { selectedRowKeys.remove(key); - DOM.setStyleAttribute(tBody.getRowFormatter().getElement( - rowIndex), "background", "transparent"); + DOM.setStyleAttribute( + tBody.getRowFormatter().getElement(rowIndex), + "background", "transparent"); } } @@ -391,8 +393,11 @@ public class VTablePaging extends Composite implements Table, Paintable, } setSelected(true); } - client.updateVariable(id, "selected", selectedRowKeys - .toArray(new String[selectedRowKeys.size()]), immediate); + client.updateVariable( + id, + "selected", + selectedRowKeys.toArray(new String[selectedRowKeys.size()]), + immediate); } /** diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java index a9d827914b..2ca1eb3a6f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java @@ -341,8 +341,9 @@ public class VTabsheet extends VTabsheetBase { DeferredCommand.addCommand(new Command() { public void execute() { previousVisibleWidget = tp.getWidget(tp.getVisibleWidget()); - DOM.setStyleAttribute(DOM.getParent(previousVisibleWidget - .getElement()), "visibility", "hidden"); + DOM.setStyleAttribute( + DOM.getParent(previousVisibleWidget.getElement()), + "visibility", "hidden"); client.updateVariable(id, "selected", tabKeys.get(tabIndex) .toString(), true); } @@ -387,9 +388,7 @@ public class VTabsheet extends VTabsheetBase { addStyleDependentName("loading"); // Indicate initial progress tb.setStyleName(CLASSNAME + "-tabs"); - DOM - .setElementProperty(contentNode, "className", CLASSNAME - + "-content"); + DOM.setElementProperty(contentNode, "className", CLASSNAME + "-content"); DOM.setElementProperty(deco, "className", CLASSNAME + "-deco"); add(tb, tabs); @@ -737,8 +736,9 @@ public class VTabsheet extends VTabsheetBase { updateOpenTabSize(); VTabsheet.this.removeStyleDependentName("loading"); if (previousVisibleWidget != null) { - DOM.setStyleAttribute(DOM.getParent(previousVisibleWidget - .getElement()), "visibility", ""); + DOM.setStyleAttribute( + DOM.getParent(previousVisibleWidget.getElement()), + "visibility", ""); previousVisibleWidget = null; } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java index 8b6d0bfbbc..fb6e7e258a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java @@ -240,8 +240,9 @@ public class VTextualDate extends VDateField implements Paintable, Field, if (date != null) { // if date value was leniently parsed, normalize text // presentation - text.setValue(DateTimeFormat.getFormat( - getFormatString()).format(date), false); + text.setValue( + DateTimeFormat.getFormat(getFormatString()) + .format(date), false); } } else { date = format.parseStrict(text.getText()); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java index d30ada2a97..2733836f1e 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTwinColSelect.java @@ -209,8 +209,9 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, options.setFocus(true);
}
- client.updateVariable(id, "selected", selectedKeys
- .toArray(new String[selectedKeys.size()]), isImmediate());
+ client.updateVariable(id, "selected",
+ selectedKeys.toArray(new String[selectedKeys.size()]),
+ isImmediate());
}
private void removeItem() {
@@ -242,8 +243,9 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, selections.setFocus(true);
}
- client.updateVariable(id, "selected", selectedKeys
- .toArray(new String[selectedKeys.size()]), isImmediate());
+ client.updateVariable(id, "selected",
+ selectedKeys.toArray(new String[selectedKeys.size()]),
+ isImmediate());
}
@Override
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java index ce3012b3b0..62d7a45477 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java @@ -247,8 +247,7 @@ public class VUpload extends SimplePanel implements Paintable { if (fu.getFilename().length() == 0 || submitted || !enabled) { ApplicationConnection .getConsole() - .log( - "Submit cancelled (disabled, no file or already submitted)"); + .log("Submit cancelled (disabled, no file or already submitted)"); return; } // flush possibly pending variable changes, so they will be handled @@ -270,8 +269,7 @@ public class VUpload extends SimplePanel implements Paintable { public void run() { ApplicationConnection .getConsole() - .log( - "Visiting server to see if upload started event changed UI."); + .log("Visiting server to see if upload started event changed UI."); client.updateVariable(paintableId, "pollForStart", nextUploadId, true); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VView.java b/src/com/vaadin/terminal/gwt/client/ui/VView.java index 3955231f3a..d6556b0d19 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VView.java @@ -292,8 +292,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler, } final String style = notification.hasAttribute("style") ? notification - .getStringAttribute("style") - : null; + .getStringAttribute("style") : null; final int position = notification .getIntAttribute("position"); final int delay = notification.getIntAttribute("delay"); @@ -455,8 +454,7 @@ public class VView extends SimplePanel implements Container, ResizeHandler, if (changed) { ApplicationConnection .getConsole() - .log( - "Running layout functions due window resize"); + .log("Running layout functions due window resize"); connection.runDescendentsLayout(VView.this); sendClientResized(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java index a1301e865a..c398db048b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java @@ -226,9 +226,7 @@ public class VWindow extends VOverlay implements Container, ScrollListener, footer = DOM.createDiv(); DOM.setElementProperty(footer, "className", CLASSNAME + "-footer"); resizeBox = DOM.createDiv(); - DOM - .setElementProperty(resizeBox, "className", CLASSNAME - + "-resizebox"); + DOM.setElementProperty(resizeBox, "className", CLASSNAME + "-resizebox"); closeBox = DOM.createDiv(); DOM.setElementProperty(closeBox, "className", CLASSNAME + "-closebox"); DOM.appendChild(footer, resizeBox); @@ -313,8 +311,8 @@ public class VWindow extends VOverlay implements Container, ScrollListener, } if (uidl.hasAttribute("caption")) { - setCaption(uidl.getStringAttribute("caption"), uidl - .getStringAttribute("icon")); + setCaption(uidl.getStringAttribute("caption"), + uidl.getStringAttribute("icon")); } boolean showingUrl = false; @@ -430,8 +428,7 @@ public class VWindow extends VOverlay implements Container, ScrollListener, } final String style = notification.hasAttribute("style") ? notification - .getStringAttribute("style") - : null; + .getStringAttribute("style") : null; final int position = notification .getIntAttribute("position"); final int delay = notification.getIntAttribute("delay"); @@ -710,14 +707,15 @@ public class VWindow extends VOverlay implements Container, ScrollListener, private void showModalityCurtain() { if (BrowserInfo.get().isFF2()) { - DOM.setStyleAttribute(modalityCurtain, "height", DOM - .getElementPropertyInt(RootPanel.getBodyElement(), - "offsetHeight") - + "px"); + DOM.setStyleAttribute( + modalityCurtain, + "height", + DOM.getElementPropertyInt(RootPanel.getBodyElement(), + "offsetHeight") + "px"); DOM.setStyleAttribute(modalityCurtain, "position", "absolute"); } - DOM.setStyleAttribute(modalityCurtain, "zIndex", "" - + (windowOrder.indexOf(this) + Z_INDEX)); + DOM.setStyleAttribute(modalityCurtain, "zIndex", + "" + (windowOrder.indexOf(this) + Z_INDEX)); DOM.appendChild(RootPanel.getBodyElement(), modalityCurtain); } @@ -996,8 +994,8 @@ public class VWindow extends VOverlay implements Container, ScrollListener, rootPixelWidth = getElement().getOffsetWidth(); width = rootPixelWidth + "px"; } else { - rootPixelWidth = Integer.parseInt(width.substring(0, width - .indexOf("px"))); + rootPixelWidth = Integer.parseInt(width.substring(0, + width.indexOf("px"))); } // "width" now contains the new width in pixels @@ -1134,8 +1132,8 @@ public class VWindow extends VOverlay implements Container, ScrollListener, // debug window Console console = ApplicationConnection.getConsole(); if (console instanceof VDebugConsole - && DOM.isOrHasChild(((VDebugConsole) console) - .getElement(), target)) { + && DOM.isOrHasChild( + ((VDebugConsole) console).getElement(), target)) { return true; // allow debug-window clicks } return false; diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java index 936cdf8408..aa5b75242f 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java @@ -14,9 +14,9 @@ import com.google.gwt.event.dom.client.KeyCodes; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Event; -import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Event.NativePreviewEvent; import com.google.gwt.user.client.Event.NativePreviewHandler; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -537,8 +537,8 @@ public class VDragAndDropManager { VTransferable transferable = currentDrag.getTransferable(); - client.updateVariable(DD_SERVICE, "component", transferable - .getDragSource(), false); + client.updateVariable(DD_SERVICE, "component", + transferable.getDragSource(), false); client.updateVariable(DD_SERVICE, "type", drop.ordinal(), false); diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java index 399c9cd2e1..306659a571 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java +++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragEvent.java @@ -8,9 +8,9 @@ import java.util.Map; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.NativeEvent; +import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.dom.client.TableElement; import com.google.gwt.dom.client.TableSectionElement; -import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.event.dom.client.MouseOverEvent; import com.google.gwt.user.client.Element; import com.vaadin.terminal.gwt.client.BrowserInfo; diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java index ec66cfe60d..f573e36e09 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/CellBasedLayout.java @@ -239,11 +239,10 @@ public abstract class CellBasedLayout extends ComplexPanel implements Container static { helper = Document.get().createDivElement(); - helper - .setInnerHTML("<div style=\"position:absolute;top:0;left:0;height:0;visibility:hidden;overflow:hidden;\">" - + "<div style=\"width:0;height:0;visibility:hidden;overflow:hidden;\">" - + "</div></div>" - + "<div style=\"position:absolute;height:0;overflow:hidden;\"></div>"); + helper.setInnerHTML("<div style=\"position:absolute;top:0;left:0;height:0;visibility:hidden;overflow:hidden;\">" + + "<div style=\"width:0;height:0;visibility:hidden;overflow:hidden;\">" + + "</div></div>" + + "<div style=\"position:absolute;height:0;overflow:hidden;\"></div>"); NodeList<Node> childNodes = helper.getChildNodes(); measurement = (DivElement) childNodes.getItem(0); measurement2 = (DivElement) measurement.getFirstChildElement(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java index 83e3c66536..8770fabdb5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java +++ b/src/com/vaadin/terminal/gwt/client/ui/layout/ChildComponentContainer.java @@ -16,11 +16,11 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Paintable; +import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; +import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VCaption; -import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; -import com.vaadin.terminal.gwt.client.RenderInformation.Size; import com.vaadin.terminal.gwt.client.ui.AlignmentInfo; public class ChildComponentContainer extends Panel { @@ -83,8 +83,7 @@ public class ChildComponentContainer extends Panel { // FF2 chokes on some floats very easily. Measuring size escpecially // becomes terribly slow TableElement tableEl = Document.get().createTableElement(); - tableEl - .setInnerHTML("<tbody><tr><td><div></div></td></tr></tbody>"); + tableEl.setInnerHTML("<tbody><tr><td><div></div></td></tr></tbody>"); DivElement div = (DivElement) tableEl.getFirstChildElement() .getFirstChildElement().getFirstChildElement() .getFirstChildElement(); @@ -268,8 +267,8 @@ public class ChildComponentContainer extends Panel { setMarginTop(containerMarginTop); if (caption != null) { - caption.getElement().getStyle().setPropertyPx("marginLeft", - alignmentLeftOffsetForCaption); + caption.getElement().getStyle() + .setPropertyPx("marginLeft", alignmentLeftOffsetForCaption); } widgetDIV.getStyle().setPropertyPx("marginLeft", alignmentLeftOffsetForWidget); @@ -326,8 +325,8 @@ public class ChildComponentContainer extends Panel { * Take into account the rare case that the caption on the right * side of the component AND is higher than the component */ - emptySpace -= Math.max(widgetSize.getHeight(), caption - .getHeight()); + emptySpace -= Math.max(widgetSize.getHeight(), + caption.getHeight()); } else { emptySpace -= widgetSize.getHeight(); emptySpace -= getCaptionHeight(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java index f3aa9d6b24..9154017a32 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextToolbar.java @@ -319,10 +319,10 @@ public class VRichTextToolbar extends Composite { setStyleName("gwt-RichTextToolbar"); if (basic != null) { - topPanel.add(bold = createToggleButton(images.bold(), strings - .bold())); - topPanel.add(italic = createToggleButton(images.italic(), strings - .italic())); + topPanel.add(bold = createToggleButton(images.bold(), + strings.bold())); + topPanel.add(italic = createToggleButton(images.italic(), + strings.italic())); topPanel.add(underline = createToggleButton(images.underline(), strings.underline())); topPanel.add(subscript = createToggleButton(images.subscript(), @@ -331,19 +331,19 @@ public class VRichTextToolbar extends Composite { strings.superscript())); topPanel.add(justifyLeft = createPushButton(images.justifyLeft(), strings.justifyLeft())); - topPanel.add(justifyCenter = createPushButton(images - .justifyCenter(), strings.justifyCenter())); + topPanel.add(justifyCenter = createPushButton( + images.justifyCenter(), strings.justifyCenter())); topPanel.add(justifyRight = createPushButton(images.justifyRight(), strings.justifyRight())); } if (extended != null) { - topPanel.add(strikethrough = createToggleButton(images - .strikeThrough(), strings.strikeThrough())); - topPanel.add(indent = createPushButton(images.indent(), strings - .indent())); - topPanel.add(outdent = createPushButton(images.outdent(), strings - .outdent())); + topPanel.add(strikethrough = createToggleButton( + images.strikeThrough(), strings.strikeThrough())); + topPanel.add(indent = createPushButton(images.indent(), + strings.indent())); + topPanel.add(outdent = createPushButton(images.outdent(), + strings.outdent())); topPanel.add(hr = createPushButton(images.hr(), strings.hr())); topPanel.add(ol = createPushButton(images.ol(), strings.ol())); topPanel.add(ul = createPushButton(images.ul(), strings.ul())); diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index 9e115842ba..29a392012d 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -96,8 +96,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet for (final Enumeration e = config.getInitParameterNames(); e .hasMoreElements();) { final String name = (String) e.nextElement(); - applicationProperties.setProperty(name, config - .getInitParameter(name)); + applicationProperties.setProperty(name, + config.getInitParameter(name)); } // Overrides with server.xml parameters @@ -105,8 +105,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet for (final Enumeration e = context.getInitParameterNames(); e .hasMoreElements();) { final String name = (String) e.nextElement(); - applicationProperties.setProperty(name, context - .getInitParameter(name)); + applicationProperties.setProperty(name, + context.getInitParameter(name)); } checkProductionMode(); checkCrossSiteProtection(); @@ -181,8 +181,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet pkgName = pkg.getName(); } else { final String className = getClass().getName(); - pkgName = new String(className.toCharArray(), 0, className - .lastIndexOf('.')); + pkgName = new String(className.toCharArray(), 0, + className.lastIndexOf('.')); } val = System.getProperty(pkgName + "." + parameterName); if (val != null) { @@ -235,8 +235,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet protected String getStaticFilesLocation(PortletRequest request) { // TODO allow overriding on portlet level? String staticFileLocation = getPortalProperty( - Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, request - .getPortalContext()); + Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, + request.getPortalContext()); if (staticFileLocation != null) { // remove trailing slash if any while (staticFileLocation.endsWith(".")) { @@ -557,8 +557,9 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet private void updateBrowserProperties(WebBrowser browser, PortletRequest request) { String userAgent = getHTTPHeader(request, "user-agent"); - browser.updateBrowserProperties(request.getLocale(), null, request - .isSecure(), userAgent, getHTTPRequestParameter(request, "sw"), + browser.updateBrowserProperties(request.getLocale(), null, + request.isSecure(), userAgent, + getHTTPRequestParameter(request, "sw"), getHTTPRequestParameter(request, "sh")); } @@ -590,8 +591,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet ResourceResponse response) throws IOException { if (stream.getParameter("Location") != null) { - response.setProperty(ResourceResponse.HTTP_STATUS_CODE, Integer - .toString(HttpServletResponse.SC_MOVED_TEMPORARILY)); + response.setProperty(ResourceResponse.HTTP_STATUS_CODE, + Integer.toString(HttpServletResponse.SC_MOVED_TEMPORARILY)); response.setProperty("Location", stream.getParameter("Location")); return; } @@ -676,8 +677,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet } else { System.err.println("Requested resource [" + resourceID + "] could not be found"); - response.setProperty(ResourceResponse.HTTP_STATUS_CODE, Integer - .toString(HttpServletResponse.SC_NOT_FOUND)); + response.setProperty(ResourceResponse.HTTP_STATUS_CODE, + Integer.toString(HttpServletResponse.SC_NOT_FOUND)); } } @@ -1022,10 +1023,9 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet widgetset = DEFAULT_WIDGETSET; } String widgetsetURL = getWidgetsetURL(widgetset, request); - writer - .write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " - + "style=\"width:0;height:0;border:0;overflow:" - + "hidden\" src=\"javascript:false\"></iframe>');\n"); + writer.write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " + + "style=\"width:0;height:0;border:0;overflow:" + + "hidden\" src=\"javascript:false\"></iframe>');\n"); writer.write("document.write(\"<script language='javascript' src='" + widgetsetURL + "'><\\/script>\");\n}\n"); } @@ -1177,14 +1177,12 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet } writer.write("if(!vaadin.themesLoaded['" + portalTheme + "']) {\n"); - writer - .write("var defaultStylesheet = document.createElement('link');\n"); + writer.write("var defaultStylesheet = document.createElement('link');\n"); writer.write("defaultStylesheet.setAttribute('rel', 'stylesheet');\n"); writer.write("defaultStylesheet.setAttribute('type', 'text/css');\n"); writer.write("defaultStylesheet.setAttribute('href', '" + getThemeURI(portalTheme, request) + "/styles.css');\n"); - writer - .write("document.getElementsByTagName('head')[0].appendChild(defaultStylesheet);\n"); + writer.write("document.getElementsByTagName('head')[0].appendChild(defaultStylesheet);\n"); writer.write("vaadin.themesLoaded['" + portalTheme + "'] = true;\n}\n"); if (!portalTheme.equals(themeName)) { @@ -1194,8 +1192,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet writer.write("stylesheet.setAttribute('type', 'text/css');\n"); writer.write("stylesheet.setAttribute('href', '" + themeURI + "/styles.css');\n"); - writer - .write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n"); + writer.write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n"); writer.write("vaadin.themesLoaded['" + themeName + "'] = true;\n}\n"); } @@ -1252,8 +1249,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet if (themeName == null) { // no, is the default theme defined by the portal? themeName = getPortalProperty( - Constants.PORTAL_PARAMETER_VAADIN_THEME, request - .getPortalContext()); + Constants.PORTAL_PARAMETER_VAADIN_THEME, + request.getPortalContext()); } if (themeName == null) { @@ -1326,8 +1323,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet // if this was an UIDL request, response UIDL back to client if (getRequestType(request) == RequestType.UIDL) { Application.SystemMessages ci = getSystemMessages(); - criticalNotification(request, (ResourceResponse) response, ci - .getInternalErrorCaption(), ci.getInternalErrorMessage(), + criticalNotification(request, (ResourceResponse) response, + ci.getInternalErrorCaption(), ci.getInternalErrorMessage(), null, ci.getInternalErrorURL()); if (application != null) { application.getErrorHandler() @@ -1429,8 +1426,8 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet * @return */ protected static String getPortalProperty(String name, PortalContext context) { - boolean isLifeRay = context.getPortalInfo().toLowerCase().contains( - "liferay"); + boolean isLifeRay = context.getPortalInfo().toLowerCase() + .contains("liferay"); // TODO test on non-LifeRay platforms diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index 2807a7ffec..c7614383de 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -117,8 +117,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * read by {@link AbstractApplicationServlet}. */ public static final String REQUEST_FRAGMENT = ApplicationServlet.class - .getName() - + ".fragment"; + .getName() + ".fragment"; /** * This request attribute forces widgetsets to be loaded from under the * specified base path; e.g shared widgetset for all portlets in a portal. @@ -128,8 +127,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * {@link AbstractApplicationServlet}. */ public static final String REQUEST_VAADIN_STATIC_FILE_PATH = ApplicationServlet.class - .getName() - + ".widgetsetPath"; + .getName() + ".widgetsetPath"; /** * This request attribute forces widgetset used; e.g for portlets that can * not have different widgetsets. @@ -139,8 +137,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * {@link AbstractApplicationServlet}. */ public static final String REQUEST_WIDGETSET = ApplicationServlet.class - .getName() - + ".widgetset"; + .getName() + ".widgetset"; /** * This request attribute indicates the shared widgetset (e.g. portal-wide * default widgetset). @@ -150,8 +147,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * {@link AbstractApplicationServlet}. */ public static final String REQUEST_SHARED_WIDGETSET = ApplicationServlet.class - .getName() - + ".sharedWidgetset"; + .getName() + ".sharedWidgetset"; /** * If set, do not load the default theme but assume that loading it is * handled e.g. by ApplicationPortlet. @@ -161,8 +157,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * {@link AbstractApplicationServlet}. */ public static final String REQUEST_DEFAULT_THEME = ApplicationServlet.class - .getName() - + ".defaultThemeUri"; + .getName() + ".defaultThemeUri"; /** * This request attribute is used to add styles to the main element. E.g * "height:500px" generates a style="height:500px" to the main element, @@ -173,8 +168,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * {@link AbstractApplicationServlet}. */ public static final String REQUEST_APPSTYLE = ApplicationServlet.class - .getName() - + ".style"; + .getName() + ".style"; private Properties applicationProperties; @@ -206,8 +200,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements for (final Enumeration e = servletConfig.getInitParameterNames(); e .hasMoreElements();) { final String name = (String) e.nextElement(); - applicationProperties.setProperty(name, servletConfig - .getInitParameter(name)); + applicationProperties.setProperty(name, + servletConfig.getInitParameter(name)); } // Overrides with server.xml parameters @@ -215,8 +209,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements for (final Enumeration e = context.getInitParameterNames(); e .hasMoreElements();) { final String name = (String) e.nextElement(); - applicationProperties.setProperty(name, context - .getInitParameter(name)); + applicationProperties.setProperty(name, + context.getInitParameter(name)); } checkProductionMode(); checkCrossSiteProtection(); @@ -305,8 +299,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements pkgName = pkg.getName(); } else { final String className = getClass().getName(); - pkgName = new String(className.toCharArray(), 0, className - .lastIndexOf('.')); + pkgName = new String(className.toCharArray(), 0, + className.lastIndexOf('.')); } val = System.getProperty(pkgName + "." + parameterName); if (val != null) { @@ -570,10 +564,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements private void updateBrowserProperties(WebBrowser browser, HttpServletRequest request) { - browser.updateBrowserProperties(request.getLocale(), request - .getRemoteAddr(), request.isSecure(), request - .getHeader("user-agent"), request.getParameter("sw"), request - .getParameter("sh")); + browser.updateBrowserProperties(request.getLocale(), + request.getRemoteAddr(), request.isSecure(), + request.getHeader("user-agent"), request.getParameter("sw"), + request.getParameter("sh")); } protected ClassLoader getClassLoader() throws ServletException { @@ -946,8 +940,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements // if this was an UIDL request, response UIDL back to client if (getRequestType(request) == RequestType.UIDL) { Application.SystemMessages ci = getSystemMessages(); - criticalNotification(request, response, ci - .getInternalErrorCaption(), ci.getInternalErrorMessage(), + criticalNotification(request, response, + ci.getInternalErrorCaption(), ci.getInternalErrorMessage(), null, ci.getInternalErrorURL()); if (application != null) { application.getErrorHandler() @@ -1059,10 +1053,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements request.getSession().invalidate(); // send uidl redirect - criticalNotification(request, response, ci - .getSessionExpiredCaption(), ci - .getSessionExpiredMessage(), null, ci - .getSessionExpiredURL()); + criticalNotification(request, response, + ci.getSessionExpiredCaption(), + ci.getSessionExpiredMessage(), null, + ci.getSessionExpiredURL()); } } catch (SystemMessageException ee) { @@ -1089,9 +1083,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements response.sendRedirect(ci.getCommunicationErrorURL()); } else { // send uidl redirect - criticalNotification(request, response, ci - .getCommunicationErrorCaption(), ci - .getCommunicationErrorMessage(), + criticalNotification(request, response, + ci.getCommunicationErrorCaption(), + ci.getCommunicationErrorMessage(), INVALID_SECURITY_KEY_MSG, ci.getCommunicationErrorURL()); /* * Invalidate session. Portal integration will fail otherwise @@ -1169,8 +1163,10 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements return true; } else if (request.getRequestURI().startsWith( request.getContextPath() + "/VAADIN/")) { - serveStaticResourcesInVAADIN(request.getRequestURI().substring( - request.getContextPath().length()), request, response); + serveStaticResourcesInVAADIN( + request.getRequestURI().substring( + request.getContextPath().length()), request, + response); return true; } @@ -1248,8 +1244,8 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements * cache timeout can be configured by setting the resourceCacheTime * parameter in web.xml */ - response.setHeader("Cache-Control", "max-age: " - + String.valueOf(resourceCacheTime)); + response.setHeader("Cache-Control", + "max-age: " + String.valueOf(resourceCacheTime)); } // Write the resource to the client. @@ -1770,10 +1766,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements if (!isProductionMode()) { page.write("vaadin.debug = true;\n"); } - page - .write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " - + "style=\"position:absolute;width:0;height:0;border:0;overflow:" - + "hidden;\" src=\"javascript:false\"></iframe>');\n"); + page.write("document.write('<iframe tabIndex=\"-1\" id=\"__gwt_historyFrame\" " + + "style=\"position:absolute;width:0;height:0;border:0;overflow:" + + "hidden;\" src=\"javascript:false\"></iframe>');\n"); page.write("document.write(\"<script language='javascript' src='" + widgetsetFilePath + "'><\\/script>\");\n}\n"); @@ -1848,8 +1843,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements page.write("stylesheet.setAttribute('type', 'text/css');\n"); page.write("stylesheet.setAttribute('href', '" + themeUri + "/styles.css');\n"); - page - .write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n"); + page.write("document.getElementsByTagName('head')[0].appendChild(stylesheet);\n"); page.write("vaadin.themesLoaded['" + themeName + "'] = true;\n}\n"); page.write("//]]>\n</script>\n"); } @@ -1858,12 +1852,9 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements // inactivity page.write("<script type=\"text/javascript\">\n"); page.write("//<![CDATA[\n"); - page - .write("setTimeout('if (typeof " - + widgetset.replace('.', '_') - + " == \"undefined\") {alert(\"Failed to load the widgetset: " - + widgetsetFilePath + "\")};',15000);\n" - + "//]]>\n</script>\n"); + page.write("setTimeout('if (typeof " + widgetset.replace('.', '_') + + " == \"undefined\") {alert(\"Failed to load the widgetset: " + + widgetsetFilePath + "\")};',15000);\n" + "//]]>\n</script>\n"); } /** @@ -1897,18 +1888,15 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements */ protected void writeAjaxPageHtmlHeader(final BufferedWriter page, String title, String themeUri) throws IOException { - page - .write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n"); + page.write("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>\n"); page.write("<style type=\"text/css\">" + "html, body {height:100%;margin:0;}</style>"); // Add favicon links - page - .write("<link rel=\"shortcut icon\" type=\"image/vnd.microsoft.icon\" href=\"" - + themeUri + "/favicon.ico\" />"); - page - .write("<link rel=\"icon\" type=\"image/vnd.microsoft.icon\" href=\"" - + themeUri + "/favicon.ico\" />"); + page.write("<link rel=\"shortcut icon\" type=\"image/vnd.microsoft.icon\" href=\"" + + themeUri + "/favicon.ico\" />"); + page.write("<link rel=\"icon\" type=\"image/vnd.microsoft.icon\" href=\"" + + themeUri + "/favicon.ico\" />"); page.write("<title>" + title + "</title>"); } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index d8664e216c..01dcffe6fc 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -53,20 +53,20 @@ import com.vaadin.terminal.DownloadStream; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Paintable; -import com.vaadin.terminal.URIHandler; -import com.vaadin.terminal.UploadStream; -import com.vaadin.terminal.VariableOwner; import com.vaadin.terminal.Paintable.RepaintRequestEvent; import com.vaadin.terminal.Terminal.ErrorEvent; import com.vaadin.terminal.Terminal.ErrorListener; +import com.vaadin.terminal.URIHandler; +import com.vaadin.terminal.UploadStream; +import com.vaadin.terminal.VariableOwner; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.Upload; -import com.vaadin.ui.Window; import com.vaadin.ui.Upload.UploadException; +import com.vaadin.ui.Window; /** * This is a common base class for the server-side implementations of the @@ -1049,14 +1049,17 @@ public abstract class AbstractCommunicationManager implements // we have more than one value changes in row for // one variable owner, collect em in HashMap m = new HashMap<String, Object>(); - m.put(variable[VAR_NAME], convertVariableValue( - variable[VAR_TYPE].charAt(0), - variable[VAR_VALUE])); + m.put(variable[VAR_NAME], + convertVariableValue( + variable[VAR_TYPE].charAt(0), + variable[VAR_VALUE])); } else { // use optimized single value map - m = Collections.singletonMap(variable[VAR_NAME], - convertVariableValue(variable[VAR_TYPE] - .charAt(0), variable[VAR_VALUE])); + m = Collections.singletonMap( + variable[VAR_NAME], + convertVariableValue( + variable[VAR_TYPE].charAt(0), + variable[VAR_VALUE])); } // collect following variable changes for this owner @@ -1070,9 +1073,10 @@ public abstract class AbstractCommunicationManager implements } else { nextVariable = null; } - m.put(variable[VAR_NAME], convertVariableValue( - variable[VAR_TYPE].charAt(0), - variable[VAR_VALUE])); + m.put(variable[VAR_NAME], + convertVariableValue( + variable[VAR_TYPE].charAt(0), + variable[VAR_VALUE])); } try { owner.changeVariables(request, m); @@ -1912,8 +1916,7 @@ public abstract class AbstractCommunicationManager implements URL windowContext; windowContext = new URL(context, prefix + "/"); final String windowUri = (uri.length() > prefix.length() + 1) ? uri - .substring(prefix.length() + 1) - : ""; + .substring(prefix.length() + 1) : ""; return window.handleURI(windowContext, windowUri); } else { return null; diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java index e9de68630b..1baad53dad 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java @@ -86,7 +86,7 @@ public abstract class AbstractWebApplicationContext implements } } - // If any runtime exceptions occurred, throw a combined exception
+ // If any runtime exceptions occurred, throw a combined exception if (exceptions != null) { final StringBuffer msg = new StringBuffer(); for (Exception e : exceptions) { @@ -106,15 +106,15 @@ public abstract class AbstractWebApplicationContext implements * @see javax.servlet.http.HttpSessionBindingListener#valueBound(HttpSessionBindingEvent) */ public void valueBound(HttpSessionBindingEvent arg0) { - // We are not interested in bindings
+ // We are not interested in bindings } /** * @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(HttpSessionBindingEvent) */ public void valueUnbound(HttpSessionBindingEvent event) { - // If we are going to be unbound from the session, the session must be
- // closing
+ // If we are going to be unbound from the session, the session must be + // closing try { while (!applications.isEmpty()) { final Application app = applications.iterator().next(); @@ -122,12 +122,12 @@ public abstract class AbstractWebApplicationContext implements removeApplication(app); } } catch (Exception e) { - // This should never happen but is possible with rare
- // configurations (e.g. robustness tests). If you have one
- // thread doing HTTP socket write and another thread trying to
- // remove same application here. Possible if you got e.g. session
- // lifetime 1 min but socket write may take longer than 1 min.
- // FIXME: Handle exception
+ // This should never happen but is possible with rare + // configurations (e.g. robustness tests). If you have one + // thread doing HTTP socket write and another thread trying to + // remove same application here. Possible if you got e.g. session + // lifetime 1 min but socket write may take longer than 1 min. + // FIXME: Handle exception System.err.println("Could not remove application, leaking memory."); e.printStackTrace(); } @@ -168,19 +168,19 @@ public abstract class AbstractWebApplicationContext implements } public boolean isApplicationResourceURL(URL context, String relativeUri) { - // If the relative uri is null, we are ready
+ // If the relative uri is null, we are ready if (relativeUri == null) { return false; } - // Resolves the prefix
+ // Resolves the prefix String prefix = relativeUri; final int index = relativeUri.indexOf('/'); if (index >= 0) { prefix = relativeUri.substring(0, index); } - // Handles the resource requests
+ // Handles the resource requests return (prefix.equals("APP")); } diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java index 3a527fc187..35c068400f 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationPortlet.java @@ -29,16 +29,16 @@ import com.vaadin.Application; */ @SuppressWarnings("serial") public class ApplicationPortlet implements Portlet, Serializable { - // portlet configuration parameters
+ // portlet configuration parameters private static final String PORTLET_PARAMETER_APPLICATION = "application"; private static final String PORTLET_PARAMETER_STYLE = "style"; private static final String PORTLET_PARAMETER_WIDGETSET = "widgetset"; - // The application to show
+ // The application to show protected String app = null; - // some applications might require forced height (and, more seldom, width)
- protected String style = null; // e.g "height:500px;"
- // force the portlet to use this widgetset - portlet level setting
+ // some applications might require forced height (and, more seldom, width) + protected String style = null; // e.g "height:500px;" + // force the portlet to use this widgetset - portlet level setting protected String portletWidgetset = null; public void destroy() { @@ -54,8 +54,8 @@ public class ApplicationPortlet implements Portlet, Serializable { + "' init parameter to be the servlet deployment path."); } style = config.getInitParameter(PORTLET_PARAMETER_STYLE); - // enable forcing the selection of the widgetset in portlet
- // configuration for a single portlet (backwards compatibility)
+ // enable forcing the selection of the widgetset in portlet + // configuration for a single portlet (backwards compatibility) portletWidgetset = config.getInitParameter(PORTLET_PARAMETER_WIDGETSET); } @@ -67,7 +67,7 @@ public class ApplicationPortlet implements Portlet, Serializable { public void render(RenderRequest request, RenderResponse response) throws PortletException, IOException { - // display the Vaadin application
+ // display the Vaadin application writeAjaxWindow(request, response); } @@ -84,7 +84,7 @@ public class ApplicationPortlet implements Portlet, Serializable { .getRequestDispatcher("/" + app); try { - // portal-wide settings
+ // portal-wide settings PortalContext portalCtx = request.getPortalContext(); boolean isLifeRay = portalCtx.getPortalInfo().toLowerCase() @@ -93,36 +93,36 @@ public class ApplicationPortlet implements Portlet, Serializable { request.setAttribute(ApplicationServlet.REQUEST_FRAGMENT, "true"); - // fixed base theme to use - all portal pages with Vaadin
- // applications will load this exactly once
+ // fixed base theme to use - all portal pages with Vaadin + // applications will load this exactly once String portalTheme = getPortalProperty( Constants.PORTAL_PARAMETER_VAADIN_THEME, portalCtx); String portalWidgetset = getPortalProperty( Constants.PORTAL_PARAMETER_VAADIN_WIDGETSET, portalCtx); - // location of the widgetset(s) and default theme (to which
- // /VAADIN/widgetsets/...
- // is appended)
+ // location of the widgetset(s) and default theme (to which + // /VAADIN/widgetsets/... + // is appended) String portalResourcePath = getPortalProperty( Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, portalCtx); if (portalResourcePath != null) { - // if portalResourcePath is defined, set it as a request
- // parameter which will override the default location in
- // servlet
+ // if portalResourcePath is defined, set it as a request + // parameter which will override the default location in + // servlet request.setAttribute( ApplicationServlet.REQUEST_VAADIN_STATIC_FILE_PATH, portalResourcePath); } - // - if the user has specified a widgetset for this portlet, use
- // it from the portlet (not fully supported)
- // - otherwise, if specified, use the portal-wide widgetset
- // and widgetset path settings (recommended)
- // - finally, default to use the default widgetset if nothing
- // else is found
+ // - if the user has specified a widgetset for this portlet, use + // it from the portlet (not fully supported) + // - otherwise, if specified, use the portal-wide widgetset + // and widgetset path settings (recommended) + // - finally, default to use the default widgetset if nothing + // else is found if (portletWidgetset != null) { request.setAttribute(ApplicationServlet.REQUEST_WIDGETSET, portletWidgetset); @@ -138,8 +138,8 @@ public class ApplicationPortlet implements Portlet, Serializable { style); } - // portalTheme is only used if the shared portal resource
- // directory is defined
+ // portalTheme is only used if the shared portal resource + // directory is defined if (portalTheme != null && portalResourcePath != null) { request.setAttribute( ApplicationServlet.REQUEST_DEFAULT_THEME, @@ -156,7 +156,7 @@ public class ApplicationPortlet implements Portlet, Serializable { */ OutputStream out = response.getPortletOutputStream(); - // Using portal-wide theme
+ // Using portal-wide theme String loadDefaultTheme = ("<script type=\"text/javascript\">\n" + "if(!vaadin) { var vaadin = {} } \n" + "if(!vaadin.themesLoaded) { vaadin.themesLoaded = {} } \n" @@ -220,10 +220,10 @@ public class ApplicationPortlet implements Portlet, Serializable { } private String getPortalProperty(String name, PortalContext context) { - boolean isLifeRay = context.getPortalInfo().toLowerCase().contains( - "liferay"); + boolean isLifeRay = context.getPortalInfo().toLowerCase() + .contains("liferay"); - // TODO test on non-LifeRay platforms
+ // TODO test on non-LifeRay platforms String value; if (isLifeRay) { diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java index 3182bfedf9..fc03ff9590 100644 --- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java +++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java @@ -106,8 +106,8 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet { * context, runner, application classname */ private static URIS getApplicationRunnerURIs(HttpServletRequest request) { - final String[] urlParts = request.getRequestURI().toString().split( - "\\/"); + final String[] urlParts = request.getRequestURI().toString() + .split("\\/"); String context = null; String runner = null; URIS uris = new URIS(); diff --git a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java index e523ad3ca5..b19abe163b 100644 --- a/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java +++ b/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java @@ -5,8 +5,8 @@ package com.vaadin.terminal.gwt.server; import java.util.Map; -import com.vaadin.ui.Component; import com.vaadin.ui.AbstractComponent.ComponentErrorEvent; +import com.vaadin.ui.Component; @SuppressWarnings("serial") public class ChangeVariablesErrorEvent implements ComponentErrorEvent { diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java index 4e6bfbd158..c48af80305 100644 --- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java @@ -162,9 +162,10 @@ public class CommunicationManager extends AbstractCommunicationManager { public void criticalNotification(Request request, Response response, String cap, String msg, String details, String outOfSyncURL) throws IOException { - servlet.criticalNotification((HttpServletRequest) request - .getWrappedRequest(), (HttpServletResponse) response - .getWrappedResponse(), cap, msg, details, outOfSyncURL); + servlet.criticalNotification( + (HttpServletRequest) request.getWrappedRequest(), + (HttpServletResponse) response.getWrappedResponse(), cap, + msg, details, outOfSyncURL); } public String getRequestPathInfo(Request request) { diff --git a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java index 9c496107a4..4ba0008252 100644 --- a/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java +++ b/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java @@ -21,6 +21,7 @@ import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Form; import com.vaadin.ui.GridLayout; +import com.vaadin.ui.GridLayout.Area; import com.vaadin.ui.Layout; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; @@ -28,7 +29,6 @@ import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.GridLayout.Area; @SuppressWarnings("serial") public class ComponentSizeValidator implements Serializable { @@ -111,8 +111,7 @@ public class ComponentSizeValidator implements Serializable { err.append("Layout problem detected: "); err.append(msg); err.append("\n"); - err - .append("Relative sizes were replaced by undefined sizes, components may not render as expected.\n"); + err.append("Relative sizes were replaced by undefined sizes, components may not render as expected.\n"); errorStream.println(err); } diff --git a/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java index 5709bc6a8d..754cc50d13 100644 --- a/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java @@ -26,11 +26,11 @@ import com.google.appengine.api.datastore.DatastoreService; import com.google.appengine.api.datastore.DatastoreServiceFactory; import com.google.appengine.api.datastore.Entity; import com.google.appengine.api.datastore.EntityNotFoundException; +import com.google.appengine.api.datastore.FetchOptions.Builder; import com.google.appengine.api.datastore.Key; import com.google.appengine.api.datastore.KeyFactory; import com.google.appengine.api.datastore.PreparedQuery; import com.google.appengine.api.datastore.Query; -import com.google.appengine.api.datastore.FetchOptions.Builder; import com.google.appengine.api.datastore.Query.FilterOperator; import com.google.appengine.api.memcache.Expiration; import com.google.appengine.api.memcache.MemcacheService; @@ -177,8 +177,8 @@ public class GAEApplicationServlet extends ApplicationServlet { if (requestType == RequestType.APPLICATION_RESOURCE) { // no locking needed, let superclass handle - getApplicationContext(request, MemcacheServiceFactory - .getMemcacheService()); + getApplicationContext(request, + MemcacheServiceFactory.getMemcacheService()); super.service(request, response); cleanSession(request); return; @@ -210,9 +210,8 @@ public class GAEApplicationServlet extends ApplicationServlet { try { Thread.sleep(RETRY_AFTER_MILLISECONDS); } catch (InterruptedException e) { - log - .info("Thread.sleep() interrupted while waiting for lock. Trying again. " - + e); + log.info("Thread.sleep() interrupted while waiting for lock. Trying again. " + + e); } } @@ -221,8 +220,7 @@ public class GAEApplicationServlet extends ApplicationServlet { // client to retry response.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE); // Note: currently interpreting Retry-After as ms, not sec - response - .setHeader("Retry-After", "" + RETRY_AFTER_MILLISECONDS); + response.setHeader("Retry-After", "" + RETRY_AFTER_MILLISECONDS); return; } @@ -397,9 +395,7 @@ public class GAEApplicationServlet extends ApplicationServlet { } } } catch (Exception e) { - log - .warning("Exception while cleaning: " - + getStackTraceAsString(e)); + log.warning("Exception while cleaning: " + getStackTraceAsString(e)); } } diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java index 91fabc948e..03de2fffd4 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java @@ -26,7 +26,7 @@ import com.vaadin.Application; /** * @author marc */ -@SuppressWarnings( { "serial", "unchecked" }) +@SuppressWarnings({ "serial", "unchecked" }) public class PortletApplicationContext extends WebApplicationContext implements Serializable { @@ -49,7 +49,7 @@ public class PortletApplicationContext extends WebApplicationContext implements cx = new PortletApplicationContext(); } if (!(cx instanceof PortletApplicationContext)) { - // TODO Should we even try this? And should we leave original as-is?
+ // TODO Should we even try this? And should we leave original as-is? PortletApplicationContext pcx = new PortletApplicationContext(); pcx.applications.addAll(cx.applications); cx.applications.clear(); @@ -89,7 +89,7 @@ public class PortletApplicationContext extends WebApplicationContext implements .iterator(); it.hasNext();) { Application value = it.next(); if (value == application) { - // values().iterator() is backed by the map
+ // values().iterator() is backed by the map it.remove(); } } diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java index 1ff07479fd..ceb26d1fb1 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java +++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java @@ -97,9 +97,7 @@ public class PortletApplicationContext2 extends AbstractWebApplicationContext { .getAttribute(PortletApplicationContext2.class.getName()); if (cx == null) { cx = new PortletApplicationContext2(); - session - .setAttribute(PortletApplicationContext2.class.getName(), - cx); + session.setAttribute(PortletApplicationContext2.class.getName(), cx); } if (cx.session == null) { cx.session = session; diff --git a/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java index 248a75efc9..57226588f9 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java @@ -161,9 +161,10 @@ public class PortletCommunicationManager extends AbstractCommunicationManager { public void criticalNotification(Request request, Response response, String cap, String msg, String details, String outOfSyncURL) throws IOException { - portlet.criticalNotification((PortletRequest) request - .getWrappedRequest(), (MimeResponse) response - .getWrappedResponse(), cap, msg, details, outOfSyncURL); + portlet.criticalNotification( + (PortletRequest) request.getWrappedRequest(), + (MimeResponse) response.getWrappedResponse(), cap, msg, + details, outOfSyncURL); } public String getRequestPathInfo(Request request) { diff --git a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java index c57a02e111..7422c8abec 100644 --- a/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java +++ b/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java @@ -51,8 +51,8 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { } public void flushBuffer() throws IOException { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public int getBufferSize() { @@ -76,12 +76,12 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { } public OutputStream getPortletOutputStream() throws IOException { - // write forbidden
+ // write forbidden return null; } public PrintWriter getWriter() throws IOException { - // write forbidden
+ // write forbidden return null; } @@ -90,23 +90,23 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { } public void reset() { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public void resetBuffer() { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public void setBufferSize(int size) { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public void setContentType(String type) { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public void setProperty(String key, String value) { @@ -118,8 +118,8 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { } public void setNextPossiblePortletModes(Collection<PortletMode> portletModes) { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public ResourceURL createResourceURL() { @@ -131,17 +131,17 @@ class RestrictedRenderResponse implements RenderResponse, Serializable { } public void addProperty(Cookie cookie) { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public void addProperty(String key, Element element) { - // NOP
- // TODO throw?
+ // NOP + // TODO throw? } public Element createElement(String tagName) throws DOMException { - // NOP
+ // NOP return null; } }
\ No newline at end of file diff --git a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java index 1f3ff8befc..116667f582 100644 --- a/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java @@ -41,8 +41,8 @@ public class WebApplicationContext extends AbstractWebApplicationContext { * @see com.vaadin.service.ApplicationContext#getBaseDirectory() */ public File getBaseDirectory() { - final String realPath = ApplicationServlet.getResourcePath(session - .getServletContext(), "/"); + final String realPath = ApplicationServlet.getResourcePath( + session.getServletContext(), "/"); if (realPath == null) { return null; } diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java index 02faefa3f4..1ba954c611 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/AcceptCriteriaFactoryGenerator.java @@ -10,8 +10,8 @@ import java.util.Date; import com.google.gwt.core.ext.Generator; import com.google.gwt.core.ext.GeneratorContext; import com.google.gwt.core.ext.TreeLogger; -import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.core.ext.TreeLogger.Type; +import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.core.ext.typeinfo.JClassType; import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.user.rebind.ClassSourceFileComposerFactory; @@ -77,8 +77,7 @@ public class AcceptCriteriaFactoryGenerator extends Generator { ClassSourceFileComposerFactory composer = null; composer = new ClassSourceFileComposerFactory(packageName, className); composer.addImport("com.google.gwt.core.client.GWT"); - composer - .setSuperclass("com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory"); + composer.setSuperclass("com.vaadin.terminal.gwt.client.ui.dd.VAcceptCriterionFactory"); SourceWriter sourceWriter = composer.createSourceWriter(context, printWriter); @@ -89,8 +88,9 @@ public class AcceptCriteriaFactoryGenerator extends Generator { sourceWriter.println("}"); // commit generated class context.commit(logger, printWriter); - logger.log(Type.INFO, "Done. (" - + (new Date().getTime() - date.getTime()) / 1000 + "seconds)"); + logger.log(Type.INFO, + "Done. (" + (new Date().getTime() - date.getTime()) / 1000 + + "seconds)"); } @@ -106,8 +106,8 @@ public class AcceptCriteriaFactoryGenerator extends Generator { .getCriterion(); for (Class<? extends AcceptCriterion> class1 : clientSideVerifiableCriterion) { - logger.log(Type.INFO, "creating mapping for " - + class1.getCanonicalName()); + logger.log(Type.INFO, + "creating mapping for " + class1.getCanonicalName()); String canonicalName = class1.getCanonicalName(); Class<? extends VAcceptCriterion> clientClass = class1 .getAnnotation(ClientCriterion.class).value(); diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java index 838b04f909..ea4cbcb663 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java @@ -92,7 +92,8 @@ public class ClassPathExplorer { /** * Finds server side widgets with {@link ClientWidget} annotation on the - * class path (entries that can contain widgets/widgetsets - see {@link #getRawClasspathEntries()}). + * class path (entries that can contain widgets/widgetsets - see + * {@link #getRawClasspathEntries()}). * * As a side effect, also accept criteria are searched under the same class * path entries and added into the acceptCriterion collection. @@ -188,8 +189,9 @@ public class ClassPathExplorer { String basePath = location.getFile().replaceAll( "/" + packagePath + "$", ""); try { - URL url = new URL(location.getProtocol(), location - .getHost(), location.getPort(), basePath); + URL url = new URL(location.getProtocol(), + location.getHost(), location.getPort(), + basePath); widgetsets.put(classname, url); } catch (MalformedURLException e) { // should never happen as based on an existing URL, @@ -388,8 +390,8 @@ public class ClassPathExplorer { && !dirs[i].getPath().contains(File.separator + ".")) { String key = dirs[i].getCanonicalPath() + "/" + name + dirs[i].getName(); - locations.put(key, new URL("file://" - + dirs[i].getCanonicalPath())); + locations.put(key, + new URL("file://" + dirs[i].getCanonicalPath())); } } catch (Exception ioe) { return; @@ -473,8 +475,8 @@ public class ClassPathExplorer { String entryname = entry.getName(); if (!entry.isDirectory() && entryname.endsWith(".class")) { - String classname = entryname.substring(0, entryname - .length() - 6); + String classname = entryname.substring(0, + entryname.length() - 6); if (classname.startsWith("/")) { classname = classname.substring(1); } diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java index b4e5df316c..5fefa68fd8 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java @@ -14,8 +14,8 @@ import java.util.TreeSet; import com.google.gwt.core.ext.Generator; import com.google.gwt.core.ext.GeneratorContext; import com.google.gwt.core.ext.TreeLogger; -import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.core.ext.TreeLogger.Type; +import com.google.gwt.core.ext.UnableToCompleteException; import com.google.gwt.core.ext.typeinfo.JClassType; import com.google.gwt.core.ext.typeinfo.TypeOracle; import com.google.gwt.user.rebind.ClassSourceFileComposerFactory; @@ -107,9 +107,8 @@ public class WidgetMapGenerator extends Generator { if (printWriter == null) { return; } - logger - .log(Type.INFO, - "Detecting Vaadin components in classpath to generate WidgetMapImpl.java ..."); + logger.log(Type.INFO, + "Detecting Vaadin components in classpath to generate WidgetMapImpl.java ..."); Date date = new Date(); // init composer, set class properties, create source writer @@ -136,8 +135,9 @@ public class WidgetMapGenerator extends Generator { sourceWriter.println("}"); // commit generated class context.commit(logger, printWriter); - logger.log(Type.INFO, "Done. (" - + (new Date().getTime() - date.getTime()) / 1000 + "seconds)"); + logger.log(Type.INFO, + "Done. (" + (new Date().getTime() - date.getTime()) / 1000 + + "seconds)"); } @@ -171,9 +171,8 @@ public class WidgetMapGenerator extends Generator { } } - logger - .log(Type.INFO, - "Widget set will contain implementations for following components: "); + logger.log(Type.INFO, + "Widget set will contain implementations for following components: "); TreeSet<String> classNames = new TreeSet<String>(); for (Class<? extends Paintable> class1 : paintablesHavingWidgetAnnotation) { diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java index ccde1719e4..7eaee22073 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetSetBuilder.java @@ -189,8 +189,7 @@ public class WidgetSetBuilder { o.println(" 2. Give the widgetsetname (to be created or updated)" + " as first parameter"); o.println(); - o - .println("All found vaadin widgetsets will be inherited in given widgetset"); + o.println("All found vaadin widgetsets will be inherited in given widgetset"); } diff --git a/src/com/vaadin/tools/WidgetsetCompiler.java b/src/com/vaadin/tools/WidgetsetCompiler.java index ad1c5cfcd2..ab5e4ad9d3 100644 --- a/src/com/vaadin/tools/WidgetsetCompiler.java +++ b/src/com/vaadin/tools/WidgetsetCompiler.java @@ -37,23 +37,23 @@ public class WidgetsetCompiler { */ public static void main(final String[] args) { try { - // run the compiler in a different thread to enable using the
- // user-set stack size
+ // run the compiler in a different thread to enable using the + // user-set stack size - // on Windows, the default stack size is too small for the main
- // thread and cannot be changed in JRE 1.5 (see
- // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197)
+ // on Windows, the default stack size is too small for the main + // thread and cannot be changed in JRE 1.5 (see + // http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6316197) Runnable runCompiler = new Runnable() { public void run() { try { - // GWTCompiler.main(args);
- // avoid warnings
+ // GWTCompiler.main(args); + // avoid warnings String wsname = args[args.length - 1]; - // TODO expecting this is launched via eclipse WTP
- // project
+ // TODO expecting this is launched via eclipse WTP + // project System.out .println("Updating GWT module description file..."); WidgetSetBuilder.updateWidgetSet(wsname); diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java index 0875355c73..78e73845ad 100644 --- a/src/com/vaadin/ui/AbstractComponent.java +++ b/src/com/vaadin/ui/AbstractComponent.java @@ -320,7 +320,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * InlineDateField date = new InlineDateField("Datum"); * * // German language specified with ISO 639-1 language - * // code and ISO 3166-1 alpha-2 country code. + * // code and ISO 3166-1 alpha-2 country code. * date.setLocale(new Locale("de", "DE")); * * date.setResolution(DateField.RESOLUTION_DAY); @@ -735,8 +735,8 @@ public abstract class AbstractComponent implements Component, MethodEventSource } if (eventIdentifiers != null) { - target.addAttribute("eventListeners", eventIdentifiers - .toArray()); + target.addAttribute("eventListeners", + eventIdentifiers.toArray()); } paintContent(target); diff --git a/src/com/vaadin/ui/AbstractLayout.java b/src/com/vaadin/ui/AbstractLayout.java index ce4b3e40c7..5cb698e688 100644 --- a/src/com/vaadin/ui/AbstractLayout.java +++ b/src/com/vaadin/ui/AbstractLayout.java @@ -59,9 +59,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer */ public void setMargin(boolean topEnabled, boolean rightEnabled, boolean bottomEnabled, boolean leftEnabled) { - margins - .setMargins(topEnabled, rightEnabled, bottomEnabled, - leftEnabled); + margins.setMargins(topEnabled, rightEnabled, bottomEnabled, leftEnabled); requestRepaint(); } diff --git a/src/com/vaadin/ui/Component.java b/src/com/vaadin/ui/Component.java index cfc648d9b0..4dcd81da31 100644 --- a/src/com/vaadin/ui/Component.java +++ b/src/com/vaadin/ui/Component.java @@ -473,9 +473,9 @@ public interface Component extends Paintable, VariableOwner, Sizeable, * </p> * * @param caption - * the new caption for the component. If the caption is {@code - * null}, no caption is shown and it does not normally take any - * space + * the new caption for the component. If the caption is + * {@code null}, no caption is shown and it does not normally + * take any space */ public void setCaption(String caption); @@ -533,10 +533,10 @@ public interface Component extends Paintable, VariableOwner, Sizeable, * </p> * * <p> - * An icon will be rendered inside an HTML element that has the {@code - * v-icon} CSS style class. The containing layout may enclose an icon and a - * caption inside elements related to the caption, such as {@code v-caption} - * . + * An icon will be rendered inside an HTML element that has the + * {@code v-icon} CSS style class. The containing layout may enclose an icon + * and a caption inside elements related to the caption, such as + * {@code v-caption} . * </p> * * This method will trigger a @@ -1075,7 +1075,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable, * * username.setTabIndex(1); * password.setTabIndex(2); - * remember.setTabIndex(3); // Different than natural place + * remember.setTabIndex(3); // Different than natural place * login.setTabIndex(4); * </pre> * diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java index 59d13c137f..673003175c 100644 --- a/src/com/vaadin/ui/CssLayout.java +++ b/src/com/vaadin/ui/CssLayout.java @@ -33,7 +33,7 @@ import com.vaadin.terminal.gwt.client.ui.VCssLayout; * <li>noticeably faster rendering time in some situations as we rely more on * the browser's rendering engine. * </ul> - *<p> + * <p> * With {@link CustomLayout} one can often achieve similar results (good looking * layouts with web technologies), but with CustomLayout developer needs to work * with fixed templates. diff --git a/src/com/vaadin/ui/DragAndDropWrapper.java b/src/com/vaadin/ui/DragAndDropWrapper.java index 2421e43401..87ff571f36 100644 --- a/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/src/com/vaadin/ui/DragAndDropWrapper.java @@ -266,8 +266,8 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, throws UploadException { Html5File file = receivers.get(fileId); if (file != null && file.receiver != null) { - OutputStream receiveUpload = file.receiver.receiveUpload(file - .getFileName(), "TODO"); + OutputStream receiveUpload = file.receiver.receiveUpload( + file.getFileName(), "TODO"); InputStream stream = upstream.getStream(); byte[] buf = new byte[AbstractApplicationServlet.MAX_BUFFER_SIZE]; diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java index 30cd546b4b..c79b62e539 100644 --- a/src/com/vaadin/ui/Form.java +++ b/src/com/vaadin/ui/Form.java @@ -682,8 +682,9 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item) */ public void setItemDataSource(Item newDataSource) { - setItemDataSource(newDataSource, newDataSource != null ? newDataSource - .getItemPropertyIds() : null); + setItemDataSource(newDataSource, + newDataSource != null ? newDataSource.getItemPropertyIds() + : null); } /** @@ -782,8 +783,8 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, Field f = getField(properties[i]); layout.removeComponent(f); if (newLayout instanceof CustomLayout) { - ((CustomLayout) newLayout).addComponent(f, properties[i] - .toString()); + ((CustomLayout) newLayout).addComponent(f, + properties[i].toString()); } else { newLayout.addComponent(f); } @@ -832,8 +833,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item, + propertyId.toString() + "' can not be found."); } final Object value = oldField.getPropertyDataSource() == null ? oldField - .getValue() - : oldField.getPropertyDataSource().getValue(); + .getValue() : oldField.getPropertyDataSource().getValue(); // Checks that the value exists and check if the select should // be forced in multiselect mode diff --git a/src/com/vaadin/ui/FormLayout.java b/src/com/vaadin/ui/FormLayout.java index 4b42f0d8fb..97b5b0c7fc 100644 --- a/src/com/vaadin/ui/FormLayout.java +++ b/src/com/vaadin/ui/FormLayout.java @@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.ui.VFormLayout; * bottom are by default on. * */ -@SuppressWarnings( { "deprecation", "serial" }) +@SuppressWarnings({ "deprecation", "serial" }) @ClientWidget(VFormLayout.class) public class FormLayout extends OrderedLayout { diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java index b7e92402cc..51610912d1 100644 --- a/src/com/vaadin/ui/GridLayout.java +++ b/src/com/vaadin/ui/GridLayout.java @@ -18,6 +18,7 @@ import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.terminal.gwt.client.ui.VGridLayout; +import com.vaadin.ui.GridLayout.OverlapsException; /** * <p> @@ -1074,8 +1075,9 @@ public class GridLayout extends AbstractLayout implements addComponent(newComponent); } else if (newLocation == null) { removeComponent(oldComponent); - addComponent(newComponent, oldLocation.getColumn1(), oldLocation - .getRow1(), oldLocation.getColumn2(), oldLocation.getRow2()); + addComponent(newComponent, oldLocation.getColumn1(), + oldLocation.getRow1(), oldLocation.getColumn2(), + oldLocation.getRow2()); } else { oldLocation.setComponent(newComponent); newLocation.setComponent(oldComponent); diff --git a/src/com/vaadin/ui/Layout.java b/src/com/vaadin/ui/Layout.java index f735b86023..df4798b0c2 100644 --- a/src/com/vaadin/ui/Layout.java +++ b/src/com/vaadin/ui/Layout.java @@ -6,8 +6,8 @@ package com.vaadin.ui; import java.io.Serializable; -import com.vaadin.terminal.gwt.client.ui.VMarginInfo; import com.vaadin.terminal.gwt.client.ui.AlignmentInfo.Bits; +import com.vaadin.terminal.gwt.client.ui.VMarginInfo; /** * Extension to the {@link ComponentContainer} interface which adds the diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java index 3c9ac71645..9a3d24a53d 100644 --- a/src/com/vaadin/ui/Panel.java +++ b/src/com/vaadin/ui/Panel.java @@ -8,8 +8,8 @@ import java.util.Iterator; import java.util.Map; import com.vaadin.event.Action; -import com.vaadin.event.ActionManager; import com.vaadin.event.Action.Handler; +import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; import com.vaadin.terminal.PaintException; @@ -191,10 +191,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable, // detach old content if present if (content != null) { content.setParent(null); - content - .removeListener((ComponentContainer.ComponentAttachListener) this); - content - .removeListener((ComponentContainer.ComponentDetachListener) this); + content.removeListener((ComponentContainer.ComponentAttachListener) this); + content.removeListener((ComponentContainer.ComponentDetachListener) this); } // Sets the panel to be parent for the content diff --git a/src/com/vaadin/ui/PopupView.java b/src/com/vaadin/ui/PopupView.java index 93208d84d2..7879b04ee4 100644 --- a/src/com/vaadin/ui/PopupView.java +++ b/src/com/vaadin/ui/PopupView.java @@ -47,8 +47,7 @@ public class PopupView extends AbstractComponentContainer { * {@link PopupView#getComponentIterator()}. */ private static class SingleComponentIterator implements - Iterator<Component>, - Serializable { + Iterator<Component>, Serializable { private final Component component; private boolean first; diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java index 0f33529714..bd7ec39bdb 100644 --- a/src/com/vaadin/ui/Select.java +++ b/src/com/vaadin/ui/Select.java @@ -283,8 +283,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering, int index = options.indexOf(selection); if (index != -1 && (index < first || index >= last)) { int newPage = (index + (needNullSelectOption ? 1 - : 0)) - / pageLength; + : 0)) / pageLength; currentPage = newPage; return sanitetizeList(options, needNullSelectOption); } diff --git a/src/com/vaadin/ui/Slider.java b/src/com/vaadin/ui/Slider.java index 7d06b8075a..55ff48b48a 100644 --- a/src/com/vaadin/ui/Slider.java +++ b/src/com/vaadin/ui/Slider.java @@ -41,7 +41,7 @@ import com.vaadin.terminal.gwt.client.ui.VSlider; * setVolume(d.doubleValue()); * } * } - * + * * </code> * * @author IT Mill Ltd. @@ -408,8 +408,8 @@ public class Slider extends AbstractField { target.addAttribute("resolution", resolution); if (resolution > 0) { - target.addVariable(this, "value", ((Double) getValue()) - .doubleValue()); + target.addVariable(this, "value", + ((Double) getValue()).doubleValue()); } else { target.addVariable(this, "value", ((Double) getValue()).intValue()); } diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java index db8178ed07..d25e68a7f9 100644 --- a/src/com/vaadin/ui/TabSheet.java +++ b/src/com/vaadin/ui/TabSheet.java @@ -21,6 +21,8 @@ import com.vaadin.terminal.PaintTarget; import com.vaadin.terminal.Resource; import com.vaadin.terminal.gwt.client.ui.VTabsheet; import com.vaadin.terminal.gwt.server.CommunicationManager; +import com.vaadin.ui.TabSheet.CloseHandler; +import com.vaadin.ui.TabSheet.Tab; import com.vaadin.ui.themes.Reindeer; import com.vaadin.ui.themes.Runo; diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java index 2ee80d7430..1f0200b583 100644 --- a/src/com/vaadin/ui/Table.java +++ b/src/com/vaadin/ui/Table.java @@ -24,9 +24,9 @@ import com.vaadin.data.Property; import com.vaadin.data.util.ContainerOrderedWrapper; import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.Action; +import com.vaadin.event.Action.Handler; import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.Action.Handler; import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.event.ItemClickEvent.ItemClickSource; import com.vaadin.event.MouseEvents.ClickEvent; @@ -553,8 +553,7 @@ public class Table extends AbstractSelect implements Action.Container, this.columnHeaders.clear(); int i = 0; for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() - && i < columnHeaders.length; i++) { + .hasNext() && i < columnHeaders.length; i++) { this.columnHeaders.put(it.next(), columnHeaders[i]); } @@ -617,8 +616,7 @@ public class Table extends AbstractSelect implements Action.Container, this.columnIcons.clear(); int i = 0; for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() - && i < columnIcons.length; i++) { + .hasNext() && i < columnIcons.length; i++) { this.columnIcons.put(it.next(), columnIcons[i]); } @@ -698,8 +696,7 @@ public class Table extends AbstractSelect implements Action.Container, final HashMap<Object, String> newCA = new HashMap<Object, String>(); int i = 0; for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() - && i < columnAlignments.length; i++) { + .hasNext() && i < columnAlignments.length; i++) { newCA.put(it.next(), columnAlignments[i]); } this.columnAlignments = newCA; @@ -714,7 +711,7 @@ public class Table extends AbstractSelect implements Action.Container, * small or very big values. Setting width to -1 (default) means that theme * will make decision of width. * - *<p> + * <p> * Column can either have a fixed width or expand ratio. The latter one set * is used. See @link {@link #setColumnExpandRatio(Object, float)}. * @@ -2075,8 +2072,8 @@ public class Table extends AbstractSelect implements Action.Container, // Actions if (variables.containsKey("action")) { - final StringTokenizer st = new StringTokenizer((String) variables - .get("action"), ","); + final StringTokenizer st = new StringTokenizer( + (String) variables.get("action"), ","); if (st.countTokens() == 2) { final Object itemId = itemIdMapper.get(st.nextToken()); final Action action = (Action) actionMapper.get(st.nextToken()); @@ -2337,8 +2334,7 @@ public class Table extends AbstractSelect implements Action.Container, final boolean[] iscomponent = new boolean[visibleColumns.size()]; int iscomponentIndex = 0; for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() - && iscomponentIndex < iscomponent.length;) { + .hasNext() && iscomponentIndex < iscomponent.length;) { final Object columnId = it.next(); if (columnGenerators.containsKey(columnId)) { iscomponent[iscomponentIndex++] = true; @@ -2383,8 +2379,8 @@ public class Table extends AbstractSelect implements Action.Container, // The select variable is only enabled if selectable if (selectable) { - target.addVariable(this, "selected", selectedKeys - .toArray(new String[selectedKeys.size()])); + target.addVariable(this, "selected", + selectedKeys.toArray(new String[selectedKeys.size()])); } // The cursors are only shown on pageable table @@ -2394,8 +2390,8 @@ public class Table extends AbstractSelect implements Action.Container, // Sorting if (getContainerDataSource() instanceof Container.Sortable) { - target.addVariable(this, "sortcolumn", columnIdMap - .key(sortContainerPropertyId)); + target.addVariable(this, "sortcolumn", + columnIdMap.key(sortContainerPropertyId)); target.addVariable(this, "sortascending", sortAscending); } @@ -2429,8 +2425,7 @@ public class Table extends AbstractSelect implements Action.Container, final String[] colorder = new String[visibleColumns.size()]; int i = 0; for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() - && i < colorder.length;) { + .hasNext() && i < colorder.length;) { colorder[i++] = columnIdMap.key(it.next()); } target.addVariable(this, "columnorder", colorder); @@ -2448,8 +2443,7 @@ public class Table extends AbstractSelect implements Action.Container, final String[] collapsedkeys = new String[ccs.size()]; int nextColumn = 0; for (final Iterator<Object> it = visibleColumns.iterator(); it - .hasNext() - && nextColumn < collapsedkeys.length;) { + .hasNext() && nextColumn < collapsedkeys.length;) { final Object columnId = it.next(); if (isColumnCollapsed(columnId)) { collapsedkeys[nextColumn++] = columnIdMap.key(columnId); @@ -2485,8 +2479,8 @@ public class Table extends AbstractSelect implements Action.Container, } if (columnWidths.containsKey(columnId)) { if (getColumnWidth(columnId) > -1) { - target.addAttribute("width", String - .valueOf(getColumnWidth(columnId))); + target.addAttribute("width", + String.valueOf(getColumnWidth(columnId))); } else { target.addAttribute("er", getColumnExpandRatio(columnId)); @@ -2542,8 +2536,7 @@ public class Table extends AbstractSelect implements Action.Container, c.paint(target); } } else { - target - .addText((String) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]); + target.addText((String) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]); } } @@ -2557,8 +2550,8 @@ public class Table extends AbstractSelect implements Action.Container, paintRowIcon(target, cells, indexInRowbuffer); paintRowHeader(target, cells, indexInRowbuffer); - target.addAttribute("key", Integer - .parseInt(cells[CELL_KEY][indexInRowbuffer].toString())); + target.addAttribute("key", + Integer.parseInt(cells[CELL_KEY][indexInRowbuffer].toString())); if (isSelected(itemId)) { target.addAttribute("selected", true); @@ -3697,8 +3690,8 @@ public class Table extends AbstractSelect implements Action.Container, AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent .getTargetDetails(); table = (Table) dragEvent.getTargetDetails().getTarget(); - ArrayList<Object> visibleItemIds = new ArrayList<Object>(table - .getPageLength()); + ArrayList<Object> visibleItemIds = new ArrayList<Object>( + table.getPageLength()); visibleItemIds.size(); Object id = table.getCurrentPageFirstItemId(); for (int i = 0; i < table.getPageLength() && id != null; i++) { diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java index 4e7fda5d88..505f37a783 100644 --- a/src/com/vaadin/ui/Tree.java +++ b/src/com/vaadin/ui/Tree.java @@ -25,9 +25,9 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.event.Action; import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.ItemClickEvent; -import com.vaadin.event.Transferable; import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.event.ItemClickEvent.ItemClickSource; +import com.vaadin.event.Transferable; import com.vaadin.event.dd.DragAndDropEvent; import com.vaadin.event.dd.DragSource; import com.vaadin.event.dd.DropHandler; @@ -436,8 +436,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, // Actions if (variables.containsKey("action")) { - final StringTokenizer st = new StringTokenizer((String) variables - .get("action"), ","); + final StringTokenizer st = new StringTokenizer( + (String) variables.get("action"), ","); if (st.countTokens() == 2) { final Object itemId = itemIdMapper.get(st.nextToken()); final Action action = (Action) actionMapper.get(st.nextToken()); @@ -508,8 +508,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, target.addAttribute("selectmode", (isMultiSelect() ? "multi" : "single")); if (isMultiSelect()) { - target.addAttribute("multiselectmode", multiSelectMode - .ordinal()); + target.addAttribute("multiselectmode", + multiSelectMode.ordinal()); } } else { target.addAttribute("selectmode", "none"); @@ -661,8 +661,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, partialUpdate = false; } else { // Selected - target.addVariable(this, "selected", selectedKeys - .toArray(new String[selectedKeys.size()])); + target.addVariable(this, "selected", + selectedKeys.toArray(new String[selectedKeys.size()])); // Expand and collapse target.addVariable(this, "expand", new String[] {}); diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java index b1b26e2807..8e407fe5ad 100644 --- a/src/com/vaadin/ui/Window.java +++ b/src/com/vaadin/ui/Window.java @@ -18,9 +18,9 @@ import java.util.Set; import com.vaadin.Application; import com.vaadin.event.ShortcutAction; -import com.vaadin.event.ShortcutListener; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; +import com.vaadin.event.ShortcutListener; import com.vaadin.terminal.DownloadStream; import com.vaadin.terminal.PaintException; import com.vaadin.terminal.PaintTarget; @@ -37,8 +37,8 @@ import com.vaadin.terminal.gwt.client.ui.VWindow; * <p> * If the window is a application window or a sub window depends on how it is * added to the application. Adding a {@code Window} to a {@code Window} using - * {@link Window#addWindow(Window)} makes it a sub window and adding a {@code - * Window} to the {@code Application} using + * {@link Window#addWindow(Window)} makes it a sub window and adding a + * {@code Window} to the {@code Application} using * {@link Application#addWindow(Window)} makes it an application window. * </p> * <p> @@ -378,8 +378,8 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * <b>Application window only</b>. Handles an URI by passing the URI to all * URI handlers defined using {@link #addURIHandler(URIHandler)}. All URI * handlers are called for each URI but no more than one handler may return - * a {@link DownloadStream}. If more than one stream is returned a {@code - * RuntimeException} is thrown. + * a {@link DownloadStream}. If more than one stream is returned a + * {@code RuntimeException} is thrown. * * @param context * The URL of the application @@ -470,8 +470,8 @@ public class Window extends Panel implements URIHandler, ParameterHandler { /** * <b>Application window only</b>. Handles parameters by passing the * parameters to all {@code ParameterHandler}s defined using - * {@link #addParameterHandler(ParameterHandler)}. All {@code - * ParameterHandler}s are called for each set of parameters. + * {@link #addParameterHandler(ParameterHandler)}. All + * {@code ParameterHandler}s are called for each set of parameters. * * @param parameters * a map containing the parameter names and values @@ -822,10 +822,10 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * name of the window is used to uniquely identify it. * <p> * The name also determines the URL that can be used for direct access to a - * window. All windows can be accessed through {@code - * http://host:port/app/win} where {@code http://host:port/app} is the - * application URL (as returned by {@link Application#getURL()} and {@code - * win} is the window name. + * window. All windows can be accessed through + * {@code http://host:port/app/win} where {@code http://host:port/app} is + * the application URL (as returned by {@link Application#getURL()} and + * {@code win} is the window name. * </p> * <p> * Note! Portlets do not support direct window access through URLs. @@ -908,10 +908,10 @@ public class Window extends Panel implements URIHandler, ParameterHandler { * application. * <p> * The name also determines the URL that can be used for direct access to a - * window. All windows can be accessed through {@code - * http://host:port/app/win} where {@code http://host:port/app} is the - * application URL (as returned by {@link Application#getURL()} and {@code - * win} is the window name. + * window. All windows can be accessed through + * {@code http://host:port/app/win} where {@code http://host:port/app} is + * the application URL (as returned by {@link Application#getURL()} and + * {@code win} is the window name. * </p> * <p> * This method can only be called before the window is added to an diff --git a/tests/src/com/vaadin/tests/CustomLayoutDemo.java b/tests/src/com/vaadin/tests/CustomLayoutDemo.java index ac0507332b..2a8d5de9b7 100644 --- a/tests/src/com/vaadin/tests/CustomLayoutDemo.java +++ b/tests/src/com/vaadin/tests/CustomLayoutDemo.java @@ -5,6 +5,8 @@ package com.vaadin.tests; import com.vaadin.ui.Button; +import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.Listener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Field; import com.vaadin.ui.Label; @@ -12,8 +14,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.Window; -import com.vaadin.ui.Component.Event; -import com.vaadin.ui.Component.Listener; /** * This example demonstrates custom layout. All components created here are diff --git a/tests/src/com/vaadin/tests/FocusingComponents.java b/tests/src/com/vaadin/tests/FocusingComponents.java index 0f1fb6ccb0..e74a935830 100644 --- a/tests/src/com/vaadin/tests/FocusingComponents.java +++ b/tests/src/com/vaadin/tests/FocusingComponents.java @@ -2,6 +2,7 @@ package com.vaadin.tests; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComboBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.DateField; @@ -10,7 +11,6 @@ import com.vaadin.ui.ListSelect; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; /** * Simple test helper to test Focusable.focus() method. diff --git a/tests/src/com/vaadin/tests/LayoutDemo.java b/tests/src/com/vaadin/tests/LayoutDemo.java index cdeeebfa37..1cdf4de298 100644 --- a/tests/src/com/vaadin/tests/LayoutDemo.java +++ b/tests/src/com/vaadin/tests/LayoutDemo.java @@ -75,8 +75,7 @@ public class LayoutDemo extends com.vaadin.Application { // Create TabSheet // final TabSheet tabsheet = new TabSheet(); - tabsheet - .setCaption("Tabsheet, above layouts are added to this component"); + tabsheet.setCaption("Tabsheet, above layouts are added to this component"); tabsheet.addTab(layoutA, "Horizontal ordered layout", null); tabsheet.addTab(layoutB, "Vertical ordered layout", null); tabsheet.addTab(layoutG, "First grid layout", null); @@ -121,13 +120,12 @@ public class LayoutDemo extends com.vaadin.Application { private Component getExampleComponent(String caption) { final Panel panel = new Panel(); panel.setCaption("Panel component " + caption); - panel - .addComponent(new Label( - "Panel is a container for other components, by default it draws a frame around it's " - + "extremities and may have a caption to clarify the nature of the contained components' purpose." - + " Panel contains an layout where the actual contained components are added, " - + "this layout may be switched on the fly.", - Label.CONTENT_XHTML)); + panel.addComponent(new Label( + "Panel is a container for other components, by default it draws a frame around it's " + + "extremities and may have a caption to clarify the nature of the contained components' purpose." + + " Panel contains an layout where the actual contained components are added, " + + "this layout may be switched on the fly.", + Label.CONTENT_XHTML)); panel.setWidth(222); return panel; } diff --git a/tests/src/com/vaadin/tests/ListenerOrder.java b/tests/src/com/vaadin/tests/ListenerOrder.java index 6f62f6a83e..3b7329c384 100644 --- a/tests/src/com/vaadin/tests/ListenerOrder.java +++ b/tests/src/com/vaadin/tests/ListenerOrder.java @@ -3,18 +3,18 @@ package com.vaadin.tests; import java.util.HashMap; import java.util.Iterator; -import com.vaadin.data.Item; import com.vaadin.data.Container.ItemSetChangeEvent; import com.vaadin.data.Container.ItemSetChangeListener; import com.vaadin.data.Container.PropertySetChangeEvent; import com.vaadin.data.Container.PropertySetChangeListener; +import com.vaadin.data.Item; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Select; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class ListenerOrder extends com.vaadin.Application implements Button.ClickListener, PropertySetChangeListener, ItemSetChangeListener, diff --git a/tests/src/com/vaadin/tests/ModalWindow.java b/tests/src/com/vaadin/tests/ModalWindow.java index 90d239abfd..4ace9f889e 100644 --- a/tests/src/com/vaadin/tests/ModalWindow.java +++ b/tests/src/com/vaadin/tests/ModalWindow.java @@ -5,11 +5,11 @@ package com.vaadin.tests; 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.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; /** * Simple program that demonstrates "modal windows" that block all access other diff --git a/tests/src/com/vaadin/tests/NativeWindowing.java b/tests/src/com/vaadin/tests/NativeWindowing.java index 13c3139036..e1cf608763 100644 --- a/tests/src/com/vaadin/tests/NativeWindowing.java +++ b/tests/src/com/vaadin/tests/NativeWindowing.java @@ -9,9 +9,9 @@ import java.net.URL; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class NativeWindowing extends Application { @@ -78,16 +78,13 @@ public class NativeWindowing extends Application { new Button.ClickListener() { public void buttonClick(ClickEvent event) { try { - main - .open( - new com.vaadin.terminal.ExternalResource( - new URL( - getURL(), - "mainwin-" - + System - .currentTimeMillis() - + "/")), - null); + main.open( + new com.vaadin.terminal.ExternalResource( + new URL( + getURL(), + "mainwin-" + + System.currentTimeMillis() + + "/")), null); } catch (final MalformedURLException e) { } } diff --git a/tests/src/com/vaadin/tests/OrderedLayoutSwapComponents.java b/tests/src/com/vaadin/tests/OrderedLayoutSwapComponents.java index 89382053d4..1c21cb25bd 100644 --- a/tests/src/com/vaadin/tests/OrderedLayoutSwapComponents.java +++ b/tests/src/com/vaadin/tests/OrderedLayoutSwapComponents.java @@ -7,10 +7,10 @@ package com.vaadin.tests; import java.util.ArrayList; 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.OrderedLayout; -import com.vaadin.ui.Button.ClickEvent; /** * diff --git a/tests/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java b/tests/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java index 6b5f271dbe..f5dcc43d5e 100644 --- a/tests/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java +++ b/tests/src/com/vaadin/tests/PerformanceTestLabelsAndOrderedLayouts.java @@ -7,11 +7,11 @@ package com.vaadin.tests; import java.util.Date; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.OrderedLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class PerformanceTestLabelsAndOrderedLayouts extends CustomComponent { private final OrderedLayout main; diff --git a/tests/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java b/tests/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java index cf03074e56..8d39562101 100644 --- a/tests/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java +++ b/tests/src/com/vaadin/tests/PerformanceTestSubTreeCaching.java @@ -37,12 +37,10 @@ public class PerformanceTestSubTreeCaching extends CustomComponent { addInfo(); Button b = new Button("start test", this, "startTest"); - b - .setDescription("Push this button to start test. A test label will be rendered above existing components."); + b.setDescription("Push this button to start test. A test label will be rendered above existing components."); main.addComponent(b); b = new Button("end test", this, "endTest"); - b - .setDescription("Push this button as soon as test componenet is rendered."); + b.setDescription("Push this button as soon as test componenet is rendered."); main.addComponent(b); result = new Label(); diff --git a/tests/src/com/vaadin/tests/RandomLayoutStress.java b/tests/src/com/vaadin/tests/RandomLayoutStress.java index a6277a8262..327e34418e 100644 --- a/tests/src/com/vaadin/tests/RandomLayoutStress.java +++ b/tests/src/com/vaadin/tests/RandomLayoutStress.java @@ -82,8 +82,7 @@ public class RandomLayoutStress extends com.vaadin.Application { // Create TabSheet final TabSheet tabsheet = new TabSheet(); - tabsheet - .setCaption("Tabsheet, above layouts are added to this component"); + tabsheet.setCaption("Tabsheet, above layouts are added to this component"); layoutA = new OrderedLayout(OrderedLayout.ORIENTATION_HORIZONTAL); // Add 4 random components fillLayout(layoutA, componentCountA); diff --git a/tests/src/com/vaadin/tests/ScrollbarStressTest.java b/tests/src/com/vaadin/tests/ScrollbarStressTest.java index 23a34302f8..d7b8cdd8bf 100644 --- a/tests/src/com/vaadin/tests/ScrollbarStressTest.java +++ b/tests/src/com/vaadin/tests/ScrollbarStressTest.java @@ -3,6 +3,8 @@ package com.vaadin.tests; import com.vaadin.Application; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; @@ -13,8 +15,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class ScrollbarStressTest extends Application { diff --git a/tests/src/com/vaadin/tests/StressComponentsInTable.java b/tests/src/com/vaadin/tests/StressComponentsInTable.java index 7e072eabd7..790d01ec71 100644 --- a/tests/src/com/vaadin/tests/StressComponentsInTable.java +++ b/tests/src/com/vaadin/tests/StressComponentsInTable.java @@ -8,10 +8,10 @@ import java.util.Date; import java.util.Vector;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Table;
-import com.vaadin.ui.Button.ClickEvent;
public class StressComponentsInTable extends CustomComponent {
diff --git a/tests/src/com/vaadin/tests/TableChangingDatasource.java b/tests/src/com/vaadin/tests/TableChangingDatasource.java index 9de6c9aa1b..722fd48d01 100644 --- a/tests/src/com/vaadin/tests/TableChangingDatasource.java +++ b/tests/src/com/vaadin/tests/TableChangingDatasource.java @@ -5,12 +5,12 @@ package com.vaadin.tests;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Table;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class TableChangingDatasource extends CustomComponent implements
ClickListener {
diff --git a/tests/src/com/vaadin/tests/TestBench.java b/tests/src/com/vaadin/tests/TestBench.java index 1e71c6fa91..a670d40708 100644 --- a/tests/src/com/vaadin/tests/TestBench.java +++ b/tests/src/com/vaadin/tests/TestBench.java @@ -25,9 +25,9 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.SplitPanel; import com.vaadin.ui.Tree; import com.vaadin.ui.UriFragmentUtility; +import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent; /** * TestBench finds out testable classes within given java packages and adds them diff --git a/tests/src/com/vaadin/tests/TestCaptionWrapper.java b/tests/src/com/vaadin/tests/TestCaptionWrapper.java index 82ae63f26e..f63c148892 100644 --- a/tests/src/com/vaadin/tests/TestCaptionWrapper.java +++ b/tests/src/com/vaadin/tests/TestCaptionWrapper.java @@ -11,6 +11,7 @@ import com.vaadin.terminal.UserError; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; import com.vaadin.ui.CheckBox; +import com.vaadin.ui.Component.Listener; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.DateField; import com.vaadin.ui.Embedded; @@ -33,7 +34,6 @@ import com.vaadin.ui.TwinColSelect; import com.vaadin.ui.Upload; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Component.Listener; public class TestCaptionWrapper extends CustomComponent implements Listener { @@ -57,11 +57,10 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { public void createNewView() { main.removeAllComponents(); - main - .addComponent(new Label( - "Each Layout and their contained components should " - + "have icon, caption, description, user error defined. " - + "Eeach layout should contain similar components.")); + main.addComponent(new Label( + "Each Layout and their contained components should " + + "have icon, caption, description, user error defined. " + + "Eeach layout should contain similar components.")); main.addComponent(eventListenerFeedback); diff --git a/tests/src/com/vaadin/tests/TestComponentAddAndRecursion.java b/tests/src/com/vaadin/tests/TestComponentAddAndRecursion.java index 469d620b53..a63575e177 100644 --- a/tests/src/com/vaadin/tests/TestComponentAddAndRecursion.java +++ b/tests/src/com/vaadin/tests/TestComponentAddAndRecursion.java @@ -4,13 +4,13 @@ package com.vaadin.tests;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
/**
* @author marc
diff --git a/tests/src/com/vaadin/tests/TestContainerChanges.java b/tests/src/com/vaadin/tests/TestContainerChanges.java index af27484834..86ff9649d3 100644 --- a/tests/src/com/vaadin/tests/TestContainerChanges.java +++ b/tests/src/com/vaadin/tests/TestContainerChanges.java @@ -9,6 +9,7 @@ import com.vaadin.data.util.ContainerHierarchicalWrapper; import com.vaadin.data.util.ContainerOrderedWrapper;
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.Label;
@@ -17,7 +18,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel;
import com.vaadin.ui.Table;
import com.vaadin.ui.Tree;
-import com.vaadin.ui.Button.ClickEvent;
/**
* @author marc
@@ -39,9 +39,8 @@ public class TestContainerChanges extends CustomComponent { OrderedLayout main = new OrderedLayout();
setCompositionRoot(main);
- main
- .addComponent(new Label(
- "The same IndexedContainer is wrapped in a ordered/hierarchical wrapper and is set as data source for all components . The buttons only affect the 'original' IndexedContainer."));
+ main.addComponent(new Label(
+ "The same IndexedContainer is wrapped in a ordered/hierarchical wrapper and is set as data source for all components . The buttons only affect the 'original' IndexedContainer."));
OrderedLayout h = new OrderedLayout(
OrderedLayout.ORIENTATION_HORIZONTAL);
diff --git a/tests/src/com/vaadin/tests/TestDateField.java b/tests/src/com/vaadin/tests/TestDateField.java index 39621b0b8e..f84b37fe6d 100644 --- a/tests/src/com/vaadin/tests/TestDateField.java +++ b/tests/src/com/vaadin/tests/TestDateField.java @@ -65,8 +65,8 @@ public class TestDateField extends CustomComponent { @Override
public void attach() {
- final ClassResource res = new ClassResource("m.gif", super
- .getApplication());
+ final ClassResource res = new ClassResource("m.gif",
+ super.getApplication());
df.setIcon(res);
super.attach();
}
diff --git a/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java b/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java index b6cd1d28a9..22f2c0d998 100644 --- a/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java +++ b/tests/src/com/vaadin/tests/TestForBasicApplicationLayout.java @@ -7,6 +7,8 @@ package com.vaadin.tests; import java.util.Locale;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.ExpandLayout;
@@ -16,8 +18,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class TestForBasicApplicationLayout extends CustomComponent {
diff --git a/tests/src/com/vaadin/tests/TestForContainerFilterable.java b/tests/src/com/vaadin/tests/TestForContainerFilterable.java index 7c261f1017..51b144d4b1 100644 --- a/tests/src/com/vaadin/tests/TestForContainerFilterable.java +++ b/tests/src/com/vaadin/tests/TestForContainerFilterable.java @@ -6,13 +6,13 @@ package com.vaadin.tests; import com.vaadin.data.util.IndexedContainer; 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.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; public class TestForContainerFilterable extends CustomComponent { diff --git a/tests/src/com/vaadin/tests/TestForNativeWindowing.java b/tests/src/com/vaadin/tests/TestForNativeWindowing.java index 8311a2e955..9728214163 100644 --- a/tests/src/com/vaadin/tests/TestForNativeWindowing.java +++ b/tests/src/com/vaadin/tests/TestForNativeWindowing.java @@ -9,9 +9,9 @@ import java.net.URL; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class TestForNativeWindowing extends Application { @@ -78,16 +78,13 @@ public class TestForNativeWindowing extends Application { new Button.ClickListener() { public void buttonClick(ClickEvent event) { try { - main - .open( - new com.vaadin.terminal.ExternalResource( - new URL( - getURL(), - "mainwin-" - + System - .currentTimeMillis() - + "/")), - null); + main.open( + new com.vaadin.terminal.ExternalResource( + new URL( + getURL(), + "mainwin-" + + System.currentTimeMillis() + + "/")), null); } catch (final MalformedURLException e) { } } diff --git a/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java b/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java index fa153fcda7..bfc9ef0abf 100644 --- a/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/tests/src/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -8,6 +8,8 @@ import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; @@ -18,8 +20,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; import com.vaadin.ui.TwinColSelect; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; /** * @author IT Mill Ltd. @@ -51,13 +51,12 @@ public class TestForPreconfiguredComponents extends CustomComponent implements public void createNewView() { main.removeAllComponents(); - main - .addComponent(new Label( - "In Toolkit 5 we introduce new components. Previously we" - + " usually used setStyle or some other methods on possibly " - + "multiple steps to configure component for ones needs. These new " - + "server side components are mostly just classes that in constructor " - + "set base class to state that programmer wants.")); + main.addComponent(new Label( + "In Toolkit 5 we introduce new components. Previously we" + + " usually used setStyle or some other methods on possibly " + + "multiple steps to configure component for ones needs. These new " + + "server side components are mostly just classes that in constructor " + + "set base class to state that programmer wants.")); main.addComponent(new Button("commit")); @@ -87,8 +86,7 @@ public class TestForPreconfiguredComponents extends CustomComponent implements fillSelect(s, 20); s.setMultiSelect(true); test = createTestBench(s); - test - .setCaption("OptionGroup + multiselect manually (configured from select)"); + test.setCaption("OptionGroup + multiselect manually (configured from select)"); main.addComponent(test); final Button b = new Button("refresh view", this, "createNewView"); diff --git a/tests/src/com/vaadin/tests/TestForRichTextEditor.java b/tests/src/com/vaadin/tests/TestForRichTextEditor.java index 7ac97ce882..4e9dfba2b4 100644 --- a/tests/src/com/vaadin/tests/TestForRichTextEditor.java +++ b/tests/src/com/vaadin/tests/TestForRichTextEditor.java @@ -7,11 +7,11 @@ package com.vaadin.tests; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; 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.OrderedLayout; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Button.ClickEvent; /** * diff --git a/tests/src/com/vaadin/tests/TestForStyledUpload.java b/tests/src/com/vaadin/tests/TestForStyledUpload.java index 0e4933d2b9..6a6ae130e5 100644 --- a/tests/src/com/vaadin/tests/TestForStyledUpload.java +++ b/tests/src/com/vaadin/tests/TestForStyledUpload.java @@ -17,15 +17,13 @@ import java.lang.management.MemoryMXBean; import com.vaadin.Application; import com.vaadin.terminal.StreamResource; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Panel; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.Upload; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Upload.FailedEvent; import com.vaadin.ui.Upload.FailedListener; import com.vaadin.ui.Upload.FinishedEvent; @@ -34,6 +32,8 @@ import com.vaadin.ui.Upload.StartedEvent; 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.ui.Window; public class TestForStyledUpload extends Application implements Upload.FinishedListener, FailedListener, SucceededListener, @@ -56,9 +56,8 @@ public class TestForStyledUpload extends Application implements private final Label memoryStatus; public TestForStyledUpload() { - main - .addComponent(new Label( - "Clicking on button b updates information about upload components status or same with garbage collector.")); + main.addComponent(new Label( + "Clicking on button b updates information about upload components status or same with garbage collector.")); up = new Upload(null, buffer); up.setButtonCaption("Select file"); @@ -153,9 +152,8 @@ public class TestForStyledUpload extends Application implements status.addComponent(new Label( "Upload finished, but output buffer is null!!")); } else { - status - .addComponent(new Label("<b>Name:</b> " - + event.getFilename(), Label.CONTENT_XHTML)); + status.addComponent(new Label( + "<b>Name:</b> " + event.getFilename(), Label.CONTENT_XHTML)); status.addComponent(new Label("<b>Mimetype:</b> " + event.getMIMEType(), Label.CONTENT_XHTML)); status.addComponent(new Label("<b>Size:</b> " + event.getLength() diff --git a/tests/src/com/vaadin/tests/TestForTabSheet.java b/tests/src/com/vaadin/tests/TestForTabSheet.java index f53faabfcb..938bf43115 100644 --- a/tests/src/com/vaadin/tests/TestForTabSheet.java +++ b/tests/src/com/vaadin/tests/TestForTabSheet.java @@ -1,10 +1,10 @@ package com.vaadin.tests; 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.TabSheet; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; public class TestForTabSheet extends CustomComponent implements diff --git a/tests/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java b/tests/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java index adde3f8c0e..c009f9c768 100644 --- a/tests/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java +++ b/tests/src/com/vaadin/tests/TestForTablesInitialColumnWidthLogicRendering.java @@ -9,12 +9,12 @@ import java.util.Vector; import com.vaadin.terminal.UserError; 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.Layout; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Table; -import com.vaadin.ui.Button.ClickEvent; /** * @@ -36,9 +36,8 @@ public class TestForTablesInitialColumnWidthLogicRendering extends public void createNewView() { main.removeAllComponents(); - main - .addComponent(new Label( - "Below are same tables that all should render somewhat nice. Also when testing, you might want to try resizing window.")); + main.addComponent(new Label( + "Below are same tables that all should render somewhat nice. Also when testing, you might want to try resizing window.")); Table t; @@ -64,8 +63,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); t = getTestTable(5, 5); - t - .setCaption("Table with some cols and rows rows, some col widths fixed"); + t.setCaption("Table with some cols and rows rows, some col widths fixed"); Iterator it = t.getContainerPropertyIds().iterator(); it.next(); @@ -80,8 +78,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); t = getTestTable(3, 40); - t - .setCaption("Table with some columns and wide explicit width. (Ought to widen columns to use all space)"); + t.setCaption("Table with some columns and wide explicit width. (Ought to widen columns to use all space)"); t.setWidth(1000); main.addComponent(t); @@ -91,8 +88,7 @@ public class TestForTablesInitialColumnWidthLogicRendering extends main.addComponent(t); t = getTestTable(12, 100); - t - .setCaption("Table with lot of rows and lot of columns, width == 50%"); + t.setCaption("Table with lot of rows and lot of columns, width == 50%"); t.setWidth(50, Table.UNITS_PERCENTAGE); main.addComponent(t); diff --git a/tests/src/com/vaadin/tests/TestForTrees.java b/tests/src/com/vaadin/tests/TestForTrees.java index f0f326c304..93579c8ae7 100644 --- a/tests/src/com/vaadin/tests/TestForTrees.java +++ b/tests/src/com/vaadin/tests/TestForTrees.java @@ -7,14 +7,14 @@ package com.vaadin.tests; import com.vaadin.event.Action; import com.vaadin.event.Action.Handler; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; /** * Some test cases for trees. Events panel logs events that happen server side. @@ -47,9 +47,8 @@ public class TestForTrees extends CustomComponent implements Handler { public void createNewView() { main.removeAllComponents(); - main - .addComponent(new Label( - "Some test cases for trees. Events panel logs events that happen server side.")); + main.addComponent(new Label( + "Some test cases for trees. Events panel logs events that happen server side.")); main.addComponent(new Button("commit")); diff --git a/tests/src/com/vaadin/tests/TestForUpload.java b/tests/src/com/vaadin/tests/TestForUpload.java index b502513139..e80a3f4581 100644 --- a/tests/src/com/vaadin/tests/TestForUpload.java +++ b/tests/src/com/vaadin/tests/TestForUpload.java @@ -20,6 +20,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.terminal.StreamResource; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; @@ -30,11 +31,10 @@ import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.Select; import com.vaadin.ui.TextField; import com.vaadin.ui.Upload; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Upload.FinishedEvent; import com.vaadin.ui.Upload.StartedEvent; import com.vaadin.ui.Upload.StartedListener; +import com.vaadin.ui.VerticalLayout; public class TestForUpload extends CustomComponent implements Upload.ProgressListener { @@ -81,9 +81,8 @@ public class TestForUpload extends CustomComponent implements + "tempfile receiver writes upload to file and " + "should have low memory consumption.")); - main - .addComponent(new Label( - "Clicking on button b updates information about upload components status or same with garbage collector.")); + main.addComponent(new Label( + "Clicking on button b updates information about upload components status or same with garbage collector.")); textField = new TextField("Test field"); textFieldValue = new Label(); diff --git a/tests/src/com/vaadin/tests/TestForWindowOpen.java b/tests/src/com/vaadin/tests/TestForWindowOpen.java index d6cd6fcc95..41af299bf3 100644 --- a/tests/src/com/vaadin/tests/TestForWindowOpen.java +++ b/tests/src/com/vaadin/tests/TestForWindowOpen.java @@ -6,9 +6,9 @@ package com.vaadin.tests; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.OrderedLayout; -import com.vaadin.ui.Button.ClickEvent; public class TestForWindowOpen extends CustomComponent { diff --git a/tests/src/com/vaadin/tests/TestForWindowing.java b/tests/src/com/vaadin/tests/TestForWindowing.java index 9fb3ea19ea..c2dac3d529 100644 --- a/tests/src/com/vaadin/tests/TestForWindowing.java +++ b/tests/src/com/vaadin/tests/TestForWindowing.java @@ -8,6 +8,8 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; @@ -16,8 +18,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Select; import com.vaadin.ui.Slider; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class TestForWindowing extends CustomComponent { diff --git a/tests/src/com/vaadin/tests/TestSetVisibleAndCaching.java b/tests/src/com/vaadin/tests/TestSetVisibleAndCaching.java index 4e7132b3c8..479a7602ef 100644 --- a/tests/src/com/vaadin/tests/TestSetVisibleAndCaching.java +++ b/tests/src/com/vaadin/tests/TestSetVisibleAndCaching.java @@ -5,11 +5,11 @@ package com.vaadin.tests; 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.ui.Panel; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class TestSetVisibleAndCaching extends com.vaadin.Application { diff --git a/tests/src/com/vaadin/tests/TestSizeableIncomponents.java b/tests/src/com/vaadin/tests/TestSizeableIncomponents.java index 7deb4479fa..c1e8aa137a 100644 --- a/tests/src/com/vaadin/tests/TestSizeableIncomponents.java +++ b/tests/src/com/vaadin/tests/TestSizeableIncomponents.java @@ -17,6 +17,7 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; @@ -27,7 +28,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class TestSizeableIncomponents extends Application { @@ -257,10 +257,8 @@ public class TestSizeableIncomponents extends Application { if (AbstractSelect.class.isAssignableFrom(c.getClass())) { if (c instanceof Table) { Table new_name = (Table) c; - new_name - .setContainerDataSource(TestForTablesInitialColumnWidthLogicRendering - .getTestTable(5, 100) - .getContainerDataSource()); + new_name.setContainerDataSource(TestForTablesInitialColumnWidthLogicRendering + .getTestTable(5, 100).getContainerDataSource()); } else { AbstractSelect new_name = (AbstractSelect) c; @@ -273,8 +271,7 @@ public class TestSizeableIncomponents extends Application { } } else if (c instanceof ComponentContainer) { ComponentContainer new_name = (ComponentContainer) c; - new_name - .addComponent(new Label("component 1 in test container")); + new_name.addComponent(new Label("component 1 in test container")); new_name.addComponent(new Button("component 2")); } else if (c instanceof Embedded) { Embedded em = (Embedded) c; diff --git a/tests/src/com/vaadin/tests/TreeFilesystem.java b/tests/src/com/vaadin/tests/TreeFilesystem.java index 202338cd50..c5ff1cb51d 100644 --- a/tests/src/com/vaadin/tests/TreeFilesystem.java +++ b/tests/src/com/vaadin/tests/TreeFilesystem.java @@ -11,8 +11,8 @@ import com.vaadin.demo.util.SampleDirectory; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; -import com.vaadin.ui.Window; import com.vaadin.ui.Tree.ExpandEvent; +import com.vaadin.ui.Window; /** * Browsable file explorer using Vaadin Tree component. Demonstrates: how to add diff --git a/tests/src/com/vaadin/tests/TreeFilesystemContainer.java b/tests/src/com/vaadin/tests/TreeFilesystemContainer.java index 690555b3ad..618fa21ccf 100644 --- a/tests/src/com/vaadin/tests/TreeFilesystemContainer.java +++ b/tests/src/com/vaadin/tests/TreeFilesystemContainer.java @@ -9,14 +9,14 @@ import java.io.File; import com.vaadin.data.util.FilesystemContainer; import com.vaadin.data.util.FilesystemContainer.FileItem; import com.vaadin.demo.util.SampleDirectory; +import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.Listener; import com.vaadin.ui.Field; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Component.Event; -import com.vaadin.ui.Component.Listener; /** * Browsable file explorer using Vaadin Tree component. Demonstrates: how to use diff --git a/tests/src/com/vaadin/tests/appengine/GAESyncTest.java b/tests/src/com/vaadin/tests/appengine/GAESyncTest.java index a28da32c39..2b6656f11a 100644 --- a/tests/src/com/vaadin/tests/appengine/GAESyncTest.java +++ b/tests/src/com/vaadin/tests/appengine/GAESyncTest.java @@ -7,12 +7,12 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.terminal.ClassResource; import com.vaadin.terminal.DownloadStream; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Embedded; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Window.Notification; public class GAESyncTest extends Application { diff --git a/tests/src/com/vaadin/tests/application/ApplicationCloseTest.java b/tests/src/com/vaadin/tests/application/ApplicationCloseTest.java index 0777f682ab..b10752d26c 100644 --- a/tests/src/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/tests/src/com/vaadin/tests/application/ApplicationCloseTest.java @@ -4,8 +4,8 @@ import com.vaadin.Application; import com.vaadin.terminal.gwt.server.WebApplicationContext;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Label;
import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
public class ApplicationCloseTest extends TestBase {
diff --git a/tests/src/com/vaadin/tests/book/BookTestApplication.java b/tests/src/com/vaadin/tests/book/BookTestApplication.java index 1491898f3d..cba0f15e01 100644 --- a/tests/src/com/vaadin/tests/book/BookTestApplication.java +++ b/tests/src/com/vaadin/tests/book/BookTestApplication.java @@ -15,9 +15,9 @@ import java.util.Map; import java.util.Set; import com.vaadin.data.Item; -import com.vaadin.data.Validator; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.data.Validator; import com.vaadin.data.util.QueryContainer; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.terminal.ClassResource; @@ -33,6 +33,7 @@ import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.Alignment; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.CustomLayout; @@ -44,24 +45,22 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.InlineDateField; import com.vaadin.ui.Label; +import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Link; import com.vaadin.ui.MenuBar; +import com.vaadin.ui.MenuBar.MenuItem; import com.vaadin.ui.NativeSelect; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupDateField; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.Select; -import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.Tree; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Layout.AlignmentHandler; -import com.vaadin.ui.MenuBar.MenuItem; public class BookTestApplication extends com.vaadin.Application { Window main = new Window("Application window"); @@ -251,7 +250,7 @@ public class BookTestApplication extends com.vaadin.Application { example_Layout(main, param); } else { ; // main.addComponent(new - // Label("Unknown test '"+example+"'.")); + // Label("Unknown test '"+example+"'.")); } return null; @@ -444,8 +443,7 @@ public class BookTestApplication extends com.vaadin.Application { final Select select = new Select("Enter containing substring"); main.addComponent(select); - select - .setFilteringMode(AbstractSelect.Filtering.FILTERINGMODE_CONTAINS); + select.setFilteringMode(AbstractSelect.Filtering.FILTERINGMODE_CONTAINS); /* Fill the component with some items. */ final String[] planets = new String[] { "Mercury", "Venus", "Earth", @@ -735,8 +733,8 @@ public class BookTestApplication extends com.vaadin.Application { form.addComponent(new TextField("Email")); // Add the panel to the main window - final ClassResource icon = new ClassResource("smiley.jpg", main - .getApplication()); + final ClassResource icon = new ClassResource("smiley.jpg", + main.getApplication()); form.addComponent(new Embedded("Image", icon)); panel.setIcon(icon); panel.addComponent(form); @@ -747,8 +745,8 @@ public class BookTestApplication extends com.vaadin.Application { if (param.equals("embedded")) { final GridLayout grid = new GridLayout(3, 3); for (int i = 0; i < 3 * 3; i++) { - ClassResource img = new ClassResource("smiley.jpg", main - .getApplication()); + ClassResource img = new ClassResource("smiley.jpg", + main.getApplication()); Embedded embedded = new Embedded("", img); grid.addComponent(embedded); } @@ -879,10 +877,9 @@ public class BookTestApplication extends com.vaadin.Application { } else if (param != null && param.equals("layout")) { Form form = new Form(); form.setCaption("Form Caption"); - form - .setDescription("This is a description of the Form that is " - + "displayed in the upper part of the form. You normally enter some " - + "descriptive text about the form and its use here."); + form.setDescription("This is a description of the Form that is " + + "displayed in the upper part of the form. You normally enter some " + + "descriptive text about the form and its use here."); // Add a field directly to the layout. This field will not be bound // to @@ -897,8 +894,7 @@ public class BookTestApplication extends com.vaadin.Application { // Set the footer layout and add some text. form.setFooter(new VerticalLayout()); - form - .getFooter() + form.getFooter() .addComponent( new Label( "This is the footer area of the Form. " @@ -1048,10 +1044,11 @@ public class BookTestApplication extends com.vaadin.Application { } else if (param.equals("icon")) { final TabSheet tabsheet = new TabSheet(); - tabsheet.addTab(new Label("Contents of the first tab"), - "First Tab", new ClassResource( - "images/Mercury_small.png", main - .getApplication())); + tabsheet.addTab( + new Label("Contents of the first tab"), + "First Tab", + new ClassResource("images/Mercury_small.png", main + .getApplication())); tabsheet.addTab(new Label("Contents of the second tab"), "Second Tab", new ClassResource( "images/Venus_small.png", this)); @@ -1606,10 +1603,9 @@ public class BookTestApplication extends com.vaadin.Application { void example_Print(final Window main, String param) { if (param != null && param.equals("simple")) { - main - .addComponent(new Label( - "<input type='button' onClick='print()' value='Click to Print'/>", - Label.CONTENT_XHTML)); + main.addComponent(new Label( + "<input type='button' onClick='print()' value='Click to Print'/>", + Label.CONTENT_XHTML)); return; } @@ -1652,8 +1648,7 @@ public class BookTestApplication extends com.vaadin.Application { // rtarea.setCaption("My Rich Text Area"); // Set initial content as HTML - rtarea - .setValue("<h1>Hello</h1>\n<p>This rich text area contains some text.</p>"); + rtarea.setValue("<h1>Hello</h1>\n<p>This rich text area contains some text.</p>"); // Show the text edited in the rich text area as HTML. final Button show = new Button("Show HTML"); @@ -1684,8 +1679,7 @@ public class BookTestApplication extends com.vaadin.Application { // Create an example table and put some data in it. Statement st = connection.createStatement(); - st - .executeQuery("CREATE TABLE Prisoners (id INTEGER, name VARCHAR)"); + st.executeQuery("CREATE TABLE Prisoners (id INTEGER, name VARCHAR)"); st.close(); for (int i = 0; i < 100; i++) { st = connection.createStatement(); diff --git a/tests/src/com/vaadin/tests/book/ChatApplication.java b/tests/src/com/vaadin/tests/book/ChatApplication.java index a70d9d450f..d6470dcc4f 100644 --- a/tests/src/com/vaadin/tests/book/ChatApplication.java +++ b/tests/src/com/vaadin/tests/book/ChatApplication.java @@ -6,11 +6,11 @@ import java.util.List; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ProgressIndicator; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class ChatApplication extends Application implements Button.ClickListener { diff --git a/tests/src/com/vaadin/tests/book/DefaultButtonExample.java b/tests/src/com/vaadin/tests/book/DefaultButtonExample.java index 5c918288df..c1520c208d 100644 --- a/tests/src/com/vaadin/tests/book/DefaultButtonExample.java +++ b/tests/src/com/vaadin/tests/book/DefaultButtonExample.java @@ -5,8 +5,8 @@ package com.vaadin.tests.book; import com.vaadin.event.Action; -import com.vaadin.event.ShortcutAction; import com.vaadin.event.Action.Handler; +import com.vaadin.event.ShortcutAction; import com.vaadin.ui.Button; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; @@ -83,7 +83,7 @@ public class DefaultButtonExample extends CustomComponent implements Handler { // Do something: report the click formlayout.addComponent(new Label("OK clicked. " + "User=" + username.getValue() + ", password=" + password.getValue())); - // + // } public void cancelHandler() { diff --git a/tests/src/com/vaadin/tests/book/FormExample.java b/tests/src/com/vaadin/tests/book/FormExample.java index bd6cfc0e98..0c50df736b 100644 --- a/tests/src/com/vaadin/tests/book/FormExample.java +++ b/tests/src/com/vaadin/tests/book/FormExample.java @@ -163,8 +163,7 @@ public class FormExample extends CustomComponent { // Set form caption and description texts. form.setCaption("Contact Information"); - form - .setDescription("Please enter valid name and address. Fields marked with * are required."); + form.setDescription("Please enter valid name and address. Fields marked with * are required."); // Use custom field factory to create the fields in the form. form.setFieldFactory(new MyFieldFactory()); diff --git a/tests/src/com/vaadin/tests/book/FormExample2.java b/tests/src/com/vaadin/tests/book/FormExample2.java index 2e7e09bdb2..d19a317966 100644 --- a/tests/src/com/vaadin/tests/book/FormExample2.java +++ b/tests/src/com/vaadin/tests/book/FormExample2.java @@ -91,8 +91,7 @@ public class FormExample2 extends CustomComponent { // Set form caption and description texts form.setCaption("Contact Information"); - form - .setDescription("Please specify name of the person and the city where the person lives in."); + form.setDescription("Please specify name of the person and the city where the person lives in."); // Use the custom field factory to create the fields in the form. form.setFieldFactory(new MyFieldFactory()); diff --git a/tests/src/com/vaadin/tests/book/MyDynamicResource.java b/tests/src/com/vaadin/tests/book/MyDynamicResource.java index 9948bfe731..db013df085 100644 --- a/tests/src/com/vaadin/tests/book/MyDynamicResource.java +++ b/tests/src/com/vaadin/tests/book/MyDynamicResource.java @@ -67,8 +67,8 @@ public class MyDynamicResource implements URIHandler, ParameterHandler { ImageIO.write(image, "png", imagebuffer); // Return a stream from the buffer. - ByteArrayInputStream istream = new ByteArrayInputStream(imagebuffer - .toByteArray()); + ByteArrayInputStream istream = new ByteArrayInputStream( + imagebuffer.toByteArray()); return new DownloadStream(istream, null, null); } catch (IOException e) { return null; diff --git a/tests/src/com/vaadin/tests/book/SSNField.java b/tests/src/com/vaadin/tests/book/SSNField.java index aab6206b4b..029b905eed 100644 --- a/tests/src/com/vaadin/tests/book/SSNField.java +++ b/tests/src/com/vaadin/tests/book/SSNField.java @@ -5,8 +5,8 @@ package com.vaadin.tests.book; import com.vaadin.data.Property; -import com.vaadin.data.Validator; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Validator; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; diff --git a/tests/src/com/vaadin/tests/book/TabSheetExample.java b/tests/src/com/vaadin/tests/book/TabSheetExample.java index 97c6e37790..766f20ff0c 100644 --- a/tests/src/com/vaadin/tests/book/TabSheetExample.java +++ b/tests/src/com/vaadin/tests/book/TabSheetExample.java @@ -5,10 +5,10 @@ package com.vaadin.tests.book; 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.TabSheet; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; public class TabSheetExample extends CustomComponent implements diff --git a/tests/src/com/vaadin/tests/book/TableCellStyle.java b/tests/src/com/vaadin/tests/book/TableCellStyle.java index 301dc7a18f..d61b590a1d 100644 --- a/tests/src/com/vaadin/tests/book/TableCellStyle.java +++ b/tests/src/com/vaadin/tests/book/TableCellStyle.java @@ -18,8 +18,8 @@ public class TableCellStyle extends CustomComponent { table.addContainerProperty("0", String.class, null, "", null, null); // Row // header for (int i = 0; i < 8; i++) { - table.addContainerProperty("" + (i + 1), String.class, null, String - .valueOf((char) (65 + i)), null, null); + table.addContainerProperty("" + (i + 1), String.class, null, + String.valueOf((char) (65 + i)), null, null); } // Add some items in the table. diff --git a/tests/src/com/vaadin/tests/book/TableExample.java b/tests/src/com/vaadin/tests/book/TableExample.java index a2cbaa45c2..5ee1f8f952 100644 --- a/tests/src/com/vaadin/tests/book/TableExample.java +++ b/tests/src/com/vaadin/tests/book/TableExample.java @@ -40,14 +40,12 @@ public class TableExample extends CustomComponent { /* Add some items in the table and assign them an Item ID (IID). */ for (int i = 0; i < 1000; i++) { /* Add a randomly generated item in the Table. */ - table - .addItem( - new Object[] { - firstnames[(int) (Math.random() * (firstnames.length - 0.01))], - lastnames[(int) (Math.random() * (lastnames.length - 0.01))], - new Integer( - (int) (1900 + Math.random() * 100)) }, - new Integer(i)); + table.addItem( + new Object[] { + firstnames[(int) (Math.random() * (firstnames.length - 0.01))], + lastnames[(int) (Math.random() * (lastnames.length - 0.01))], + new Integer((int) (1900 + Math.random() * 100)) }, + new Integer(i)); } /* Set the number of items visible in the table. */ diff --git a/tests/src/com/vaadin/tests/book/TableExample3.java b/tests/src/com/vaadin/tests/book/TableExample3.java index 92ef890c33..2fba7ec469 100644 --- a/tests/src/com/vaadin/tests/book/TableExample3.java +++ b/tests/src/com/vaadin/tests/book/TableExample3.java @@ -5,13 +5,13 @@ package com.vaadin.tests.book; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; public class TableExample3 extends CustomComponent { /* A layout needed for the example. */ diff --git a/tests/src/com/vaadin/tests/book/TableHuge.java b/tests/src/com/vaadin/tests/book/TableHuge.java index 191d4bbfc8..5648b9417e 100644 --- a/tests/src/com/vaadin/tests/book/TableHuge.java +++ b/tests/src/com/vaadin/tests/book/TableHuge.java @@ -8,9 +8,9 @@ import java.util.Collection; import java.util.Vector; import com.vaadin.data.Container; +import com.vaadin.data.Container.Indexed; import com.vaadin.data.Item; import com.vaadin.data.Property; -import com.vaadin.data.Container.Indexed; import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.ObjectProperty; import com.vaadin.data.util.PropertysetItem; diff --git a/tests/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java b/tests/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java index 6b3daae539..57b81ddecc 100644 --- a/tests/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java +++ b/tests/src/com/vaadin/tests/components/CustomComponentwithUndefinedSize.java @@ -1,13 +1,13 @@ package com.vaadin.tests.components; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Layout; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class CustomComponentwithUndefinedSize extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/FocusAndBlurListeners.java b/tests/src/com/vaadin/tests/components/FocusAndBlurListeners.java index 3ef26c7e1c..267807b16b 100644 --- a/tests/src/com/vaadin/tests/components/FocusAndBlurListeners.java +++ b/tests/src/com/vaadin/tests/components/FocusAndBlurListeners.java @@ -7,6 +7,8 @@ import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; import com.vaadin.ui.DateField; @@ -16,8 +18,6 @@ import com.vaadin.ui.NativeButton; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class FocusAndBlurListeners extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/HierarchicalContainerSorting.java b/tests/src/com/vaadin/tests/components/HierarchicalContainerSorting.java index 6f1352f164..1f0f1bd923 100644 --- a/tests/src/com/vaadin/tests/components/HierarchicalContainerSorting.java +++ b/tests/src/com/vaadin/tests/components/HierarchicalContainerSorting.java @@ -89,8 +89,8 @@ public class HierarchicalContainerSorting extends TestBase { item.getItemProperty("name").setValue(string);
if (parent != null && container instanceof HierarchicalContainer) {
- ((HierarchicalContainer) container).setParent(index, nameToId
- .get(parent));
+ ((HierarchicalContainer) container).setParent(index,
+ nameToId.get(parent));
}
index++;
diff --git a/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.java b/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.java index 3c36af8ee9..5d4f0f2acf 100644 --- a/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.java +++ b/tests/src/com/vaadin/tests/components/abstractcomponent/EnableState.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.abstractcomponent; import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class EnableState extends AbstractTestCase {
@Override
diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java index 69705d4143..c0c1a29598 100644 --- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java +++ b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.java @@ -4,9 +4,9 @@ import com.vaadin.data.util.ObjectProperty; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.TextField; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.TextField; import com.vaadin.ui.Window.Notification; public class AbstractFieldCommitWithInvalidValues extends TestBase { @@ -27,9 +27,7 @@ public class AbstractFieldCommitWithInvalidValues extends TestBase { protected void setup() { tf = new TextField("A field, must contain 1-2 chars", new ObjectProperty("a")); - tf - .addValidator(new StringLengthValidator("Invalid length", 1, 2, - false)); + tf.addValidator(new StringLengthValidator("Invalid length", 1, 2, false)); tf.setWriteThrough(false); tf.setRequired(true); diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java index d439544067..5eaf9c17a1 100644 --- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java +++ b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java @@ -3,9 +3,9 @@ package com.vaadin.tests.components.abstractfield; import com.vaadin.data.util.ObjectProperty;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.TextField;
import com.vaadin.ui.Component.Event;
import com.vaadin.ui.Component.Listener;
+import com.vaadin.ui.TextField;
public class AbstractFieldDataSourceReadOnly extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java index c0172cfee0..28b06709ff 100644 --- a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java +++ b/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java @@ -3,8 +3,8 @@ package com.vaadin.tests.components.accordion; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Accordion; import com.vaadin.ui.SplitPanel; -import com.vaadin.ui.TextField; import com.vaadin.ui.TabSheet.Tab; +import com.vaadin.ui.TextField; public class AccordionInactiveTabSize extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java b/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java index a345ad61a2..09e0caf5e3 100644 --- a/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java +++ b/tests/src/com/vaadin/tests/components/accordion/RemoveTabs.java @@ -8,9 +8,9 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractComponentContainer;
import com.vaadin.ui.Accordion;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Button.ClickEvent;
public class RemoveTabs extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java b/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java index 15f292a6ca..87ef5ad71a 100644 --- a/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java +++ b/tests/src/com/vaadin/tests/components/beanitemcontainer/BeanItemContainerNullValues.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.beanitemcontainer; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Table; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Table; public class BeanItemContainerNullValues extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/button/Buttons.java b/tests/src/com/vaadin/tests/components/button/Buttons.java index 1c5c35e237..7972d27df4 100644 --- a/tests/src/com/vaadin/tests/components/button/Buttons.java +++ b/tests/src/com/vaadin/tests/components/button/Buttons.java @@ -6,10 +6,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.NativeButton; -import com.vaadin.ui.Button.ClickEvent; public class Buttons extends ComponentTestCase<Button> { @@ -38,8 +38,9 @@ public class Buttons extends ComponentTestCase<Button> { l.setWidth("200px"); addTestComponent(l); - l = createButton("This is a 100% wide simple button " - + LoremIpsum.get(1500), nat); + l = createButton( + "This is a 100% wide simple button " + LoremIpsum.get(1500), + nat); l.setWidth("100%"); addTestComponent(l); diff --git a/tests/src/com/vaadin/tests/components/button/ShortCutListenerModification.java b/tests/src/com/vaadin/tests/components/button/ShortCutListenerModification.java index eea1d5e943..3d4dfeda04 100644 --- a/tests/src/com/vaadin/tests/components/button/ShortCutListenerModification.java +++ b/tests/src/com/vaadin/tests/components/button/ShortCutListenerModification.java @@ -4,9 +4,9 @@ import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Window; import com.vaadin.ui.Window.Notification; @SuppressWarnings("serial") diff --git a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.java b/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.java index 220c349e98..3fe9097451 100644 --- a/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.java +++ b/tests/src/com/vaadin/tests/components/checkbox/CheckBoxes.java @@ -7,9 +7,9 @@ import com.vaadin.terminal.Resource; import com.vaadin.terminal.ThemeResource;
import com.vaadin.tests.components.ComponentTestCase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
-import com.vaadin.ui.Button.ClickEvent;
public class CheckBoxes extends ComponentTestCase<CheckBox> {
diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java index 818e63de92..adeaede187 100644 --- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.java @@ -5,11 +5,11 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
-import com.vaadin.ui.Button.ClickEvent;
@SuppressWarnings("serial")
public class ComboBoxDataSourceChange extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java index 40a70fa92a..6fc01b6a81 100644 --- a/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java +++ b/tests/src/com/vaadin/tests/components/combobox/Comboboxes.java @@ -5,11 +5,11 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.ComboBox; import com.vaadin.ui.Component; import com.vaadin.ui.Select; -import com.vaadin.ui.Button.ClickEvent; public class Comboboxes extends ComponentTestCase<ComboBox> { diff --git a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java b/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java index ad15db1b18..575a1651e3 100644 --- a/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java +++ b/tests/src/com/vaadin/tests/components/customcomponent/CustomComponentSizeUpdate.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.customcomponent;
import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.CustomComponent;
-import com.vaadin.ui.NativeButton;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.CustomComponent;
+import com.vaadin.ui.NativeButton;
public class CustomComponentSizeUpdate extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java index 2ab16f68e9..b7686cace2 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldInSubWindow.java @@ -6,6 +6,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.BeanItem; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.DateField; import com.vaadin.ui.DefaultFieldFactory; @@ -14,7 +15,6 @@ import com.vaadin.ui.Form; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class DateFieldInSubWindow extends AbstractTestCase { diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldLocale.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldLocale.java index 4857461242..fbeeb872d7 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DateFieldLocale.java +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldLocale.java @@ -5,9 +5,9 @@ import java.util.Locale; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.DateField;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.DateField;
public class DateFieldLocale extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java index 1690bd61ce..cb3fc1f916 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldPopupOffScreen.java @@ -55,8 +55,7 @@ public class DateFieldPopupOffScreen extends AbstractTestCase { private DateField createDateField() {
DateField df = new DateField();
- df
- .setDescription("This is a long, multiline tooltip.<br/>It should always be on screen so it can be read.");
+ df.setDescription("This is a long, multiline tooltip.<br/>It should always be on screen so it can be read.");
df.setValue(new Date(1000000L));
return df;
}
diff --git a/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java b/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java index ae31d25190..3084eab32b 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java +++ b/tests/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.java @@ -5,9 +5,9 @@ import java.util.Locale; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.DateField;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.DateField;
public class DateFieldReadOnly extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java b/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java index 3f26e106ee..33156b9a75 100644 --- a/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java +++ b/tests/src/com/vaadin/tests/components/datefield/DisabledDateFieldWidth.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.datefield; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.DateField;
import com.vaadin.ui.GridLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class DisabledDateFieldWidth extends TestBase {
@Override
diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java b/tests/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java index e2b4ca5a2e..1a5327c8b9 100644 --- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java +++ b/tests/src/com/vaadin/tests/components/embedded/EmbeddedImageRefresh.java @@ -14,8 +14,8 @@ import javax.imageio.ImageIO; import com.vaadin.terminal.StreamResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Embedded; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Embedded; public class EmbeddedImageRefresh extends TestBase { @Override @@ -54,8 +54,7 @@ public class EmbeddedImageRefresh extends TestBase { button.addListener(new Button.ClickListener() { public void buttonClick(ClickEvent event) { ((StreamResource) embedded.getSource()).setFilename(new Date() - .getTime() - + ".png"); + .getTime() + ".png"); embedded.requestRepaint(); } }); diff --git a/tests/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java b/tests/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java index 37dbacb830..2ac39c05a0 100644 --- a/tests/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java +++ b/tests/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.java @@ -20,8 +20,7 @@ public class EmbeddedTooltip extends TestBase { protected void setup() {
Embedded e = new Embedded("Embedded caption", new ThemeResource(
"../runo/icons/64/ok.png"));
- e
- .setDescription("Embedded tooltip, only shown on caption, not on the image");
+ e.setDescription("Embedded tooltip, only shown on caption, not on the image");
addComponent(e);
}
diff --git a/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java b/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java index 6431e0aeb1..0a3054b0e4 100644 --- a/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java +++ b/tests/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.java @@ -3,10 +3,10 @@ package com.vaadin.tests.components.form; import com.vaadin.data.validator.StringLengthValidator; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Form; -import com.vaadin.ui.TextField; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Form; +import com.vaadin.ui.TextField; import com.vaadin.ui.Window.Notification; public class FormCommitWithInvalidValues extends TestBase { @@ -27,9 +27,7 @@ public class FormCommitWithInvalidValues extends TestBase { protected void setup() { form = new Form(); TextField tf = new TextField("A field, must contain 1-2 chars"); - tf - .addValidator(new StringLengthValidator("Invalid length", 1, 2, - false)); + tf.addValidator(new StringLengthValidator("Invalid length", 1, 2, false)); tf.setRequired(true); form.addField("a", tf); diff --git a/tests/src/com/vaadin/tests/components/form/FormFieldCaptions.java b/tests/src/com/vaadin/tests/components/form/FormFieldCaptions.java index f4bc0635c3..b4dee985f4 100644 --- a/tests/src/com/vaadin/tests/components/form/FormFieldCaptions.java +++ b/tests/src/com/vaadin/tests/components/form/FormFieldCaptions.java @@ -14,9 +14,7 @@ public class FormFieldCaptions extends TestBase { Form form1 = new Form();
Item item1 = createItem();
for (Object propertyId : item1.getItemPropertyIds()) {
- form1
- .addItemProperty(propertyId, item1
- .getItemProperty(propertyId));
+ form1.addItemProperty(propertyId, item1.getItemProperty(propertyId));
}
// Method 2
diff --git a/tests/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java b/tests/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java index 1cf21126a0..488a97c2d7 100644 --- a/tests/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java +++ b/tests/src/com/vaadin/tests/components/form/FormNotGettingSmaller.java @@ -28,8 +28,7 @@ public class FormNotGettingSmaller extends TestBase { buttons.setExpandRatio(spacer, 1f); Form form = new Form(); - form - .setDescription("Ooh. Just a demonstration of things, really. Some long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet."); + form.setDescription("Ooh. Just a demonstration of things, really. Some long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet.Some very long lorem ipsum dolor sit amet."); form.setItemDataSource(item); form.setFooter(buttons); diff --git a/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java b/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java index d494ac176e..1d2fb2a59c 100644 --- a/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java +++ b/tests/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.label; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Label;
import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
public class HundredPercentWideLabelResize extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/label/LabelModes.java b/tests/src/com/vaadin/tests/components/label/LabelModes.java index 88ff296739..152e41b521 100644 --- a/tests/src/com/vaadin/tests/components/label/LabelModes.java +++ b/tests/src/com/vaadin/tests/components/label/LabelModes.java @@ -5,10 +5,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Button.ClickEvent; public class LabelModes extends ComponentTestCase<Label> { diff --git a/tests/src/com/vaadin/tests/components/label/LabelWrapping.java b/tests/src/com/vaadin/tests/components/label/LabelWrapping.java index d702f2440d..a06d0b1351 100644 --- a/tests/src/com/vaadin/tests/components/label/LabelWrapping.java +++ b/tests/src/com/vaadin/tests/components/label/LabelWrapping.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.label; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
-import com.vaadin.ui.Button.ClickEvent;
public class LabelWrapping extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/label/Labels.java b/tests/src/com/vaadin/tests/components/label/Labels.java index 30e35fcb4c..fe25ca316b 100644 --- a/tests/src/com/vaadin/tests/components/label/Labels.java +++ b/tests/src/com/vaadin/tests/components/label/Labels.java @@ -6,10 +6,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.Label; -import com.vaadin.ui.Button.ClickEvent; public class Labels extends ComponentTestCase<Label> { diff --git a/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.java b/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.java index 38dea89515..761800de5a 100644 --- a/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.java +++ b/tests/src/com/vaadin/tests/components/loginform/LoginFormTest.java @@ -2,14 +2,14 @@ package com.vaadin.tests.components.loginform; 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.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.LoginForm; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; +import com.vaadin.ui.VerticalLayout; public class LoginFormTest extends TestBase { @@ -32,9 +32,9 @@ public class LoginFormTest extends TestBase { private static final long serialVersionUID = 1L; public void onLogin(LoginEvent event) { - login((LoginForm) event.getSource(), event - .getLoginParameter("username"), event - .getLoginParameter("password")); + login((LoginForm) event.getSource(), + event.getLoginParameter("username"), + event.getLoginParameter("password")); } }); @@ -90,8 +90,8 @@ public class LoginFormTest extends TestBase { public void buttonClick(ClickEvent event) { Button b = event.getButton(); - loginFormLayout.replaceComponent(b.getParent(), (LoginForm) b - .getData()); + loginFormLayout.replaceComponent(b.getParent(), + (LoginForm) b.getData()); } }); diff --git a/tests/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java b/tests/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java index 9a857515c1..341caecc9f 100644 --- a/tests/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java +++ b/tests/src/com/vaadin/tests/components/loginform/LoginFormWithMultipleWindows.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.loginform; import com.vaadin.Application; import com.vaadin.ui.LoginForm; -import com.vaadin.ui.Window; import com.vaadin.ui.LoginForm.LoginEvent; import com.vaadin.ui.LoginForm.LoginListener; +import com.vaadin.ui.Window; @SuppressWarnings("serial") public class LoginFormWithMultipleWindows extends Application { diff --git a/tests/src/com/vaadin/tests/components/menubar/Menubars.java b/tests/src/com/vaadin/tests/components/menubar/Menubars.java index 0c059b82db..590602ea03 100644 --- a/tests/src/com/vaadin/tests/components/menubar/Menubars.java +++ b/tests/src/com/vaadin/tests/components/menubar/Menubars.java @@ -5,10 +5,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.MenuBar;
-import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.MenuBar.MenuItem;
public class Menubars extends ComponentTestCase<MenuBar> {
diff --git a/tests/src/com/vaadin/tests/components/notification/Notifications.java b/tests/src/com/vaadin/tests/components/notification/Notifications.java index c99766b4a0..d59abbd586 100644 --- a/tests/src/com/vaadin/tests/components/notification/Notifications.java +++ b/tests/src/com/vaadin/tests/components/notification/Notifications.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.notification; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.NativeSelect;
-import com.vaadin.ui.TextField;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.NativeSelect;
+import com.vaadin.ui.TextField;
import com.vaadin.ui.Window.Notification;
public class Notifications extends TestBase implements ClickListener {
@@ -23,14 +23,14 @@ public class Notifications extends TestBase implements ClickListener { type.setNullSelectionAllowed(false);
type.addContainerProperty(CAPTION, String.class, "");
type.setItemCaptionPropertyId(CAPTION);
- type.addItem(Notification.TYPE_HUMANIZED_MESSAGE).getItemProperty(
- CAPTION).setValue("Humanized");
+ type.addItem(Notification.TYPE_HUMANIZED_MESSAGE)
+ .getItemProperty(CAPTION).setValue("Humanized");
type.addItem(Notification.TYPE_ERROR_MESSAGE).getItemProperty(CAPTION)
.setValue("Error");
type.addItem(Notification.TYPE_WARNING_MESSAGE)
.getItemProperty(CAPTION).setValue("Warning");
- type.addItem(Notification.TYPE_TRAY_NOTIFICATION).getItemProperty(
- CAPTION).setValue("Tray");
+ type.addItem(Notification.TYPE_TRAY_NOTIFICATION)
+ .getItemProperty(CAPTION).setValue("Tray");
type.setValue(type.getItemIds().iterator().next());
addComponent(type);
Button showNotification = new Button("Show notification", this);
diff --git a/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java b/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java index 0b065da912..6c63f3be23 100644 --- a/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java +++ b/tests/src/com/vaadin/tests/components/optiongroup/DisabledOptionGroupItems.java @@ -6,11 +6,11 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.OptionGroup; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { @@ -76,8 +76,8 @@ public class DisabledOptionGroupItems extends ComponentTestCase<OptionGroup> { public void buttonClick(ClickEvent event) { for (OptionGroup og : getTestComponents()) { for (Object itemId : og.getItemIds()) { - og.setItemEnabled(itemId, !og - .isItemEnabled(itemId)); + og.setItemEnabled(itemId, + !og.isItemEnabled(itemId)); } } } diff --git a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java b/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java index ccb5b10c08..29a81720c7 100644 --- a/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java +++ b/tests/src/com/vaadin/tests/components/optiongroup/OptionGroupMultipleValueChange.java @@ -21,8 +21,7 @@ public class OptionGroupMultipleValueChange extends TestBase { @Override protected void setup() { final OptionGroup og = new OptionGroup(); - og - .addItem("Clicking on the text might cause an extra valuechange event"); + og.addItem("Clicking on the text might cause an extra valuechange event"); og.addItem("Second option, same thing"); og.setImmediate(true); addComponent(og); diff --git a/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java b/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java index e211b9e833..555495cc58 100644 --- a/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java +++ b/tests/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.orderedlayout; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.VerticalLayout;
public class ReplaceComponentNPE extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java b/tests/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java index 982cbced5b..eec39359aa 100644 --- a/tests/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java +++ b/tests/src/com/vaadin/tests/components/panel/PanelShouldRemoveActionHandler.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.event.Action; -import com.vaadin.event.ShortcutAction; import com.vaadin.event.Action.Handler; +import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; public class PanelShouldRemoveActionHandler extends TestBase { @@ -64,8 +64,7 @@ public class PanelShouldRemoveActionHandler extends TestBase { public void remove() { panel.setCaption(panel.getCaption() + " - Removed handler"); - panel.removeActionHandler(actionHandlers - .remove(actionHandlers.size() - 1)); + panel.removeActionHandler(actionHandlers.remove(actionHandlers.size() - 1)); } private List<Handler> actionHandlers = new ArrayList<Handler>(); diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java b/tests/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java index 30fa028c40..78e66e2db3 100644 --- a/tests/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java +++ b/tests/src/com/vaadin/tests/components/popupview/PopupViewNullValues.java @@ -2,10 +2,10 @@ package com.vaadin.tests.components.popupview; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.PopupView;
-import com.vaadin.ui.TextField;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.PopupView;
+import com.vaadin.ui.TextField;
import com.vaadin.ui.Window.Notification;
public class PopupViewNullValues extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java b/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java index 194c76d9df..7067281fa2 100644 --- a/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java +++ b/tests/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.java @@ -6,14 +6,14 @@ import java.util.List; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.LoremIpsum; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.PopupView; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class PopupViewOffScreen extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java b/tests/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java index 06319a5019..ea94ee2185 100644 --- a/tests/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java +++ b/tests/src/com/vaadin/tests/components/popupview/PopupViewWithRTE.java @@ -3,9 +3,9 @@ package com.vaadin.tests.components.popupview; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Component;
import com.vaadin.ui.PopupView;
+import com.vaadin.ui.PopupView.Content;
import com.vaadin.ui.RichTextArea;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.PopupView.Content;
public class PopupViewWithRTE extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java b/tests/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java index 026465a624..7e6cfd17ea 100644 --- a/tests/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java +++ b/tests/src/com/vaadin/tests/components/progressindicator/ProgressIndicatorInvisible.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.progressindicator; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ProgressIndicator;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class ProgressIndicatorInvisible extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java b/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java index a6bd70a2d0..2e26d3e2c4 100644 --- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java +++ b/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreaWithKeyboardShortcuts.java @@ -1,8 +1,8 @@ package com.vaadin.tests.components.richtextarea; import com.vaadin.event.Action; -import com.vaadin.event.ShortcutAction; import com.vaadin.event.Action.Handler; +import com.vaadin.event.ShortcutAction; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Component; diff --git a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java b/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java index 721088d93d..62feef3f49 100644 --- a/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java +++ b/tests/src/com/vaadin/tests/components/richtextarea/RichTextAreas.java @@ -5,10 +5,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.RichTextArea; -import com.vaadin.ui.Button.ClickEvent; public class RichTextAreas extends ComponentTestCase<RichTextArea> { diff --git a/tests/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java b/tests/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java index e8ef599e5e..931686003a 100644 --- a/tests/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java +++ b/tests/src/com/vaadin/tests/components/select/ComboBoxAddWhileFiltering.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.select; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.ComboBox; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.ComboBox; /** * TODO can't reproduce the issue with this test case, possibly need some diff --git a/tests/src/com/vaadin/tests/components/select/NativeSelects.java b/tests/src/com/vaadin/tests/components/select/NativeSelects.java index 8f3b79af21..9524ae5edf 100644 --- a/tests/src/com/vaadin/tests/components/select/NativeSelects.java +++ b/tests/src/com/vaadin/tests/components/select/NativeSelects.java @@ -5,10 +5,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.NativeSelect; -import com.vaadin.ui.Button.ClickEvent; public class NativeSelects extends ComponentTestCase<NativeSelect> { diff --git a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java b/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java index bff840f421..4298cfc525 100644 --- a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java +++ b/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.select; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Select;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Select;
public class NullSelectionItemId extends TestBase implements ClickListener {
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java index bde33df3d5..1def3c3154 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelExtraScrollbars.java @@ -3,12 +3,12 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.terminal.Sizeable;
import com.vaadin.tests.components.AbstractTestCase;
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.NativeButton;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class SplitPanelExtraScrollbars extends AbstractTestCase implements
ClickListener {
diff --git a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java index 89008754ba..ae239cedc1 100644 --- a/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java +++ b/tests/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.splitpanel; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; import com.vaadin.ui.SplitPanel; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Window.Notification; public class SplitPanelSplitterWidth extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java index 11a111acf8..271b6175f3 100644 --- a/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java +++ b/tests/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java @@ -5,11 +5,11 @@ import com.vaadin.event.Action.Handler; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Alignment;
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.Table;
import com.vaadin.ui.TextField;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class ColumnCollapsingAndColumnExpansion extends TestBase {
@@ -36,8 +36,8 @@ public class ColumnCollapsingAndColumnExpansion extends TestBase { public void handleAction(Action action, Object sender, Object target) {
try {
- table.setColumnCollapsed("Col2", !table
- .isColumnCollapsed("Col2"));
+ table.setColumnCollapsed("Col2",
+ !table.isColumnCollapsed("Col2"));
} catch (IllegalAccessException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.java b/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.java index 567cde8a54..84e98deffb 100644 --- a/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.java +++ b/tests/src/com/vaadin/tests/components/table/ContainerSizeChange.java @@ -4,8 +4,8 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Table; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Table; public class ContainerSizeChange extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/Footer.java b/tests/src/com/vaadin/tests/components/table/Footer.java index 4dc032fdd2..d6a9853fff 100644 --- a/tests/src/com/vaadin/tests/components/table/Footer.java +++ b/tests/src/com/vaadin/tests/components/table/Footer.java @@ -7,12 +7,12 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; @SuppressWarnings("serial") public class Footer extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/FooterClick.java b/tests/src/com/vaadin/tests/components/table/FooterClick.java index 842e4fdffe..363e18844b 100644 --- a/tests/src/com/vaadin/tests/components/table/FooterClick.java +++ b/tests/src/com/vaadin/tests/components/table/FooterClick.java @@ -4,12 +4,12 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Table; -import com.vaadin.ui.TextField; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.Table; import com.vaadin.ui.Table.FooterClickEvent; +import com.vaadin.ui.TextField; @SuppressWarnings("serial") public class FooterClick extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/HeaderClick.java b/tests/src/com/vaadin/tests/components/table/HeaderClick.java index 9be8426e19..3cb11781b1 100644 --- a/tests/src/com/vaadin/tests/components/table/HeaderClick.java +++ b/tests/src/com/vaadin/tests/components/table/HeaderClick.java @@ -4,12 +4,12 @@ import com.vaadin.data.Container; import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.CheckBox; -import com.vaadin.ui.Table; -import com.vaadin.ui.TextField; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.CheckBox; +import com.vaadin.ui.Table; import com.vaadin.ui.Table.HeaderClickEvent; +import com.vaadin.ui.TextField; @SuppressWarnings("serial") public class HeaderClick extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java b/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java index da64d167b5..bf1f9ca883 100644 --- a/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java +++ b/tests/src/com/vaadin/tests/components/table/HeaderUpdateWhenNoRows.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Table; -import com.vaadin.ui.Button.ClickEvent; public class HeaderUpdateWhenNoRows extends TestBase { @@ -20,11 +20,9 @@ public class HeaderUpdateWhenNoRows extends TestBase { new CheckBox.ClickListener() { public void buttonClick(ClickEvent event) { if (event.getButton().booleanValue()) { - table - .setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); + table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); } else { - table - .setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); + table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); } } }); diff --git a/tests/src/com/vaadin/tests/components/table/KeyControl.java b/tests/src/com/vaadin/tests/components/table/KeyControl.java index b13c53a43f..94c6375c30 100644 --- a/tests/src/com/vaadin/tests/components/table/KeyControl.java +++ b/tests/src/com/vaadin/tests/components/table/KeyControl.java @@ -43,8 +43,7 @@ public class KeyControl extends TestBase { table1.addListener(new Table.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { Set<String> value = (Set<String>) table1.getValue(); - selected1 - .setValue(value.toString() + " TOTAL: " + value.size()); + selected1.setValue(value.toString() + " TOTAL: " + value.size()); } }); diff --git a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java b/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java index af95f9a559..da68a832c3 100644 --- a/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java +++ b/tests/src/com/vaadin/tests/components/table/KeyboardNavigationWithChangingContent.java @@ -6,9 +6,9 @@ import com.vaadin.data.util.BeanItemContainer; import com.vaadin.terminal.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Table; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Table; @SuppressWarnings("serial") public class KeyboardNavigationWithChangingContent extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index dc6cf53de7..504e3b1aaf 100644 --- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java +++ b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java @@ -43,8 +43,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase { item = table.addItem("Item 2 (row 2)"); item.getItemProperty("Column 1").setValue("String B"); item.getItemProperty("Column 2").setValue(new Label("Label B")); - item - .getItemProperty("Column 3") + item.getItemProperty("Column 3") .setValue( new Label( "<a href=\"http://www.vaadin.com\" target=_blank>Label A</a>", diff --git a/tests/src/com/vaadin/tests/components/table/MissingScrollbar.java b/tests/src/com/vaadin/tests/components/table/MissingScrollbar.java index 26ad70e79b..5f65b40f2f 100644 --- a/tests/src/com/vaadin/tests/components/table/MissingScrollbar.java +++ b/tests/src/com/vaadin/tests/components/table/MissingScrollbar.java @@ -6,10 +6,10 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; public class MissingScrollbar extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.java b/tests/src/com/vaadin/tests/components/table/PropertyValueChange.java index 353d2f13ef..4a676cc3b4 100644 --- a/tests/src/com/vaadin/tests/components/table/PropertyValueChange.java +++ b/tests/src/com/vaadin/tests/components/table/PropertyValueChange.java @@ -6,6 +6,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.AbstractSelect.NewItemHandler; import com.vaadin.ui.BaseFieldFactory; import com.vaadin.ui.Button; import com.vaadin.ui.ComboBox; @@ -14,7 +15,6 @@ import com.vaadin.ui.Field; import com.vaadin.ui.FieldFactory; import com.vaadin.ui.Label; import com.vaadin.ui.Table; -import com.vaadin.ui.AbstractSelect.NewItemHandler; import com.vaadin.ui.Table.ColumnGenerator; public class PropertyValueChange extends TestBase { @@ -92,10 +92,9 @@ public class PropertyValueChange extends TestBase { Table t2 = new Table( "A clone of table1, but disabled. Properties are in components."); - t2 - .setDescription("This table is in editable mode." - + " Updates to common datasource should not affect redraw for this " - + "table. Only the components inside table should get updated."); + t2.setDescription("This table is in editable mode." + + " Updates to common datasource should not affect redraw for this " + + "table. Only the components inside table should get updated."); t2.setFieldFactory(ff); t2.setEditable(true); t2.setEnabled(false); @@ -105,9 +104,8 @@ public class PropertyValueChange extends TestBase { t2.setDebugId("disabled table"); Table reader = new Table("Reader table"); - reader - .setDescription("This table should be redrawn on container changes as container data is " - + "displayed directly in cells."); + reader.setDescription("This table should be redrawn on container changes as container data is " + + "displayed directly in cells."); reader.setContainerDataSource(container); reader.addGeneratedColumn("integer x 3", multiplier); reader.setPageLength(0); diff --git a/tests/src/com/vaadin/tests/components/table/RowAdditionTest.java b/tests/src/com/vaadin/tests/components/table/RowAdditionTest.java index 9b600eff7a..742cc0acf3 100644 --- a/tests/src/com/vaadin/tests/components/table/RowAdditionTest.java +++ b/tests/src/com/vaadin/tests/components/table/RowAdditionTest.java @@ -4,9 +4,9 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Table;
-import com.vaadin.ui.Button.ClickEvent;
public class RowAdditionTest extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java b/tests/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java index e9055bf2b8..220d5e8192 100644 --- a/tests/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java +++ b/tests/src/com/vaadin/tests/components/table/TableCacheBuildEfficiency.java @@ -3,10 +3,10 @@ package com.vaadin.tests.components.table; import com.vaadin.data.Property; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Table; -import com.vaadin.ui.Button.ClickEvent; public class TableCacheBuildEfficiency extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java b/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java index c174ae8351..d0b7631f10 100644 --- a/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java +++ b/tests/src/com/vaadin/tests/components/table/TableHeightWhenHidingHeaders.java @@ -1,10 +1,10 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.AbstractTestCase; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; /** * Setting table height and setting column header mode as hidden leaves the body @@ -36,11 +36,9 @@ public class TableHeightWhenHidingHeaders extends AbstractTestCase { if (event.getButton().booleanValue()) { // table body height is now 77px, which together // with header makes 100px - table - .setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); + table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_EXPLICIT_DEFAULTS_ID); } else { - table - .setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); + table.setColumnHeaderMode(Table.COLUMN_HEADER_MODE_HIDDEN); // header disappears, but table body height stays at // 77px // and below the body is an empty area (same height diff --git a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java b/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java index 8906b8e835..fec830fd66 100644 --- a/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java +++ b/tests/src/com/vaadin/tests/components/table/TablePageLengthUpdate.java @@ -4,11 +4,11 @@ import com.vaadin.data.util.MethodProperty; import com.vaadin.terminal.Sizeable; 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.ui.Table; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class TablePageLengthUpdate extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java b/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java index 2c9d75808b..7dcc6f17d2 100644 --- a/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java +++ b/tests/src/com/vaadin/tests/components/table/TableRowHeight2.java @@ -32,9 +32,8 @@ public class TableRowHeight2 extends TestBase { int COL_TITLE_W = 200; int COL_TEST_W = 98; - table - .setWidth((COL_TEST_W + COL_TITLE_W + 2 * COLEXTRASPACE + TABLE_EXTRA) - + "px"); + table.setWidth((COL_TEST_W + COL_TITLE_W + 2 * COLEXTRASPACE + TABLE_EXTRA) + + "px"); table.setPageLength(0); table.setColumnWidth("title", COL_TITLE_W); table.setColumnWidth("test", COL_TEST_W); @@ -48,8 +47,7 @@ public class TableRowHeight2 extends TestBase { b.setStyleName(Button.STYLE_LINK); b.addStyleName("nowraplink"); - b - .setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); + b.setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); item.getItemProperty("title").setValue(b); diff --git a/tests/src/com/vaadin/tests/components/table/TableRowHeight3.java b/tests/src/com/vaadin/tests/components/table/TableRowHeight3.java index d0b7afe94c..d7af764788 100644 --- a/tests/src/com/vaadin/tests/components/table/TableRowHeight3.java +++ b/tests/src/com/vaadin/tests/components/table/TableRowHeight3.java @@ -39,8 +39,7 @@ public class TableRowHeight3 extends TestBase { b.setStyleName(Button.STYLE_LINK); b.addStyleName("nowraplink"); if (i < 2) { - b - .setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); + b.setCaption("Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi ullamcorper, elit quis elementum iaculis, dui est rutrum risus, at cursus sem leo eget arcu. Proin vel eros ut tortor luctus pretium. Nulla facilisi. Donec in dui. Proin ac diam vitae massa tempus faucibus. Fusce eu risus. Nunc ac risus. Cras libero."); } else if (2 <= i && i < 4) { b.setCaption("One line"); } else { diff --git a/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java b/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java index 8f7f781684..ad8eacb4b7 100644 --- a/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java +++ b/tests/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.table; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Table; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Table; public class TableVisibleColumnsUpdate extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java b/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java index d74c3b7238..90add959f1 100644 --- a/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java +++ b/tests/src/com/vaadin/tests/components/table/TestCurrentPageFirstItem.java @@ -5,11 +5,11 @@ import com.vaadin.data.Container; import com.vaadin.data.Item;
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class TestCurrentPageFirstItem extends Application implements
ClickListener {
diff --git a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java b/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java index b3c75ea06d..385916a54a 100644 --- a/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java +++ b/tests/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.java @@ -5,10 +5,10 @@ import com.vaadin.data.Property; import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
-import com.vaadin.ui.Button.ClickEvent;
public class TextFieldRelativeWidth extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java b/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java index 44859fb511..3b5166a21e 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.TabSheet; -import com.vaadin.ui.Button.ClickEvent; public class AddAndRemoveTabs extends TestBase { private TabSheet tabSheet; diff --git a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java b/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java index 7194ddf9fd..b357e06a37 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/RemoveTabs.java @@ -7,10 +7,10 @@ import java.util.List; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.AbstractComponentContainer;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.TabSheet.Tab;
public class RemoveTabs extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java index 699988489f..3d624df709 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetCaptions.java @@ -6,10 +6,10 @@ import java.util.Locale; 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.ui.Panel;
import com.vaadin.ui.TabSheet;
-import com.vaadin.ui.Button.ClickEvent;
public class TabSheetCaptions extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java index 612960f2cf..4f4ab836ed 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.TabSheet;
public class TabSheetDisabling extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java index 3d389184b5..db647f7110 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabSheetMinimal.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.tabsheet; 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.ui.TabSheet;
-import com.vaadin.ui.Button.ClickEvent;
public class TabSheetMinimal extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java index a9ebd2dfa0..ac460dafbb 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetNPE.java @@ -2,13 +2,13 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.tests.components.AbstractTestCase;
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.ui.TabSheet;
+import com.vaadin.ui.TabSheet.Tab;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.TabSheet.Tab;
public class TabsheetNPE extends AbstractTestCase implements ClickListener {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java index 718a10aadd..0880b57eed 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/TabsheetScrolling.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.tabsheet; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.TabSheet;
import com.vaadin.ui.TabSheet.Tab;
public class TabsheetScrolling extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java b/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java index a94aa1cd47..08478c4930 100644 --- a/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java +++ b/tests/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.java @@ -25,11 +25,10 @@ public class VerticalScrollbarPosition extends TestBase { tf.setRows(2);
tf.setHeight("300px");
tf.setWidth("200px");
- tabsheet
- .addTab(
- tf,
- "A text field that is 200px wide, the tab bar for the tabsheet is wider",
- null);
+ tabsheet.addTab(
+ tf,
+ "A text field that is 200px wide, the tab bar for the tabsheet is wider",
+ null);
TextField tf2 = new TextField("Another tab", "b");
tf2.setWidth("1000px");
tf2.setHeight("50px");
diff --git a/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java b/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java index 3a9f35f75a..09b7fe0d6c 100644 --- a/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java +++ b/tests/src/com/vaadin/tests/components/textfield/SelectionAndCursorPosition.java @@ -4,13 +4,13 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; 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.CheckBox; import com.vaadin.ui.FormLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class SelectionAndCursorPosition extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFields.java b/tests/src/com/vaadin/tests/components/textfield/TextFields.java index 16ac819718..2fc1e2f0c2 100644 --- a/tests/src/com/vaadin/tests/components/textfield/TextFields.java +++ b/tests/src/com/vaadin/tests/components/textfield/TextFields.java @@ -5,10 +5,10 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; public class TextFields extends ComponentTestCase<TextField> { diff --git a/tests/src/com/vaadin/tests/components/tree/TreeContainerChange.java b/tests/src/com/vaadin/tests/components/tree/TreeContainerChange.java index 673969f4a8..f33bbae7b5 100644 --- a/tests/src/com/vaadin/tests/components/tree/TreeContainerChange.java +++ b/tests/src/com/vaadin/tests/components/tree/TreeContainerChange.java @@ -5,11 +5,11 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.IndexedContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
import com.vaadin.ui.Tree;
-import com.vaadin.ui.Button.ClickEvent;
@SuppressWarnings("serial")
public class TreeContainerChange extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java index bea9fb3377..ff1ac96e26 100644 --- a/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java +++ b/tests/src/com/vaadin/tests/components/tree/TreeFiltering.java @@ -6,10 +6,10 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.HierarchicalContainer;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.CheckBox;
-import com.vaadin.ui.Tree;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.Tree;
public class TreeFiltering extends TestBase {
diff --git a/tests/src/com/vaadin/tests/components/upload/TestUpload.java b/tests/src/com/vaadin/tests/components/upload/TestUpload.java index b87300462e..ae5800e1da 100644 --- a/tests/src/com/vaadin/tests/components/upload/TestUpload.java +++ b/tests/src/com/vaadin/tests/components/upload/TestUpload.java @@ -6,11 +6,11 @@ import java.util.ArrayList; import java.util.List;
import com.vaadin.tests.components.ComponentTestCase;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.Upload;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Upload.FinishedEvent;
import com.vaadin.ui.Upload.Receiver;
diff --git a/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java b/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java index c49823e97b..e9c96112bc 100644 --- a/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java +++ b/tests/src/com/vaadin/tests/components/upload/TestUploadAndDisableOnSuccess.java @@ -7,11 +7,11 @@ import java.util.List; import com.vaadin.tests.components.ComponentTestCase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.Upload;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Upload.FinishedEvent;
import com.vaadin.ui.Upload.Receiver;
import com.vaadin.ui.Upload.StartedEvent;
diff --git a/tests/src/com/vaadin/tests/components/window/ExecuteJavaScript.java b/tests/src/com/vaadin/tests/components/window/ExecuteJavaScript.java index 3d4394dede..dfa0e80368 100644 --- a/tests/src/com/vaadin/tests/components/window/ExecuteJavaScript.java +++ b/tests/src/com/vaadin/tests/components/window/ExecuteJavaScript.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.window; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class ExecuteJavaScript extends AbstractTestCase { diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowFocus.java b/tests/src/com/vaadin/tests/components/window/SubWindowFocus.java index b0fbf29b8d..f0dccda66c 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindowFocus.java +++ b/tests/src/com/vaadin/tests/components/window/SubWindowFocus.java @@ -4,10 +4,10 @@ import com.vaadin.event.Action; import com.vaadin.event.ShortcutAction; 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.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class SubWindowFocus extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows.java b/tests/src/com/vaadin/tests/components/window/SubWindows.java index 6d7ba78ab7..bbd830b85b 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows.java +++ b/tests/src/com/vaadin/tests/components/window/SubWindows.java @@ -2,13 +2,13 @@ package com.vaadin.tests.components.window; 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.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class SubWindows extends TestBase { @@ -78,9 +78,8 @@ public class SubWindows extends TestBase { dialog.getContent().setWidth("100%"); TextField tf = new TextField(); - tf - .setValue("The textfield should fill the window (except margins)." - + "\n - Try to resize the window\n"); + tf.setValue("The textfield should fill the window (except margins)." + + "\n - Try to resize the window\n"); tf.setRows(5); tf.setWidth("100%"); dialog.addComponent(tf); @@ -96,9 +95,8 @@ public class SubWindows extends TestBase { dialog.getContent().setWidth("100%"); TextField tf = new TextField(); - tf - .setValue("The textfield should fill the window (except margins)." - + "\n - Try to resize the window\n"); + tf.setValue("The textfield should fill the window (except margins)." + + "\n - Try to resize the window\n"); tf.setWidth("100%"); tf.setHeight("100%"); tf.setRows(5); diff --git a/tests/src/com/vaadin/tests/components/window/SubwindowDraggability.java b/tests/src/com/vaadin/tests/components/window/SubwindowDraggability.java index 14cb5dedd0..e1927982cd 100644 --- a/tests/src/com/vaadin/tests/components/window/SubwindowDraggability.java +++ b/tests/src/com/vaadin/tests/components/window/SubwindowDraggability.java @@ -2,8 +2,8 @@ package com.vaadin.tests.components.window; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Window; public class SubwindowDraggability extends TestBase { diff --git a/tests/src/com/vaadin/tests/components/window/WindowResizeListener.java b/tests/src/com/vaadin/tests/components/window/WindowResizeListener.java index 8b468cc972..a6c4b21b70 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowResizeListener.java +++ b/tests/src/com/vaadin/tests/components/window/WindowResizeListener.java @@ -3,11 +3,11 @@ package com.vaadin.tests.components.window; import com.vaadin.terminal.Sizeable; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Window.ResizeEvent; import com.vaadin.ui.Window.ResizeListener; diff --git a/tests/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java b/tests/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java index 3d051c4a10..7889a58f81 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java +++ b/tests/src/com/vaadin/tests/components/window/WindowScrollingComponentIntoView.java @@ -2,6 +2,8 @@ package com.vaadin.tests.components.window; import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
@@ -9,8 +11,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Table;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class WindowScrollingComponentIntoView extends AbstractTestCase {
diff --git a/tests/src/com/vaadin/tests/components/window/WindowScrollingUp.java b/tests/src/com/vaadin/tests/components/window/WindowScrollingUp.java index a97341d8b9..476fd22a55 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowScrollingUp.java +++ b/tests/src/com/vaadin/tests/components/window/WindowScrollingUp.java @@ -2,9 +2,9 @@ package com.vaadin.tests.components.window; import com.vaadin.tests.components.AbstractTestCase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Table;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class WindowScrollingUp extends AbstractTestCase {
diff --git a/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java b/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java index d61deffef8..e6d3fb1651 100644 --- a/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java +++ b/tests/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.java @@ -4,13 +4,13 @@ import java.util.ArrayList; import java.util.List;
import com.vaadin.event.Action;
-import com.vaadin.event.ShortcutAction;
import com.vaadin.event.Action.Handler;
+import com.vaadin.event.ShortcutAction;
import com.vaadin.event.ShortcutAction.ModifierKey;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.TextField;
import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.TextField;
public class WindowShouldRemoveActionHandler extends TestBase {
diff --git a/tests/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java b/tests/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java index e4b65d5676..0d47cc426d 100644 --- a/tests/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java +++ b/tests/src/com/vaadin/tests/containers/BeanItemContainerFilteringTest.java @@ -5,12 +5,12 @@ import com.vaadin.data.util.BeanItemContainer; import com.vaadin.terminal.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class BeanItemContainerFilteringTest extends TestBase {
diff --git a/tests/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java b/tests/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java index f708ad87e9..fb5fe8c27a 100644 --- a/tests/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java +++ b/tests/src/com/vaadin/tests/containers/HierarchicalWrapperOrdering.java @@ -7,11 +7,11 @@ import com.vaadin.data.util.ContainerHierarchicalWrapper; import com.vaadin.data.util.IndexedContainer; 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.Layout; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class HierarchicalWrapperOrdering extends TestBase { diff --git a/tests/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java b/tests/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java index d66435bdaa..154118a393 100644 --- a/tests/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java +++ b/tests/src/com/vaadin/tests/containers/IndexedContainerFilteringTest.java @@ -5,12 +5,12 @@ import com.vaadin.data.util.IndexedContainer; import com.vaadin.terminal.Sizeable;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class IndexedContainerFilteringTest extends TestBase {
diff --git a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java index 6ba7e038c9..308f002e4f 100644 --- a/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java +++ b/tests/src/com/vaadin/tests/dd/AcceptAnythingWindow.java @@ -9,14 +9,14 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; +import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; -import com.vaadin.ui.Label; -import com.vaadin.ui.Window; -import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.DragAndDropWrapper.DragStartMode; import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; +import com.vaadin.ui.Label; +import com.vaadin.ui.Window; public class AcceptAnythingWindow extends Window { diff --git a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java index 81e37a58ec..43bdce2ad4 100644 --- a/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java +++ b/tests/src/com/vaadin/tests/dd/AcceptFromComponent.java @@ -9,14 +9,14 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; +import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; +import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails; +import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; import com.vaadin.ui.Label; import com.vaadin.ui.Tree; import com.vaadin.ui.Window; -import com.vaadin.ui.AbsoluteLayout.ComponentPosition; -import com.vaadin.ui.DragAndDropWrapper.WrapperTargetDetails; -import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; public class AcceptFromComponent extends Window { @@ -75,10 +75,8 @@ public class AcceptFromComponent extends Window { // Item id Label l = new Label(); l.setSizeUndefined(); - l - .setValue("ItemId : " - + ((DataBoundTransferable) ctr) - .getItemId()); + l.setValue("ItemId : " + + ((DataBoundTransferable) ctr).getItemId()); layout.addComponent(l); component = l; diff --git a/tests/src/com/vaadin/tests/dd/DDTest1.java b/tests/src/com/vaadin/tests/dd/DDTest1.java index 1300773094..21ae600934 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest1.java +++ b/tests/src/com/vaadin/tests/dd/DDTest1.java @@ -13,15 +13,15 @@ import com.vaadin.event.dd.acceptcriteria.ServerSideCriterion; import com.vaadin.terminal.ExternalResource; import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.AbstractSelect.AcceptItem; import com.vaadin.ui.Component; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; import com.vaadin.ui.Link; import com.vaadin.ui.Table; -import com.vaadin.ui.Tree; -import com.vaadin.ui.AbstractSelect.AcceptItem; import com.vaadin.ui.Table.TableDragMode; +import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.TreeDragMode; import com.vaadin.ui.Tree.TreeTargetDetails; @@ -55,8 +55,7 @@ public class DDTest1 extends TestBase { pane1.addComponent(label); DragDropPane pane2 = new DragDropPane(); - pane2 - .setCaption("Pane2 (accept needs server side visit, check for \"Bar\")"); + pane2.setCaption("Pane2 (accept needs server side visit, check for \"Bar\")"); final AcceptCriterion crit = new ServerSideCriterion() { /** * @@ -156,8 +155,8 @@ public class DDTest1 extends TestBase { HierarchicalContainer hierarchicalContainer = new HierarchicalContainer(); Collection containerPropertyIds = idx.getContainerPropertyIds(); for (Object object : containerPropertyIds) { - hierarchicalContainer.addContainerProperty(object, idx - .getType(object), null); + hierarchicalContainer.addContainerProperty(object, + idx.getType(object), null); } hierarchicalContainer.addItem(itemId); copyChildren(idx, hierarchicalContainer, itemId); diff --git a/tests/src/com/vaadin/tests/dd/DDTest2.java b/tests/src/com/vaadin/tests/dd/DDTest2.java index 2866489259..f21eb23f16 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest2.java +++ b/tests/src/com/vaadin/tests/dd/DDTest2.java @@ -21,15 +21,15 @@ import com.vaadin.terminal.Resource; import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractSelect; -import com.vaadin.ui.HorizontalLayout; -import com.vaadin.ui.Table; -import com.vaadin.ui.Tree; -import com.vaadin.ui.Window; import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.AbstractSelect.AcceptItem; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Table; import com.vaadin.ui.Table.TableTransferable; +import com.vaadin.ui.Tree; import com.vaadin.ui.Tree.TargetItemAllowsChildren; import com.vaadin.ui.Tree.TreeDragMode; +import com.vaadin.ui.Window; public class DDTest2 extends TestBase { @@ -210,8 +210,8 @@ public class DDTest2 extends TestBase { .getItemProperty("Name").getValue(); tree2.setItemCaption(itemId, name); } else if (tr.getSourceComponent() == tree2) { - tree2.setItemCaption(itemId, tree2.getItemCaption(tr - .getItemId())); + tree2.setItemCaption(itemId, + tree2.getItemCaption(tr.getItemId())); } } } diff --git a/tests/src/com/vaadin/tests/dd/DDTest4.java b/tests/src/com/vaadin/tests/dd/DDTest4.java index a50a81d1ea..f0f5f9bf34 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest4.java +++ b/tests/src/com/vaadin/tests/dd/DDTest4.java @@ -15,10 +15,10 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; +import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; public class DDTest4 extends TestBase { diff --git a/tests/src/com/vaadin/tests/dd/DDTest5.java b/tests/src/com/vaadin/tests/dd/DDTest5.java index 475f005e1b..e1884060b9 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest5.java +++ b/tests/src/com/vaadin/tests/dd/DDTest5.java @@ -12,11 +12,11 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DragAndDropWrapper; +import com.vaadin.ui.DragAndDropWrapper.DragStartMode; +import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.DragAndDropWrapper.DragStartMode; -import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable; public class DDTest5 extends TestBase { @@ -130,8 +130,8 @@ public class DDTest5 extends TestBase { cssLayout.removeComponent(sourceComponent); wrappedLabel = (WrappedLabel) sourceComponent; } - if (dropEvent.getTargetDetails().getData( - "verticalLocation").equals("TOP")) { + if (dropEvent.getTargetDetails() + .getData("verticalLocation").equals("TOP")) { // before reference if dropped on topmost part i--; if (i < 0) { diff --git a/tests/src/com/vaadin/tests/dd/DDTest6.java b/tests/src/com/vaadin/tests/dd/DDTest6.java index 5812a44e1b..b8540167c8 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest6.java +++ b/tests/src/com/vaadin/tests/dd/DDTest6.java @@ -16,8 +16,8 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.BeanItemContainer; import com.vaadin.data.util.ContainerHierarchicalWrapper; import com.vaadin.event.Action; -import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.Action.Handler; +import com.vaadin.event.DataBoundTransferable; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.dd.DragAndDropEvent; @@ -29,26 +29,26 @@ import com.vaadin.event.dd.acceptcriteria.SourceIsTarget; import com.vaadin.terminal.ApplicationResource; import com.vaadin.terminal.Resource; import com.vaadin.terminal.StreamResource; -import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.StreamResource.StreamSource; +import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; import com.vaadin.ui.AbsoluteLayout; +import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DragAndDropWrapper; +import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable.Html5File; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.SplitPanel; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; -import com.vaadin.ui.Window; -import com.vaadin.ui.AbsoluteLayout.ComponentPosition; -import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable.Html5File; import com.vaadin.ui.Tree.TreeDragMode; import com.vaadin.ui.Tree.TreeTargetDetails; import com.vaadin.ui.Upload.Receiver; +import com.vaadin.ui.Window; public class DDTest6 extends TestBase { @@ -384,8 +384,7 @@ public class DDTest6 extends TestBase { ComponentPosition position = l.getPosition(transferable .getSourceComponent()); position.setTop(position.getTopValue() + deltaY, UNITS_PIXELS); - position - .setLeft(position.getLeftValue() + deltaX, UNITS_PIXELS); + position.setLeft(position.getLeftValue() + deltaX, UNITS_PIXELS); } else if (dropEvent.getTransferable().getSourceComponent() == tree1) { diff --git a/tests/src/com/vaadin/tests/dd/DDTest7.java b/tests/src/com/vaadin/tests/dd/DDTest7.java index e388f3d9ed..f6eced1121 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest7.java +++ b/tests/src/com/vaadin/tests/dd/DDTest7.java @@ -15,10 +15,10 @@ import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.components.TestBase; import com.vaadin.tests.util.TestUtils; +import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.AbstractSelect.AbstractSelectTargetDetails; public class DDTest7 extends TestBase { @@ -78,8 +78,9 @@ public class DDTest7 extends TestBase { Object draggedItemId = ((Table.TableTransferable) dragEvent .getTransferable()).getItemId(); - Integer weightOfDraggedRow = (Integer) table.getItem( - draggedItemId).getItemProperty("Weight").getValue(); + Integer weightOfDraggedRow = (Integer) table + .getItem(draggedItemId).getItemProperty("Weight") + .getValue(); HashSet<Object> accepted = new HashSet<Object>(); for (Object itemId : visibleItemIds) { diff --git a/tests/src/com/vaadin/tests/dd/DDTest8.java b/tests/src/com/vaadin/tests/dd/DDTest8.java index 1e6bfef1e6..7582d92be4 100644 --- a/tests/src/com/vaadin/tests/dd/DDTest8.java +++ b/tests/src/com/vaadin/tests/dd/DDTest8.java @@ -80,8 +80,8 @@ public class DDTest8 extends TestBase { HierarchicalContainer hierarchicalContainer = new HierarchicalContainer(); Collection containerPropertyIds = idx.getContainerPropertyIds(); for (Object object : containerPropertyIds) { - hierarchicalContainer.addContainerProperty(object, idx - .getType(object), null); + hierarchicalContainer.addContainerProperty(object, + idx.getType(object), null); } hierarchicalContainer.addItem(itemId); copyChildren(idx, hierarchicalContainer, itemId); diff --git a/tests/src/com/vaadin/tests/dd/DragDropPane.java b/tests/src/com/vaadin/tests/dd/DragDropPane.java index 0d9da4f8c4..ec9015679c 100644 --- a/tests/src/com/vaadin/tests/dd/DragDropPane.java +++ b/tests/src/com/vaadin/tests/dd/DragDropPane.java @@ -12,11 +12,11 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.terminal.gwt.client.MouseEventDetails; import com.vaadin.ui.AbsoluteLayout; +import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; -import com.vaadin.ui.Label; -import com.vaadin.ui.AbsoluteLayout.ComponentPosition; import com.vaadin.ui.DragAndDropWrapper.WrapperTransferable.Html5File; +import com.vaadin.ui.Label; import com.vaadin.ui.Upload.Receiver; /** diff --git a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java index 579f912e87..aa51dd539d 100644 --- a/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java +++ b/tests/src/com/vaadin/tests/dd/HorizontalLayoutSortableWithWrappers.java @@ -10,9 +10,9 @@ import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.event.dd.acceptcriteria.And; -import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; -import com.vaadin.event.dd.acceptcriteria.SourceIsTarget; import com.vaadin.event.dd.acceptcriteria.Not; +import com.vaadin.event.dd.acceptcriteria.SourceIsTarget; +import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; import com.vaadin.ui.Component; import com.vaadin.ui.DragAndDropWrapper; import com.vaadin.ui.HorizontalLayout; diff --git a/tests/src/com/vaadin/tests/featurebrowser/Feature.java b/tests/src/com/vaadin/tests/featurebrowser/Feature.java index f3335f8e24..241be04e21 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/Feature.java +++ b/tests/src/com/vaadin/tests/featurebrowser/Feature.java @@ -48,9 +48,8 @@ public abstract class Feature extends CustomComponent { * @param url */ public void setJavadocURL(String url) { - javadoc - .setValue("<iframe width=\"100%\" src=\"http://www.vaadin.com/api/com/vaadin/" - + url + "\"></iframe>"); + javadoc.setValue("<iframe width=\"100%\" src=\"http://www.vaadin.com/api/com/vaadin/" + + url + "\"></iframe>"); } /** diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java index 2b8668aa94..d4eb6867a1 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureBrowser.java @@ -10,6 +10,8 @@ import java.util.StringTokenizer; import com.vaadin.data.Property; 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.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CustomComponent; @@ -17,8 +19,6 @@ import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.Select; import com.vaadin.ui.Tree; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class FeatureBrowser extends CustomComponent implements Property.ValueChangeListener, ClickListener, Layout { @@ -166,7 +166,8 @@ public class FeatureBrowser extends CustomComponent implements .equals("tree")) { // ignore tree initialization } else { - FeatureUtil.debug(getApplication().getUser().toString(), + FeatureUtil.debug( + getApplication().getUser().toString(), "valueChange " + ((AbstractComponent) event.getProperty()) .getTag() + ", " + event.getProperty()); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java index 48ead2f676..adb563e6d4 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureBuffering.java @@ -54,10 +54,12 @@ public class FeatureBuffering extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/Buffered.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureButton.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureButton.java index a47eda9d35..58c4a1cea8 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureButton.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureButton.java @@ -27,8 +27,9 @@ public class FeatureButton extends Feature { // Properties propertyPanel = new PropertyPanel(b); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("link").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("link"); + themes.addItem("link") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("link"); final Form ap = propertyPanel .createBeanPropertySet(new String[] { "switchMode" }); propertyPanel.addProperties("Button Properties", ap); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureContainers.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureContainers.java index 319be0056b..06732c0325 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureContainers.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureContainers.java @@ -60,10 +60,12 @@ public class FeatureContainers extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/Container.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureCustomLayout.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureCustomLayout.java index 97ce9761a1..e016ebaf4e 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureCustomLayout.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureCustomLayout.java @@ -46,10 +46,12 @@ public class FeatureCustomLayout extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("ui/CustomLayout.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureDateField.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureDateField.java index 31a3c53438..8fda0597e7 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureDateField.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureDateField.java @@ -60,10 +60,12 @@ public class FeatureDateField extends Feature { new Integer(DateField.RESOLUTION_DAY)); ap.getField("locale").setValue(Locale.getDefault()); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("text").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("text"); - themes.addItem("calendar").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("calendar"); + themes.addItem("text") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("text"); + themes.addItem("calendar") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("calendar"); propertyPanel.addProperties("DateField Properties", ap); setJavadocURL("ui/DateField.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureForm.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureForm.java index f50ad70ffc..8c0d01752d 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureForm.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureForm.java @@ -116,16 +116,14 @@ public class FeatureForm extends Feature implements } if (value.equals("Time")) { final DateField d = new DateField("Time", new Date()); - d - .setDescription("This is a DateField-component with text-style"); + d.setDescription("This is a DateField-component with text-style"); d.setResolution(DateField.RESOLUTION_MIN); d.setStyle("text"); test.addField(new Object(), d); } if (value.equals("Calendar")) { final DateField c = new DateField("Calendar", new Date()); - c - .setDescription("DateField-component with calendar-style and day-resolution"); + c.setDescription("DateField-component with calendar-style and day-resolution"); c.setStyle("calendar"); c.setResolution(DateField.RESOLUTION_DAY); test.addField(new Object(), c); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureItems.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureItems.java index 00e06deafd..47fdc2d71f 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureItems.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureItems.java @@ -50,10 +50,12 @@ public class FeatureItems extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/Item.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureOrderedLayout.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureOrderedLayout.java index 1ef07a6878..cd7c5f9092 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureOrderedLayout.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureOrderedLayout.java @@ -36,8 +36,9 @@ public class FeatureOrderedLayout extends Feature { new Integer(OrderedLayout.ORIENTATION_VERTICAL) }, new Object[] { "Horizontal", "Vertical" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("form").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("form"); + themes.addItem("form") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("form"); propertyPanel.addProperties("OrderedLayout Properties", ap); setJavadocURL("ui/OrderedLayout.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeaturePanel.java b/tests/src/com/vaadin/tests/featurebrowser/FeaturePanel.java index a12e51cae2..dd5b7a431a 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeaturePanel.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeaturePanel.java @@ -24,9 +24,8 @@ public class FeaturePanel extends Feature { // Example panel final Panel show = new Panel("Panel caption"); - show - .addComponent(new Label( - "This is an example Label component that is added into Panel.")); + show.addComponent(new Label( + "This is an example Label component that is added into Panel.")); l.addComponent(show); // Properties @@ -34,10 +33,12 @@ public class FeaturePanel extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("ui/Panel.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java index 4bb90e02b0..80c3296651 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureParameters.java @@ -81,10 +81,12 @@ public class FeatureParameters extends Feature implements URIHandler, final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("ui/Panel.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureProperties.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureProperties.java index 5c2b07b3e2..718ebbd9e4 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureProperties.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureProperties.java @@ -58,10 +58,12 @@ public class FeatureProperties extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/Property.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureSelect.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureSelect.java index d38815e960..f4386e762d 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureSelect.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureSelect.java @@ -31,20 +31,21 @@ public class FeatureSelect extends Feature { final Select s = new Select("Select employee"); for (int i = 0; i < 50; i++) { - s - .addItem(firstnames[(int) (Math.random() * (firstnames.length - 1))] - + " " - + lastnames[(int) (Math.random() * (lastnames.length - 1))]); + s.addItem(firstnames[(int) (Math.random() * (firstnames.length - 1))] + + " " + + lastnames[(int) (Math.random() * (lastnames.length - 1))]); } l.addComponent(s); // Properties propertyPanel = new PropertyPanel(s); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("optiongroup").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("optiongroup"); - themes.addItem("twincol").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("twincol"); + themes.addItem("optiongroup") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("optiongroup"); + themes.addItem("twincol") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("twincol"); setJavadocURL("ui/Select.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureTabSheet.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureTabSheet.java index 5dd686e60e..ab015297a9 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureTabSheet.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureTabSheet.java @@ -21,21 +21,18 @@ public class FeatureTabSheet extends Feature { final OrderedLayout l = new OrderedLayout(); final TabSheet ts = new TabSheet(); - ts - .addTab( - new Label( - "This is an example Label component that is added into Tab 1."), - "Tab 1 caption", null); - ts - .addTab( - new Label( - "This is an example Label component that is added into Tab 2."), - "Tab 2 caption", null); - ts - .addTab( - new Label( - "This is an example Label component that is added into Tab 3."), - "Tab 3 caption", null); + ts.addTab( + new Label( + "This is an example Label component that is added into Tab 1."), + "Tab 1 caption", null); + ts.addTab( + new Label( + "This is an example Label component that is added into Tab 2."), + "Tab 2 caption", null); + ts.addTab( + new Label( + "This is an example Label component that is added into Tab 3."), + "Tab 3 caption", null); l.addComponent(ts); // Properties diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureTable.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureTable.java index ecc000320b..7c58bf89ee 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureTable.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureTable.java @@ -71,14 +71,13 @@ public class FeatureTable extends Feature implements Action.Handler { // Add random rows to table for (int j = 0; j < 300; j++) { - t - .addItem( - new Object[] { - firstnames[(int) (Math.random() * (firstnames.length - 1))], - lastnames[(int) (Math.random() * (lastnames.length - 1))], - title[(int) (Math.random() * title.length)], - unit[(int) (Math.random() * unit.length)] }, - new Integer(j)); + t.addItem( + new Object[] { + firstnames[(int) (Math.random() * (firstnames.length - 1))], + lastnames[(int) (Math.random() * (lastnames.length - 1))], + title[(int) (Math.random() * title.length)], + unit[(int) (Math.random() * unit.length)] }, + new Integer(j)); } // Actions @@ -109,10 +108,12 @@ public class FeatureTable extends Feature implements Action.Handler { "ID", "Index", "Item", "Property" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("list").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("list"); - themes.addItem("paging").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("paging"); + themes.addItem("list") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("list"); + themes.addItem("paging") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("paging"); propertyPanel.addProperties("Table Properties", ap); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java index 368b2df0f7..c5ccb3ef5f 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureTree.java @@ -101,8 +101,9 @@ public class FeatureTree extends Feature implements Action.Handler { final Form ap = propertyPanel .createBeanPropertySet(new String[] { "selectable" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("menu").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("menu"); + themes.addItem("menu") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("menu"); propertyPanel.addProperties("Tree Properties", ap); setJavadocURL("ui/Tree.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureUpload.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureUpload.java index c93a34c7ec..64cd29eba5 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureUpload.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureUpload.java @@ -83,9 +83,8 @@ public class FeatureUpload extends Feature implements Upload.FinishedListener { status.addComponent(new Label( "Upload finished, but output buffer is null!!")); } else { - status - .addComponent(new Label("<b>Name:</b> " - + event.getFilename(), Label.CONTENT_XHTML)); + status.addComponent(new Label( + "<b>Name:</b> " + event.getFilename(), Label.CONTENT_XHTML)); status.addComponent(new Label("<b>Mimetype:</b> " + event.getMIMEType(), Label.CONTENT_XHTML)); status.addComponent(new Label("<b>Size:</b> " + event.getLength() diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeatureValidators.java b/tests/src/com/vaadin/tests/featurebrowser/FeatureValidators.java index 5f251929a5..2b2fbae805 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeatureValidators.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeatureValidators.java @@ -50,10 +50,12 @@ public class FeatureValidators extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/Validator.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java b/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java index 2d3ac436ad..2b1f48075c 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java +++ b/tests/src/com/vaadin/tests/featurebrowser/FeaturesApplication.java @@ -26,8 +26,8 @@ public class FeaturesApplication extends com.vaadin.Application { @Override public void terminalError(com.vaadin.terminal.Terminal.ErrorEvent event) { final Throwable e = event.getThrowable(); - FeatureUtil.debug(getUser().toString(), "terminalError: " - + e.toString()); + FeatureUtil.debug(getUser().toString(), + "terminalError: " + e.toString()); e.printStackTrace(); } diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroBasic.java b/tests/src/com/vaadin/tests/featurebrowser/IntroBasic.java index 5d480c106a..9543b89d0f 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroBasic.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroBasic.java @@ -42,10 +42,12 @@ public class IntroBasic extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("ui/package-summary.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroComponents.java b/tests/src/com/vaadin/tests/featurebrowser/IntroComponents.java index c4898a7fcc..ceb36324ad 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroComponents.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroComponents.java @@ -46,10 +46,12 @@ public class IntroComponents extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("ui/package-summary.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroDataHandling.java b/tests/src/com/vaadin/tests/featurebrowser/IntroDataHandling.java index d164442d4c..3e5b013f8d 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroDataHandling.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroDataHandling.java @@ -42,10 +42,12 @@ public class IntroDataHandling extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); return l; diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroDataModel.java b/tests/src/com/vaadin/tests/featurebrowser/IntroDataModel.java index b4fb8f6757..9bc199dc34 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroDataModel.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroDataModel.java @@ -43,10 +43,12 @@ public class IntroDataModel extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/package-summary.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroItemContainers.java b/tests/src/com/vaadin/tests/featurebrowser/IntroItemContainers.java index db9909946c..ff8b029fbd 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroItemContainers.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroItemContainers.java @@ -42,10 +42,12 @@ public class IntroItemContainers extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("data/Container.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroLayouts.java b/tests/src/com/vaadin/tests/featurebrowser/IntroLayouts.java index bd180a860c..c0dd0e305a 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroLayouts.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroLayouts.java @@ -44,10 +44,12 @@ public class IntroLayouts extends Feature { final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("ui/Layout.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java b/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java index d9c20b96b2..16437c8f4c 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java +++ b/tests/src/com/vaadin/tests/featurebrowser/IntroWelcome.java @@ -77,10 +77,12 @@ public class IntroWelcome extends Feature implements URIHandler, final Form ap = propertyPanel.createBeanPropertySet(new String[] { "width", "height" }); final Select themes = (Select) propertyPanel.getField("style"); - themes.addItem("light").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("light"); - themes.addItem("strong").getItemProperty( - themes.getItemCaptionPropertyId()).setValue("strong"); + themes.addItem("light") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("light"); + themes.addItem("strong") + .getItemProperty(themes.getItemCaptionPropertyId()) + .setValue("strong"); propertyPanel.addProperties("Panel Properties", ap); setJavadocURL("package-summary.html"); diff --git a/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java b/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java index 6a87dec748..7139202485 100644 --- a/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java +++ b/tests/src/com/vaadin/tests/featurebrowser/PropertyPanel.java @@ -150,10 +150,12 @@ public class PropertyPanel extends Panel implements Button.ClickListener, // Fill the table for (int i = 0; i < pd.length; i++) { - allProperties.addItem(new Object[] { pd[i].getName(), - pd[i].getPropertyType().getName(), - (pd[i].getWriteMethod() == null ? "R" : "R/W"), - (listed.contains(pd[i].getName()) ? "x" : "") }, pd[i]); + allProperties.addItem( + new Object[] { pd[i].getName(), + pd[i].getPropertyType().getName(), + (pd[i].getWriteMethod() == null ? "R" : "R/W"), + (listed.contains(pd[i].getName()) ? "x" : "") }, + pd[i]); } } @@ -177,23 +179,22 @@ public class PropertyPanel extends Panel implements Button.ClickListener, } catch (final NullPointerException e) { sampleException = e; } - set - .replaceWithSelect( - "componentError", - new Object[] { - null, - new UserError("Sample text error message."), - new UserError( - "<h3>Error message formatting</h3><p>Error messages can " - + "contain any UIDL formatting, like: <ul><li><b>Bold" - + "</b></li><li><i>Italic</i></li></ul></p>", - UserError.CONTENT_UIDL, - ErrorMessage.INFORMATION), - new SystemError( - "This is an example of exception error reposting", - sampleException) }, - new Object[] { "No error", "Sample text error", - "Sample Formatted error", "Sample System Error" }); + set.replaceWithSelect( + "componentError", + new Object[] { + null, + new UserError("Sample text error message."), + new UserError( + "<h3>Error message formatting</h3><p>Error messages can " + + "contain any UIDL formatting, like: <ul><li><b>Bold" + + "</b></li><li><i>Italic</i></li></ul></p>", + UserError.CONTENT_UIDL, + ErrorMessage.INFORMATION), + new SystemError( + "This is an example of exception error reposting", + sampleException) }, new Object[] { "No error", + "Sample text error", "Sample Formatted error", + "Sample System Error" }); // Style final String currentStyle = ((Component) objectToConfigure) @@ -208,59 +209,50 @@ public class PropertyPanel extends Panel implements Button.ClickListener, } // Set up descriptions - set - .getField("caption") + set.getField("caption") .setDescription( "Component caption is the title of the component. Usage of the caption is optional and the " + "exact behavior of the propery is defined by the component. Setting caption null " + "or empty disables the caption."); - set - .getField("enabled") + set.getField("enabled") .setDescription( "Enabled property controls the usage of the component. If the component is disabled (enabled=false)," + " it can not receive any events from the terminal. In most cases it makes the usage" + " of the component easier, if the component visually looks disbled (for example is grayed), " + "when it can not be used."); - set - .getField("icon") + set.getField("icon") .setDescription( "Icon of the component selects the main icon of the component. The usage of the icon is identical " + "to caption and in most components caption and icon are kept together. Icons can be " + "loaded from any resources (see Terminal/Resources for more information). Some components " + "contain more than just the captions icon. Those icons are controlled through their " + "own properties."); - set - .getField("visible") + set.getField("visible") .setDescription( "Visibility property says if the component is renreded or not. Invisible components are implicitly " + "disabled, as there is no visible user interface to send event."); - set - .getField("description") + set.getField("description") .setDescription( "Description is designed to allow easy addition of short tooltips, like this. Like the caption," + " setting description null or empty disables the description."); - set - .getField("readOnly") + set.getField("readOnly") .setDescription( "Those components that have internal state that can be written are settable to readOnly-mode," + " where the object can only be read, not written."); - set - .getField("componentError") + set.getField("componentError") .setDescription( "Vaadin supports extensive error reporting. One part of the error reporting are component" + " errors that can be controlled by the programmer. This example only contains couple of " + "sample errors; to get the full picture, read browse ErrorMessage-interface implementors " + "API documentation."); - set - .getField("immediate") + set.getField("immediate") .setDescription( "Not all terminals can send the events immediately to server from all action. Web is the most " + "typical environment where many events (like textfield changed) are not sent to server, " + "before they are explicitly submitted. Setting immediate property true (by default this " + "is false for most components), the programmer can assure that the application is" + " notified as soon as possible about the value change in this component."); - set - .getField("style") + set.getField("style") .setDescription( "Themes specify the overall looks of the user interface. In addition component can have a set of " + "styles, that can be visually very different (like datefield calendar- and text-styles), " @@ -287,8 +279,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener, set.getField("multiSelect").setDescription( "Specified if multiple items can be selected at once."); - set - .getField("newItemsAllowed") + set.getField("newItemsAllowed") .setDescription( "Select component (but not Tree or Table) can allow the user to directly " + "add new items to set of options. The new items are constrained to be " @@ -352,7 +343,8 @@ public class PropertyPanel extends Panel implements Button.ClickListener, // FIXME: navigation statistics try { - FeatureUtil.debug(getApplication().getUser().toString(), + FeatureUtil.debug( + getApplication().getUser().toString(), "valueChange " + ((AbstractComponent) event.getProperty()) .getTag() + ", " + event.getProperty()); @@ -374,8 +366,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener, // DateField time style if (value.equals("Time")) { final DateField d = new DateField("Time", new Date()); - d - .setDescription("This is a DateField-component with text-style"); + d.setDescription("This is a DateField-component with text-style"); d.setResolution(DateField.RESOLUTION_MIN); d.setStyleName("text"); ((AbstractComponentContainer) objectToConfigure) @@ -385,8 +376,7 @@ public class PropertyPanel extends Panel implements Button.ClickListener, // Date field calendar style if (value.equals("Calendar")) { final DateField c = new DateField("Calendar", new Date()); - c - .setDescription("DateField-component with calendar-style and day-resolution"); + c.setDescription("DateField-component with calendar-style and day-resolution"); c.setStyleName("calendar"); c.setResolution(DateField.RESOLUTION_DAY); ((AbstractComponentContainer) objectToConfigure) diff --git a/tests/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java b/tests/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java index 7172dd7e0d..6193fd238e 100644 --- a/tests/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java +++ b/tests/src/com/vaadin/tests/layouts/AbsoluteLayoutAddRemove.java @@ -3,9 +3,9 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Button.ClickEvent; public class AbsoluteLayoutAddRemove extends TestBase { diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java b/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java index f5e3d8e1b2..946e778ead 100644 --- a/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java +++ b/tests/src/com/vaadin/tests/layouts/CssLayoutRemoveComponentWithCaption.java @@ -2,10 +2,10 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.CssLayout;
-import com.vaadin.ui.TextField;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.TextField;
public class CssLayoutRemoveComponentWithCaption extends TestBase {
diff --git a/tests/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java b/tests/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java index a464e9b5c9..0be605c795 100644 --- a/tests/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java +++ b/tests/src/com/vaadin/tests/layouts/CssLayoutSizeChangePropagation.java @@ -2,12 +2,12 @@ package com.vaadin.tests.layouts; 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.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.Label; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class CssLayoutSizeChangePropagation extends TestBase { diff --git a/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java b/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java index e13cdf5c3a..fc280c0ce2 100644 --- a/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java +++ b/tests/src/com/vaadin/tests/layouts/DeepComponentTrees.java @@ -3,6 +3,7 @@ package com.vaadin.tests.layouts; import com.vaadin.data.Property.ValueChangeEvent;
import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.HorizontalLayout;
@@ -10,7 +11,6 @@ import com.vaadin.ui.Label; import com.vaadin.ui.Layout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class DeepComponentTrees extends TestBase {
diff --git a/tests/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java b/tests/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java index 8934adae0a..e29c7559b3 100644 --- a/tests/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java +++ b/tests/src/com/vaadin/tests/layouts/FormLayoutWithInvisibleComponent.java @@ -2,10 +2,10 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.FormLayout; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; public class FormLayoutWithInvisibleComponent extends TestBase { diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutCaptions.java b/tests/src/com/vaadin/tests/layouts/GridLayoutCaptions.java index 468261d523..08df953e66 100644 --- a/tests/src/com/vaadin/tests/layouts/GridLayoutCaptions.java +++ b/tests/src/com/vaadin/tests/layouts/GridLayoutCaptions.java @@ -5,6 +5,7 @@ import com.vaadin.data.Validator; import com.vaadin.data.util.BeanItem; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.CssLayout; import com.vaadin.ui.DefaultFieldFactory; @@ -16,7 +17,6 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class GridLayoutCaptions extends TestBase { @@ -39,24 +39,21 @@ public class GridLayoutCaptions extends TestBase { } else if (propertyId.equals(DataPOJO.Fields.hp.name())) { Field f = DefaultFieldFactory.get().createField(item, propertyId, uiContext); - f - .setCaption("This is a long caption for the HP field, but it has a VL as a wrapper"); + f.setCaption("This is a long caption for the HP field, but it has a VL as a wrapper"); return f; } else if (propertyId.equals(DataPOJO.Fields.place.name())) { Field f = DefaultFieldFactory.get().createField(item, propertyId, uiContext); - f - .setCaption("This is a long caption for the Place field, but it has a CSSLo as a wrapper"); + f.setCaption("This is a long caption for the Place field, but it has a CSSLo as a wrapper"); return f; } else if (propertyId.equals(DataPOJO.Fields.price.name())) { Field f = DefaultFieldFactory.get().createField(item, propertyId, uiContext); - f - .setCaption("With size undefined the caption behaves like this..."); + f.setCaption("With size undefined the caption behaves like this..."); f.setSizeFull(); return f; diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java b/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java index 781e39bb4e..03e51c0a41 100644 --- a/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java +++ b/tests/src/com/vaadin/tests/layouts/GridLayoutExpandRatioModification.java @@ -2,13 +2,13 @@ package com.vaadin.tests.layouts; 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.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class GridLayoutExpandRatioModification extends TestBase implements ClickListener { diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutNPE.java b/tests/src/com/vaadin/tests/layouts/GridLayoutNPE.java index 5f67aa1a57..48ecb5832a 100644 --- a/tests/src/com/vaadin/tests/layouts/GridLayoutNPE.java +++ b/tests/src/com/vaadin/tests/layouts/GridLayoutNPE.java @@ -2,10 +2,10 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class GridLayoutNPE extends TestBase {
diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java b/tests/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java index db765e0636..8689503332 100644 --- a/tests/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java +++ b/tests/src/com/vaadin/tests/layouts/GridLayoutRemoveFinalRow.java @@ -2,9 +2,9 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Button.ClickEvent; /** * Tests removing rows from a GridLayout diff --git a/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java b/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java index 1592c3adcf..08bef51163 100644 --- a/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java +++ b/tests/src/com/vaadin/tests/layouts/GridLayoutWidthChange.java @@ -2,12 +2,12 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomComponent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.NativeButton;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class GridLayoutWidthChange extends TestBase {
diff --git a/tests/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java b/tests/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java index e548d7dacc..50cf41f095 100644 --- a/tests/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java +++ b/tests/src/com/vaadin/tests/layouts/HiddenHorizontalLayout.java @@ -2,10 +2,10 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class HiddenHorizontalLayout extends TestBase {
diff --git a/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.java b/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.java index 0c02d0d3f3..23ae31d786 100644 --- a/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.java +++ b/tests/src/com/vaadin/tests/layouts/MovingInvisibleField.java @@ -2,10 +2,10 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.TextField; -import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.TextField; +import com.vaadin.ui.VerticalLayout; @SuppressWarnings("serial") public class MovingInvisibleField extends TestBase { diff --git a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java b/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java index 3167947697..c70ac5dfa8 100644 --- a/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java +++ b/tests/src/com/vaadin/tests/layouts/OrderedLayoutBasics.java @@ -10,17 +10,17 @@ import com.vaadin.tests.components.TestBase; import com.vaadin.ui.AbstractOrderedLayout;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Component;
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.Layout.AlignmentHandler;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Select;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Layout.AlignmentHandler;
public class OrderedLayoutBasics extends TestBase {
@@ -53,64 +53,38 @@ public class OrderedLayoutBasics extends TestBase { }
private void createUI(Layout layout) {
- layout
- .addComponent(wrapLayout(layout_field_100pct_button_field(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_field_100pct_button_field(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_overfilled(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_overfilled(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_overfilled_dynamic_height(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_overfilled_dynamic_height(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_symmetric_fields(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_symmetric_fields(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_leftAndRight(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_leftAndRight(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_fixed_filled(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_fixed_filled(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_field_100pct_button_field(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_field_100pct_button_field(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_overfilled(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_overfilled(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_overfilled_dynamic_height(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_overfilled_dynamic_height(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_symmetric_fields(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_symmetric_fields(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_leftAndRight(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_leftAndRight(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_fixed_filled(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_fixed_filled(new VerticalLayout())));
layout.addComponent(wrapLayout(layout_dynamic(new HorizontalLayout())));
layout.addComponent(wrapLayout(layout_dynamic(new VerticalLayout())));
layout.addComponent(wrapLayout(layout_labels(new HorizontalLayout())));
layout.addComponent(wrapLayout(layout_labels(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_captions(new HorizontalLayout())));
layout.addComponent(wrapLayout(layout_captions(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions_fixed_size(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions_fixed_size(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_add_remove_components(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_add_remove_components(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_pctFilled(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_captions_fixed_size(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_captions_fixed_size(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_captions_fixed_size_and_relative_size(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_captions_fixed_size_and_fixed_size(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_add_remove_components(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_add_remove_components(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_pctFilled(new HorizontalLayout())));
layout.addComponent(wrapLayout(layout_pctFilled(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_underFilled(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_underFilled(new VerticalLayout())));
- layout
- .addComponent(wrapLayout(layout_basic_test(new HorizontalLayout())));
- layout
- .addComponent(wrapLayout(layout_basic_test(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_underFilled(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_underFilled(new VerticalLayout())));
+ layout.addComponent(wrapLayout(layout_basic_test(new HorizontalLayout())));
+ layout.addComponent(wrapLayout(layout_basic_test(new VerticalLayout())));
}
private Layout wrapLayout(Layout ol) {
@@ -1074,8 +1048,8 @@ public class OrderedLayoutBasics extends TestBase { }
index++;
}
- AbstractOrderedLayout inner = createAddRemove(ol, width, String
- .valueOf(suffix++));
+ AbstractOrderedLayout inner = createAddRemove(ol, width,
+ String.valueOf(suffix++));
ol.addComponent(inner, index);
if (width.contains("%")) {
ol.setExpandRatio(inner, 1.0f);
diff --git a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java index efabf0ac9a..1225874a44 100644 --- a/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java +++ b/tests/src/com/vaadin/tests/layouts/TestAbsoluteLayout.java @@ -17,6 +17,7 @@ import com.vaadin.ui.AbsoluteLayout; import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.BaseFieldFactory;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.Field;
import com.vaadin.ui.FieldFactory;
@@ -26,7 +27,6 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class TestAbsoluteLayout extends TestBase {
@@ -208,8 +208,8 @@ public class TestAbsoluteLayout extends TestBase { if (files[j].endsWith(".class")) {
// removes the .class extension
String p = resource.toString()
- + files[j].substring(0, files[j]
- .length() - 6);
+ + files[j].substring(0,
+ files[j].length() - 6);
p = p.replaceAll(".*classes/", "");
p = p.replaceAll("/", ".");
Class c;
@@ -291,9 +291,9 @@ public class TestAbsoluteLayout extends TestBase { BeanItem beanItem = new BeanItem(value);
String c = "Component properties for "
+ value.getClass().getSimpleName();
- ArrayList<String> fields = new ArrayList<String>(Arrays
- .asList(new String[] { "width", "widthUnits", "height",
- "heightUnits", "caption", "styleName" }));
+ ArrayList<String> fields = new ArrayList<String>(
+ Arrays.asList(new String[] { "width", "widthUnits",
+ "height", "heightUnits", "caption", "styleName" }));
if (value instanceof Label) {
c += "(" + ((Label) value).getValue() + ")";
fields.add("value");
diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java b/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java index 896581ce3d..6cae2a7679 100644 --- a/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java +++ b/tests/src/com/vaadin/tests/layouts/TestLayoutPerformance.java @@ -3,6 +3,7 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.AbstractComponent;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.Component;
import com.vaadin.ui.CssLayout;
@@ -12,7 +13,6 @@ import com.vaadin.ui.Layout; import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class TestLayoutPerformance extends TestBase {
private NativeSelect ns;
diff --git a/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java b/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java index 9aadbadd78..dbaf2c07a5 100644 --- a/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java +++ b/tests/src/com/vaadin/tests/layouts/VerticalLayoutExpandRatioModification.java @@ -2,12 +2,12 @@ package com.vaadin.tests.layouts; 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.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class VerticalLayoutExpandRatioModification extends TestBase implements
ClickListener {
diff --git a/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java b/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java index f9ff36d9ee..360cc73f5e 100644 --- a/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java +++ b/tests/src/com/vaadin/tests/layouts/VerticalLayoutWithRelativeSizeComponentsInitiallyHidden.java @@ -2,10 +2,10 @@ package com.vaadin.tests.layouts; import com.vaadin.tests.components.TestBase;
import com.vaadin.ui.Button;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Button.ClickListener;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.VerticalLayout;
public class VerticalLayoutWithRelativeSizeComponentsInitiallyHidden extends
TestBase {
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java index c06e0b3c14..10bdd0aff2 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java @@ -12,6 +12,7 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.GridLayout;
@@ -26,7 +27,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.themes.Reindeer;
public class GridLayoutTests extends AbstractLayoutTests {
@@ -147,7 +147,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.addComponent(cc1);
button1.setEnabled(false);
@@ -265,7 +264,6 @@ public class GridLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getExpandRatiosTests() {
final GridLayout glo = getTestGrid();
Layout baseLayout = getBaseLayout();
@@ -289,7 +287,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setColumnExpandRatio(3, 1);
button1.setEnabled(false);
@@ -299,7 +296,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setColumnExpandRatio(0, 0.25f);
glo.setColumnExpandRatio(1, 0.25f);
@@ -312,7 +308,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setRowExpandRatio(0, 0.5f);
button3.setEnabled(false);
@@ -322,7 +317,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setRowExpandRatio(3, 0.3f);
button4.setEnabled(false);
@@ -332,7 +326,6 @@ public class GridLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getIconsTests() {
GridLayout glo = getTestGrid();
glo.setWidth("600px");
@@ -348,8 +341,7 @@ public class GridLayoutTests extends AbstractLayoutTests { col2.setIcon(icons[1]);
col3.setIcon(icons[0]);
rc1.setIcon(icons[1]);
- col3
- .setCaption("long test caption bewucbwuebco or bmort b cbwecubw wbeucwe asdasd asdasda asdasd");
+ col3.setCaption("long test caption bewucbwuebco or bmort b cbwecubw wbeucwe asdasd asdasda asdasd");
col3.setComponentError(new UserError("component error, user error"));
glo.replaceComponent(row1, row1 = new DateField());
@@ -370,7 +362,6 @@ public class GridLayoutTests extends AbstractLayoutTests { return glo;
}
-
protected Layout getLayoutSizingTests() {
final GridLayout glo = getTestGrid();
Layout baseLayout = getBaseLayout();
@@ -397,7 +388,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setHeight("350px");
button1.setEnabled(false);
@@ -407,7 +397,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setSizeUndefined();
glo.addComponent(new Label("--- NEW LABEL ---"));
@@ -418,7 +407,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setWidth("75%");
glo.setHeight("75%");
@@ -429,7 +417,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setSizeFull();
button4.setEnabled(false);
@@ -439,7 +426,6 @@ public class GridLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getMarginSpacingTests() {
final GridLayout glo = getTestGrid();
Layout baseLayout = getBaseLayout();
@@ -464,7 +450,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setMargin(true);
button1.setEnabled(false);
@@ -474,7 +459,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setSpacing(true);
button2.setEnabled(false);
@@ -484,7 +468,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setMargin(false);
button3.setEnabled(false);
@@ -494,7 +477,6 @@ public class GridLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
glo.setSpacing(false);
button4.setEnabled(false);
@@ -504,7 +486,6 @@ public class GridLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getRequiredErrorIndicatorsTests() {
GridLayout glo = getTestGrid();
glo.setWidth("600px");
@@ -518,9 +499,7 @@ public class GridLayoutTests extends AbstractLayoutTests { col1.setIcon(icons[0]);
col1.setComponentError(new UserError("component error, user error"));
- col2
- .setComponentError(new SystemError(
- "component error, system error"));
+ col2.setComponentError(new SystemError("component error, system error"));
col3.setComponentError(new UserError("component error, user error"));
glo.replaceComponent(row1, row1 = new DateField());
@@ -542,8 +521,7 @@ public class GridLayoutTests extends AbstractLayoutTests { row3.setComponentError(new UserError("component error, user error"));
row3.setIcon(icons[1]);
- row3
- .setCaption("long test caption bewucbwuebco or bmort b cbwecubw wbeucwe asdasd asdasda asdasd");
+ row3.setCaption("long test caption bewucbwuebco or bmort b cbwecubw wbeucwe asdasd asdasda asdasd");
glo.replaceComponent(x3, x3 = new CheckBox("CHECKBOX"));
glo.replaceComponent(x22, x22 = new Panel("PANEL"));
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java index 831f5e3a19..bebbbfed49 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java @@ -10,6 +10,7 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalLayout;
@@ -22,7 +23,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.themes.Reindeer;
public class HorizontalLayoutTests extends AbstractLayoutTests {
@@ -34,7 +34,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { this.application = application;
}
-
protected Layout getAlignmentTests() {
Layout baseLayout = getBaseLayout();
HorizontalLayout vlo = getTestLaytout();
@@ -63,7 +62,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getCaptionsTests() {
Layout baseLayout = getBaseLayout();
AbstractComponent component = null;
@@ -109,7 +107,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getComponentAddReplaceMoveTests() {
final HorizontalLayout vlo = getTestLaytout();
Layout baseLayout = getBaseLayout();
@@ -136,7 +133,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { addButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.addComponent(new TextField());
addButton.setEnabled(false);
@@ -146,7 +142,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { replaceButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.replaceComponent(c1, c3);
replaceButton.setEnabled(false);
@@ -156,7 +151,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { moveButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.moveComponentsFrom(source);
moveButton.setEnabled(false);
@@ -166,7 +160,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { removeButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.removeComponent(c1);
vlo.removeComponent(c2);
@@ -187,7 +180,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getComponentSizingTests() {
final HorizontalLayout vlo = getTestLaytout();
Layout baseLayout = getBaseLayout();
@@ -211,7 +203,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { biggerButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
c.setSizeFull();
biggerButton.setEnabled(false);
@@ -221,7 +212,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { smallerButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
c.setWidth("200px");
smallerButton.setEnabled(false);
@@ -231,7 +221,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { originalButton.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
originalButton.setEnabled(false);
c.setSizeUndefined();
@@ -245,7 +234,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getLayoutSizingTests() {
final HorizontalLayout vlo = getTestLaytout();
vlo.setSpacing(false);
@@ -281,7 +269,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setHeight("350px");
button1.setEnabled(false);
@@ -291,7 +278,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setSizeUndefined();
vlo.addComponent(new Label("--- NEW LABEL ---"));
@@ -302,7 +288,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setWidth("75%");
vlo.setHeight("75%");
@@ -313,7 +298,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setSizeFull();
button4.setEnabled(false);
@@ -323,7 +307,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getExpandRatiosTests() {
final HorizontalLayout vlo = getTestLaytout();
Layout baseLayout = getBaseLayout();
@@ -350,7 +333,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setExpandRatio(c1, 1.0f);
button1.setEnabled(false);
@@ -360,7 +342,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setExpandRatio(c1, 0.5f);
vlo.setExpandRatio(c2, 0.5f);
@@ -371,7 +352,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setExpandRatio(c1, 0.75f);
vlo.setExpandRatio(c2, 0.25f);
@@ -381,7 +361,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getIconsTests() {
HorizontalLayout vlo = getTestLaytout();
AbstractComponent[] components = new AbstractComponent[2];
@@ -427,7 +406,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getMarginSpacingTests() {
final HorizontalLayout vlo = getTestLaytout();
vlo.setSpacing(false);
@@ -461,7 +439,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button1.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setMargin(true);
button1.setEnabled(false);
@@ -471,7 +448,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button2.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setSpacing(true);
button2.setEnabled(false);
@@ -481,7 +457,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button3.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setMargin(false);
button3.setEnabled(false);
@@ -491,7 +466,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { button4.addListener(new Button.ClickListener() {
private static final long serialVersionUID = 7716267156088629379L;
-
public void buttonClick(ClickEvent event) {
vlo.setSpacing(false);
button4.setEnabled(false);
@@ -501,7 +475,6 @@ public class HorizontalLayoutTests extends AbstractLayoutTests { return baseLayout;
}
-
protected Layout getRequiredErrorIndicatorsTests() {
HorizontalLayout vlo = getTestLaytout();
Layout baseLayout = getBaseLayout();
diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java b/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java index cfe730b930..3145a0eb54 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/LayoutTesterApplication.java @@ -2,12 +2,18 @@ package com.vaadin.tests.layouts.layouttester; import java.lang.reflect.Method; -import com.vaadin.Application; import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.tests.components.AbstractTestCase; -import com.vaadin.ui.*; +import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.GridLayout; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.Label; +import com.vaadin.ui.Layout; +import com.vaadin.ui.NativeSelect; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; import com.vaadin.ui.themes.Reindeer; @SuppressWarnings("serial") @@ -99,7 +105,6 @@ public class LayoutTesterApplication extends AbstractTestCase { layoutSelector.addListener(new Property.ValueChangeListener() { private static final long serialVersionUID = -605319614765838359L; - public void valueChange(ValueChangeEvent event) { layoutIndex = -1; nextLaytout(); @@ -109,12 +114,10 @@ public class LayoutTesterApplication extends AbstractTestCase { return layoutSelector; } - protected String getDescription() { return "Test application for VerticalLayout, HorizontalLayout, and GridLayout"; } - protected Integer getTicketNumber() { return 5334; } diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java index ba77440f86..655f9d164e 100644 --- a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java +++ b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java @@ -10,6 +10,7 @@ import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Alignment;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CheckBox;
import com.vaadin.ui.DateField;
import com.vaadin.ui.HorizontalLayout;
@@ -22,7 +23,6 @@ import com.vaadin.ui.TabSheet; import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
public class VerticalLayoutTests extends AbstractLayoutTests {
@@ -35,7 +35,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests { protected Layout getAlignmentTests() {
Layout baseLayout = getBaseLayout();
- ((HorizontalLayout)baseLayout).setSpacing(true);
+ ((HorizontalLayout) baseLayout).setSpacing(true);
VerticalLayout vlo = getTestLaytout();
AbstractComponent[] components = new AbstractComponent[9];
Alignment[] alignments = new Alignment[] { Alignment.BOTTOM_CENTER,
diff --git a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java index 9d4abd24df..2299ba4d26 100644 --- a/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java +++ b/tests/src/com/vaadin/tests/resources/NonExistingFileResource.java @@ -24,8 +24,8 @@ public class NonExistingFileResource extends TestBase { public void buttonClick(ClickEvent event) {
FileResource res = new FileResource(new File(getContext()
- .getBaseDirectory()
- + "/" + filename), NonExistingFileResource.this);
+ .getBaseDirectory() + "/" + filename),
+ NonExistingFileResource.this);
getMainWindow().open(res);
}
diff --git a/tests/src/com/vaadin/tests/robustness/Robustness.java b/tests/src/com/vaadin/tests/robustness/Robustness.java index 06d2ab0949..8ee06ec4e0 100644 --- a/tests/src/com/vaadin/tests/robustness/Robustness.java +++ b/tests/src/com/vaadin/tests/robustness/Robustness.java @@ -2,10 +2,10 @@ package com.vaadin.tests.robustness; import com.vaadin.tests.util.RandomComponents; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public abstract class Robustness extends com.vaadin.Application implements Button.ClickListener { diff --git a/tests/src/com/vaadin/tests/server/TestClassesSerializable.java b/tests/src/com/vaadin/tests/server/TestClassesSerializable.java index 5ab7137306..bebb629aa8 100644 --- a/tests/src/com/vaadin/tests/server/TestClassesSerializable.java +++ b/tests/src/com/vaadin/tests/server/TestClassesSerializable.java @@ -78,7 +78,8 @@ public class TestClassesSerializable extends TestCase { }
}
- // useful failure message including all non-serializable classes and interfaces
+ // useful failure message including all non-serializable classes and
+ // interfaces
if (!nonSerializableClasses.isEmpty()) {
String nonSerializableString = "";
Iterator<Class> it = nonSerializableClasses.iterator();
@@ -99,7 +100,7 @@ public class TestClassesSerializable extends TestCase { *
* @return List of class path segment strings
*/
- //
+ //
private final static List<String> getRawClasspathEntries() {
// try to keep the order of the classpath
List<String> locations = new ArrayList<String>();
@@ -152,7 +153,7 @@ public class TestClassesSerializable extends TestCase { for (String className : classes) {
boolean ok = false;
for (String basePackage : BASE_PACKAGES) {
- if (className.startsWith(basePackage+".")) {
+ if (className.startsWith(basePackage + ".")) {
ok = true;
break;
}
@@ -167,7 +168,7 @@ public class TestClassesSerializable extends TestCase { filteredClasses.add(className);
}
}
-
+
return filteredClasses;
}
@@ -187,7 +188,8 @@ public class TestClassesSerializable extends TestCase { while (e.hasMoreElements()) {
JarEntry entry = e.nextElement();
if (entry.getName().endsWith(".class")) {
- String nameWithoutExtension = entry.getName().replaceAll("\\.class", "");
+ String nameWithoutExtension = entry.getName().replaceAll(
+ "\\.class", "");
String className = nameWithoutExtension.replace('/', '.');
classes.add(className);
}
@@ -225,8 +227,8 @@ public class TestClassesSerializable extends TestCase { File[] files = parent.listFiles();
for (File child : files) {
if (child.isDirectory()) {
- classNames.addAll(findClassesInDirectory(parentPackage
- + child.getName(), child));
+ classNames.addAll(findClassesInDirectory(
+ parentPackage + child.getName(), child));
} else if (child.getName().endsWith(".class")) {
classNames.add(parentPackage.replace(File.separatorChar, '.')
+ child.getName().replaceAll("\\.class", ""));
diff --git a/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java b/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java index dc1b292cc9..03b37470f7 100644 --- a/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java +++ b/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java @@ -21,32 +21,38 @@ public class TestFileTypeResolver extends TestCase { assertEquals( FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath()), FLASH_MIME_TYPE); - assertEquals(FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath() - + "?param1=value1"), FLASH_MIME_TYPE); - assertEquals(FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath() - + "?param1=value1¶m2=value2"), FLASH_MIME_TYPE); + assertEquals( + FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath() + + "?param1=value1"), FLASH_MIME_TYPE); + assertEquals( + FileTypeResolver.getMIMEType(plainFlash.getAbsolutePath() + + "?param1=value1¶m2=value2"), FLASH_MIME_TYPE); // Plain text assertEquals(FileTypeResolver.getMIMEType(plainText.getAbsolutePath()), TEXT_MIME_TYPE); - assertEquals(FileTypeResolver.getMIMEType(plainText.getAbsolutePath() - + "?param1=value1"), TEXT_MIME_TYPE); - assertEquals(FileTypeResolver.getMIMEType(plainText.getAbsolutePath() - + "?param1=value1¶m2=value2"), TEXT_MIME_TYPE); + assertEquals( + FileTypeResolver.getMIMEType(plainText.getAbsolutePath() + + "?param1=value1"), TEXT_MIME_TYPE); + assertEquals( + FileTypeResolver.getMIMEType(plainText.getAbsolutePath() + + "?param1=value1¶m2=value2"), TEXT_MIME_TYPE); // Plain text assertEquals(FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath()), HTML_MIME_TYPE); - assertEquals(FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath() - + "?param1=value1"), HTML_MIME_TYPE); - assertEquals(FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath() - + "?param1=value1¶m2=value2"), HTML_MIME_TYPE); + assertEquals( + FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath() + + "?param1=value1"), HTML_MIME_TYPE); + assertEquals( + FileTypeResolver.getMIMEType(plainHtml.getAbsolutePath() + + "?param1=value1¶m2=value2"), HTML_MIME_TYPE); // Filename missing - assertEquals(FileTypeResolver.DEFAULT_MIME_TYPE, FileTypeResolver - .getMIMEType("")); - assertEquals(FileTypeResolver.DEFAULT_MIME_TYPE, FileTypeResolver - .getMIMEType("?param1")); + assertEquals(FileTypeResolver.DEFAULT_MIME_TYPE, + FileTypeResolver.getMIMEType("")); + assertEquals(FileTypeResolver.DEFAULT_MIME_TYPE, + FileTypeResolver.getMIMEType("?param1")); } } diff --git a/tests/src/com/vaadin/tests/server/TestMimeTypes.java b/tests/src/com/vaadin/tests/server/TestMimeTypes.java index 4475d0cdcf..8231030666 100644 --- a/tests/src/com/vaadin/tests/server/TestMimeTypes.java +++ b/tests/src/com/vaadin/tests/server/TestMimeTypes.java @@ -18,8 +18,8 @@ public class TestMimeTypes extends TestCase { } }; Embedded e = new Embedded("A pdf", new ClassResource("file.pddf", app)); - assertEquals("Invalid mimetype", "application/octet-stream", e - .getMimeType()); + assertEquals("Invalid mimetype", "application/octet-stream", + e.getMimeType()); e = new Embedded("A pdf", new ClassResource("file.pdf", app)); assertEquals("Invalid mimetype", "application/pdf", e.getMimeType()); } diff --git a/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java index a3c0342d63..3f16bb262b 100644 --- a/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java +++ b/tests/src/com/vaadin/tests/server/TransactionListenersConcurrency.java @@ -141,8 +141,8 @@ public class TransactionListenersConcurrency extends TestCase { session.getAttribute(WebApplicationContext.class.getName()))
.andReturn(null).anyTimes();
session.setAttribute(
- EasyMock.eq(WebApplicationContext.class.getName()), EasyMock
- .anyObject());
+ EasyMock.eq(WebApplicationContext.class.getName()),
+ EasyMock.anyObject());
EasyMock.replay(session);
return session;
diff --git a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java b/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java index e9742389d3..ed743ccedc 100644 --- a/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java +++ b/tests/src/com/vaadin/tests/server/applicationservlet/TestStaticFilesLocation.java @@ -148,8 +148,7 @@ public class TestStaticFilesLocation extends TestCase { expect(request.getAttribute("javax.servlet.include.servlet_path")) .andReturn(realServletPath).anyTimes(); expect( - request - .getAttribute(AbstractApplicationServlet.REQUEST_VAADIN_STATIC_FILE_PATH)) + request.getAttribute(AbstractApplicationServlet.REQUEST_VAADIN_STATIC_FILE_PATH)) .andReturn(null).anyTimes(); return request; @@ -165,8 +164,7 @@ public class TestStaticFilesLocation extends TestCase { expect(request.getAttribute("javax.servlet.include.servlet_path")) .andReturn(null).anyTimes(); expect( - request - .getAttribute(ApplicationServlet.REQUEST_VAADIN_STATIC_FILE_PATH)) + request.getAttribute(ApplicationServlet.REQUEST_VAADIN_STATIC_FILE_PATH)) .andReturn(null).anyTimes(); return request; diff --git a/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java b/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java index c87ebe9a91..767b651b68 100644 --- a/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java +++ b/tests/src/com/vaadin/tests/server/component/table/TestMultipleSelection.java @@ -7,8 +7,8 @@ import junit.framework.TestCase; import com.vaadin.data.Container; import com.vaadin.data.util.IndexedContainer; -import com.vaadin.ui.Table; import com.vaadin.ui.AbstractSelect.MultiSelectMode; +import com.vaadin.ui.Table; public class TestMultipleSelection extends TestCase { diff --git a/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java b/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java index 3af9d12a83..92664917fd 100644 --- a/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java +++ b/tests/src/com/vaadin/tests/server/components/TestGridLayoutLastRowRemoval.java @@ -28,10 +28,10 @@ public class TestGridLayoutLastRowRemoval extends TestCase { assertEquals(1, grid.getRows()); // There should be no component left in the grid layout - assertNull("A component should not be left in the layout", grid - .getComponent(0, 0)); - assertNull("A component should not be left in the layout", grid - .getComponent(1, 0)); + assertNull("A component should not be left in the layout", + grid.getComponent(0, 0)); + assertNull("A component should not be left in the layout", + grid.getComponent(1, 0)); // The cursor should be in the first cell assertEquals(0, grid.getCursorX()); diff --git a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java index f7f6ccbd47..d080095ac7 100644 --- a/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java +++ b/tests/src/com/vaadin/tests/server/container/AbstractContainerTest.java @@ -6,9 +6,9 @@ import java.util.List; import junit.framework.TestCase;
import com.vaadin.data.Container;
-import com.vaadin.data.Item;
import com.vaadin.data.Container.Filterable;
import com.vaadin.data.Container.Sortable;
+import com.vaadin.data.Item;
public abstract class AbstractContainerTest extends TestCase {
@@ -58,8 +58,8 @@ public abstract class AbstractContainerTest extends TestCase { assertEquals(itemIdList.get(1), indexed.nextItemId(first));
// prevItemId
- assertEquals(itemIdList.get(itemIdList.size() - 2), indexed
- .prevItemId(last));
+ assertEquals(itemIdList.get(itemIdList.size() - 2),
+ indexed.prevItemId(last));
// isFirstId
assertTrue(indexed.isFirstId(first));
diff --git a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java index 16b7e49c60..59edf18477 100644 --- a/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java +++ b/tests/src/com/vaadin/tests/server/container/AbstractHierarchicalContainerTest.java @@ -3,9 +3,9 @@ package com.vaadin.tests.server.container; import java.util.Collection;
import com.vaadin.data.Container;
-import com.vaadin.data.Item;
import com.vaadin.data.Container.Hierarchical;
import com.vaadin.data.Container.Sortable;
+import com.vaadin.data.Item;
public class AbstractHierarchicalContainerTest extends AbstractContainerTest {
diff --git a/tests/src/com/vaadin/tests/server/container/TestContainerSorting.java b/tests/src/com/vaadin/tests/server/container/TestContainerSorting.java index d1960899e6..fee398feeb 100644 --- a/tests/src/com/vaadin/tests/server/container/TestContainerSorting.java +++ b/tests/src/com/vaadin/tests/server/container/TestContainerSorting.java @@ -93,11 +93,13 @@ public class TestContainerSorting extends TestCase { "Might and Magic", "Natural languages", "PHP",
"Programming languages", "Python", "Red Alert", "Swedish",
"Toyota", "Volvo" });
- assertArrays(hc.rootItemIds().toArray(), new Integer[] {
- nameToId.get("Cars"), nameToId.get("Games"),
- nameToId.get("Natural languages"),
- nameToId.get("Programming languages") });
- assertArrays(hc.getChildren(nameToId.get("Games")).toArray(),
+ assertArrays(
+ hc.rootItemIds().toArray(),
+ new Integer[] { nameToId.get("Cars"), nameToId.get("Games"),
+ nameToId.get("Natural languages"),
+ nameToId.get("Programming languages") });
+ assertArrays(
+ hc.getChildren(nameToId.get("Games")).toArray(),
new Integer[] { nameToId.get("Call of Duty"),
nameToId.get("Fallout"),
nameToId.get("Might and Magic"),
@@ -145,8 +147,8 @@ public class TestContainerSorting extends TestCase { item.getItemProperty("name").setValue(string);
if (parent != null && container instanceof HierarchicalContainer) {
- ((HierarchicalContainer) container).setParent(index, nameToId
- .get(parent));
+ ((HierarchicalContainer) container).setParent(index,
+ nameToId.get(parent));
}
index++;
diff --git a/tests/src/com/vaadin/tests/themes/ButtonsTest.java b/tests/src/com/vaadin/tests/themes/ButtonsTest.java index 9ad2a9f39e..9425cd9bd2 100644 --- a/tests/src/com/vaadin/tests/themes/ButtonsTest.java +++ b/tests/src/com/vaadin/tests/themes/ButtonsTest.java @@ -3,12 +3,12 @@ package com.vaadin.tests.themes; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.UserError; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Layout; import com.vaadin.ui.NativeButton; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; @SuppressWarnings("serial") public class ButtonsTest extends com.vaadin.Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1230.java b/tests/src/com/vaadin/tests/tickets/Ticket1230.java index b77c21a4a6..03e89aa355 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1230.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1230.java @@ -3,11 +3,11 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Select; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket1230 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket124.java b/tests/src/com/vaadin/tests/tickets/Ticket124.java index 1c2ca1a2e1..985d8bccac 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket124.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket124.java @@ -2,12 +2,12 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket124 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java b/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java index 8640b06bc0..6d20b7c1cd 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1362Login.java @@ -13,13 +13,13 @@ import com.vaadin.terminal.DownloadStream; import com.vaadin.terminal.ParameterHandler; import com.vaadin.terminal.URIHandler; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Embedded; import com.vaadin.ui.ExpandLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Window.Notification; /** diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1365.java b/tests/src/com/vaadin/tests/tickets/Ticket1365.java index 9bd7d3a045..be549ebf8c 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1365.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1365.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets;
import com.vaadin.event.Action;
-import com.vaadin.event.ShortcutAction;
import com.vaadin.event.Action.Handler;
+import com.vaadin.event.ShortcutAction;
import com.vaadin.ui.Label;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1435.java b/tests/src/com/vaadin/tests/tickets/Ticket1435.java index 9058184d8f..2d406e5a18 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1435.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1435.java @@ -2,6 +2,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.CheckBox; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; @@ -12,7 +13,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket1435 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java b/tests/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java index 3437ca5d2a..ff716aefc1 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1465ModalNotification.java @@ -2,9 +2,9 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket1465ModalNotification extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1572.java b/tests/src/com/vaadin/tests/tickets/Ticket1572.java index b2bc0397fd..b82c8469ad 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1572.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1572.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1572 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1581.java b/tests/src/com/vaadin/tests/tickets/Ticket1581.java index 0b170260d9..6780b3c9de 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1581.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1581.java @@ -3,11 +3,11 @@ package com.vaadin.tests.tickets; import java.util.Date;
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.ui.ProgressIndicator;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket1581 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1589.java b/tests/src/com/vaadin/tests/tickets/Ticket1589.java index 3debf78f25..5a2bf0c793 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1589.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1589.java @@ -29,15 +29,13 @@ public class Ticket1589 extends Application { w.addURIHandler(res);
- w
- .addComponent(new Link(
- "Test (without Content-Disposition, should suggest generatedFile.png when saving, browser default for actual disposition)",
- new ExternalResource("myresource")));
-
- w
- .addComponent(new Link(
- "Test (with Content-Disposition, should popup download dialog that suggests filename downloadedPNG.png)",
- new ExternalResource("myresource_download")));
+ w.addComponent(new Link(
+ "Test (without Content-Disposition, should suggest generatedFile.png when saving, browser default for actual disposition)",
+ new ExternalResource("myresource")));
+
+ w.addComponent(new Link(
+ "Test (with Content-Disposition, should popup download dialog that suggests filename downloadedPNG.png)",
+ new ExternalResource("myresource_download")));
}
}
@@ -79,8 +77,8 @@ class MyDynamicResource implements URIHandler { ImageIO.write(image, "png", imagebuffer);
// Return a stream from the buffer.
- ByteArrayInputStream istream = new ByteArrayInputStream(imagebuffer
- .toByteArray());
+ ByteArrayInputStream istream = new ByteArrayInputStream(
+ imagebuffer.toByteArray());
DownloadStream downloadStream = new DownloadStream(istream,
"image/png", "generatedFile.png");
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1598.java b/tests/src/com/vaadin/tests/tickets/Ticket1598.java index 0b35a223cc..20f1d4d985 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1598.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1598.java @@ -6,9 +6,9 @@ import java.util.List; import com.vaadin.Application; import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.MenuBar; -import com.vaadin.ui.Window; import com.vaadin.ui.MenuBar.Command; import com.vaadin.ui.MenuBar.MenuItem; +import com.vaadin.ui.Window; public class Ticket1598 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket161.java b/tests/src/com/vaadin/tests/tickets/Ticket161.java index a09b0d01cb..b2998c687d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket161.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket161.java @@ -4,9 +4,9 @@ import com.vaadin.Application; import com.vaadin.data.Container; import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; /** */ diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1632.java b/tests/src/com/vaadin/tests/tickets/Ticket1632.java index 1c521f8afb..e156752450 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1632.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1632.java @@ -3,9 +3,9 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Item; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; /** */ @@ -48,9 +48,7 @@ public class Ticket1632 extends Application { public void buttonClick(ClickEvent event) { visible = !visible; if (visible) { - t - .setVisibleColumns(new Object[] { "col1", "col2", - "col3" }); + t.setVisibleColumns(new Object[] { "col1", "col2", "col3" }); } else { t.setVisibleColumns(new Object[] { "col1", "col2" }); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1659.java b/tests/src/com/vaadin/tests/tickets/Ticket1659.java index 78715c89d1..8bba5a103e 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1659.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1659.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Window; public class Ticket1659 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1663.java b/tests/src/com/vaadin/tests/tickets/Ticket1663.java index 04adfa3c79..e7b98a4c99 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1663.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1663.java @@ -13,8 +13,7 @@ public class Ticket1663 extends com.vaadin.Application { setMainWindow(main);
TextField tf = new TextField("First name");
- tf
- .setDescription("The first name is used for the administration user interfaces only.");
+ tf.setDescription("The first name is used for the administration user interfaces only.");
tf.setComponentError(new SystemError(
"You must enter only one first name."));
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1710.java b/tests/src/com/vaadin/tests/tickets/Ticket1710.java index f65fd0c8e4..a19dde5b34 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1710.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1710.java @@ -19,12 +19,12 @@ import com.vaadin.ui.Form; import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.Layout.AlignmentHandler;
import com.vaadin.ui.NativeSelect;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Layout.AlignmentHandler;
public class Ticket1710 extends com.vaadin.Application {
@@ -58,9 +58,8 @@ public class Ticket1710 extends com.vaadin.Application { false);
orientationButton.addListener(new Property.ValueChangeListener() {
public void valueChange(ValueChangeEvent event) {
- orderedLayout
- .setOrientation(orientationButton.booleanValue() ? OrderedLayout.ORIENTATION_HORIZONTAL
- : OrderedLayout.ORIENTATION_VERTICAL);
+ orderedLayout.setOrientation(orientationButton.booleanValue() ? OrderedLayout.ORIENTATION_HORIZONTAL
+ : OrderedLayout.ORIENTATION_VERTICAL);
}
});
orientationButton.setImmediate(true);
@@ -333,9 +332,7 @@ public class Ticket1710 extends com.vaadin.Application { vAlign.setItemCaption(new Integer(
Layout.AlignmentHandler.ALIGNMENT_VERTICAL_CENTER),
"center");
- vAlign
- .addItem(new Integer(
- Layout.AlignmentHandler.ALIGNMENT_BOTTOM));
+ vAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_BOTTOM));
vAlign.setItemCaption(new Integer(
Layout.AlignmentHandler.ALIGNMENT_BOTTOM), "bottom");
@@ -347,9 +344,7 @@ public class Ticket1710 extends com.vaadin.Application { hAlign.setItemCaption(new Integer(
Layout.AlignmentHandler.ALIGNMENT_HORIZONTAL_CENTER),
"center");
- hAlign
- .addItem(new Integer(
- Layout.AlignmentHandler.ALIGNMENT_RIGHT));
+ hAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_RIGHT));
hAlign.setItemCaption(new Integer(
Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right");
@@ -361,9 +356,7 @@ public class Ticket1710 extends com.vaadin.Application { };
- hAlign
- .setValue(new Integer(
- Layout.AlignmentHandler.ALIGNMENT_LEFT));
+ hAlign.setValue(new Integer(Layout.AlignmentHandler.ALIGNMENT_LEFT));
vAlign.addListener(alignmentChangeListener);
hAlign.addListener(alignmentChangeListener);
vAlign.setValue(new Integer(Layout.AlignmentHandler.ALIGNMENT_TOP));
@@ -380,9 +373,7 @@ public class Ticket1710 extends com.vaadin.Application { lAlign.setItemCaption(new Integer(
Layout.AlignmentHandler.ALIGNMENT_HORIZONTAL_CENTER),
"center");
- lAlign
- .addItem(new Integer(
- Layout.AlignmentHandler.ALIGNMENT_RIGHT));
+ lAlign.addItem(new Integer(Layout.AlignmentHandler.ALIGNMENT_RIGHT));
lAlign.setItemCaption(new Integer(
Layout.AlignmentHandler.ALIGNMENT_RIGHT), "right");
@@ -403,11 +394,11 @@ public class Ticket1710 extends com.vaadin.Application { }
private void updateMarginsAndSpacing() {
- testedLayout.setMargin(((Boolean) marginTop.getValue())
- .booleanValue(), ((Boolean) marginRight.getValue())
- .booleanValue(), ((Boolean) marginBottom.getValue())
- .booleanValue(), ((Boolean) marginLeft.getValue())
- .booleanValue());
+ testedLayout.setMargin(
+ ((Boolean) marginTop.getValue()).booleanValue(),
+ ((Boolean) marginRight.getValue()).booleanValue(),
+ ((Boolean) marginBottom.getValue()).booleanValue(),
+ ((Boolean) marginLeft.getValue()).booleanValue());
if (testedLayout instanceof Layout.SpacingHandler) {
((Layout.SpacingHandler) testedLayout)
.setSpacing(((Boolean) spacing.getValue())
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1772.java b/tests/src/com/vaadin/tests/tickets/Ticket1772.java index 977d8563f0..68e00e7f94 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1772.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1772.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1772 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1775.java b/tests/src/com/vaadin/tests/tickets/Ticket1775.java index cd66ecf0e5..aabf31b620 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1775.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1775.java @@ -1,10 +1,10 @@ package com.vaadin.tests.tickets;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1775 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1804.java b/tests/src/com/vaadin/tests/tickets/Ticket1804.java index 5a0cc7e30b..42a9e49c98 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1804.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1804.java @@ -9,10 +9,10 @@ import com.vaadin.terminal.Sizeable; import com.vaadin.terminal.SystemError;
import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Select;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1804 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1806.java b/tests/src/com/vaadin/tests/tickets/Ticket1806.java index 1949fddfa1..9be7792c5d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1806.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1806.java @@ -2,9 +2,9 @@ package com.vaadin.tests.tickets; import com.vaadin.data.util.ObjectProperty;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1806 extends com.vaadin.Application {
@@ -21,9 +21,8 @@ public class Ticket1806 extends com.vaadin.Application { tf1.setReadThrough(false);
tf1.setPropertyDataSource(prop);
main.addComponent(tf1);
- main
- .addComponent(new Button(
- "This button does nothing (but flushes queued variable changes)"));
+ main.addComponent(new Button(
+ "This button does nothing (but flushes queued variable changes)"));
main.addComponent(new Button("Commit the field to property",
new Button.ClickListener() {
public void buttonClick(ClickEvent event) {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1811.java b/tests/src/com/vaadin/tests/tickets/Ticket1811.java index 29571220a2..35c3992bf0 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1811.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1811.java @@ -6,10 +6,10 @@ import java.util.LinkedList; import com.vaadin.data.Validator;
import com.vaadin.data.validator.StringLengthValidator;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1811 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1819.java b/tests/src/com/vaadin/tests/tickets/Ticket1819.java index e014dfee29..836d6b4ae9 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1819.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1819.java @@ -5,10 +5,10 @@ import java.util.LinkedList; import com.vaadin.ui.AbstractField;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Select;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1819 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java b/tests/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java index 13e9591303..985d52936b 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1834PanelScrolling.java @@ -1,12 +1,12 @@ package com.vaadin.tests.tickets;
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.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket1834PanelScrolling extends com.vaadin.Application {
@@ -72,11 +72,10 @@ public class Ticket1834PanelScrolling extends com.vaadin.Application { p.setScrollable(true);
for (int i = 0; i < ROWS; i++) {
- p
- .addComponent(new Label(
- "Label"
- + i
- + "................................................................................................................."));
+ p.addComponent(new Label(
+ "Label"
+ + i
+ + "................................................................................................................."));
}
p.setHeight("300px");
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1878.java b/tests/src/com/vaadin/tests/tickets/Ticket1878.java index 04f6efb78c..711bb533f8 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1878.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1878.java @@ -11,19 +11,19 @@ import com.vaadin.terminal.Resource; import com.vaadin.terminal.ThemeResource;
import com.vaadin.terminal.UserError;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.ExpandLayout;
import com.vaadin.ui.Field;
import com.vaadin.ui.Form;
import com.vaadin.ui.FormLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.Layout.AlignmentHandler;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
-import com.vaadin.ui.Layout.AlignmentHandler;
public class Ticket1878 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1900.java b/tests/src/com/vaadin/tests/tickets/Ticket1900.java index a6f3c5c224..2047b4698c 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1900.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1900.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; -import com.vaadin.data.Validator; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Validator; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; @@ -36,22 +36,18 @@ public class Ticket1900 extends Application { f[0].setDescription("Field is empty, requiredError(null): *"); - f[1] - .setDescription("Field is empty, requiredError(\"foo\"): * (popup shows the validation error)"); + f[1].setDescription("Field is empty, requiredError(\"foo\"): * (popup shows the validation error)"); f[1].setRequiredError("The field must not be empty"); - f[2] - .setDescription("Field is non-empty, validators do not give validation error: *"); + f[2].setDescription("Field is non-empty, validators do not give validation error: *"); f[2].setValue("valid 12"); - f[3] - .setDescription("Field is non-empty, requiredError(null), validators " - + "give validation error: * ! (popup shows the validation error)"); + f[3].setDescription("Field is non-empty, requiredError(null), validators " + + "give validation error: * ! (popup shows the validation error)"); f[3].setValue("invalid"); - f[4] - .setDescription("Field is non-empty, requiredError(\"foo\"), validators " - + "give validation error: * ! (popup shows the validation error)"); + f[4].setDescription("Field is non-empty, requiredError(\"foo\"), validators " + + "give validation error: * ! (popup shows the validation error)"); f[4].setValue("invalid"); f[4].setRequiredError("The field must not be empty"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1921.java b/tests/src/com/vaadin/tests/tickets/Ticket1921.java index 8dae844b75..0bb79f224a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1921.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1921.java @@ -77,9 +77,8 @@ public class Ticket1921 extends Application implements ParameterHandler { break; case 6: - inner - .setOrientation(inner.getOrientation() == OrderedLayout.ORIENTATION_HORIZONTAL ? OrderedLayout.ORIENTATION_VERTICAL - : OrderedLayout.ORIENTATION_HORIZONTAL); + inner.setOrientation(inner.getOrientation() == OrderedLayout.ORIENTATION_HORIZONTAL ? OrderedLayout.ORIENTATION_VERTICAL + : OrderedLayout.ORIENTATION_HORIZONTAL); getMainWindow() .showNotification( "inner swithed to " @@ -92,9 +91,8 @@ public class Ticket1921 extends Application implements ParameterHandler { break; case 8: - outer - .setOrientation(outer.getOrientation() == OrderedLayout.ORIENTATION_HORIZONTAL ? OrderedLayout.ORIENTATION_VERTICAL - : OrderedLayout.ORIENTATION_HORIZONTAL); + outer.setOrientation(outer.getOrientation() == OrderedLayout.ORIENTATION_HORIZONTAL ? OrderedLayout.ORIENTATION_VERTICAL + : OrderedLayout.ORIENTATION_HORIZONTAL); getMainWindow() .showNotification( "outer swithed to " diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1923.java b/tests/src/com/vaadin/tests/tickets/Ticket1923.java index 8ed9273a06..cbbaed6c9d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1923.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1923.java @@ -22,11 +22,10 @@ public class Ticket1923 extends com.vaadin.Application { p.setScrollable(true);
// p.setLayout(new GridLayout(1, 100));
for (int i = 0; i < ROWS; i++) {
- p
- .addComponent(new Label(
- "Label"
- + i
- + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh"));
+ p.addComponent(new Label(
+ "Label"
+ + i
+ + " 5067w09adsfasdjfahlsdfjhalfjhaldjfhalsjdfhlajdhflajhdfljahdslfjahldsjfhaljdfhaljfdhlajsdhflajshdflkajhsdlfkjahsldfkjahsldfhalskjfdhlksjfdh857idifhaljsdfhlajsdhflajhdflajhdfljahldfjhaljdfhalsjdfhalkjdhflkajhdfljahsdlfjahlsdjfhaldjfhaljfdhlajdhflajshdfljahsdlfjhalsjdfhalskjhfdlhusfglksuhdflgjshflgjhslfghslfjghsljfglsjhfglsjhfgljshfgljshflgjhslfghsljfgsljdfglsdjhfglsjhflgkjshfldjgh"));
}
// main.getLayout().setSizeFull();
@@ -51,9 +50,8 @@ public class Ticket1923 extends com.vaadin.Application { // p.getLayout().setSizeFull();
p.setWidth("50px");
p.setHeight("100px");
- p
- .addComponent(new Label(
- "aasdfaasdfja dslkfj lakfdj lakjdf lkaj dflkaj ldfkj alsdfj laksdj flkajs dflkj sdfsadfasdfasd"));
+ p.addComponent(new Label(
+ "aasdfaasdfja dslkfj lakfdj lakjdf lkaj dflkaj ldfkj alsdfj laksdj flkajs dflkj sdfsadfasdfasd"));
ol.addComponent(p);
main.addComponent(ol);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java b/tests/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java index 4fb357b94e..981fd9cd5c 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1924ThemeChanging.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets;
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.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket1924ThemeChanging extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1939.java b/tests/src/com/vaadin/tests/tickets/Ticket1939.java index 429834c382..cd1b844976 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1939.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1939.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket1939 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966.java b/tests/src/com/vaadin/tests/tickets/Ticket1966.java index d6c5accd4c..2d0ec54992 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1966.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1966.java @@ -7,10 +7,10 @@ import com.vaadin.Application; import com.vaadin.ui.Button;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.Layout.AlignmentHandler;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Layout.AlignmentHandler;
public class Ticket1966 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java index 862cb8ecd3..e325922abc 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1966_2.java @@ -8,10 +8,10 @@ import com.vaadin.ui.Button; import com.vaadin.ui.ExpandLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.Layout.AlignmentHandler;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Layout.AlignmentHandler;
public class Ticket1966_2 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1969.java b/tests/src/com/vaadin/tests/tickets/Ticket1969.java index 5e183beb78..a1528efc08 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1969.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1969.java @@ -3,12 +3,12 @@ package com.vaadin.tests.tickets; import com.vaadin.terminal.UserError;
import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Table;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1969 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1970.java b/tests/src/com/vaadin/tests/tickets/Ticket1970.java index b23a3f58d6..c39f28bb86 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1970.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1970.java @@ -4,9 +4,9 @@ import java.util.Iterator; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Window.CloseEvent; public class Ticket1970 extends Application { @@ -68,11 +68,10 @@ public class Ticket1970 extends Application { })); w.addComponent(new Label("<a href='" + getURL().toExternalForm() + "'>" + getURL().toExternalForm() + "</a>", Label.CONTENT_XHTML)); - w - .addComponent(new Label( - "<h2>How to reproduce</h2>Open the above link in another browser" - + " window and then press the Show-button on this window.", - Label.CONTENT_XHTML)); + w.addComponent(new Label( + "<h2>How to reproduce</h2>Open the above link in another browser" + + " window and then press the Show-button on this window.", + Label.CONTENT_XHTML)); return w; } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1975.java b/tests/src/com/vaadin/tests/tickets/Ticket1975.java index 9adc67f529..9a423c9056 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1975.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1975.java @@ -7,11 +7,11 @@ import java.io.FileInputStream; import com.vaadin.Application;
import com.vaadin.terminal.gwt.server.WebApplicationContext;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.CustomLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket1975 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1982.java b/tests/src/com/vaadin/tests/tickets/Ticket1982.java index a81478ff67..8d0f22f6a3 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1982.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1982.java @@ -5,12 +5,12 @@ import java.util.List; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.ExpandLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket1982 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1983.java b/tests/src/com/vaadin/tests/tickets/Ticket1983.java index b02047aca2..ec26328f6f 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1983.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1983.java @@ -4,12 +4,12 @@ import com.vaadin.Application; import com.vaadin.data.util.IndexedContainer; import com.vaadin.terminal.Sizeable; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Layout; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.SplitPanel; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; /** * Test class for ticket 1983 @@ -52,10 +52,16 @@ public class Ticket1983 extends Application { dataSource.addContainerProperty(propId, String.class, null); dataSource.addContainerProperty(propId2, String.class, null); final Object itemId = dataSource.addItem(); - dataSource.getItem(itemId).getItemProperty(propId).setValue( - "Very long value that makes a scrollbar appear for sure"); - dataSource.getItem(itemId).getItemProperty(propId2).setValue( - "Very long value that makes a scrollbar appear for sure"); + dataSource + .getItem(itemId) + .getItemProperty(propId) + .setValue( + "Very long value that makes a scrollbar appear for sure"); + dataSource + .getItem(itemId) + .getItemProperty(propId2) + .setValue( + "Very long value that makes a scrollbar appear for sure"); for (int i = 0; i < 150; i++) { Object id = dataSource.addItem(); @@ -65,8 +71,8 @@ public class Ticket1983 extends Application { .setValue( (i == 100 ? "Very long value that makes a scrollbar appear for sure" : "Short")); - dataSource.getItem(id).getItemProperty(propId2).setValue( - "Short"); + dataSource.getItem(id).getItemProperty(propId2) + .setValue("Short"); } table.setSizeFull(); @@ -113,9 +119,7 @@ public class Ticket1983 extends Application { public void buttonClick(ClickEvent event) { Button b = event.getButton(); if (((Boolean) b.getValue()).booleanValue()) { - table - .setVisibleColumns(new Object[] { propId, - propId2 }); + table.setVisibleColumns(new Object[] { propId, propId2 }); } else { table.setVisibleColumns(new Object[] { propId }); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1995.java b/tests/src/com/vaadin/tests/tickets/Ticket1995.java index 1745ace18c..93f16ca527 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket1995.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket1995.java @@ -2,12 +2,12 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.data.Container;
-import com.vaadin.data.Item;
import com.vaadin.data.Container.Filterable;
+import com.vaadin.data.Item;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Table;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket1995 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2007.java b/tests/src/com/vaadin/tests/tickets/Ticket2007.java index e925519ee2..84dafb41f3 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2007.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2007.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Window; public class Ticket2007 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2009.java b/tests/src/com/vaadin/tests/tickets/Ticket2009.java index 4118794aa7..f6d01d284c 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2009.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2009.java @@ -4,6 +4,7 @@ import com.vaadin.data.Container; import com.vaadin.event.ItemClickEvent;
import com.vaadin.tests.TestForTablesInitialColumnWidthLogicRendering;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
@@ -11,7 +12,6 @@ import com.vaadin.ui.Table; import com.vaadin.ui.TextField;
import com.vaadin.ui.Tree;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket2009 extends com.vaadin.Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2014.java b/tests/src/com/vaadin/tests/tickets/Ticket2014.java index 1cf0e4c58e..74b3fa3641 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2014.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2014.java @@ -4,12 +4,12 @@ import java.util.UUID; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Panel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2014 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2021.java b/tests/src/com/vaadin/tests/tickets/Ticket2021.java index 5ea423ea99..5fb6f89baf 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2021.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2021.java @@ -3,6 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
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.ExpandLayout;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
@@ -11,8 +13,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2021 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2023.java b/tests/src/com/vaadin/tests/tickets/Ticket2023.java index fac09e07ea..ac80ef602b 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2023.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2023.java @@ -2,9 +2,9 @@ package com.vaadin.tests.tickets; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2023 extends com.vaadin.Application implements Button.ClickListener { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2024.java b/tests/src/com/vaadin/tests/tickets/Ticket2024.java index 1c2c7b4a33..ffc6022f0a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2024.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2024.java @@ -23,9 +23,7 @@ public class Ticket2024 extends Application { layout.addComponent(new Label(
"This should NOT get stuck when scrolling down"));
- layout
- .addComponent(new TextField(
- "This should not get stuck either..."));
+ layout.addComponent(new TextField("This should not get stuck either..."));
OrderedLayout ol = new OrderedLayout();
ol.setHeight("1000");
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2037.java b/tests/src/com/vaadin/tests/tickets/Ticket2037.java index 084ca14c0f..7cbb3802da 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2037.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2037.java @@ -1,11 +1,11 @@ package com.vaadin.tests.tickets;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket2037 extends com.vaadin.Application {
@@ -14,9 +14,8 @@ public class Ticket2037 extends com.vaadin.Application { Window main = new Window();
setMainWindow(main);
- main
- .addComponent(new Label(
- "Use debug dialog and trac number of registered paintables. It should not grow on subsequant b clicks."));
+ main.addComponent(new Label(
+ "Use debug dialog and trac number of registered paintables. It should not grow on subsequant b clicks."));
final Layout lo = new OrderedLayout();
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2038.java b/tests/src/com/vaadin/tests/tickets/Ticket2038.java index e566d50520..ff5ceb22e7 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2038.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2038.java @@ -36,9 +36,8 @@ public class Ticket2038 extends Application { b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - tf - .setRequiredError(b.booleanValue() ? "Field must not be empty" - : null); + tf.setRequiredError(b.booleanValue() ? "Field must not be empty" + : null); } }); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2042.java b/tests/src/com/vaadin/tests/tickets/Ticket2042.java index 6339222a0b..0c7bede4b8 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2042.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2042.java @@ -2,11 +2,11 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Window.Notification;
public class Ticket2042 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2048.java b/tests/src/com/vaadin/tests/tickets/Ticket2048.java index f1bfecdcc0..12cb4269a5 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2048.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2048.java @@ -3,6 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.terminal.ThemeResource;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.Embedded;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
@@ -11,8 +13,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel;
import com.vaadin.ui.SplitPanel;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2048 extends Application {
@@ -94,8 +94,7 @@ public class Ticket2048 extends Application { .contains("folder-add")) {
img = "folder-delete";
}
- embedded
- .setSource(new ThemeResource("icons/64/" + img + ".png"));
+ embedded.setSource(new ThemeResource("icons/64/" + img + ".png"));
}
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2053.java b/tests/src/com/vaadin/tests/tickets/Ticket2053.java index 167a1440c0..f784b40aed 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2053.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2053.java @@ -5,10 +5,10 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Window.CloseEvent; public class Ticket2053 extends Application { @@ -22,10 +22,9 @@ public class Ticket2053 extends Application { setMainWindow(main); Button nothing = new Button("Do nothing"); main.addComponent(nothing); - nothing - .setDescription("Even though no action is taked, this window is refreshed to " - + "draw changes not originating from this window. Such changes include changes " - + "made by other browser-windows."); + nothing.setDescription("Even though no action is taked, this window is refreshed to " + + "draw changes not originating from this window. Such changes include changes " + + "made by other browser-windows."); Button add = new Button("Add a window", new Button.ClickListener() { public void buttonClick(ClickEvent event) { final String name = "Child " + (++childs); @@ -65,11 +64,10 @@ public class Ticket2053 extends Application { } }); main.addComponent(add); - add - .setDescription("This button opens a new browser window. Closing the browser " - + "window should do two things: 1) submit all unsubmitted state to server " - + "(print any changes to textfield to main window) and 2) call window.close()" - + " on the child window (print closed on the main window)"); + add.setDescription("This button opens a new browser window. Closing the browser " + + "window should do two things: 1) submit all unsubmitted state to server " + + "(print any changes to textfield to main window) and 2) call window.close()" + + " on the child window (print closed on the main window)"); } } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2060.java b/tests/src/com/vaadin/tests/tickets/Ticket2060.java index 09a391e80d..70f55afbf9 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2060.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2060.java @@ -2,11 +2,11 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2060 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2061b.java b/tests/src/com/vaadin/tests/tickets/Ticket2061b.java index 8d87a70788..3cefb28841 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2061b.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2061b.java @@ -14,11 +14,11 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; +import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; +import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.Table; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; -import com.vaadin.ui.TabSheet.SelectedTabChangeListener; public class Ticket2061b extends Application implements SelectedTabChangeListener { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2061c.java b/tests/src/com/vaadin/tests/tickets/Ticket2061c.java index 9f4b754325..4cca979268 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2061c.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2061c.java @@ -11,11 +11,11 @@ import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.TabSheet; +import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; +import com.vaadin.ui.TabSheet.SelectedTabChangeListener; import com.vaadin.ui.Table; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.TabSheet.SelectedTabChangeEvent; -import com.vaadin.ui.TabSheet.SelectedTabChangeListener; public class Ticket2061c extends Application implements SelectedTabChangeListener { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2095.java b/tests/src/com/vaadin/tests/tickets/Ticket2095.java index 49353db114..5fcab528c1 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2095.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2095.java @@ -18,9 +18,7 @@ public class Ticket2095 extends Application { Embedded em = new Embedded();
em.setType(Embedded.TYPE_BROWSER);
- em
- .setSource(new ExternalResource(
- "../statictestfiles/ticket2095.html"));
+ em.setSource(new ExternalResource("../statictestfiles/ticket2095.html"));
em.setDebugId("MYIFRAME");
em.setSizeFull();
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2099.java b/tests/src/com/vaadin/tests/tickets/Ticket2099.java index 44c264e07e..f1add90886 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2099.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2099.java @@ -2,13 +2,13 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.TabSheet;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2099 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2104.java b/tests/src/com/vaadin/tests/tickets/Ticket2104.java index 974e97871f..63dd280d56 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2104.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2104.java @@ -6,12 +6,12 @@ import com.vaadin.event.ItemClickEvent; import com.vaadin.event.ItemClickEvent.ItemClickListener; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Table; import com.vaadin.ui.Tree; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2104 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2106.java b/tests/src/com/vaadin/tests/tickets/Ticket2106.java index 8168e06154..92908aa66d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2106.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2106.java @@ -4,9 +4,9 @@ import java.util.Date; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2106 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2107.java b/tests/src/com/vaadin/tests/tickets/Ticket2107.java index adb6784275..4c185801c3 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2107.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2107.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; -import com.vaadin.data.Validator; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Validator; import com.vaadin.ui.Button; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; @@ -18,8 +18,7 @@ public class Ticket2107 extends Application { final TextField tf = new TextField( "Required field that validated the input"); - tf - .setDescription("Enter someting and click outside the field to activate"); + tf.setDescription("Enter someting and click outside the field to activate"); tf.setRequired(true); tf.setImmediate(true); tf.addListener(new Property.ValueChangeListener() { @@ -52,9 +51,8 @@ public class Ticket2107 extends Application { b.setImmediate(true); b.addListener(new Property.ValueChangeListener() { public void valueChange(ValueChangeEvent event) { - tf - .setRequiredError(b.booleanValue() ? "Field must not be empty" - : null); + tf.setRequiredError(b.booleanValue() ? "Field must not be empty" + : null); } }); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2117.java b/tests/src/com/vaadin/tests/tickets/Ticket2117.java index 6a22915f03..974b3c4572 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2117.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2117.java @@ -3,10 +3,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.terminal.ExternalResource; import com.vaadin.ui.Button; -import com.vaadin.ui.Label; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.Label; +import com.vaadin.ui.Window; public class Ticket2117 extends Application { @@ -48,14 +48,13 @@ public class Ticket2117 extends Application { private Window createWindow() { final Window w = new Window(); - w - .addComponent(new Label( - "Click this link: <a target=\"_blank\" href='" - + getURL().toExternalForm() - + "'>" - + getURL().toExternalForm() - + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.", - Label.CONTENT_XHTML)); + w.addComponent(new Label( + "Click this link: <a target=\"_blank\" href='" + + getURL().toExternalForm() + + "'>" + + getURL().toExternalForm() + + "</a> which opens new windows to this uri. They should end up having a separate Window and URL.", + Label.CONTENT_XHTML)); return w; } } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2125.java b/tests/src/com/vaadin/tests/tickets/Ticket2125.java index 49610597db..914b951019 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2125.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2125.java @@ -6,9 +6,9 @@ import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Table; -import com.vaadin.ui.Window; import com.vaadin.ui.Table.CellStyleGenerator; import com.vaadin.ui.Table.ColumnGenerator; +import com.vaadin.ui.Window; public class Ticket2125 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2179.java b/tests/src/com/vaadin/tests/tickets/Ticket2179.java index 4612f7464f..165e770307 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2179.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2179.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.Property; -import com.vaadin.data.Validator; import com.vaadin.data.Property.ValueChangeEvent; +import com.vaadin.data.Validator; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2181.java b/tests/src/com/vaadin/tests/tickets/Ticket2181.java index d5afb01e0d..98bfdce04c 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2181.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2181.java @@ -9,12 +9,12 @@ import com.vaadin.Application; import com.vaadin.terminal.ThemeResource; import com.vaadin.terminal.UserError; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.OptionGroup; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2181 extends Application implements Button.ClickListener { @@ -91,8 +91,7 @@ public class Ticket2181 extends Application implements Button.ClickListener { } else if (value.equals("Icon")) { String timestamp = String.valueOf(new Date().getTime()); tf.setIcon(new ThemeResource(icons.get(random.nextInt(icons - .size())) - + "?" + timestamp)); + .size())) + "?" + timestamp)); } else if (value.equals("Required")) { tf.setRequired(true); } else if (value.equals("Error")) { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2204.java b/tests/src/com/vaadin/tests/tickets/Ticket2204.java index d4bcd55c55..6401867289 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2204.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2204.java @@ -12,6 +12,8 @@ import com.vaadin.data.Property; import com.vaadin.data.util.BeanItem; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.Field; @@ -26,8 +28,6 @@ import com.vaadin.ui.RichTextArea; import com.vaadin.ui.SplitPanel; import com.vaadin.ui.TabSheet; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket2204 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2208.java b/tests/src/com/vaadin/tests/tickets/Ticket2208.java index 0c8639603e..a326a0c381 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2208.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2208.java @@ -5,9 +5,9 @@ import com.vaadin.data.Item; import com.vaadin.ui.Component;
import com.vaadin.ui.Label;
import com.vaadin.ui.Table;
-import com.vaadin.ui.Window;
import com.vaadin.ui.Table.CellStyleGenerator;
import com.vaadin.ui.Table.ColumnGenerator;
+import com.vaadin.ui.Window;
public class Ticket2208 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2209.java b/tests/src/com/vaadin/tests/tickets/Ticket2209.java index 02450e23c1..7ee8a07405 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2209.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2209.java @@ -2,12 +2,12 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2209 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2209OL.java b/tests/src/com/vaadin/tests/tickets/Ticket2209OL.java index 620fed1021..b9a44f6d93 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2209OL.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2209OL.java @@ -2,12 +2,12 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2209OL extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2209OL2.java b/tests/src/com/vaadin/tests/tickets/Ticket2209OL2.java index 5f250b7976..0b8152b003 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2209OL2.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2209OL2.java @@ -2,12 +2,12 @@ package com.vaadin.tests.tickets; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
import com.vaadin.ui.ComboBox;
import com.vaadin.ui.Label;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class Ticket2209OL2 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2221.java b/tests/src/com/vaadin/tests/tickets/Ticket2221.java index 30d3070043..8d53951959 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2221.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2221.java @@ -2,6 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.Layout; @@ -9,8 +11,6 @@ import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket2221 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2232.java b/tests/src/com/vaadin/tests/tickets/Ticket2232.java index 2b33ee39cf..91e557fa84 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2232.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2232.java @@ -5,9 +5,9 @@ import com.vaadin.ui.Button; import com.vaadin.ui.GridLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.Layout.SpacingHandler;
import com.vaadin.ui.OrderedLayout;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Layout.SpacingHandler;
public class Ticket2232 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2242.java b/tests/src/com/vaadin/tests/tickets/Ticket2242.java index 0c1bf21a3f..9a59bc00a7 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2242.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2242.java @@ -7,11 +7,11 @@ import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.util.IndexedContainer; import com.vaadin.data.util.ObjectProperty; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Table; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket2242 extends Application implements ValueChangeListener { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2244.java b/tests/src/com/vaadin/tests/tickets/Ticket2244.java index 4631f63cc4..1330116d80 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2244.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2244.java @@ -3,12 +3,12 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.data.util.BeanItem; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Form; import com.vaadin.ui.FormLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2244 extends Application { @@ -43,9 +43,7 @@ public class Ticket2244 extends Application { new Button.ClickListener() { public void buttonClick(ClickEvent event) { - form - .setItemDataSource(new BeanItem( - new MyBiggerBean())); + form.setItemDataSource(new BeanItem(new MyBiggerBean())); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2267.java b/tests/src/com/vaadin/tests/tickets/Ticket2267.java index 2ccbce604a..b55776be79 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2267.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2267.java @@ -2,11 +2,11 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket2267 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2279.java b/tests/src/com/vaadin/tests/tickets/Ticket2279.java index 06f2cb9348..5a92f85b32 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2279.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2279.java @@ -11,9 +11,9 @@ import com.vaadin.ui.AbstractOrderedLayout; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; +import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Layout.AlignmentHandler; public class Ticket2279 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2282.java b/tests/src/com/vaadin/tests/tickets/Ticket2282.java index 1e5924fced..14467cf483 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2282.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2282.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.FormLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2282 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2283.java b/tests/src/com/vaadin/tests/tickets/Ticket2283.java index 6504355676..5831b9638f 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2283.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2283.java @@ -3,8 +3,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; -import com.vaadin.ui.Window; import com.vaadin.ui.Layout.AlignmentHandler; +import com.vaadin.ui.Window; public class Ticket2283 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2287.java b/tests/src/com/vaadin/tests/tickets/Ticket2287.java index cd6770e156..5d4ac308ef 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2287.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2287.java @@ -13,9 +13,8 @@ public class Ticket2287 extends Ticket2292 { getClass().getName().lastIndexOf(".") + 1));
setMainWindow(main);
URL url = getURL();
- main
- .addComponent(new Label(
- "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)."));
+ main.addComponent(new Label(
+ "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)."));
Label l = new Label();
l.setContentMode(Label.CONTENT_XHTML);
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2289.java b/tests/src/com/vaadin/tests/tickets/Ticket2289.java index bd92311f73..29508013f4 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2289.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2289.java @@ -3,6 +3,7 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Accordion; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.HorizontalLayout; @@ -10,7 +11,6 @@ import com.vaadin.ui.Label; import com.vaadin.ui.TabSheet; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2289 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2292.java b/tests/src/com/vaadin/tests/tickets/Ticket2292.java index 9cd448a5c7..2fd7c3511a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2292.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2292.java @@ -27,9 +27,8 @@ public class Ticket2292 extends com.vaadin.Application { setMainWindow(main);
ExternalResource icon = new ExternalResource("./icon.png");
- main
- .addComponent(new Label(
- "Note, run with trailing slash in url to have a working icon. Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)"));
+ main.addComponent(new Label(
+ "Note, run with trailing slash in url to have a working icon. Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)"));
Button b = new Button();
main.addComponent(b);
b.setIcon(icon);
@@ -77,8 +76,8 @@ public class Ticket2292 extends com.vaadin.Application { ImageIO.write(image, "png", imagebuffer);
// Return a stream from the buffer.
- ByteArrayInputStream istream = new ByteArrayInputStream(imagebuffer
- .toByteArray());
+ ByteArrayInputStream istream = new ByteArrayInputStream(
+ imagebuffer.toByteArray());
return new DownloadStream(istream, null, null);
} catch (IOException e) {
return null;
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2294.java b/tests/src/com/vaadin/tests/tickets/Ticket2294.java index f6c8a14420..de18bf94ef 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2294.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2294.java @@ -2,9 +2,9 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Label; +import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Layout.AlignmentHandler; public class Ticket2294 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2297.java b/tests/src/com/vaadin/tests/tickets/Ticket2297.java index 48265ded63..da257b4ae8 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2297.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2297.java @@ -16,9 +16,8 @@ public class Ticket2297 extends Ticket2292 { getClass().getName().lastIndexOf(".") + 1));
setMainWindow(main);
URL url = getURL();
- main
- .addComponent(new Label(
- "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)."));
+ main.addComponent(new Label(
+ "Icon is built by servlet with a slow method, so it will show the bug (components not firing requestLayout)."));
try {
CustomLayout cl = new CustomLayout(
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2303.java b/tests/src/com/vaadin/tests/tickets/Ticket2303.java index 927358723d..36dd842140 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2303.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2303.java @@ -18,8 +18,8 @@ public class Ticket2303 extends Application { String customlayout = "<div location=\"test\"></div>";
CustomLayout cl = null;
try {
- cl = new CustomLayout(new ByteArrayInputStream(customlayout
- .getBytes()));
+ cl = new CustomLayout(new ByteArrayInputStream(
+ customlayout.getBytes()));
} catch (IOException e) {
// TODO Auto-generated catch block
e.printStackTrace();
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2310.java b/tests/src/com/vaadin/tests/tickets/Ticket2310.java index 3318456afa..82928d9c91 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2310.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2310.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2310 extends Application { @@ -15,11 +15,9 @@ public class Ticket2310 extends Application { getClass().getName().lastIndexOf(".") + 1)); setMainWindow(main); - main - .addComponent(new Label( - "Instructions: change label when panel is " - + "invisible -> invalid change (with disabled " - + "flag) is sent to client. Label is grey when panel is shown.")); + main.addComponent(new Label("Instructions: change label when panel is " + + "invisible -> invalid change (with disabled " + + "flag) is sent to client. Label is grey when panel is shown.")); final Panel p = new Panel(); p.setStyleName(Panel.STYLE_LIGHT); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2319.java b/tests/src/com/vaadin/tests/tickets/Ticket2319.java index 9d61a27613..b48302a1f4 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2319.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2319.java @@ -16,9 +16,8 @@ public class Ticket2319 extends Application { Window mainw = new Window(); setMainWindow(mainw); - mainw - .addComponent(new Label( - "This test has somewhat invalid layouts in it to detect analyzy layout function in debug dialog")); + mainw.addComponent(new Label( + "This test has somewhat invalid layouts in it to detect analyzy layout function in debug dialog")); HorizontalLayout hl = new HorizontalLayout(); Panel panel = new Panel("p1"); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2329.java b/tests/src/com/vaadin/tests/tickets/Ticket2329.java index c55ab9cac5..f7b47f6708 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2329.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2329.java @@ -4,9 +4,9 @@ import com.vaadin.Application; import com.vaadin.ui.Button; import com.vaadin.ui.Component; import com.vaadin.ui.Table; +import com.vaadin.ui.Table.ColumnGenerator; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Table.ColumnGenerator; public class Ticket2329 extends Application { private Table table; diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2337.java b/tests/src/com/vaadin/tests/tickets/Ticket2337.java index aae4807277..9277a01f96 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2337.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2337.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.GridLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2337 extends Application { @@ -18,8 +18,8 @@ public class Ticket2337 extends Application { Button b = new Button("add", new Button.ClickListener() { public void buttonClick(ClickEvent event) { - gl.addComponent(new Label("asd"), 0, gl.getCursorY(), 2, gl - .getCursorY()); + gl.addComponent(new Label("asd"), 0, gl.getCursorY(), 2, + gl.getCursorY()); } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2347.java b/tests/src/com/vaadin/tests/tickets/Ticket2347.java index 08e1aae34c..c591fb8f6a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2347.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2347.java @@ -2,11 +2,11 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; public class Ticket2347 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2365.java b/tests/src/com/vaadin/tests/tickets/Ticket2365.java index 1fee955e6b..bd8bbc05af 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2365.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2365.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Panel; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket2365 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2406.java b/tests/src/com/vaadin/tests/tickets/Ticket2406.java index b4f8ec77cf..22ff32d036 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2406.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2406.java @@ -2,10 +2,10 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; +import com.vaadin.ui.VerticalLayout; +import com.vaadin.ui.Window; public class Ticket2406 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2426.java b/tests/src/com/vaadin/tests/tickets/Ticket2426.java index bbad5ef686..90e2ce438d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2426.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2426.java @@ -18,9 +18,7 @@ public class Ticket2426 extends Application { w.addComponent(new Label("CONTENT_PREFORMATTED: " + content, Label.CONTENT_PREFORMATTED)); w.addComponent(new Label("CONTENT_RAW: " + content, Label.CONTENT_RAW)); - w - .addComponent(new Label("CONTENT_TEXT: " + content, - Label.CONTENT_TEXT)); + w.addComponent(new Label("CONTENT_TEXT: " + content, Label.CONTENT_TEXT)); w.addComponent(new Label("CONTENT_XML: " + content, Label.CONTENT_XML)); w.addComponent(new Label("CONTENT_XHTML: " + content, Label.CONTENT_XHTML)); diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2431.java b/tests/src/com/vaadin/tests/tickets/Ticket2431.java index 5ab8486663..e1eb2531f2 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2431.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2431.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.event.Action; -import com.vaadin.event.ShortcutAction; import com.vaadin.event.Action.Handler; +import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.ui.Label; diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2432.java b/tests/src/com/vaadin/tests/tickets/Ticket2432.java index 635a356e49..c5465b917d 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2432.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2432.java @@ -6,9 +6,9 @@ import com.vaadin.ui.GridLayout; import com.vaadin.ui.HorizontalLayout; import com.vaadin.ui.Label; import com.vaadin.ui.Layout; -import com.vaadin.ui.Window; import com.vaadin.ui.Layout.AlignmentHandler; import com.vaadin.ui.Layout.SpacingHandler; +import com.vaadin.ui.Window; public class Ticket2432 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2440.java b/tests/src/com/vaadin/tests/tickets/Ticket2440.java index 16b8c3e707..cd1e8e682e 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2440.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2440.java @@ -16,9 +16,8 @@ public class Ticket2440 extends Application { public void init() { final Window main = new MainWindow(); setMainWindow(main); - main - .addComponent(new Label( - "Clicking the link should open a new window that should receive the URI 'msg/hello' and add that a a Label to it's ui. Currently the Label ends up in this (main) window (try reloading). Console intentionally spams during the window finding/uri handling - looks, uhm, interesting.")); + main.addComponent(new Label( + "Clicking the link should open a new window that should receive the URI 'msg/hello' and add that a a Label to it's ui. Currently the Label ends up in this (main) window (try reloading). Console intentionally spams during the window finding/uri handling - looks, uhm, interesting.")); } @Override diff --git a/tests/src/com/vaadin/tests/tickets/Ticket2526.java b/tests/src/com/vaadin/tests/tickets/Ticket2526.java index 05528ef086..5fc06c27bf 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket2526.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket2526.java @@ -2,8 +2,8 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Window; public class Ticket2526 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket3146.java b/tests/src/com/vaadin/tests/tickets/Ticket3146.java index 53600b9299..623b88f616 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket3146.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket3146.java @@ -5,10 +5,10 @@ import java.util.HashSet; import com.vaadin.Application;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket3146 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket34.java b/tests/src/com/vaadin/tests/tickets/Ticket34.java index beb6813d4d..44328b0390 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket34.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket34.java @@ -5,15 +5,15 @@ import java.util.Map; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.Panel; import com.vaadin.ui.TextField; import com.vaadin.ui.UriFragmentUtility; +import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent; import com.vaadin.ui.VerticalLayout; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.UriFragmentUtility.FragmentChangedEvent; public class Ticket34 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket5157.java b/tests/src/com/vaadin/tests/tickets/Ticket5157.java index e080f0279a..f620cd27be 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket5157.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket5157.java @@ -1,8 +1,8 @@ package com.vaadin.tests.tickets;
import com.vaadin.Application;
-import com.vaadin.event.ShortcutListener;
import com.vaadin.event.ShortcutAction.KeyCode;
+import com.vaadin.event.ShortcutListener;
import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TextField;
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket677.java b/tests/src/com/vaadin/tests/tickets/Ticket677.java index ab945a2d8e..ca9c9227b2 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket677.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket677.java @@ -7,6 +7,7 @@ import com.vaadin.data.Property; import com.vaadin.data.util.BeanItem;
import com.vaadin.ui.BaseFieldFactory;
import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
import com.vaadin.ui.Component;
import com.vaadin.ui.ComponentContainer;
import com.vaadin.ui.Field;
@@ -18,7 +19,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Table;
import com.vaadin.ui.TextField;
import com.vaadin.ui.Window;
-import com.vaadin.ui.Button.ClickEvent;
public class Ticket677 extends Application {
diff --git a/tests/src/com/vaadin/tests/tickets/Ticket695.java b/tests/src/com/vaadin/tests/tickets/Ticket695.java index a328133014..f122031b6e 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket695.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket695.java @@ -6,8 +6,8 @@ import java.io.ObjectOutputStream; import com.vaadin.Application; import com.vaadin.ui.Button; -import com.vaadin.ui.Window; import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Window; @SuppressWarnings("serial") public class Ticket695 extends Application { @@ -31,8 +31,7 @@ public class Ticket695 extends Application { + (System.currentTimeMillis() - t) + "ms"); } catch (IOException e) { e.printStackTrace(); - w - .showNotification("ApplicationContext serialization failed - see console for stacktrace"); + w.showNotification("ApplicationContext serialization failed - see console for stacktrace"); } } diff --git a/tests/src/com/vaadin/tests/tickets/Ticket736.java b/tests/src/com/vaadin/tests/tickets/Ticket736.java index 45d46866a5..e85ca3533a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket736.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket736.java @@ -7,12 +7,12 @@ import com.vaadin.data.util.MethodProperty; import com.vaadin.terminal.ThemeResource; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ExpandLayout; import com.vaadin.ui.Form; import com.vaadin.ui.OrderedLayout; import com.vaadin.ui.Panel; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket736 extends Application { diff --git a/tests/src/com/vaadin/tests/tickets/Ticket932.java b/tests/src/com/vaadin/tests/tickets/Ticket932.java index 6a8a459042..d053cbbb2a 100644 --- a/tests/src/com/vaadin/tests/tickets/Ticket932.java +++ b/tests/src/com/vaadin/tests/tickets/Ticket932.java @@ -2,11 +2,11 @@ package com.vaadin.tests.tickets; import com.vaadin.Application; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Label; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.TextField; import com.vaadin.ui.Window; -import com.vaadin.ui.Button.ClickEvent; public class Ticket932 extends Application { diff --git a/tests/src/com/vaadin/tests/util/RandomComponents.java b/tests/src/com/vaadin/tests/util/RandomComponents.java index bb64450ac7..f857563cdd 100644 --- a/tests/src/com/vaadin/tests/util/RandomComponents.java +++ b/tests/src/com/vaadin/tests/util/RandomComponents.java @@ -28,6 +28,7 @@ import com.vaadin.terminal.ThemeResource; import com.vaadin.tests.StressComponentsInTable; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.DateField; import com.vaadin.ui.Embedded; @@ -39,7 +40,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Select; import com.vaadin.ui.TabSheet; import com.vaadin.ui.TextField; -import com.vaadin.ui.Button.ClickEvent; public class RandomComponents { @@ -79,8 +79,8 @@ public class RandomComponents { if (seededRandom.nextInt(1) > 0) { gl = new GridLayout(); } else { - gl = new GridLayout(seededRandom.nextInt(3) + 1, seededRandom - .nextInt(3) + 1); + gl = new GridLayout(seededRandom.nextInt(3) + 1, + seededRandom.nextInt(3) + 1); } gl.setCaption("GridLayout_" + caption); gl.setDescription(gl.getCaption()); diff --git a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java b/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java index 067b407143..c8d79ecca0 100644 --- a/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java +++ b/tests/src/com/vaadin/tests/validation/EmptyFieldErrorIndicators.java @@ -6,6 +6,8 @@ import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.data.validator.AbstractValidator;
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.ComponentContainer;
import com.vaadin.ui.DateField;
import com.vaadin.ui.Field;
@@ -17,8 +19,6 @@ import com.vaadin.ui.Panel; import com.vaadin.ui.Select;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Button.ClickListener;
public class EmptyFieldErrorIndicators extends TestBase {
@@ -81,13 +81,11 @@ public class EmptyFieldErrorIndicators extends TestBase { field.setRequired(required);
field.setRequiredError("Missing required value!");
if (failValidator && !(field instanceof Button)) {
- field
- .addValidator(new AbstractValidator(
- "Validation error") {
- public boolean isValid(Object value) {
- return false;
- }
- });
+ field.addValidator(new AbstractValidator("Validation error") {
+ public boolean isValid(Object value) {
+ return false;
+ }
+ });
}
}
};
diff --git a/tests/src/com/vaadin/tests/validation/TestValidators.java b/tests/src/com/vaadin/tests/validation/TestValidators.java index 4917d7c65c..5264d47c9d 100644 --- a/tests/src/com/vaadin/tests/validation/TestValidators.java +++ b/tests/src/com/vaadin/tests/validation/TestValidators.java @@ -10,11 +10,11 @@ import com.vaadin.data.validator.RegexpValidator; import com.vaadin.data.validator.StringLengthValidator; 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.Form; import com.vaadin.ui.TextField; import com.vaadin.ui.VerticalLayout; -import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Button.ClickListener; import com.vaadin.ui.Window.Notification; public class TestValidators extends TestBase { @@ -36,9 +36,7 @@ public class TestValidators extends TestBase { // simple validators TextField tf = new TextField("A field, must contain 1-2 chars"); - tf - .addValidator(new StringLengthValidator("Invalid length", 1, 2, - false)); + tf.addValidator(new StringLengthValidator("Invalid length", 1, 2, false)); tf.setRequired(true); tf.setValue("ab"); form.addField("a", tf); @@ -101,10 +99,8 @@ public class TestValidators extends TestBase { CompositeValidator cv = new CompositeValidator( CompositeValidator.MODE_AND, "The field must contain a floating point number with 4-5 characters"); - cv - .addValidator(new StringLengthValidator( - "String length of '{0}' should be 4-5 characters", 4, - 5, false)); + cv.addValidator(new StringLengthValidator( + "String length of '{0}' should be 4-5 characters", 4, 5, false)); cv.addValidator(new DoubleValidator( "{0} must be a floating point number")); tf.addValidator(cv); @@ -115,10 +111,8 @@ public class TestValidators extends TestBase { "A field, must be a floating point number or 4-5 chars"); cv = new CompositeValidator(CompositeValidator.MODE_OR, "The field must contain a floating point or with 4-5 characters"); - cv - .addValidator(new StringLengthValidator( - "String length of '{0}' should be 4-5 characters", 4, - 5, false)); + cv.addValidator(new StringLengthValidator( + "String length of '{0}' should be 4-5 characters", 4, 5, false)); cv.addValidator(new DoubleValidator( "{0} must be a floating point number")); tf.addValidator(cv); |