diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-06-16 07:19:43 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-06-16 07:19:43 +0000 |
| commit | 79c52ac3d4756a6f8cbb94b9e7dc264ba61c5430 (patch) | |
| tree | d2ede4345c21d3caffe5dd2873f10ccb4aabbfff | |
| parent | 3239587ad38fb20df82a235d732c10d88aebe5b8 (diff) | |
| parent | 3547a37b82a25f2f8a7ecf4ca012094d62159ab3 (diff) | |
| download | vaadin-framework-79c52ac3d4756a6f8cbb94b9e7dc264ba61c5430.tar.gz vaadin-framework-79c52ac3d4756a6f8cbb94b9e7dc264ba61c5430.zip | |
Merge from 6.6
svn changeset:19412/svn branch:6.7
59 files changed, 1746 insertions, 513 deletions
diff --git a/WebContent/VAADIN/themes/base/menubar/img/check.gif b/WebContent/VAADIN/themes/base/menubar/img/check.gif Binary files differnew file mode 100644 index 0000000000..0a89195168 --- /dev/null +++ b/WebContent/VAADIN/themes/base/menubar/img/check.gif diff --git a/WebContent/VAADIN/themes/base/menubar/menubar.css b/WebContent/VAADIN/themes/base/menubar/menubar.css index d1972ac4ec..042ec15d1d 100644 --- a/WebContent/VAADIN/themes/base/menubar/menubar.css +++ b/WebContent/VAADIN/themes/base/menubar/menubar.css @@ -79,4 +79,15 @@ .v-menubar-popup .popupContent:focus, .v-menubar-popup .popupContent .v-menubar-submenu:focus{ outline: none; -}
\ No newline at end of file +} +/* Checkboxes for checkable/checked menu items */ +/* Checked/unchecked requires combined style selected-(un)checked for IE6 */ +.v-menubar-submenu-check-column .v-menubar-menuitem { + padding-left: 6px; +} +.v-menubar-submenu-check-column .v-menubar-menuitem-caption { + padding-left: 18px; +} +.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { + background: transparent url(img/check.gif) no-repeat left; +} diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/WebContent/VAADIN/themes/base/tree/img/connector-item.png Binary files differdeleted file mode 100644 index a64c209cb1..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector-item.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/WebContent/VAADIN/themes/base/tree/img/connector.png Binary files differdeleted file mode 100644 index c56b8f4244..0000000000 --- a/WebContent/VAADIN/themes/base/tree/img/connector.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css index 37af1d11a8..9e056dc4d6 100644 --- a/WebContent/VAADIN/themes/base/tree/tree.css +++ b/WebContent/VAADIN/themes/base/tree/tree.css @@ -4,29 +4,17 @@ padding: 1px 0; outline: none; } -.v-tree .v-tree-node { +.v-tree-node { background: transparent url(../common/img/sprites.png) no-repeat 5px -37px; padding: 1px 0; } .v-tree-node-caption:focus { outline: none; } -.v-tree div.v-tree-node-leaf { - background: transparent; -} -.v-tree-connectors div.v-tree-node-leaf { - background: transparent url(img/connector-item.png) no-repeat 8px 0; -} -.v-tree-connectors div.v-tree-node-leaf-last { - background: transparent url(img/connector-item.png) no-repeat 8px bottom; -} -.v-tree .v-tree-node-expanded { - background: transparent url(../common/img/sprites.png) no-repeat -5px -10px; -} -.v-tree-connectors .v-tree-node-children { - background: transparent url(img/connector.png) repeat-y 8px bottom; +.v-tree-node-expanded { + background-position: -5px -10px; } -.v-tree-connectors .v-tree-node-children-last { +div.v-tree-node-leaf { background: transparent; } .v-tree-node-caption { diff --git a/WebContent/VAADIN/themes/liferay/tree/tree.css b/WebContent/VAADIN/themes/liferay/tree/tree.css index 3c3c6abdfe..23fe10f52e 100644 --- a/WebContent/VAADIN/themes/liferay/tree/tree.css +++ b/WebContent/VAADIN/themes/liferay/tree/tree.css @@ -1,4 +1,4 @@ -.v-tree .v-tree-node { +.v-tree-node { background: transparent url(arrows_sprites.png) no-repeat -42px 1px; -background: transparent url(arrows_sprites-ie6.png) no-repeat -42px 1px; } @@ -13,7 +13,7 @@ background-position: -14px -30px; } -.v-tree .v-tree-node-expanded { +.v-tree-node-expanded { background-position: -28px -14px; } diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png Binary files differdeleted file mode 100644 index 90a73be23f..0000000000 --- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png Binary files differdeleted file mode 100644 index 744ca30d64..0000000000 --- a/WebContent/VAADIN/themes/reindeer/button/img/black-button-sprites.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png Binary files differdeleted file mode 100644 index 8ccaa56edd..0000000000 --- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png b/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png Binary files differdeleted file mode 100644 index 5087e8e957..0000000000 --- a/WebContent/VAADIN/themes/reindeer/button/img/button-sprites.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png Binary files differdeleted file mode 100644 index 84c52dbf4c..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png Binary files differdeleted file mode 100644 index 387abf2d4b..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/img/black-vertical-sprites.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png Binary files differdeleted file mode 100644 index 7980a5aa18..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/img/horizontal-sprites.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png Binary files differdeleted file mode 100644 index a7ace8b131..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites-ie6.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png b/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png Binary files differdeleted file mode 100644 index 31571144df..0000000000 --- a/WebContent/VAADIN/themes/reindeer/common/img/vertical-sprites.png +++ /dev/null diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png Binary files differnew file mode 100644 index 0000000000..192c404617 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked-selected.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png Binary files differnew file mode 100644 index 0000000000..418e951166 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/checked.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png Binary files differnew file mode 100644 index 0000000000..bac6587c20 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked-selected.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png Binary files differnew file mode 100644 index 0000000000..92a2b582c5 --- /dev/null +++ b/WebContent/VAADIN/themes/reindeer/menubar/img/unchecked.png diff --git a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css index f3e620353a..e5e337725e 100644 --- a/WebContent/VAADIN/themes/reindeer/menubar/menubar.css +++ b/WebContent/VAADIN/themes/reindeer/menubar/menubar.css @@ -49,4 +49,24 @@ } .v-menubar-submenu .v-menubar-menuitem-selected .v-menubar-submenu-indicator { background-image: url(img/submenu-icon-hover.png); -}
\ No newline at end of file +} + +/* Checkboxes for checkable/checked menu items */ +.v-menubar-submenu-check-column .v-menubar-menuitem { + padding-left: 6px; +} +.v-menubar-submenu-check-column .v-menubar-menuitem-caption { + padding-left: 18px; +} +.v-menubar-submenu .v-menubar-menuitem-checked .v-menubar-menuitem-caption { + background: transparent url(img/checked.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-unchecked .v-menubar-menuitem-caption { + background: transparent url(img/unchecked.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-selected-checked .v-menubar-menuitem-caption { + background: transparent url(img/checked-selected.png) no-repeat left; +} +.v-menubar-submenu .v-menubar-menuitem-selected-unchecked .v-menubar-menuitem-caption { + background: transparent url(img/unchecked-selected.png) no-repeat left; +} diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css index 4f31d43960..3f77bd991d 100644 --- a/WebContent/VAADIN/themes/reindeer/tree/tree.css +++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css @@ -1,4 +1,4 @@ -.v-tree .v-tree-node { +.v-tree-node { background: transparent url(img/arrows.png) no-repeat 6px -10px; } .v-ie6 .v-tree-node { @@ -8,7 +8,7 @@ .v-ie6 div.v-tree-node-leaf { background: transparent; } -.v-tree .v-tree-node-expanded { +.v-tree-node-expanded { background-position: -7px 5px; } .v-tree-node-caption { diff --git a/WebContent/VAADIN/themes/runo/select/select.css b/WebContent/VAADIN/themes/runo/select/select.css index e00e033017..ad1744288a 100644 --- a/WebContent/VAADIN/themes/runo/select/select.css +++ b/WebContent/VAADIN/themes/runo/select/select.css @@ -24,7 +24,7 @@ border: none; height: 20px; margin: 0; - padding: 3px 0 0 2px; + padding: 2px 0 1px 2px; font-size: 13px; } .v-filterselect-prompt .v-filterselect-input { diff --git a/WebContent/VAADIN/themes/runo/tree/tree.css b/WebContent/VAADIN/themes/runo/tree/tree.css index c2458bc0b8..bec3b318dd 100644 --- a/WebContent/VAADIN/themes/runo/tree/tree.css +++ b/WebContent/VAADIN/themes/runo/tree/tree.css @@ -1,7 +1,7 @@ -.v-tree .v-tree-node { +.v-tree-node { background: transparent url(img/collapsed.png) no-repeat 2px 1px; } -.v-tree .v-tree-node-expanded { +.v-tree-node-expanded { background: transparent url(img/expanded.png) no-repeat 2px 1px; } .v-tree-node-caption { diff --git a/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-MenuBarSelectableItems.gif b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-MenuBarSelectableItems.gif Binary files differnew file mode 100644 index 0000000000..f59714cc62 --- /dev/null +++ b/WebContent/VAADIN/themes/sampler/icons/sampleicons/75-MenuBarSelectableItems.gif diff --git a/build/build.xml b/build/build.xml index 928bfdc638..ad90bc083b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -812,6 +812,7 @@ <include name="VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/**/*" /> <include name="VAADIN/themes/base/**/*" /> <include name="VAADIN/themes/default/**/*" /> + <include name="VAADIN/themes/liferay/**/*" /> <include name="VAADIN/themes/runo/**/*" /> <include name="VAADIN/themes/reindeer/**/*" /> </patternset> diff --git a/src/com/vaadin/data/util/HierarchicalContainer.java b/src/com/vaadin/data/util/HierarchicalContainer.java index d671dbc833..99de7a1352 100644 --- a/src/com/vaadin/data/util/HierarchicalContainer.java +++ b/src/com/vaadin/data/util/HierarchicalContainer.java @@ -471,6 +471,9 @@ public class HierarchicalContainer extends IndexedContainer implements if (filteredChildren != null) { filteredChildren = null; } + if (filteredParent != null) { + filteredParent = null; + } } enableAndFireContentsChangeEvents(); return success; @@ -516,18 +519,30 @@ public class HierarchicalContainer extends IndexedContainer implements if (c != null) { c.remove(itemId); + if (c.isEmpty()) { + children.remove(parentItemId); + } + // Found in the children list so might also be in the // filteredChildren list if (filteredChildren != null) { LinkedList<Object> f = filteredChildren .get(parentItemId); if (f != null) { - f.remove(parentItemId); + f.remove(itemId); + if (f.isEmpty()) { + filteredChildren.remove(parentItemId); + } } } } } parent.remove(itemId); + if (filteredParent != null) { + // Item id no longer has a parent as the item id is not in the + // container. + filteredParent.remove(itemId); + } noChildrenAllowed.remove(itemId); } @@ -642,6 +657,7 @@ public class HierarchicalContainer extends IndexedContainer implements // All filters removed filteredRoots = null; filteredChildren = null; + filteredParent = null; return super.doFilterContainer(hasFilters); } diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 5f808ea8cd..056428881f 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -367,7 +367,8 @@ public class ApplicationConnection { + "&vw=" + offsetWidth + "&vh=" + offsetHeight + "&fr=" + token + "&tzo=" + tzOffset + "&rtzo=" + rtzOffset + "&dstd=" + dstDiff + "&dston=" + dstInEffect + "&curdate=" + curDate - + "&wsver=" + widgetsetVersion; + + "&wsver=" + widgetsetVersion + + (BrowserInfo.get().isTouchDevice() ? "&td=1" : ""); return parameters; } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java index 996b719e33..4d43b7c346 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java @@ -8,6 +8,7 @@ import java.util.Iterator; import java.util.List; import java.util.Stack; +import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.dom.client.NodeList; @@ -66,6 +67,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, public static final String OPEN_ROOT_MENU_ON_HOWER = "ormoh"; + public static final String ATTRIBUTE_CHECKED = "checked"; + /** Widget fields **/ protected boolean subMenu; protected ArrayList<CustomMenuItem> items; @@ -154,8 +157,8 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, // special case that uses another method. Really should fix the // Util.setWidthExcludingPaddingAndBorder method but that will // probably break additional cases - int requestedPixelWidth = Integer.parseInt(width.substring(0, width - .length() - 2)); + int requestedPixelWidth = Integer.parseInt(width.substring(0, + width.length() - 2)); int paddingBorder = Util.measureHorizontalPaddingAndBorder( getElement(), 0); int w = requestedPixelWidth - paddingBorder; @@ -228,9 +231,12 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } itemHTML.append(moreItemText); - moreItem = new CustomMenuItem(itemHTML.toString(), emptyCommand); - collapsedRootItems = new VMenuBar(true, (VMenuBar) client - .getPaintable(uidlId)); + moreItem = GWT.create(CustomMenuItem.class); + moreItem.setHTML(itemHTML.toString()); + moreItem.setCommand(emptyCommand); + + collapsedRootItems = new VMenuBar(true, + (VMenuBar) client.getPaintable(uidlId)); moreItem.setSubMenu(collapsedRootItems); moreItem.addStyleName(CLASSNAME + "-more-menuitem"); } @@ -245,45 +251,16 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, UIDL item = (UIDL) itr.next(); CustomMenuItem currentItem = null; - String itemText = item.getStringAttribute("text"); final int itemId = item.getIntAttribute("id"); boolean itemHasCommand = item.hasAttribute("command"); + boolean itemIsCheckable = item.hasAttribute(ATTRIBUTE_CHECKED); - // Construct html from the text and the optional icon - StringBuffer itemHTML = new StringBuffer(); - Command cmd = null; - - if (item.hasAttribute("separator")) { - itemHTML.append("<span>---</span>"); - } else { - // Add submenu indicator - if (item.getChildCount() > 0) { - // FIXME For compatibility reasons: remove in version 7 - String bgStyle = ""; - if (submenuIcon != null) { - bgStyle = " style=\"background-image: url(" - + submenuIcon - + "); text-indent: -999px; width: 1em;\""; - } - itemHTML.append("<span class=\"" + CLASSNAME - + "-submenu-indicator\"" + bgStyle - + ">►</span>"); - } - - 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(Util.escapeHTML(itemText) + "</span>"); + String itemHTML = buildItemHTML(item); - if (itemHasCommand) { + Command cmd = null; + if (!item.hasAttribute("separator")) { + if (itemHasCommand || itemIsCheckable) { // Construct a command that fires onMenuClick(int) with the // item's id-number cmd = new Command() { @@ -312,6 +289,17 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, } while (!itr.hasNext() && !iteratorStack.empty()) { + boolean hasCheckableItem = false; + for (CustomMenuItem menuItem : currentMenu.getItems()) { + hasCheckableItem = hasCheckableItem + || menuItem.isCheckable(); + } + if (hasCheckableItem) { + currentMenu.addStyleDependentName("check-column"); + } else { + currentMenu.removeStyleDependentName("check-column"); + } + itr = iteratorStack.pop(); currentMenu = menuStack.pop(); } @@ -322,6 +310,45 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, }// updateFromUIDL /** + * Build the HTML content for a menu item. + * + * @param item + * @return + */ + protected String buildItemHTML(UIDL item) { + // Construct html from the text and the optional icon + StringBuffer itemHTML = new StringBuffer(); + if (item.hasAttribute("separator")) { + itemHTML.append("<span>---</span>"); + } else { + // Add submenu indicator + if (item.getChildCount() > 0) { + // FIXME For compatibility reasons: remove in version 7 + String bgStyle = ""; + if (submenuIcon != null) { + bgStyle = " style=\"background-image: url(" + submenuIcon + + "); text-indent: -999px; width: 1em;\""; + } + itemHTML.append("<span class=\"" + CLASSNAME + + "-submenu-indicator\"" + bgStyle + ">►</span>"); + } + + itemHTML.append("<span class=\"" + CLASSNAME + + "-menuitem-caption\">"); + if (item.hasAttribute("icon")) { + itemHTML.append("<img src=\"" + + client.translateVaadinUri(item + .getStringAttribute("icon")) + "\" class=\"" + + Icon.CLASSNAME + "\" alt=\"\" />"); + } + String itemText = item.getStringAttribute("text"); + itemHTML.append(Util.escapeHTML(itemText)); + itemHTML.append("</span>"); + } + return itemHTML.toString(); + } + + /** * This is called by the items in the menu and it communicates the * information to the server * @@ -379,7 +406,10 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, * @return the item created */ public CustomMenuItem addItem(String html, Command cmd) { - CustomMenuItem item = new CustomMenuItem(html, cmd); + CustomMenuItem item = GWT.create(CustomMenuItem.class); + item.setHTML(html); + item.setCommand(cmd); + addItem(item); return item; } @@ -418,8 +448,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); } } @@ -672,8 +702,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; @@ -701,8 +730,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"); @@ -835,7 +864,28 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, protected VMenuBar parentMenu = null; protected boolean enabled = true; protected boolean isSeparator = false; + protected boolean checkable = false; + protected boolean checked = false; + + /** + * Default menu item {@link Widget} constructor for GWT.create(). + * + * Use {@link #setHTML(String)} and {@link #setCommand(Command)} after + * constructing a menu item. + */ + public CustomMenuItem() { + this("", null); + } + /** + * Creates a menu item {@link Widget}. + * + * @param html + * @param cmd + * @deprecated use the default constructor and {@link #setHTML(String)} + * and {@link #setCommand(Command)} instead + */ + @Deprecated public CustomMenuItem(String html, Command cmd) { // We need spans to allow inline-block in IE setElement(DOM.createSpan()); @@ -846,20 +896,64 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, setStyleName(CLASSNAME + "-menuitem"); sinkEvents(VTooltip.TOOLTIP_EVENTS); - - // Sink the onload event for any icons. The onload - // events are handled by the parent VMenuBar. - Util.sinkOnloadForImages(getElement()); } public void setSelected(boolean selected) { if (selected && !isSeparator) { addStyleDependentName("selected"); + // needed for IE6 to have a single style name to match for an + // element + if (checkable) { + if (checked) { + removeStyleDependentName("selected-unchecked"); + addStyleDependentName("selected-checked"); + } else { + removeStyleDependentName("selected-checked"); + addStyleDependentName("selected-unchecked"); + } + } } else { removeStyleDependentName("selected"); + // needed for IE6 to have a single style name to match for an + // element + removeStyleDependentName("selected-checked"); + removeStyleDependentName("selected-unchecked"); } } + public void setChecked(boolean checked) { + if (checkable && !isSeparator) { + this.checked = checked; + + if (checked) { + addStyleDependentName("checked"); + removeStyleDependentName("unchecked"); + } else { + addStyleDependentName("unchecked"); + removeStyleDependentName("checked"); + } + } else { + this.checked = false; + } + } + + public boolean isChecked() { + return checked; + } + + public void setCheckable(boolean checkable) { + if (checkable && !isSeparator) { + this.checkable = true; + } else { + setChecked(false); + this.checkable = false; + } + } + + public boolean isCheckable() { + return checkable; + } + /* * setters and getters for the fields */ @@ -895,6 +989,10 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, public void setHTML(String html) { this.html = html; DOM.setInnerHTML(getElement(), html); + + // Sink the onload event for any icons. The onload + // events are handled by the parent VMenuBar. + Util.sinkOnloadForImages(getElement()); } public String getText() { @@ -937,6 +1035,15 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, setSeparator(uidl.hasAttribute("separator")); setEnabled(!uidl.hasAttribute("disabled")); + if (!isSeparator() && uidl.hasAttribute(ATTRIBUTE_CHECKED)) { + // if the selected attribute is present (either true or false), + // the item is selectable + setCheckable(true); + setChecked(uidl.getBooleanAttribute(ATTRIBUTE_CHECKED)); + } else { + setCheckable(false); + } + if (uidl.hasAttribute("style")) { String itemStyle = uidl.getStringAttribute("style"); addStyleDependentName(itemStyle); @@ -1111,9 +1218,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(); } } @@ -1126,9 +1233,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(); } } @@ -1435,9 +1542,7 @@ public class VMenuBar extends SimpleFocusablePanel implements Paintable, * .dom.client.FocusEvent) */ public void onFocus(FocusEvent event) { - // Focus the first element directly, so the keyboard focus becomes - // visible - setSelected(items.get(0)); + } private final String SUBPART_PREFIX = "item"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java index aba7ccf217..a277b4c42d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VOverlay.java @@ -22,7 +22,7 @@ import com.vaadin.terminal.gwt.client.Util; * temporary float over other components like context menus etc. This is to deal * stacking order correctly with VWindow objects. */ -public class VOverlay extends PopupPanel { +public class VOverlay extends PopupPanel implements CloseHandler<PopupPanel> { /* * The z-index value from where all overlays live. This can be overridden in @@ -84,23 +84,43 @@ public class VOverlay extends PopupPanel { public VOverlay(boolean autoHide, boolean modal, boolean showShadow) { super(autoHide, modal); - if (showShadow) { - shadow = DOM.createDiv(); - shadow.setClassName(CLASSNAME_SHADOW); - shadow.setInnerHTML(SHADOW_HTML); - DOM.setStyleAttribute(shadow, "position", "absolute"); - - addCloseHandler(new CloseHandler<PopupPanel>() { - public void onClose(CloseEvent<PopupPanel> event) { - if (shadow.getParentElement() != null) { - shadow.getParentElement().removeChild(shadow); - } - } - }); - } + setShadowEnabled(showShadow); adjustZIndex(); } + /** + * Method to controle whether DOM elements for shadow are added. With this + * method subclasses can control displaying of shadow also after the + * constructor. + * + * @param enabled + * true if shadow should be displayed + */ + protected void setShadowEnabled(boolean enabled) { + if (enabled != isShadowEnabled()) { + if (enabled) { + shadow = DOM.createDiv(); + shadow.setClassName(CLASSNAME_SHADOW); + shadow.setInnerHTML(SHADOW_HTML); + DOM.setStyleAttribute(shadow, "position", "absolute"); + addCloseHandler(this); + } else { + removeShadowIfPresent(); + shadow = null; + } + } + } + + protected boolean isShadowEnabled() { + return shadow != null; + } + + private void removeShadowIfPresent() { + if (isShadowEnabled() && shadow.getParentElement() != null) { + shadow.getParentElement().removeChild(shadow); + } + } + private void adjustZIndex() { setZIndex(Z_INDEX); } @@ -113,7 +133,7 @@ public class VOverlay extends PopupPanel { */ protected void setZIndex(int zIndex) { DOM.setStyleAttribute(getElement(), "zIndex", "" + zIndex); - if (shadow != null) { + if (isShadowEnabled()) { DOM.setStyleAttribute(shadow, "zIndex", "" + zIndex); } } @@ -128,25 +148,37 @@ public class VOverlay extends PopupPanel { style.setMarginLeft(-adjustByRelativeLeftBodyMargin(), Unit.PX); style.setMarginTop(-adjustByRelativeTopBodyMargin(), Unit.PX); super.setPopupPosition(left, top); - if (shadow != null) { - updateShadowSizeAndPosition(isAnimationEnabled() ? 0 : 1); - } + updateShadowSizeAndPosition(isAnimationEnabled() ? 0 : 1); } private static int adjustByRelativeTopBodyMargin() { if (topFix == -1) { - topFix = detectRelativeBodyFixes("top"); + boolean ie6OrIe7 = BrowserInfo.get().isIE() + && BrowserInfo.get().getIEVersion() <= 7; + topFix = detectRelativeBodyFixes("top", ie6OrIe7); } return topFix; } - private native static int detectRelativeBodyFixes(String axis) + private native static int detectRelativeBodyFixes(String axis, + boolean removeClientLeftOrTop) /*-{ try { var b = $wnd.document.body; var cstyle = b.currentStyle ? b.currentStyle : getComputedStyle(b); if(cstyle && cstyle.position == 'relative') { - return b.getBoundingClientRect()[axis]; + var offset = b.getBoundingClientRect()[axis]; + if (removeClientLeftOrTop) { + // IE6 and IE7 include the top left border of the client area into the boundingClientRect + var clientTopOrLeft = 0; + if (axis == "top") + clientTopOrLeft = $wnd.document.documentElement.clientTop; + else + clientTopOrLeft = $wnd.document.documentElement.clientLeft; + + offset -= clientTopOrLeft; + } + return offset; } } catch(e){} return 0; @@ -154,7 +186,10 @@ public class VOverlay extends PopupPanel { private static int adjustByRelativeLeftBodyMargin() { if (leftFix == -1) { - leftFix = detectRelativeBodyFixes("left"); + boolean ie6OrIe7 = BrowserInfo.get().isIE() + && BrowserInfo.get().getIEVersion() <= 7; + leftFix = detectRelativeBodyFixes("left", ie6OrIe7); + } return leftFix; } @@ -162,7 +197,7 @@ public class VOverlay extends PopupPanel { @Override public void show() { super.show(); - if (shadow != null) { + if (isShadowEnabled()) { if (isAnimationEnabled()) { ShadowAnimation sa = new ShadowAnimation(); sa.run(200); @@ -180,9 +215,17 @@ public class VOverlay extends PopupPanel { } @Override + protected void onDetach() { + super.onDetach(); + + // Always ensure shadow is removed when the overlay is removed. + removeShadowIfPresent(); + } + + @Override public void setVisible(boolean visible) { super.setVisible(visible); - if (shadow != null) { + if (isShadowEnabled()) { shadow.getStyle().setProperty("visibility", visible ? "visible" : "hidden"); } @@ -191,17 +234,13 @@ public class VOverlay extends PopupPanel { @Override public void setWidth(String width) { super.setWidth(width); - if (shadow != null) { - updateShadowSizeAndPosition(1.0); - } + updateShadowSizeAndPosition(1.0); } @Override public void setHeight(String height) { super.setHeight(height); - if (shadow != null) { - updateShadowSizeAndPosition(1.0); - } + updateShadowSizeAndPosition(1.0); } /** @@ -215,7 +254,7 @@ public class VOverlay extends PopupPanel { * name=='v-shadow-foobar'. */ protected void setShadowStyle(String style) { - if (shadow != null) { + if (isShadowEnabled()) { shadow.setClassName(CLASSNAME_SHADOW + "-" + style); } } @@ -241,7 +280,7 @@ public class VOverlay extends PopupPanel { */ private void updateShadowSizeAndPosition(final double progress) { // Don't do anything if overlay element is not attached - if (!isAttached()) { + if (!isAttached() || shadow == null) { return; } // Calculate proper z-index @@ -336,9 +375,11 @@ public class VOverlay extends PopupPanel { protected class ShadowAnimation extends Animation { @Override protected void onUpdate(double progress) { - if (shadow != null) { - updateShadowSizeAndPosition(progress); - } + updateShadowSizeAndPosition(progress); } } + + public void onClose(CloseEvent<PopupPanel> event) { + removeShadowIfPresent(); + } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index c1d674a367..d36c2137d8 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -843,6 +843,10 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, if (uidl.hasAttribute("alb")) { bodyActionKeys = uidl.getStringArrayAttribute("alb"); + } else { + // Need to clear the actions if the action handlers have been + // removed + bodyActionKeys = null; } setCacheRate(uidl.hasAttribute("cr") ? uidl.getDoubleAttribute("cr") diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java index 3df2e356d1..a05cef3984 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextField.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextField.java @@ -12,6 +12,9 @@ import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.event.dom.client.ChangeHandler; import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; +import com.google.gwt.event.dom.client.KeyCodes; +import com.google.gwt.event.dom.client.KeyDownEvent; +import com.google.gwt.event.dom.client.KeyDownHandler; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; @@ -24,7 +27,6 @@ import com.vaadin.terminal.gwt.client.EventId; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; -import com.vaadin.terminal.gwt.client.VConsole; import com.vaadin.terminal.gwt.client.VTooltip; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; @@ -35,7 +37,8 @@ import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutAct * */ public class VTextField extends TextBoxBase implements Paintable, Field, - ChangeHandler, FocusHandler, BlurHandler, BeforeShortcutActionListener { + ChangeHandler, FocusHandler, BlurHandler, BeforeShortcutActionListener, + KeyDownHandler { public static final String VAR_CUR_TEXT = "curText"; /** @@ -85,6 +88,11 @@ public class VTextField extends TextBoxBase implements Paintable, Field, } setStyleName(CLASSNAME); addChangeHandler(this); + if (BrowserInfo.get().isIE()) { + // IE does not send change events when pressing enter in a text + // input so we handle it using a key listener instead + addKeyDownHandler(this); + } addFocusHandler(this); addBlurHandler(this); sinkEvents(VTooltip.TOOLTIP_EVENTS); @@ -590,4 +598,10 @@ public class VTextField extends TextBoxBase implements Paintable, Field, } wordwrap = enabled; } + + public void onKeyDown(KeyDownEvent event) { + if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) { + valueChange(false); + } + } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java index 98ebf73b77..e2fe47cc2c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java @@ -14,13 +14,13 @@ import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; +import com.google.gwt.event.dom.client.DomEvent.Type; import com.google.gwt.event.dom.client.FocusEvent; import com.google.gwt.event.dom.client.FocusHandler; import com.google.gwt.event.dom.client.KeyDownEvent; import com.google.gwt.event.dom.client.KeyDownHandler; import com.google.gwt.event.dom.client.ScrollEvent; import com.google.gwt.event.dom.client.ScrollHandler; -import com.google.gwt.event.dom.client.DomEvent.Type; import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Command; @@ -258,9 +258,7 @@ public class VWindow extends VOverlay implements Container, 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,11 +311,11 @@ public class VWindow extends VOverlay implements Container, resizeLazy = uidl.hasAttribute(VView.RESIZE_LAZY); setDraggable(!uidl.hasAttribute("fixedposition")); - } - if (uidl.hasAttribute("caption")) { - setCaption(uidl.getStringAttribute("caption"), uidl - .getStringAttribute("icon")); + // Caption must be set before required header size is measured. If + // the caption attribute is missing the caption should be cleared. + setCaption(uidl.getStringAttribute("caption"), + uidl.getStringAttribute("icon")); } visibilityChangesDisabled = true; @@ -458,8 +456,7 @@ public class VWindow extends VOverlay implements Container, } 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"); @@ -679,7 +676,8 @@ public class VWindow extends VOverlay implements Container, * Sets the closable state of the window. Additionally hides/shows the close * button according to the new state. * - * @param closable true if the window can be closed by the user + * @param closable + * true if the window can be closed by the user */ protected void setClosable(boolean closable) { if (this.closable == closable) { @@ -777,14 +775,15 @@ public class VWindow extends VOverlay implements Container, private void showModalityCurtain() { if (BrowserInfo.get().isFF2()) { - DOM.setStyleAttribute(getModalityCurtain(), "height", DOM - .getElementPropertyInt(RootPanel.getBodyElement(), - "offsetHeight") - + "px"); + DOM.setStyleAttribute( + getModalityCurtain(), + "height", + DOM.getElementPropertyInt(RootPanel.getBodyElement(), + "offsetHeight") + "px"); DOM.setStyleAttribute(getModalityCurtain(), "position", "absolute"); } - DOM.setStyleAttribute(getModalityCurtain(), "zIndex", "" - + (windowOrder.indexOf(this) + Z_INDEX)); + DOM.setStyleAttribute(getModalityCurtain(), "zIndex", + "" + (windowOrder.indexOf(this) + Z_INDEX)); if (isShowing()) { RootPanel.getBodyElement().insertBefore(getModalityCurtain(), getElement()); @@ -987,7 +986,8 @@ public class VWindow extends VOverlay implements Container, * Checks if the cursor was inside the browser content area when the event * happened. * - * @param event The event to be checked + * @param event + * The event to be checked * @return true, if the cursor is inside the browser content area * * false, otherwise @@ -1075,8 +1075,8 @@ public class VWindow extends VOverlay implements Container, 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 @@ -1305,15 +1305,15 @@ public class VWindow extends VOverlay implements Container, public void onScroll(ScrollEvent event) { client.updateVariable(id, "scrollTop", contentPanel.getScrollPosition(), false); - client.updateVariable(id, "scrollLeft", contentPanel - .getHorizontalScrollPosition(), false); + client.updateVariable(id, "scrollLeft", + contentPanel.getHorizontalScrollPosition(), false); } public void onKeyDown(KeyDownEvent event) { if (shortcutHandler != null) { - shortcutHandler.handleKeyboardEvent(Event - .as(event.getNativeEvent())); + shortcutHandler + .handleKeyboardEvent(Event.as(event.getNativeEvent())); return; } } diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java index cb4ba16f65..b4f194c7f7 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java @@ -561,15 +561,19 @@ 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"), - getHTTPRequestParameter(request, "sh"), - getHTTPRequestParameter(request, "tzo"), - getHTTPRequestParameter(request, "rtzo"), - getHTTPRequestParameter(request, "dstd"), - getHTTPRequestParameter(request, "dstActive"), - getHTTPRequestParameter(request, "curdate")); + browser.updateRequestDetails(request.getLocale(), null, + request.isSecure(), userAgent); + if (getHTTPRequestParameter(request, "repaintAll") != null) { + browser.updateClientSideDetails( + getHTTPRequestParameter(request, "sw"), + getHTTPRequestParameter(request, "sh"), + getHTTPRequestParameter(request, "tzo"), + getHTTPRequestParameter(request, "rtzo"), + getHTTPRequestParameter(request, "dstd"), + getHTTPRequestParameter(request, "dstActive"), + getHTTPRequestParameter(request, "curdate"), + getHTTPRequestParameter(request, "td") != null); + } } @Override diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java index f274a474dd..c394e8ae6a 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java @@ -589,12 +589,18 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements private void updateBrowserProperties(WebBrowser browser, HttpServletRequest request) { - browser.updateBrowserProperties(request.getLocale(), + // request based details updated always + browser.updateRequestDetails(request.getLocale(), request.getRemoteAddr(), request.isSecure(), - request.getHeader("user-agent"), request.getParameter("sw"), - request.getParameter("sh"), request.getParameter("tzo"), - request.getParameter("rtzo"), request.getParameter("dstd"), - request.getParameter("dston"), request.getParameter("curdate")); + request.getHeader("user-agent")); + if (request.getParameter("repaintAll") != null) { + browser.updateClientSideDetails(request.getParameter("sw"), + request.getParameter("sh"), request.getParameter("tzo"), + request.getParameter("rtzo"), request.getParameter("dstd"), + request.getParameter("dston"), + request.getParameter("curdate"), + request.getParameter("td") != null); + } } protected ClassLoader getClassLoader() throws ServletException { diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java index 152fa81bb5..74b7a27a96 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java @@ -392,6 +392,7 @@ public abstract class AbstractCommunicationManager implements int contentLength = request.getContentLength(); boolean atStart = false; + boolean firstFileFieldFound = false; String rawfilename = "unknown"; String rawMimeType = "application/octet-stream"; @@ -410,7 +411,8 @@ public abstract class AbstractCommunicationManager implements rawfilename = rawfilename.substring(1); rawfilename = rawfilename.substring(0, rawfilename.indexOf(parenthesis)); - } else if (readLine.equals("")) { + firstFileFieldFound = true; + } else if (firstFileFieldFound && readLine.equals("")) { atStart = true; } else if (readLine.startsWith("Content-Type")) { rawMimeType = readLine.split(": ")[1]; diff --git a/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/src/com/vaadin/terminal/gwt/server/WebBrowser.java index 1b0d7fe986..4835b3c55b 100644 --- a/src/com/vaadin/terminal/gwt/server/WebBrowser.java +++ b/src/com/vaadin/terminal/gwt/server/WebBrowser.java @@ -30,9 +30,10 @@ public class WebBrowser implements Terminal { private int rawTimezoneOffset = 0; private int dstSavings; private boolean dstInEffect; - private Date currentDate; + private boolean touchDevice; private VBrowserDetails browserDetails; + private long clientServerTimeDelta; /** * There is no default-theme for this terminal type. @@ -71,91 +72,6 @@ public class WebBrowser implements Terminal { } /** - * For internal use by AbstractApplicationServlet/AbstractApplicationPortlet - * only. Updates all properties in the class according to the given - * information. - * - * @param locale - * The browser primary locale - * @param address - * The browser ip address - * @param secureConnection - * true if using an https connection - * @param agent - * Raw userAgent string from the browser - * @param sw - * Screen width - * @param sh - * Screen height - * @param tzo - * TimeZone offset in minutes from GMT - * @param rtzo - * raw TimeZone offset in minutes from GMT (w/o DST adjustment) - * @param dstSavings - * the difference between the raw TimeZone and DST in minutes - * @param dstInEffect - * is DST currently active in the region or not? - * @param curDate - * the current date in milliseconds since the epoch - */ - void updateBrowserProperties(Locale locale, String address, - boolean secureConnection, String agent, String sw, String sh, - String tzo, String rtzo, String dstSavings, String dstInEffect, - String curDate) { - this.locale = locale; - this.address = address; - this.secureConnection = secureConnection; - if (agent != null) { - browserApplication = agent; - browserDetails = new VBrowserDetails(agent); - } - - if (sw != null) { - try { - screenHeight = Integer.parseInt(sh); - screenWidth = Integer.parseInt(sw); - } catch (final NumberFormatException e) { - screenHeight = screenWidth = 0; - } - } - if (tzo != null) { - try { - // browser->java conversion: min->ms, reverse sign - timezoneOffset = -Integer.parseInt(tzo) * 60 * 1000; - } catch (final NumberFormatException e) { - timezoneOffset = 0; // default gmt+0 - } - } - if (rtzo != null) { - try { - // browser->java conversion: min->ms, reverse sign - rawTimezoneOffset = -Integer.parseInt(rtzo) * 60 * 1000; - } catch (final NumberFormatException e) { - rawTimezoneOffset = 0; // default gmt+0 - } - } - if (dstSavings != null) { - try { - // browser->java conversion: min->ms - this.dstSavings = Integer.parseInt(dstSavings) * 60 * 1000; - } catch (final NumberFormatException e) { - this.dstSavings = 0; // default no savings - } - } - if (dstInEffect != null) { - this.dstInEffect = Boolean.parseBoolean(dstInEffect); - } - if (curDate != null) { - try { - long curTime = Long.parseLong(curDate); - currentDate = new Date(curTime); - } catch (final NumberFormatException e) { - currentDate = new Date(); - } - } - } - - /** * Gets the IP-address of the web browser. If the application is running * inside a portlet, this method will return null. * @@ -368,12 +284,120 @@ public class WebBrowser implements Terminal { /** * Returns the current date and time of the browser. This will not be * entirely accurate due to varying network latencies, but should provide a - * close-enough value for most cases. + * close-enough value for most cases. Also note that the returned Date + * object uses servers default time zone, not the clients. * * @return the current date and time of the browser. + * @see #isDSTInEffect() + * @see #getDSTSavings() + * @see #getTimezoneOffset() */ public Date getCurrentDate() { - return currentDate; + return new Date(new Date().getTime() + clientServerTimeDelta); + } + + /** + * @return true if the browser is detected to support touch events + */ + public boolean isTouchDevice() { + return touchDevice; + } + + /** + * For internal use by AbstractApplicationServlet/AbstractApplicationPortlet + * only. Updates all properties in the class according to the given + * information. + * + * @param sw + * Screen width + * @param sh + * Screen height + * @param tzo + * TimeZone offset in minutes from GMT + * @param rtzo + * raw TimeZone offset in minutes from GMT (w/o DST adjustment) + * @param dstSavings + * the difference between the raw TimeZone and DST in minutes + * @param dstInEffect + * is DST currently active in the region or not? + * @param curDate + * the current date in milliseconds since the epoch + * @param touchDevice + */ + void updateClientSideDetails(String sw, String sh, String tzo, String rtzo, + String dstSavings, String dstInEffect, String curDate, + boolean touchDevice) { + if (sw != null) { + try { + screenHeight = Integer.parseInt(sh); + screenWidth = Integer.parseInt(sw); + } catch (final NumberFormatException e) { + screenHeight = screenWidth = 0; + } + } + if (tzo != null) { + try { + // browser->java conversion: min->ms, reverse sign + timezoneOffset = -Integer.parseInt(tzo) * 60 * 1000; + } catch (final NumberFormatException e) { + timezoneOffset = 0; // default gmt+0 + } + } + if (rtzo != null) { + try { + // browser->java conversion: min->ms, reverse sign + rawTimezoneOffset = -Integer.parseInt(rtzo) * 60 * 1000; + } catch (final NumberFormatException e) { + rawTimezoneOffset = 0; // default gmt+0 + } + } + if (dstSavings != null) { + try { + // browser->java conversion: min->ms + this.dstSavings = Integer.parseInt(dstSavings) * 60 * 1000; + } catch (final NumberFormatException e) { + this.dstSavings = 0; // default no savings + } + } + if (dstInEffect != null) { + this.dstInEffect = Boolean.parseBoolean(dstInEffect); + } + if (curDate != null) { + try { + long curTime = Long.parseLong(curDate); + clientServerTimeDelta = curTime - new Date().getTime(); + } catch (final NumberFormatException e) { + clientServerTimeDelta = 0; + } + } + this.touchDevice = touchDevice; + + } + + /** + * For internal use by AbstractApplicationServlet/AbstractApplicationPortlet + * only. Updates all properties in the class according to the given + * information. + * + * @param locale + * The browser primary locale + * @param address + * The browser ip address + * @param secureConnection + * true if using an https connection + * @param agent + * Raw userAgent string from the browser + */ + void updateRequestDetails(Locale locale, String address, + boolean secureConnection, String agent) { + this.locale = locale; + this.address = address; + this.secureConnection = secureConnection; + if (agent != null) { + browserApplication = agent; + browserDetails = new VBrowserDetails(agent); + } + } } diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java index 8dfbe07b18..0b0fff2a34 100644 --- a/src/com/vaadin/ui/AbstractOrderedLayout.java +++ b/src/com/vaadin/ui/AbstractOrderedLayout.java @@ -23,7 +23,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements private static final String CLICK_EVENT = EventId.LAYOUT_CLICK; - private static final Alignment ALIGNMENT_DEFAULT = Alignment.TOP_LEFT; + public static final Alignment ALIGNMENT_DEFAULT = Alignment.TOP_LEFT; /** * Custom layout slots containing the components. diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java index c64cd386ce..122d155e0f 100644 --- a/src/com/vaadin/ui/Button.java +++ b/src/com/vaadin/ui/Button.java @@ -176,15 +176,29 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, if (newValue != null && !newValue.equals(oldValue) && !isReadOnly()) { setValue(newValue); - fireClick(MouseEventDetails.deSerialize((String) variables - .get("mousedetails"))); + if (variables.containsKey("mousedetails")) { + fireClick(MouseEventDetails + .deSerialize((String) variables + .get("mousedetails"))); + } else { + // for compatibility with custom implementations which + // don't send mouse details + fireClick(); + } } } else { // Only send click event if the button is pushed if (newValue.booleanValue()) { - fireClick(MouseEventDetails.deSerialize((String) variables - .get("mousedetails"))); + if (variables.containsKey("mousedetails")) { + fireClick(MouseEventDetails + .deSerialize((String) variables + .get("mousedetails"))); + } else { + // for compatibility with custom implementations which + // don't send mouse details + fireClick(); + } } // If the button is true for some reason, release it @@ -298,7 +312,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, */ public class ClickEvent extends Component.Event { - private MouseEventDetails details; + private final MouseEventDetails details; /** * New instance of text change event. @@ -308,6 +322,7 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, */ public ClickEvent(Component source) { super(source); + details = null; } /** @@ -336,20 +351,28 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, * Returns the mouse position (x coordinate) when the click took place. * The position is relative to the browser client area. * - * @return The mouse cursor x position + * @return The mouse cursor x position or -1 if unknown */ public int getClientX() { - return details.getClientX(); + if (null != details) { + return details.getClientX(); + } else { + return -1; + } } /** * Returns the mouse position (y coordinate) when the click took place. * The position is relative to the browser client area. * - * @return The mouse cursor y position + * @return The mouse cursor y position or -1 if unknown */ public int getClientY() { - return details.getClientY(); + if (null != details) { + return details.getClientY(); + } else { + return -1; + } } /** @@ -360,7 +383,11 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, * component or -1 if no x coordinate available */ public int getRelativeX() { - return details.getRelativeX(); + if (null != details) { + return details.getRelativeX(); + } else { + return -1; + } } /** @@ -371,46 +398,67 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, * component or -1 if no y coordinate available */ public int getRelativeY() { - return details.getRelativeY(); + if (null != details) { + return details.getRelativeY(); + } else { + return -1; + } } /** * Checks if the Alt key was down when the mouse event took place. * * @return true if Alt was down when the event occured, false otherwise + * or if unknown */ public boolean isAltKey() { - return details.isAltKey(); + if (null != details) { + return details.isAltKey(); + } else { + return false; + } } /** * Checks if the Ctrl key was down when the mouse event took place. * * @return true if Ctrl was pressed when the event occured, false - * otherwise + * otherwise or if unknown */ public boolean isCtrlKey() { - return details.isCtrlKey(); + if (null != details) { + return details.isCtrlKey(); + } else { + return false; + } } /** * Checks if the Meta key was down when the mouse event took place. * * @return true if Meta was pressed when the event occured, false - * otherwise + * otherwise or if unknown */ public boolean isMetaKey() { - return details.isMetaKey(); + if (null != details) { + return details.isMetaKey(); + } else { + return false; + } } /** * Checks if the Shift key was down when the mouse event took place. * * @return true if Shift was pressed when the event occured, false - * otherwise + * otherwise or if unknown */ public boolean isShiftKey() { - return details.isShiftKey(); + if (null != details) { + return details.isShiftKey(); + } else { + return false; + } } } @@ -457,13 +505,25 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier, } /** - * Emits the options change event. + * Fires a click event to all listeners without any event details. + * + * In subclasses, override {@link #fireClick(MouseEventDetails)} instead of + * this method. */ protected void fireClick() { fireEvent(new Button.ClickEvent(this)); } - private void fireClick(MouseEventDetails details) { + /** + * Fires a click event to all listeners. + * + * @param details + * MouseEventDetails from which keyboard modifiers and other + * information about the mouse click can be obtained. If the + * button was clicked by a keyboard event, some of the fields may + * be empty/undefined. + */ + protected void fireClick(MouseEventDetails details) { fireEvent(new Button.ClickEvent(this, details)); } diff --git a/src/com/vaadin/ui/MenuBar.java b/src/com/vaadin/ui/MenuBar.java index d79e070fca..f8fbf91712 100644 --- a/src/com/vaadin/ui/MenuBar.java +++ b/src/com/vaadin/ui/MenuBar.java @@ -123,7 +123,12 @@ public class MenuBar extends AbstractComponent { if (description != null && description.length() > 0) { target.addAttribute("description", description); } - + if (item.isCheckable()) { + // if the "checked" attribute is present (either true or false), + // the item is checkable + target.addAttribute(VMenuBar.ATTRIBUTE_CHECKED, + item.isChecked()); + } if (item.hasChildren()) { for (MenuItem child : item.getChildren()) { paintItem(target, child); @@ -167,7 +172,12 @@ public class MenuBar extends AbstractComponent { // If we got the clicked item, launch the command. if (found && tmpItem.isEnabled()) { - tmpItem.getCommand().menuSelected(tmpItem); + if (tmpItem.isCheckable()) { + tmpItem.setChecked(!tmpItem.isChecked()); + } + if (null != tmpItem.getCommand()) { + tmpItem.getCommand().menuSelected(tmpItem); + } } }// if }// changeVariables @@ -431,6 +441,8 @@ public class MenuBar extends AbstractComponent { private boolean isSeparator = false; private String styleName; private String description; + private boolean checkable = false; + private boolean checked = false; /** * Constructs a new menu item that can optionally have an icon and a @@ -505,13 +517,19 @@ public class MenuBar extends AbstractComponent { * the icon for the menu item * @param command * the command for the menu item + * @throws IllegalStateException + * If the item is checkable and thus cannot have children. */ public MenuBar.MenuItem addItem(String caption, Resource icon, - MenuBar.Command command) { + MenuBar.Command command) throws IllegalStateException { if (isSeparator()) { throw new UnsupportedOperationException( "Cannot add items to a separator"); } + if (isCheckable()) { + throw new IllegalStateException( + "A checkable item cannot have children"); + } if (caption == null) { throw new IllegalArgumentException("Caption cannot be null"); } @@ -544,11 +562,16 @@ public class MenuBar extends AbstractComponent { * the command for the menu item * @param itemToAddBefore * the item that will be after the new item - * + * @throws IllegalStateException + * If the item is checkable and thus cannot have children. */ public MenuBar.MenuItem addItemBefore(String caption, Resource icon, - MenuBar.Command command, MenuBar.MenuItem itemToAddBefore) { - + MenuBar.Command command, MenuBar.MenuItem itemToAddBefore) + throws IllegalStateException { + if (isCheckable()) { + throw new IllegalStateException( + "A checkable item cannot have children"); + } MenuItem newItem = null; if (hasChildren() && itsChildren.contains(itemToAddBefore)) { @@ -814,6 +837,93 @@ public class MenuBar extends AbstractComponent { return description; } + /** + * Gets the checkable state of the item - whether the item has checked + * and unchecked states. If an item is checkable its checked state (as + * returned by {@link #isChecked()}) is indicated in the UI. + * + * <p> + * An item is not checkable by default. + * </p> + * + * @return true if the item is checkable, false otherwise + * @since 6.6.2 + */ + public boolean isCheckable() { + return checkable; + } + + /** + * Sets the checkable state of the item. If an item is checkable its + * checked state (as returned by {@link #isChecked()}) is indicated in + * the UI. + * + * <p> + * An item is not checkable by default. + * </p> + * + * <p> + * Items with sub items cannot be checkable. + * </p> + * + * @param checkable + * true if the item should be checkable, false otherwise + * @throws IllegalStateException + * If the item has children + * @since 6.6.2 + */ + public void setCheckable(boolean checkable) + throws IllegalStateException { + if (hasChildren()) { + throw new IllegalStateException( + "A menu item with children cannot be checkable"); + } + this.checkable = checkable; + requestRepaint(); + } + + /** + * Gets the checked state of the item (checked or unchecked). Only used + * if the item is checkable (as indicated by {@link #isCheckable()}). + * The checked state is indicated in the UI with the item, if the item + * is checkable. + * + * <p> + * An item is not checked by default. + * </p> + * + * <p> + * The CSS style corresponding to the checked state is "-checked". + * </p> + * + * @return true if the item is checked, false otherwise + * @since 6.6.2 + */ + public boolean isChecked() { + return checked; + } + + /** + * Sets the checked state of the item. Only used if the item is + * checkable (indicated by {@link #isCheckable()}). The checked state is + * indicated in the UI with the item, if the item is checkable. + * + * <p> + * An item is not checked by default. + * </p> + * + * <p> + * The CSS style corresponding to the checked state is "-checked". + * </p> + * + * @return true if the item is checked, false otherwise + * @since 6.6.2 + */ + public void setChecked(boolean checked) { + this.checked = checked; + requestRepaint(); + } + }// class MenuItem }// class MenuBar diff --git a/src/com/vaadin/ui/themes/BaseTheme.java b/src/com/vaadin/ui/themes/BaseTheme.java index babdb1f1d5..c8ba08d30d 100644 --- a/src/com/vaadin/ui/themes/BaseTheme.java +++ b/src/com/vaadin/ui/themes/BaseTheme.java @@ -44,12 +44,4 @@ public class BaseTheme { @Deprecated public static final String PANEL_LIGHT = "light"; - /** - * Adds connector lines between the tree nodes to better visualize the - * hierarchy. - * - * @since 6.6.1 - */ - public static final String TREE_CONNECTORS = "connectors"; - }
\ No newline at end of file diff --git a/tests/src/com/vaadin/tests/components/LongTooltip.html b/tests/src/com/vaadin/tests/components/LongTooltip.html new file mode 100644 index 0000000000..ac317380b8 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/LongTooltip.html @@ -0,0 +1,325 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<!--Lower-right--> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.LongTooltip?restartApplication</td> + <td></td> +</tr> +<!--Show tooltip, which should be on screen--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VTextField[0]</td> + <td>0,0</td> +</tr> +<!--Wait for tooltip to appear--> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-lower-right-1</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VTextField[0]</td> + <td>0,0</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-lower-right-2</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[3]/VTextField[0]</td> + <td>100,20</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-lower-right-3</td> +</tr> +<!--Upper-right--> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.LongTooltip?restartApplication</td> + <td></td> +</tr> +<!--Show tooltip, which should be on screen--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VTextField[0]</td> + <td>0,0</td> +</tr> +<!--Wait for tooltip to appear--> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-upper-right-1</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VTextField[0]</td> + <td>0,0</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-upper-right-2</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VTextField[0]</td> + <td>100,20</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-upper-right-3</td> +</tr> +<!--Lower-left--> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.LongTooltip?restartApplication</td> + <td></td> +</tr> +<!--Show tooltip, which should be on screen--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VTextField[0]</td> + <td>0,0</td> +</tr> +<!--Wait for tooltip to appear--> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-lower-left-1</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VTextField[0]</td> + <td>0,0</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-lower-left-2</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[2]/VTextField[0]</td> + <td>100,20</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-lower-left-3</td> +</tr> +<!--Upper-left--> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.LongTooltip?restartApplication</td> + <td></td> +</tr> +<!--Show tooltip, which should be on screen--> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VTextField[0]</td> + <td>0,0</td> +</tr> +<!--Wait for tooltip to appear--> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-upper-left-1</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VTextField[0]</td> + <td>0,0</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-upper-left-2</td> +</tr> +<!--Hide tooltip--> +<tr> + <td>mouseOut</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td>55,43</td> +</tr> +<!--Wait for tooltip to disappear. Cannot for some reason use waitForNotVisible--> +<tr> + <td>pause</td> + <td>500</td> + <td></td> +</tr> +<tr> + <td>showTooltip</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VTextField[0]</td> + <td>100,20</td> +</tr> +<tr> + <td>waitForVisible</td> + <td>vaadin=runcomvaadintestscomponentsLongTooltip::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>tooltip-upper-left-3</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/src/com/vaadin/tests/components/LongTooltip.java b/tests/src/com/vaadin/tests/components/LongTooltip.java new file mode 100644 index 0000000000..87adaa673b --- /dev/null +++ b/tests/src/com/vaadin/tests/components/LongTooltip.java @@ -0,0 +1,49 @@ +package com.vaadin.tests.components;
+
+import com.vaadin.tests.util.LoremIpsum;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.TextField;
+
+public class LongTooltip extends TestBase {
+
+ @Override
+ public void setup() {
+
+ GridLayout gl = new GridLayout(2, 2);
+ gl.setSizeFull();
+ TextField f1 = createField();
+ TextField f2 = createField();
+ TextField f3 = createField();
+ TextField f4 = createField();
+ gl.addComponent(f1);
+ gl.addComponent(f2);
+ gl.addComponent(f3);
+ gl.addComponent(f4);
+
+ gl.setComponentAlignment(f1, Alignment.TOP_LEFT);
+ gl.setComponentAlignment(f2, Alignment.TOP_RIGHT);
+ gl.setComponentAlignment(f3, Alignment.BOTTOM_LEFT);
+ gl.setComponentAlignment(f4, Alignment.BOTTOM_RIGHT);
+
+ getLayout().setSizeFull();
+ getLayout().addComponent(gl);
+
+ }
+
+ private TextField createField() {
+ final TextField field = new TextField();
+ field.setDescription(LoremIpsum.get(1000));
+ return field;
+ }
+
+ @Override
+ protected String getDescription() {
+ return "For a given cursor position the tooltip should always appear with the same size in the same position. The tooltip should also always be completely on screen and not cause any scrollbars to appear.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 7100;
+ }
+}
diff --git a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java b/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java index 48212b2fdc..387ec7857f 100644 --- a/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java +++ b/tests/src/com/vaadin/tests/components/accordion/AccordionInactiveTabSize.java @@ -21,7 +21,8 @@ public class AccordionInactiveTabSize extends TestBase { @Override protected void setup() { HorizontalSplitPanel sp = new HorizontalSplitPanel(); - sp.setSizeFull(); + sp.setWidth("100%"); + sp.setHeight("70px"); Accordion acc = new Accordion(); diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html index a398f7a17c..cab8bbc996 100644 --- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxDataSourceChange.html @@ -54,7 +54,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>combo should have ds1-3 text</td> + <td>combo-should-have-ds1-3-text</td> </tr> <tr> <td>click</td> diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html new file mode 100644 index 0000000000..ae0dfec828 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.html @@ -0,0 +1,85 @@ +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.combobox.ComboBoxUndefinedWidthAndIcon?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td> + <td>13,14</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td> + <td>32,5</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>item1-selected</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[2]</td> + <td>12,5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td>81,6</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>page2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td>78,6</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>page3</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td>78,6</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>page4</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item3</td> + <td>68,8</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>item33-selected</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[2]</td> + <td>8,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td>116,3</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxUndefinedWidthAndIcon::</td> + <td>338,241</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>item33-selected-after-popup-opened-and-closed</td> +</tr> diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java b/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java new file mode 100644 index 0000000000..fd5f7d47f8 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxUndefinedWidthAndIcon.java @@ -0,0 +1,36 @@ +package com.vaadin.tests.components.combobox;
+
+import com.vaadin.data.Item;
+import com.vaadin.terminal.Resource;
+import com.vaadin.terminal.ThemeResource;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.ComboBox;
+
+public class ComboBoxUndefinedWidthAndIcon extends TestBase {
+ @Override
+ protected void setup() {
+ ComboBox cb = new ComboBox();
+ cb.addContainerProperty("caption", String.class, null);
+ cb.addContainerProperty("icon", Resource.class, null);
+ for (int i = 1; i < 200 + 1; i++) {
+ Item item = cb.addItem(i);
+ item.getItemProperty("caption").setValue("Item " + i);
+ item.getItemProperty("icon").setValue(
+ new ThemeResource("../runo/icons/16/users.png"));
+ }
+ cb.setItemIconPropertyId("icon");
+ cb.setItemCaptionPropertyId("caption");
+
+ addComponent(cb);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "The width of the ComboBox should be fixed even though it is set to undefined width. The width should not change when changing pages in the dropdown.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 7013;
+ }
+}
diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html b/tests/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html new file mode 100644 index 0000000000..ebdfa81f20 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/menubar/MenuBarItemsCheckable.html @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>MenuBarItemsCheckable</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">MenuBarItemsCheckable</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.menubar.MenuBarTest?restartApplication</td> + <td></td> +</tr> +<!--Hide event log to be able to compare screenshots--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item1</td> + <td>30,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td> + <td>27,3</td> +</tr> +<!--Make some items checkable--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td> + <td>43,12</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item5</td> + <td>47,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item4</td> + <td>48,5</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item2</td> + <td>90,11</td> +</tr> +<!--Show icons on some items--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td> + <td>13,1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item5</td> + <td>47,3</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td> + <td>26,4</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item3</td> + <td>39,7</td> +</tr> +<!--Set width to 100%--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_Smenu#item0</td> + <td>23,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item2</td> + <td>36,6</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td> + <td>27,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[2]/VMenuBar[0]#item2</td> + <td>23,3</td> +</tr> +<!--Open sub menu 1--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_StestComponent#item0</td> + <td>51,10</td> +</tr> +<!--Open sub menu 1-1--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td> + <td>51,10</td> +</tr> +<tr> + <td>pause</td> + <td>3000</td> + <td></td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>submenu-1-1-checkable-items</td> +</tr> +<!--Select item--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[1]/VMenuBar[0]#item0</td> + <td>51,10</td> +</tr> +<!--Open sub menu 1--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::PID_StestComponent#item0</td> + <td>51,10</td> +</tr> +<!--Open sub menu 1-1--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentsmenubarMenuBarTest::Root/VOverlay[0]/VMenuBar[0]#item0</td> + <td>51,10</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>submenu-1-1-checked-items</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/src/com/vaadin/tests/components/menubar/MenuBarTest.java b/tests/src/com/vaadin/tests/components/menubar/MenuBarTest.java index 31121a8d37..e41652126d 100644 --- a/tests/src/com/vaadin/tests/components/menubar/MenuBarTest.java +++ b/tests/src/com/vaadin/tests/components/menubar/MenuBarTest.java @@ -24,6 +24,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { private Integer iconSize;
private Integer disabledDensity;
private Integer invisibleDensity;
+ private Integer checkableDensity;
@Override
protected Class<MenuBar> getTestClass() {
@@ -46,6 +47,7 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { createMenuIconsSizeSelect(CATEGORY_MENU_ITEM_STATES);
createMenuItemDisabledDensitySelect(CATEGORY_MENU_ITEM_STATES);
createMenuItemInvisibleDensitySelect(CATEGORY_MENU_ITEM_STATES);
+ createMenuItemCheckableDensitySelect(CATEGORY_MENU_ITEM_STATES);
}
@@ -125,6 +127,17 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { setMenuItemInvisibleDensity);
}
+ private void createMenuItemCheckableDensitySelect(String category) {
+ LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
+ options.put("No items checkable", null);
+ options.put("All checkable", 1);
+ options.put("Every second", 2);
+ options.put("Every third", 3);
+
+ createSelectAction("Checkable", category, options,
+ "No items checkable", setMenuItemCheckableDensity);
+ }
+
/* COMMANDS */
Command<MenuBar, Integer> createRootMenuItems = new Command<MenuBar, Integer>() {
@@ -181,6 +194,14 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { }
};
+ private Command<MenuBar, Integer> setMenuItemCheckableDensity = new Command<MenuBar, Integer>() {
+
+ public void execute(MenuBar c, Integer value, Object data) {
+ checkableDensity = value;
+ createRootItems(c);
+ }
+ };
+
private Command<MenuBar, Integer> setSubMenuSeparatorDensity = new Command<MenuBar, Integer>() {
public void execute(MenuBar c, Integer value, Object data) {
@@ -250,6 +271,11 @@ public class MenuBarTest extends AbstractComponentTest<MenuBar> { subMenuItem.setCommand(null);
createSubItems(subMenuItem, level + 1);
}
+
+ if (!subMenuItem.hasChildren() && level > 0
+ && checkableDensity != null && i % checkableDensity == 0) {
+ subMenuItem.setCheckable(true);
+ }
}
}
diff --git a/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html b/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html index edbdd72258..eb40765d03 100644 --- a/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html +++ b/tests/src/com/vaadin/tests/components/panel/PanelClickListenerRelativeCoordinates.html @@ -39,7 +39,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>click-287,25</td> + <td>click-287-25</td> </tr> <tr> <td>mouseClick</td> diff --git a/tests/src/com/vaadin/tests/components/panel/PanelTest.java b/tests/src/com/vaadin/tests/components/panel/PanelTest.java new file mode 100644 index 0000000000..29d93ce86c --- /dev/null +++ b/tests/src/com/vaadin/tests/components/panel/PanelTest.java @@ -0,0 +1,15 @@ +package com.vaadin.tests.components.panel; + +import com.vaadin.tests.components.AbstractComponentContainerTest; +import com.vaadin.ui.Panel; + +public class PanelTest<T extends Panel> extends + AbstractComponentContainerTest<T> { + + @SuppressWarnings("unchecked") + @Override + protected Class<T> getTestClass() { + return (Class<T>) Panel.class; + } + +} diff --git a/tests/src/com/vaadin/tests/components/slider/SliderTest.java b/tests/src/com/vaadin/tests/components/slider/SliderTest.java index 9b6d964f44..65a2fdd1b5 100644 --- a/tests/src/com/vaadin/tests/components/slider/SliderTest.java +++ b/tests/src/com/vaadin/tests/components/slider/SliderTest.java @@ -55,7 +55,7 @@ public class SliderTest extends AbstractFieldTest<Slider> { LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
options.put("Horizontal", Slider.ORIENTATION_HORIZONTAL);
options.put("Vertical", Slider.ORIENTATION_VERTICAL);
- createSelectAction("Resolution", category, options, "Horizontal",
+ createSelectAction("Orientation", category, options, "Horizontal",
orientationCommand);
}
diff --git a/tests/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html b/tests/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html new file mode 100644 index 0000000000..a363f6980e --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/TableRemoveActionHandlers.html @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.table.Tables?restartApplication</td> + <td></td> +</tr> +<!--5 items--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>25,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item5</td> + <td>50,2</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item1</td> + <td>86,10</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item5</td> + <td>53,6</td> +</tr> +<!--Item 1 context menu--> +<tr> + <td>contextmenu</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td></td> +</tr> +<!--Body context menu--> +<tr> + <td>contextmenu</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]</td> + <td></td> +</tr> +<!--Add context menu--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>21,8</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td> + <td>61,1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td> + <td>68,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item5</td> + <td>69,12</td> +</tr> +<!--Item 1 context menu--> +<tr> + <td>contextmenu</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertVisible</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td> + <td>Edit Item 1</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td> + <td>52,12</td> +</tr> +<!--Body context menu--> +<tr> + <td>contextmenu</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>assertVisible</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td> + <td>New...</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VContextMenu[0]#option0</td> + <td>35,12</td> +</tr> +<!--Remove context menu--> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_Smenu#item0</td> + <td>20,8</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[0]/VMenuBar[0]#item8</td> + <td>67,3</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[1]/VMenuBar[0]#item2</td> + <td>71,7</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableTables::Root/VOverlay[2]/VMenuBar[0]#item0</td> + <td>16,3</td> +</tr> +<!--Item 1 context menu--> +<tr> + <td>contextmenu</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[2]/domChild[0]</td> + <td></td> +</tr> +<tr> + <td>assertElementNotPresent</td> + <td>//div[@id='PID_VAADIN_CM']</td> + <td></td> +</tr> +<!--Body context menu--> +<tr> + <td>contextmenu</td> + <td>vaadin=runcomvaadintestscomponentstableTables::PID_StestComponent/domChild[1]</td> + <td></td> +</tr> +<tr> + <td>assertElementNotPresent</td> + <td>//div[@id='PID_VAADIN_CM']</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/src/com/vaadin/tests/components/tree/TreeWithConnectors.java b/tests/src/com/vaadin/tests/components/tree/TreeWithConnectors.java deleted file mode 100644 index 996b5aafc9..0000000000 --- a/tests/src/com/vaadin/tests/components/tree/TreeWithConnectors.java +++ /dev/null @@ -1,215 +0,0 @@ -package com.vaadin.tests.components.tree; - -import java.util.Collection; -import java.util.Date; - -import com.vaadin.data.Item; -import com.vaadin.data.util.HierarchicalContainer; -import com.vaadin.event.DataBoundTransferable; -import com.vaadin.event.Transferable; -import com.vaadin.event.dd.DragAndDropEvent; -import com.vaadin.event.dd.DropHandler; -import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; -import com.vaadin.terminal.ThemeResource; -import com.vaadin.terminal.gwt.client.ui.dd.VerticalDropLocation; -import com.vaadin.tests.components.TestBase; -import com.vaadin.ui.Panel; -import com.vaadin.ui.Tree; -import com.vaadin.ui.AbstractSelect.AcceptItem; -import com.vaadin.ui.Tree.TreeDragMode; -import com.vaadin.ui.Tree.TreeTargetDetails; -import com.vaadin.ui.themes.Reindeer; - -public class TreeWithConnectors extends TestBase { - - @Override - protected void setup() { - ThemeResource notCachedFileIcon = new ThemeResource( - "../runo/icons/16/document.png?" + new Date().getTime()); - ThemeResource notCachedFolderIconHuge = new ThemeResource( - "../runo/icons/64/folder.png?" + new Date().getTime()); - ThemeResource notCachedFolderIconLarge = new ThemeResource( - "../runo/icons/32/folder.png?" + new Date().getTime()); - ThemeResource notCachedFolderIconLargeOther = new ThemeResource( - "../runo/icons/32/ok.png?" + new Date().getTime()); - - Tree t = new Tree(); - t.setImmediate(true); - t.addStyleName(Reindeer.TREE_CONNECTORS); - - for (int i = 1; i <= 5; i++) { - String item = "Root " + i; - t.addItem(item); - if (i == 1) { - t.setItemIcon(item, notCachedFileIcon); - addChildren(t, item, true); - } else if (i == 2) { - t.setItemIcon(item, notCachedFolderIconHuge); - addChildren(t, item, false); - } else if (i == 3) { - t.setItemIcon(item, notCachedFolderIconLarge); - addChildren(t, item, true); - } else if (i == 4) { - t.setItemIcon(item, notCachedFolderIconLargeOther); - addChildren(t, item, false); - } else if (i == 5) { - addChildren(t, item, true); - } - } - - Panel p = new Panel(); - p.addComponent(t); - p.setSizeFull(); - getLayout().setSizeFull(); - - addComponent(p); - - addDnD(t); - } - - private void addDnD(final Tree t) { - t.setDragMode(TreeDragMode.NODE); - DropHandler itemSorter = new DropHandler() { - - @SuppressWarnings("unused") - private void populateSubTree(HierarchicalContainer idx, - HierarchicalContainer subtree, Object itemId) { - Collection<?> children = subtree.getChildren(itemId); - if (children != null) { - - for (Object childId : children) { - Item addItem = idx.addItem(childId); - if (addItem != null) { - // did not exist, populate properties - Item item = subtree.getItem(itemId); - Collection<?> itemPropertyIds = item - .getItemPropertyIds(); - for (Object propId : itemPropertyIds) { - addItem.getItemProperty(propId) - .setValue( - item.getItemProperty(propId) - .getValue()); - } - } - idx.setParent(childId, itemId); - populateSubTree(idx, subtree, childId); - } - } - - } - - @SuppressWarnings("unused") - private HierarchicalContainer getSubTree(HierarchicalContainer idx, - Object itemId) { - HierarchicalContainer hierarchicalContainer = new HierarchicalContainer(); - Collection<?> containerPropertyIds = idx - .getContainerPropertyIds(); - for (Object object : containerPropertyIds) { - hierarchicalContainer.addContainerProperty(object, idx - .getType(object), null); - } - hierarchicalContainer.addItem(itemId); - copyChildren(idx, hierarchicalContainer, itemId); - return hierarchicalContainer; - } - - private void copyChildren(HierarchicalContainer source, - HierarchicalContainer target, Object itemId) { - Collection<?> children = source.getChildren(itemId); - if (children != null) { - for (Object childId : children) { - Item item = source.getItem(childId); - Item addedItem = target.addItem(childId); - target.setParent(childId, itemId); - Collection<?> itemPropertyIds = item - .getItemPropertyIds(); - for (Object propertyId : itemPropertyIds) { - addedItem.getItemProperty(propertyId) - .setValue( - item.getItemProperty(propertyId) - .getValue()); - } - copyChildren(source, target, childId); - } - } - - } - - public void drop(DragAndDropEvent event) { - TreeTargetDetails details = (TreeTargetDetails) event - .getTargetDetails(); - // TODO set properties, so same sorter could be used in Table - Transferable transferable = event.getTransferable(); - if (transferable instanceof DataBoundTransferable) { - DataBoundTransferable transferrable2 = (DataBoundTransferable) transferable; - - Object itemId = transferrable2.getItemId(); - - Object itemIdOver = details.getItemIdOver(); - - // TODO could use the "folder" node id to make the drop - // logic simpler - Object itemIdInto = details.getItemIdInto(); - VerticalDropLocation dropLocation = details - .getDropLocation(); - - Object itemIdAfter = details.getItemIdAfter(); - - if (itemIdOver.equals(itemIdInto)) { // directly on a node - t.setParent(itemId, itemIdOver); - return; - } - - ((HierarchicalContainer) t.getContainerDataSource()) - .setParent(itemId, itemIdInto); - - if (dropLocation == null) { - System.err.println("No detail of drop place available"); - } - ((HierarchicalContainer) t.getContainerDataSource()) - .moveAfterSibling(itemId, itemIdAfter); - } - - return; - } - - public AcceptCriterion getAcceptCriterion() { - // TODO should actually check that source is same as target - return AcceptItem.ALL; - } - - }; - - t.setDropHandler(itemSorter); - } - - protected void addChildren(Tree t, String parent, boolean recurse) { - for (int i = 1; i <= Math.max(3, 3 + Math.random() * 2); i++) { - String item = parent + ", child " + i; - t.addItem(item); - t.setChildrenAllowed(parent, true); - t.setParent(item, parent); - if (recurse) { - if (i % 2 == 0) { - addChildren(t, item, false); - t.expandItem(parent); - } else { - t.setChildrenAllowed(item, false); - } - } else { - t.setChildrenAllowed(item, false); - } - } - } - - @Override - protected String getDescription() { - return "A tree using the 'connectors' stylename should have Windows-like dotted connector lines joining the different hierarchy levels."; - } - - @Override - protected Integer getTicketNumber() { - return 6745; - } - -}
\ No newline at end of file diff --git a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html b/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html index a8030a9604..c59e831582 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindowOrder.html @@ -29,7 +29,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>dialog1 should be on top</td> + <td>dialog1-should-be-on-top</td> </tr> <tr> <td>mouseClick</td> @@ -44,7 +44,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>dialog 3 modal</td> + <td>dialog-3-modal</td> </tr> <tr> <td>mouseClick</td> @@ -84,7 +84,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>window5closed window 5 modal</td> + <td>window5closed-window-5-modal</td> </tr> <tr> <td>mouseClick</td> @@ -129,7 +129,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>window2 on top of window1, others closed</td> + <td>window2-on-top-of-window1-others-closed</td> </tr> </tbody></table> diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html b/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html index 2109a53273..5cbd350174 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindows-runo.html @@ -54,7 +54,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>add+2 remove</td> + <td>add+2-remove</td> </tr> <tr> <td>click</td> @@ -79,7 +79,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>add-button only</td> + <td>add-button-only</td> </tr> </tbody></table> diff --git a/tests/src/com/vaadin/tests/components/window/SubWindows.html b/tests/src/com/vaadin/tests/components/window/SubWindows.html index 7279a10b9c..3b2109e3f1 100644 --- a/tests/src/com/vaadin/tests/components/window/SubWindows.html +++ b/tests/src/com/vaadin/tests/components/window/SubWindows.html @@ -54,7 +54,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>add+2 remove</td> + <td>add+2-remove</td> </tr> <tr> <td>click</td> @@ -79,7 +79,7 @@ <tr> <td>screenCapture</td> <td></td> - <td>add-button only</td> + <td>add-button-only</td> </tr> </tbody></table> diff --git a/tests/src/com/vaadin/tests/components/window/WindowCaptionTest.html b/tests/src/com/vaadin/tests/components/window/WindowCaptionTest.html new file mode 100644 index 0000000000..83889aedb8 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/window/WindowCaptionTest.html @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://arturwin.office.itmill.com:8888/" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.window.WindowTest?restartApplication</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td>Short</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_Smenu#item0</td> + <td>52,19</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::Root/VOverlay[0]/VMenuBar[0]#item1</td> + <td>85,4</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::Root/VOverlay[1]/VMenuBar[0]#item2</td> + <td>67,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::Root/VOverlay[2]/VMenuBar[0]#item2</td> + <td>23,11</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td>This is a semi-long text that might wrap.</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_Smenu#item0</td> + <td>52,19</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::Root/VOverlay[0]/VMenuBar[0]#item1</td> + <td>85,4</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::Root/VOverlay[1]/VMenuBar[0]#item2</td> + <td>67,9</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::Root/VOverlay[2]/VMenuBar[0]#item0</td> + <td>23,11</td> +</tr> +<tr> + <td>assertText</td> + <td>vaadin=runcomvaadintestscomponentswindowWindowTest::PID_StestComponent/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/src/com/vaadin/tests/components/window/WindowTest.java b/tests/src/com/vaadin/tests/components/window/WindowTest.java new file mode 100644 index 0000000000..ae3b0f22df --- /dev/null +++ b/tests/src/com/vaadin/tests/components/window/WindowTest.java @@ -0,0 +1,19 @@ +package com.vaadin.tests.components.window; + +import com.vaadin.tests.components.panel.PanelTest; +import com.vaadin.ui.Window; + +public class WindowTest extends PanelTest<Window> { + + @Override + protected Class<Window> getTestClass() { + return Window.class; + } + + @Override + protected void addTestComponent(Window c) { + getMainWindow().addWindow(c); + getTestComponents().add(c); + } + +} diff --git a/tests/src/com/vaadin/tests/server/container/TestHierarchicalContainer.java b/tests/src/com/vaadin/tests/server/container/TestHierarchicalContainer.java index 67ad4fe45f..5ca8194646 100644 --- a/tests/src/com/vaadin/tests/server/container/TestHierarchicalContainer.java +++ b/tests/src/com/vaadin/tests/server/container/TestHierarchicalContainer.java @@ -1,5 +1,7 @@ package com.vaadin.tests.server.container;
+import com.vaadin.data.Container.Filter;
+import com.vaadin.data.Item;
import com.vaadin.data.util.HierarchicalContainer;
public class TestHierarchicalContainer extends
@@ -29,6 +31,69 @@ public class TestHierarchicalContainer extends testContainerSortingAndFiltering(new HierarchicalContainer());
}
+ public void testRemovingItemsFromFilteredContainer() {
+ HierarchicalContainer container = new HierarchicalContainer();
+ initializeContainer(container);
+ container.setIncludeParentsWhenFiltering(true);
+ container.addContainerFilter(FULLY_QUALIFIED_NAME, "ab", false, false);
+ Object p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertEquals("com.vaadin.ui", p1);
+
+ container.removeItem("com.vaadin.ui.TabSheet");
+ // Parent for the removed item must be null because the item is no
+ // longer in the container
+ p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertNull("Parent should be null, is " + p1, p1);
+
+ container.removeAllItems();
+ p1 = container.getParent("com.vaadin.terminal.gwt.client.Focusable");
+ assertNull("Parent should be null, is " + p1, p1);
+
+ }
+
+ public void testParentWhenRemovingFilterFromContainer() {
+ HierarchicalContainer container = new HierarchicalContainer();
+ initializeContainer(container);
+ container.setIncludeParentsWhenFiltering(true);
+ container.addContainerFilter(FULLY_QUALIFIED_NAME, "ab", false, false);
+ Object p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertEquals("com.vaadin.ui", p1);
+ p1 = container
+ .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar");
+ assertNull(p1);
+ container.removeAllContainerFilters();
+ p1 = container
+ .getParent("com.vaadin.terminal.gwt.client.ui.VPopupCalendar");
+ assertEquals("com.vaadin.terminal.gwt.client.ui", p1);
+
+ }
+
+ public void testChangeParentInFilteredContainer() {
+ HierarchicalContainer container = new HierarchicalContainer();
+ initializeContainer(container);
+ container.setIncludeParentsWhenFiltering(true);
+ container.addContainerFilter(FULLY_QUALIFIED_NAME, "Tab", false, false);
+
+ // Change parent of filtered item
+ Object p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertEquals("com.vaadin.ui", p1);
+ container.setParent("com.vaadin.ui.TabSheet", "com.vaadin");
+ p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertEquals("com.vaadin", p1);
+ container.setParent("com.vaadin.ui.TabSheet", "com");
+ p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertEquals("com", p1);
+ container.setParent("com.vaadin.ui.TabSheet", null);
+ p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertNull(p1);
+
+ // root -> non-root
+ container.setParent("com.vaadin.ui.TabSheet", "com");
+ p1 = container.getParent("com.vaadin.ui.TabSheet");
+ assertEquals("com", p1);
+
+ }
+
public void testHierarchicalFilteringWithParents() {
HierarchicalContainer container = new HierarchicalContainer();
initializeContainer(container);
@@ -80,6 +145,55 @@ public class TestHierarchicalContainer extends }
+ public void testRemoveLastChild() {
+ HierarchicalContainer c = new HierarchicalContainer();
+
+ c.addItem("root");
+ assertEquals(false, c.hasChildren("root"));
+
+ c.addItem("child");
+ c.setParent("child", "root");
+ assertEquals(true, c.hasChildren("root"));
+
+ c.removeItem("child");
+ assertFalse(c.containsId("child"));
+ assertNull(c.getChildren("root"));
+ assertNull(c.getChildren("child"));
+ assertFalse(c.hasChildren("child"));
+ assertFalse(c.hasChildren("root"));
+ }
+
+ public void testRemoveLastChildFromFiltered() {
+ HierarchicalContainer c = new HierarchicalContainer();
+
+ c.addItem("root");
+ assertEquals(false, c.hasChildren("root"));
+
+ c.addItem("child");
+ c.setParent("child", "root");
+ assertEquals(true, c.hasChildren("root"));
+
+ // Dummy filter that does not remove any items
+ c.addContainerFilter(new Filter() {
+
+ public boolean passesFilter(Object itemId, Item item)
+ throws UnsupportedOperationException {
+ return true;
+ }
+
+ public boolean appliesToProperty(Object propertyId) {
+ return true;
+ }
+ });
+ c.removeItem("child");
+
+ assertFalse(c.containsId("child"));
+ assertNull(c.getChildren("root"));
+ assertNull(c.getChildren("child"));
+ assertFalse(c.hasChildren("child"));
+ assertFalse(c.hasChildren("root"));
+ }
+
public void testHierarchicalFilteringWithoutParents() {
HierarchicalContainer container = new HierarchicalContainer();
|
