diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-11-12 13:22:47 +0200 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-11-13 17:51:45 +0200 |
| commit | d67ed230968d89e980a1c00d4c99cca597a4c9ac (patch) | |
| tree | 5d06e1eba56f979b009d9f1906bfcac1b72ccfd6 | |
| parent | eebb1069afaa16a8b2395225f7506d59c868c13a (diff) | |
| download | vaadin-framework-d67ed230968d89e980a1c00d4c99cca597a4c9ac.tar.gz vaadin-framework-d67ed230968d89e980a1c00d4c99cca597a4c9ac.zip | |
Move widget classes from c.v.c.ui.<widget> to c.v.c.ui (#9392)
Change-Id: I5bc64ed7446ca6f87311bf63f49fb883cfd8b538
116 files changed, 1210 insertions, 721 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index 5475be4877..e35fd82424 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -75,9 +75,9 @@ import com.vaadin.client.metadata.TypeData; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.AbstractConnector; import com.vaadin.client.ui.VContextMenu; +import com.vaadin.client.ui.VNotification; +import com.vaadin.client.ui.VNotification.HideEvent; import com.vaadin.client.ui.dd.VDragAndDropManager; -import com.vaadin.client.ui.notification.VNotification; -import com.vaadin.client.ui.notification.VNotification.HideEvent; import com.vaadin.client.ui.ui.UIConnector; import com.vaadin.client.ui.window.WindowConnector; import com.vaadin.shared.ApplicationConstants; diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java index 15962fefa9..99f973c467 100644 --- a/client/src/com/vaadin/client/ComponentLocator.java +++ b/client/src/com/vaadin/client/ComponentLocator.java @@ -27,12 +27,12 @@ import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.csslayout.VCssLayout; -import com.vaadin.client.ui.gridlayout.VGridLayout; -import com.vaadin.client.ui.orderedlayout.VOrderedLayout; -import com.vaadin.client.ui.tabsheet.VTabsheetPanel; -import com.vaadin.client.ui.ui.VUI; -import com.vaadin.client.ui.window.VWindow; +import com.vaadin.client.ui.VCssLayout; +import com.vaadin.client.ui.VGridLayout; +import com.vaadin.client.ui.VOrderedLayout; +import com.vaadin.client.ui.VTabsheetPanel; +import com.vaadin.client.ui.VUI; +import com.vaadin.client.ui.VWindow; import com.vaadin.client.ui.window.WindowConnector; import com.vaadin.shared.ComponentState; import com.vaadin.shared.Connector; diff --git a/client/src/com/vaadin/client/LayoutManager.java b/client/src/com/vaadin/client/LayoutManager.java index 99f207edce..a3533bdd01 100644 --- a/client/src/com/vaadin/client/LayoutManager.java +++ b/client/src/com/vaadin/client/LayoutManager.java @@ -31,10 +31,10 @@ import com.vaadin.client.MeasuredSize.MeasureResult; import com.vaadin.client.ui.ManagedLayout; import com.vaadin.client.ui.PostLayoutListener; import com.vaadin.client.ui.SimpleManagedLayout; +import com.vaadin.client.ui.VNotification; import com.vaadin.client.ui.layout.ElementResizeEvent; import com.vaadin.client.ui.layout.ElementResizeListener; import com.vaadin.client.ui.layout.LayoutDependencyTree; -import com.vaadin.client.ui.notification.VNotification; public class LayoutManager { private static final String LOOP_ABORT_MESSAGE = "Aborting layout after 100 passes. This would probably be an infinite loop."; diff --git a/client/src/com/vaadin/client/SuperDevMode.java b/client/src/com/vaadin/client/SuperDevMode.java index 35f9e71df2..b8bf0f75c3 100644 --- a/client/src/com/vaadin/client/SuperDevMode.java +++ b/client/src/com/vaadin/client/SuperDevMode.java @@ -22,9 +22,9 @@ import com.google.gwt.jsonp.client.JsonpRequestBuilder; import com.google.gwt.storage.client.Storage; import com.google.gwt.user.client.Window.Location; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.vaadin.client.ui.notification.VNotification; -import com.vaadin.client.ui.notification.VNotification.EventListener; -import com.vaadin.client.ui.notification.VNotification.HideEvent; +import com.vaadin.client.ui.VNotification; +import com.vaadin.client.ui.VNotification.EventListener; +import com.vaadin.client.ui.VNotification.HideEvent; /** * Class that enables SuperDevMode using a ?superdevmode parameter in the url. diff --git a/client/src/com/vaadin/client/VDebugConsole.java b/client/src/com/vaadin/client/VDebugConsole.java index a436f6e648..67980cc5a3 100644 --- a/client/src/com/vaadin/client/VDebugConsole.java +++ b/client/src/com/vaadin/client/VDebugConsole.java @@ -68,8 +68,8 @@ import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.VLazyExecutor; +import com.vaadin.client.ui.VNotification; import com.vaadin.client.ui.VOverlay; -import com.vaadin.client.ui.notification.VNotification; import com.vaadin.client.ui.ui.UIConnector; import com.vaadin.client.ui.window.WindowConnector; import com.vaadin.shared.Version; diff --git a/client/src/com/vaadin/client/VUIDLBrowser.java b/client/src/com/vaadin/client/VUIDLBrowser.java index 6f393b0bb0..26c41eddf6 100644 --- a/client/src/com/vaadin/client/VUIDLBrowser.java +++ b/client/src/com/vaadin/client/VUIDLBrowser.java @@ -39,7 +39,7 @@ import com.google.gwt.json.client.JSONValue; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.UnknownComponentConnector; -import com.vaadin.client.ui.window.VWindow; +import com.vaadin.client.ui.VWindow; /** * TODO Rename to something more Vaadin7-ish? diff --git a/client/src/com/vaadin/client/ui/ShortcutActionHandler.java b/client/src/com/vaadin/client/ui/ShortcutActionHandler.java index cd14f14585..7165fd7490 100644 --- a/client/src/com/vaadin/client/ui/ShortcutActionHandler.java +++ b/client/src/com/vaadin/client/ui/ShortcutActionHandler.java @@ -33,7 +33,6 @@ import com.vaadin.client.ComponentConnector; import com.vaadin.client.ConnectorMap; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.richtextarea.VRichTextArea; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.ShortCutConstants; diff --git a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java b/client/src/com/vaadin/client/ui/VAbsoluteLayout.java index 0cfd4fb8e5..a177ca713f 100644 --- a/client/src/com/vaadin/client/ui/absolutelayout/VAbsoluteLayout.java +++ b/client/src/com/vaadin/client/ui/VAbsoluteLayout.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.absolutelayout; +package com.vaadin.client.ui; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Document; diff --git a/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java b/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java index bcb8809e90..9b1143ea46 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/VAbstractSplitPanel.java +++ b/client/src/com/vaadin/client/ui/VAbstractSplitPanel.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.splitpanel; +package com.vaadin.client.ui; import java.util.Collections; import java.util.List; @@ -44,10 +44,8 @@ import com.vaadin.client.LayoutManager; import com.vaadin.client.StyleConstants; import com.vaadin.client.Util; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.TouchScrollDelegate; import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler; -import com.vaadin.client.ui.VOverlay; -import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent; +import com.vaadin.client.ui.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent; import com.vaadin.shared.ui.Orientation; public class VAbstractSplitPanel extends ComplexPanel { @@ -70,7 +68,8 @@ public class VAbstractSplitPanel extends ComplexPanel { private final Element secondContainer = DOM.createDiv(); - final Element splitter = DOM.createDiv(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element splitter = DOM.createDiv(); private boolean resizing; @@ -88,20 +87,29 @@ public class VAbstractSplitPanel extends ComplexPanel { private boolean positionReversed = false; - List<String> componentStyleNames = Collections.emptyList(); + /** For internal use only. May be removed or replaced in the future. */ + public List<String> componentStyleNames = Collections.emptyList(); private Element draggingCurtain; - ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; - /* The current position of the split handle in either percentages or pixels */ - String position; + /** + * The current position of the split handle in either percentages or pixels + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public String position; - String maximumPosition; + /** For internal use only. May be removed or replaced in the future. */ + public String maximumPosition; - String minimumPosition; + /** For internal use only. May be removed or replaced in the future. */ + public String minimumPosition; private TouchScrollHandler touchScrollHandler; @@ -215,7 +223,8 @@ public class VAbstractSplitPanel extends ComplexPanel { return removed; } - void setLocked(boolean newValue) { + /** For internal use only. May be removed or replaced in the future. */ + public void setLocked(boolean newValue) { if (locked != newValue) { locked = newValue; splitterSize = -1; @@ -223,7 +232,8 @@ public class VAbstractSplitPanel extends ComplexPanel { } } - void setPositionReversed(boolean reversed) { + /** For internal use only. May be removed or replaced in the future. */ + public void setPositionReversed(boolean reversed) { if (positionReversed != reversed) { if (orientation == Orientation.HORIZONTAL) { DOM.setStyleAttribute(splitter, "right", ""); @@ -329,7 +339,7 @@ public class VAbstractSplitPanel extends ComplexPanel { return pos; } - void setSplitPosition(String pos) { + public void setSplitPosition(String pos) { if (pos == null) { return; } @@ -370,7 +380,8 @@ public class VAbstractSplitPanel extends ComplexPanel { } } - void updateSizes() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateSizes() { if (!isAttached()) { return; } @@ -479,7 +490,8 @@ public class VAbstractSplitPanel extends ComplexPanel { } } - void setFirstWidget(Widget w) { + /** For internal use only. May be removed or replaced in the future. */ + public void setFirstWidget(Widget w) { if (firstChild != null) { firstChild.removeFromParent(); } @@ -489,7 +501,8 @@ public class VAbstractSplitPanel extends ComplexPanel { firstChild = w; } - void setSecondWidget(Widget w) { + /** For internal use only. May be removed or replaced in the future. */ + public void setSecondWidget(Widget w) { if (secondChild != null) { secondChild.removeFromParent(); } @@ -675,7 +688,8 @@ public class VAbstractSplitPanel extends ComplexPanel { } } - String getSplitterPosition() { + /** For internal use only. May be removed or replaced in the future. */ + public String getSplitterPosition() { return position; } @@ -741,7 +755,8 @@ public class VAbstractSplitPanel extends ComplexPanel { return splitterSize; } - void setStylenames() { + /** For internal use only. May be removed or replaced in the future. */ + public void setStylenames() { final String splitterClass = CLASSNAME + (orientation == Orientation.HORIZONTAL ? "-hsplitter" : "-vsplitter"); @@ -772,8 +787,10 @@ public class VAbstractSplitPanel extends ComplexPanel { /** * Ensures the panels are scrollable eg. after style name changes + * <p> + * For internal use only. May be removed or replaced in the future. */ - void makeScrollable() { + public void makeScrollable() { if (touchScrollHandler == null) { touchScrollHandler = TouchScrollDelegate.enableTouchScrolling(this); } diff --git a/client/src/com/vaadin/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/client/ui/VAccordion.java index 70398c238f..6132fb0450 100644 --- a/client/src/com/vaadin/client/ui/accordion/VAccordion.java +++ b/client/src/com/vaadin/client/ui/VAccordion.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.accordion; +package com.vaadin.client.ui; import java.util.HashMap; import java.util.HashSet; @@ -32,9 +32,7 @@ import com.vaadin.client.ConnectorMap; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.VCaption; -import com.vaadin.client.ui.TouchScrollDelegate; import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler; -import com.vaadin.client.ui.tabsheet.VTabsheetBase; import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; public class VAccordion extends VTabsheetBase { @@ -43,11 +41,14 @@ public class VAccordion extends VTabsheetBase { private Set<Widget> widgets = new HashSet<Widget>(); - HashMap<StackItem, UIDL> lazyUpdateMap = new HashMap<StackItem, UIDL>(); + /** For internal use only. May be removed or replaced in the future. */ + public HashMap<StackItem, UIDL> lazyUpdateMap = new HashMap<StackItem, UIDL>(); - StackItem openTab = null; + /** For internal use only. May be removed or replaced in the future. */ + public StackItem openTab = null; - int selectedUIDLItemIndex = -1; + /** For internal use only. May be removed or replaced in the future. */ + public int selectedUIDLItemIndex = -1; private final TouchScrollHandler touchScrollHandler; @@ -57,7 +58,7 @@ public class VAccordion extends VTabsheetBase { } @Override - protected void renderTab(UIDL tabUidl, int index, boolean selected, + public void renderTab(UIDL tabUidl, int index, boolean selected, boolean hidden) { StackItem item; int itemIndex; @@ -171,7 +172,8 @@ public class VAccordion extends VTabsheetBase { return item; } - void open(int itemIndex) { + /** For internal use only. May be removed or replaced in the future. */ + public void open(int itemIndex) { StackItem item = (StackItem) getWidget(itemIndex); boolean alreadyOpen = false; if (openTab != null) { @@ -193,7 +195,8 @@ public class VAccordion extends VTabsheetBase { updateOpenTabSize(); } - void close(StackItem item) { + /** For internal use only. May be removed or replaced in the future. */ + public void close(StackItem item) { if (!item.isOpen()) { return; } @@ -227,9 +230,11 @@ public class VAccordion extends VTabsheetBase { } /** - * Sets the size of the open tab + * Sets the size of the open tab. + * <p> + * For internal use only. May be removed or replaced in the future. */ - void updateOpenTabSize() { + public void updateOpenTabSize() { if (openTab == null) { return; } @@ -297,7 +302,7 @@ public class VAccordion extends VTabsheetBase { * A StackItem has always two children, Child 0 is a VCaption, Child 1 is * the actual child widget. */ - protected class StackItem extends ComplexPanel implements ClickHandler { + public class StackItem extends ComplexPanel implements ClickHandler { public void setHeight(int height) { if (height == -1) { @@ -523,24 +528,24 @@ public class VAccordion extends VTabsheetBase { @Override @SuppressWarnings("unchecked") - protected Iterator<Widget> getWidgetIterator() { + public Iterator<Widget> getWidgetIterator() { return widgets.iterator(); } @Override - protected int getTabCount() { + public int getTabCount() { return getWidgetCount(); } @Override - protected void removeTab(int index) { + public void removeTab(int index) { StackItem item = getStackItem(index); remove(item); touchScrollHandler.removeElement(item.getContainerElement()); } @Override - protected ComponentConnector getTab(int index) { + public ComponentConnector getTab(int index) { if (index < getWidgetCount()) { StackItem stackItem = getStackItem(index); if (stackItem == null) { @@ -555,7 +560,8 @@ public class VAccordion extends VTabsheetBase { return null; } - StackItem getStackItem(int index) { + /** For internal use only. May be removed or replaced in the future. */ + public StackItem getStackItem(int index) { return (StackItem) getWidget(index); } diff --git a/client/src/com/vaadin/client/ui/audio/VAudio.java b/client/src/com/vaadin/client/ui/VAudio.java index 8b2a915bab..da3910e804 100644 --- a/client/src/com/vaadin/client/ui/audio/VAudio.java +++ b/client/src/com/vaadin/client/ui/VAudio.java @@ -14,11 +14,10 @@ * the License. */ -package com.vaadin.client.ui.audio; +package com.vaadin.client.ui; import com.google.gwt.dom.client.AudioElement; import com.google.gwt.dom.client.Document; -import com.vaadin.client.ui.VMediaBase; public class VAudio extends VMediaBase { private static String CLASSNAME = "v-audio"; diff --git a/client/src/com/vaadin/client/ui/browserframe/VBrowserFrame.java b/client/src/com/vaadin/client/ui/VBrowserFrame.java index aac8151d96..78bf55a0e6 100644 --- a/client/src/com/vaadin/client/ui/browserframe/VBrowserFrame.java +++ b/client/src/com/vaadin/client/ui/VBrowserFrame.java @@ -1,4 +1,4 @@ -package com.vaadin.client.ui.browserframe; +package com.vaadin.client.ui; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; diff --git a/client/src/com/vaadin/client/ui/button/VButton.java b/client/src/com/vaadin/client/ui/VButton.java index 52987b01c1..f896f16c83 100644 --- a/client/src/com/vaadin/client/ui/button/VButton.java +++ b/client/src/com/vaadin/client/ui/VButton.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.button; +package com.vaadin.client.ui; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Element; @@ -30,7 +30,6 @@ import com.google.gwt.user.client.ui.FocusWidget; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.Util; -import com.vaadin.client.ui.Icon; public class VButton extends FocusWidget implements ClickHandler { @@ -42,15 +41,20 @@ public class VButton extends FocusWidget implements ClickHandler { protected int mousedownX = 0; protected int mousedownY = 0; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected final Element wrapper = DOM.createSpan(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element wrapper = DOM.createSpan(); - protected Element errorIndicatorElement; + /** For internal use only. May be removed or replaced in the future. */ + public Element errorIndicatorElement; - protected final Element captionElement = DOM.createSpan(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element captionElement = DOM.createSpan(); - protected Icon icon; + /** For internal use only. May be removed or replaced in the future. */ + public Icon icon; /** * Helper flag to handle special-case where the button is moved from under @@ -86,7 +90,8 @@ public class VButton extends FocusWidget implements ClickHandler { private boolean disallowNextClick = false; private boolean isHovering; - protected int clickShortcut = 0; + /** For internal use only. May be removed or replaced in the future. */ + public int clickShortcut = 0; private HandlerRegistration focusHandlerRegistration; private HandlerRegistration blurHandlerRegistration; @@ -321,8 +326,10 @@ public class VButton extends FocusWidget implements ClickHandler { * <p> * To add custom code for a click event, override * {@link #onClick(ClickEvent)} instead of this. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected void onClick() { + public void onClick() { // Allow the click we're about to synthesize to pass through to the // superclass and containing elements. Element.dispatchEvent() is // synchronous, so we simply set and clear the flag within this method. diff --git a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java b/client/src/com/vaadin/client/ui/VCalendarPanel.java index 0d77b4d023..4e147b5346 100644 --- a/client/src/com/vaadin/client/ui/datefield/VCalendarPanel.java +++ b/client/src/com/vaadin/client/ui/VCalendarPanel.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.datefield; +package com.vaadin.client.ui; import java.util.Date; import java.util.Iterator; @@ -52,10 +52,6 @@ import com.vaadin.client.BrowserInfo; import com.vaadin.client.DateTimeService; import com.vaadin.client.Util; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.FocusableFlexTable; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.label.VLabel; -import com.vaadin.client.ui.nativeselect.VNativeSelect; import com.vaadin.shared.ui.datefield.Resolution; @SuppressWarnings("deprecation") diff --git a/client/src/com/vaadin/client/ui/checkbox/VCheckBox.java b/client/src/com/vaadin/client/ui/VCheckBox.java index e78251cbde..4688ee5547 100644 --- a/client/src/com/vaadin/client/ui/checkbox/VCheckBox.java +++ b/client/src/com/vaadin/client/ui/VCheckBox.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.checkbox; +package com.vaadin.client.ui; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; @@ -22,23 +22,26 @@ import com.google.gwt.user.client.Event; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Util; import com.vaadin.client.VTooltip; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.Icon; public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements Field { public static final String CLASSNAME = "v-checkbox"; - String id; + /** For internal use only. May be removed or replaced in the future. */ + public String id; - boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; - ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - Element errorIndicatorElement; + /** For internal use only. May be removed or replaced in the future. */ + public Element errorIndicatorElement; - Icon icon; + /** For internal use only. May be removed or replaced in the future. */ + public Icon icon; public VCheckBox() { setStyleName(CLASSNAME); diff --git a/client/src/com/vaadin/client/ui/csslayout/VCssLayout.java b/client/src/com/vaadin/client/ui/VCssLayout.java index 212a6307be..a11b2ffe11 100644 --- a/client/src/com/vaadin/client/ui/csslayout/VCssLayout.java +++ b/client/src/com/vaadin/client/ui/VCssLayout.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.csslayout; +package com.vaadin.client.ui; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Widget; @@ -38,12 +38,9 @@ public class VCssLayout extends FlowPanel { } /** - * Add or move a child in the - * - * @param child - * @param index + * For internal use only. May be removed or replaced in the future. */ - void addOrMove(Widget child, int index) { + public void addOrMove(Widget child, int index) { if (child.getParent() == this) { int currentIndex = getWidgetIndex(child); if (index == currentIndex) { diff --git a/client/src/com/vaadin/client/ui/customcomponent/VCustomComponent.java b/client/src/com/vaadin/client/ui/VCustomComponent.java index fa2d5c4fa1..cb9793c661 100644 --- a/client/src/com/vaadin/client/ui/customcomponent/VCustomComponent.java +++ b/client/src/com/vaadin/client/ui/VCustomComponent.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.customcomponent; +package com.vaadin.client.ui; import com.google.gwt.user.client.ui.SimplePanel; diff --git a/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java b/client/src/com/vaadin/client/ui/VCustomLayout.java index 803b266550..aae82556a4 100644 --- a/client/src/com/vaadin/client/ui/customlayout/VCustomLayout.java +++ b/client/src/com/vaadin/client/ui/VCustomLayout.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.customlayout; +package com.vaadin.client.ui; import java.util.HashMap; import java.util.Iterator; @@ -57,16 +57,22 @@ public class VCustomLayout extends ComplexPanel { /** Widget to captionwrapper map */ private final HashMap<Widget, VCaptionWrapper> childWidgetToCaptionWrapper = new HashMap<Widget, VCaptionWrapper>(); - /** Name of the currently rendered style */ - String currentTemplateName; - - /** Unexecuted scripts loaded from the template */ - String scripts = ""; + /** + * Unexecuted scripts loaded from the template. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public String scripts = ""; - /** Paintable ID of this paintable */ - String pid; + /** + * Paintable ID of this paintable. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public String pid; - ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; private boolean htmlInitialized = false; @@ -195,7 +201,8 @@ public class VCustomLayout extends ComplexPanel { return false; }-*/; - boolean hasTemplate() { + /** For internal use only. May be removed or replaced in the future. */ + public boolean hasTemplate() { return htmlInitialized; } @@ -215,8 +222,12 @@ public class VCustomLayout extends ComplexPanel { } } - /** Evaluate given script in browser document */ - static native void eval(String script) + /** + * Evaluate given script in browser document. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public static native void eval(String script) /*-{ try { if (script != null) @@ -396,17 +407,19 @@ public class VCustomLayout extends ComplexPanel { * JavaScript. This function tests if one exists (with name "iLayoutJS" in * layouts first DOM node) and runs et. Return value is used to determine if * children needs to be notified of size changes. - * + * <p> * Note! When implementing a JS layout function you most likely want to call * notifyChildrenOfSizeChange() function on your custom layouts main * element. That method is used to control whether child components layout * functions are to be run. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param el * @return true if layout function exists and was run successfully, else * false. */ - native boolean iLayoutJS(Element el) + public native boolean iLayoutJS(Element el) /*-{ if(el && el.iLayoutJS) { try { diff --git a/client/src/com/vaadin/client/ui/datefield/VDateField.java b/client/src/com/vaadin/client/ui/VDateField.java index 84fe061347..5c16f10db4 100644 --- a/client/src/com/vaadin/client/ui/datefield/VDateField.java +++ b/client/src/com/vaadin/client/ui/VDateField.java @@ -14,25 +14,27 @@ * the License. */ -package com.vaadin.client.ui.datefield; +package com.vaadin.client.ui; import java.util.Date; import com.google.gwt.user.client.ui.FlowPanel; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.DateTimeService; -import com.vaadin.client.ui.Field; import com.vaadin.shared.ui.datefield.Resolution; public class VDateField extends FlowPanel implements Field { public static final String CLASSNAME = "v-datefield"; - protected String paintableId; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; @Deprecated public static final Resolution RESOLUTION_YEAR = Resolution.YEAR; @@ -47,7 +49,8 @@ public class VDateField extends FlowPanel implements Field { @Deprecated public static final Resolution RESOLUTION_SEC = Resolution.SECOND; - static String resolutionToString(Resolution res) { + /** For internal use only. May be removed or replaced in the future. */ + public static String resolutionToString(Resolution res) { if (res.getCalendarField() > Resolution.DAY.getCalendarField()) { return "full"; } @@ -74,7 +77,8 @@ public class VDateField extends FlowPanel implements Field { */ private Date date = null; - protected DateTimeService dts; + /** For internal use only. May be removed or replaced in the future. */ + public DateTimeService dts; protected boolean showISOWeekNumbers = false; @@ -83,11 +87,13 @@ public class VDateField extends FlowPanel implements Field { dts = new DateTimeService(); } - /* + /** * We need this redundant native function because Java's Date object doesn't * have a setMilliseconds method. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected static native double getTime(int y, int m, int d, int h, int mi, + public static native double getTime(int y, int m, int d, int h, int mi, int s, int ms) /*-{ try { @@ -143,14 +149,26 @@ public class VDateField extends FlowPanel implements Field { return immediate; } + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + public boolean isReadonly() { return readonly; } + public void setReadonly(boolean readonly) { + this.readonly = readonly; + } + public boolean isEnabled() { return enabled; } + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } + public DateTimeService getDateTimeService() { return dts; } @@ -174,14 +192,20 @@ public class VDateField extends FlowPanel implements Field { return showISOWeekNumbers; } + public void setShowISOWeekNumbers(boolean showISOWeekNumbers) { + this.showISOWeekNumbers = showISOWeekNumbers; + } + /** * Returns a copy of the current date. Modifying the returned date will not * modify the value of this VDateField. Use {@link #setDate(Date)} to change * the current date. + * <p> + * For internal use only. May be removed or replaced in the future. * * @return A copy of the current date */ - protected Date getDate() { + public Date getDate() { Date current = getCurrentDate(); if (current == null) { return null; diff --git a/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java b/client/src/com/vaadin/client/ui/VDateFieldCalendar.java index 39972e7214..b7621f00f8 100644 --- a/client/src/com/vaadin/client/ui/datefield/VDateFieldCalendar.java +++ b/client/src/com/vaadin/client/ui/VDateFieldCalendar.java @@ -14,14 +14,14 @@ * the License. */ -package com.vaadin.client.ui.datefield; +package com.vaadin.client.ui; import java.util.Date; import com.google.gwt.event.dom.client.DomEvent; import com.vaadin.client.DateTimeService; -import com.vaadin.client.ui.datefield.VCalendarPanel.FocusOutListener; -import com.vaadin.client.ui.datefield.VCalendarPanel.SubmitListener; +import com.vaadin.client.ui.VCalendarPanel.FocusOutListener; +import com.vaadin.client.ui.VCalendarPanel.SubmitListener; import com.vaadin.shared.ui.datefield.Resolution; /** @@ -29,7 +29,8 @@ import com.vaadin.shared.ui.datefield.Resolution; */ public class VDateFieldCalendar extends VDateField { - protected final VCalendarPanel calendarPanel; + /** For internal use only. May be removed or replaced in the future. */ + public final VCalendarPanel calendarPanel; public VDateFieldCalendar() { super(); @@ -59,9 +60,12 @@ public class VDateFieldCalendar extends VDateField { /** * TODO refactor: almost same method as in VPopupCalendar.updateValue + * <p> + * For internal use only. May be removed or replaced in the future. */ + @SuppressWarnings("deprecation") - protected void updateValueFromPanel() { + public void updateValueFromPanel() { // If field is invisible at the beginning, client can still be null when // this function is called. diff --git a/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapper.java b/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java index e983015dfc..af728b3797 100644 --- a/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapper.java +++ b/client/src/com/vaadin/client/ui/VDragAndDropWrapper.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.draganddropwrapper; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.List; @@ -42,7 +42,6 @@ import com.vaadin.client.MouseEventDetailsBuilder; import com.vaadin.client.Util; import com.vaadin.client.VConsole; import com.vaadin.client.ValueMap; -import com.vaadin.client.ui.customcomponent.VCustomComponent; import com.vaadin.client.ui.dd.DDUtil; import com.vaadin.client.ui.dd.VAbstractDropHandler; import com.vaadin.client.ui.dd.VAcceptCallback; @@ -69,7 +68,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements private static final String CLASSNAME = "v-ddwrapper"; protected static final String DRAGGABLE = "draggable"; - boolean hasTooltip = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean hasTooltip = false; public VDragAndDropWrapper() { super(); @@ -140,18 +140,29 @@ public class VDragAndDropWrapper extends VCustomComponent implements protected final static int WRAPPER = 2; protected final static int HTML5 = 3; - protected int dragStartMode; + /** For internal use only. May be removed or replaced in the future. */ + public int dragStartMode; + + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; + + /** For internal use only. May be removed or replaced in the future. */ + public VAbstractDropHandler dropHandler; - ApplicationConnection client; - VAbstractDropHandler dropHandler; private VDragEvent vaadinDragEvent; int filecounter = 0; - Map<String, String> fileIdToReceiver; - ValueMap html5DataFlavors; + + /** For internal use only. May be removed or replaced in the future. */ + public Map<String, String> fileIdToReceiver; + + /** For internal use only. May be removed or replaced in the future. */ + public ValueMap html5DataFlavors; + private Element dragStartElement; - protected void initDragStartMode() { + /** For internal use only. May be removed or replaced in the future. */ + public void initDragStartMode() { Element div = getElement(); if (dragStartMode == HTML5) { if (dragStartElement == null) { @@ -192,7 +203,8 @@ public class VDragAndDropWrapper extends VCustomComponent implements }; private Timer dragleavetimer; - void startNextUpload() { + /** For internal use only. May be removed or replaced in the future. */ + public void startNextUpload() { Scheduler.get().scheduleDeferred(new Command() { @Override @@ -412,15 +424,11 @@ public class VDragAndDropWrapper extends VCustomComponent implements } - /** - * Currently supports only FF36 as no other browser supports natively File - * api. - * - * @param fileId - * @param data - */ - List<Integer> fileIds = new ArrayList<Integer>(); - List<VHtml5File> files = new ArrayList<VHtml5File>(); + /** For internal use only. May be removed or replaced in the future. */ + public List<Integer> fileIds = new ArrayList<Integer>(); + + /** For internal use only. May be removed or replaced in the future. */ + public List<VHtml5File> files = new ArrayList<VHtml5File>(); private void queueFilePost(final int fileId, final VHtml5File file) { fileIds.add(fileId); diff --git a/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java b/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java index b0323ab289..8dcd64a658 100644 --- a/client/src/com/vaadin/client/ui/draganddropwrapper/VDragAndDropWrapperIE.java +++ b/client/src/com/vaadin/client/ui/VDragAndDropWrapperIE.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.draganddropwrapper; +package com.vaadin.client.ui; import com.google.gwt.dom.client.AnchorElement; import com.google.gwt.dom.client.Document; diff --git a/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java index 31b240ad80..54498c432f 100644 --- a/client/src/com/vaadin/client/ui/combobox/VFilterSelect.java +++ b/client/src/com/vaadin/client/ui/VFilterSelect.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.combobox; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Collection; @@ -66,10 +66,6 @@ import com.vaadin.client.Focusable; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.VLazyExecutor; -import com.vaadin.client.ui.VOverlay; import com.vaadin.client.ui.menubar.MenuBar; import com.vaadin.client.ui.menubar.MenuItem; import com.vaadin.shared.ComponentState; @@ -183,7 +179,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, private static final int Z_INDEX = 30000; - protected final SuggestionMenu menu; + /** For internal use only. May be removed or replaced in the future. */ + public final SuggestionMenu menu; private final Element up = DOM.createDiv(); private final Element down = DOM.createDiv(); @@ -841,7 +838,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, return keyboardSelectedItem; } - protected void setKeyboardSelectedItem(MenuItem firstItem) { + public void setKeyboardSelectedItem(MenuItem firstItem) { keyboardSelectedItem = firstItem; } @@ -862,7 +859,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, public static final String CLASSNAME = "v-filterselect"; private static final String STYLE_NO_INPUT = "no-input"; - protected int pageLength = 10; + /** For internal use only. May be removed or replaced in the future. */ + public int pageLength = 10; private boolean enableDebug = false; @@ -870,8 +868,10 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, /** * The text box where the filter is written + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected final TextBox tb = new TextBox() { + public final TextBox tb = new TextBox() { // Overridden to avoid selecting text when text input is disabled @Override @@ -884,7 +884,8 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, }; }; - protected final SuggestionPopup suggestionPopup = new SuggestionPopup(); + /** For internal use only. May be removed or replaced in the future. */ + public final SuggestionPopup suggestionPopup = new SuggestionPopup(); /** * Used when measuring the width of the popup @@ -913,68 +914,113 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, private final Image selectedItemIcon = new Image(); - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected String paintableId; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; - protected int currentPage; + /** For internal use only. May be removed or replaced in the future. */ + public int currentPage; /** * A collection of available suggestions (options) as received from the * server. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected final List<FilterSelectSuggestion> currentSuggestions = new ArrayList<FilterSelectSuggestion>(); + public final List<FilterSelectSuggestion> currentSuggestions = new ArrayList<FilterSelectSuggestion>(); - protected boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; - protected String selectedOptionKey; + /** For internal use only. May be removed or replaced in the future. */ + public String selectedOptionKey; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean waitingForFilteringResponse = false; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean updateSelectionWhenReponseIsReceived = false; - protected boolean waitingForFilteringResponse = false; - protected boolean updateSelectionWhenReponseIsReceived = false; private boolean tabPressedWhenPopupOpen = false; - protected boolean initDone = false; - protected String lastFilter = ""; + /** For internal use only. May be removed or replaced in the future. */ + public boolean initDone = false; + + /** For internal use only. May be removed or replaced in the future. */ + public String lastFilter = ""; - protected enum Select { + /** For internal use only. May be removed or replaced in the future. */ + public enum Select { NONE, FIRST, LAST }; - protected Select selectPopupItemWhenResponseIsReceived = Select.NONE; + /** For internal use only. May be removed or replaced in the future. */ + public Select selectPopupItemWhenResponseIsReceived = Select.NONE; /** * The current suggestion selected from the dropdown. This is one of the * values in currentSuggestions except when filtering, in this case * currentSuggestion might not be in currentSuggestions. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected FilterSelectSuggestion currentSuggestion; + public FilterSelectSuggestion currentSuggestion; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean allowNewItem; + + /** For internal use only. May be removed or replaced in the future. */ + public int totalMatches; - protected int totalMatches; - protected boolean allowNewItem; - protected boolean nullSelectionAllowed; - protected boolean nullSelectItem; - protected boolean enabled; - protected boolean readonly; + /** For internal use only. May be removed or replaced in the future. */ + public boolean nullSelectionAllowed; - protected FilteringMode filteringmode = FilteringMode.OFF; + /** For internal use only. May be removed or replaced in the future. */ + public boolean nullSelectItem; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean enabled; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean readonly; + + /** For internal use only. May be removed or replaced in the future. */ + public FilteringMode filteringmode = FilteringMode.OFF; // shown in unfocused empty field, disappears on focus (e.g "Search here") private static final String CLASSNAME_PROMPT = "prompt"; - protected String inputPrompt = ""; - protected boolean prompting = false; - - // Set true when popupopened has been clicked. Cleared on each UIDL-update. - // This handles the special case where are not filtering yet and the - // selected value has changed on the server-side. See #2119 - protected boolean popupOpenerClicked; - protected int suggestionPopupMinWidth = 0; + + /** For internal use only. May be removed or replaced in the future. */ + public String inputPrompt = ""; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean prompting = false; + + /** + * Set true when popupopened has been clicked. Cleared on each UIDL-update. + * This handles the special case where are not filtering yet and the + * selected value has changed on the server-side. See #2119 + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public boolean popupOpenerClicked; + + /** For internal use only. May be removed or replaced in the future. */ + public int suggestionPopupMinWidth = 0; + private int popupWidth = -1; - /* + /** * Stores the last new item string to avoid double submissions. Cleared on - * uidl updates + * uidl updates. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected String lastNewItemString; - protected boolean focused = false; + public String lastNewItemString; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean focused = false; /** * If set to false, the component should not allow entering text to the @@ -1107,11 +1153,12 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, currentPage = page; } - protected void updateReadOnly() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateReadOnly() { tb.setReadOnly(readonly || !textInputEnabled); } - protected void setTextInputEnabled(boolean textInputEnabled) { + public void setTextInputEnabled(boolean textInputEnabled) { // Always update styles as they might have been overwritten if (textInputEnabled) { removeStyleDependentName(STYLE_NO_INPUT); @@ -1133,7 +1180,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * @param text * the text to set in the text box */ - protected void setTextboxText(final String text) { + public void setTextboxText(final String text) { tb.setText(text); } @@ -1141,7 +1188,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * Turns prompting on. When prompting is turned on a command prompt is shown * in the text box if nothing has been entered. */ - protected void setPromptingOn() { + public void setPromptingOn() { if (!prompting) { prompting = true; addStyleDependentName(CLASSNAME_PROMPT); @@ -1152,11 +1199,13 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, /** * Turns prompting off. When prompting is turned on a command prompt is * shown in the text box if nothing has been entered. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param text * The text the text box should contain. */ - protected void setPromptingOff(String text) { + public void setPromptingOff(String text) { setTextboxText(text); if (prompting) { prompting = false; @@ -1206,7 +1255,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, * @param iconUri * The URI of the icon */ - protected void setSelectedItemIcon(String iconUri) { + public void setSelectedItemIcon(String iconUri) { if (iconUri == null || iconUri.length() == 0) { if (selectedItemIcon.isAttached()) { panel.remove(selectedItemIcon); @@ -1501,9 +1550,11 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, } /** - * Calculate minimum width for FilterSelect textarea + * Calculate minimum width for FilterSelect textarea. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected native int minWidth(String captions) + public native int minWidth(String captions) /*-{ if(!captions || captions.length <= 0) return 0; @@ -1646,8 +1697,10 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, /** * Calculates the width of the select if the select has undefined width. * Should be called when the width changes or when the icon changes. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected void updateRootWidth() { + public void updateRootWidth() { ComponentConnector paintable = ConnectorMap.get(client).getConnector( this); if (paintable.isUndefinedWidth()) { diff --git a/client/src/com/vaadin/client/ui/gridlayout/VGridLayout.java b/client/src/com/vaadin/client/ui/VGridLayout.java index 770499e9b5..be8353ac6e 100644 --- a/client/src/com/vaadin/client/ui/gridlayout/VGridLayout.java +++ b/client/src/com/vaadin/client/ui/VGridLayout.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.gridlayout; +package com.vaadin.client.ui; import java.util.HashMap; import java.util.LinkedList; @@ -36,6 +36,7 @@ import com.vaadin.client.StyleConstants; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.VCaption; +import com.vaadin.client.ui.gridlayout.GridLayoutConnector; import com.vaadin.client.ui.layout.ComponentConnectorLayoutSlot; import com.vaadin.client.ui.layout.VLayoutSlot; import com.vaadin.shared.ui.AlignmentInfo; @@ -45,22 +46,30 @@ public class VGridLayout extends ComplexPanel { public static final String CLASSNAME = "v-gridlayout"; - ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - HashMap<Widget, Cell> widgetToCell = new HashMap<Widget, Cell>(); + /** For internal use only. May be removed or replaced in the future. */ + public HashMap<Widget, Cell> widgetToCell = new HashMap<Widget, Cell>(); - int[] columnWidths; - int[] rowHeights; + /** For internal use only. May be removed or replaced in the future. */ + public int[] columnWidths; - int[] colExpandRatioArray; + /** For internal use only. May be removed or replaced in the future. */ + public int[] rowHeights; - int[] rowExpandRatioArray; + /** For internal use only. May be removed or replaced in the future. */ + public int[] colExpandRatioArray; + + /** For internal use only. May be removed or replaced in the future. */ + public int[] rowExpandRatioArray; int[] minColumnWidths; private int[] minRowHeights; - DivElement spacingMeasureElement; + /** For internal use only. May be removed or replaced in the future. */ + public DivElement spacingMeasureElement; public VGridLayout() { super(); @@ -152,7 +161,8 @@ public class VGridLayout extends ComplexPanel { } } - void updateHeight() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateHeight() { // Detect minimum heights & calculate spans detectRowHeights(); @@ -163,7 +173,8 @@ public class VGridLayout extends ComplexPanel { layoutCellsVertically(); } - void updateWidth() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateWidth() { // Detect widths & calculate spans detectColWidths(); // Expand @@ -481,7 +492,8 @@ public class VGridLayout extends ComplexPanel { /** * Private helper class. */ - class Cell { + /** For internal use only. May be removed or replaced in the future. */ + public class Cell { public Cell(int row, int col) { this.row = row; this.col = col; @@ -566,7 +578,8 @@ public class VGridLayout extends ComplexPanel { private AlignmentInfo alignment; - ComponentConnectorLayoutSlot slot; + /** For internal use only. May be removed or replaced in the future. */ + public ComponentConnectorLayoutSlot slot; public void updateFromUidl(UIDL cellUidl) { // Set cell width @@ -619,19 +632,22 @@ public class VGridLayout extends ComplexPanel { } } - Cell getCell(int row, int col) { + /** For internal use only. May be removed or replaced in the future. */ + public Cell getCell(int row, int col) { return cells[col][row]; } /** * Creates a new Cell with the given coordinates. If an existing cell was * found, returns that one. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param row * @param col * @return */ - Cell createCell(int row, int col) { + public Cell createCell(int row, int col) { Cell cell = getCell(row, col); if (cell == null) { cell = new Cell(row, col); @@ -643,6 +659,8 @@ public class VGridLayout extends ComplexPanel { /** * Returns the deepest nested child component which contains "element". The * child component is also returned if "element" is part of its caption. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param element * An element that is a nested sub element of the root element in @@ -650,11 +668,12 @@ public class VGridLayout extends ComplexPanel { * @return The Paintable which the element is a part of. Null if the element * belongs to the layout and not to a child. */ - ComponentConnector getComponent(Element element) { + public ComponentConnector getComponent(Element element) { return Util.getConnectorForElement(client, this, element); } - void setCaption(Widget widget, VCaption caption) { + /** For internal use only. May be removed or replaced in the future. */ + public void setCaption(Widget widget, VCaption caption) { VLayoutSlot slot = widgetToCell.get(widget).slot; if (caption != null) { @@ -679,14 +698,16 @@ public class VGridLayout extends ComplexPanel { } } - void updateMarginStyleNames(MarginInfo marginInfo) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateMarginStyleNames(MarginInfo marginInfo) { togglePrefixedStyleName("margin-top", marginInfo.hasTop()); togglePrefixedStyleName("margin-right", marginInfo.hasRight()); togglePrefixedStyleName("margin-bottom", marginInfo.hasBottom()); togglePrefixedStyleName("margin-left", marginInfo.hasLeft()); } - void updateSpacingStyleName(boolean spacingEnabled) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateSpacingStyleName(boolean spacingEnabled) { String styleName = getStylePrimaryName(); if (spacingEnabled) { spacingMeasureElement.addClassName(styleName + "-spacing-on"); diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VHorizontalLayout.java b/client/src/com/vaadin/client/ui/VHorizontalLayout.java index b1ebebe1a9..53a933e374 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/VHorizontalLayout.java +++ b/client/src/com/vaadin/client/ui/VHorizontalLayout.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.orderedlayout; +package com.vaadin.client.ui; import com.vaadin.client.StyleConstants; diff --git a/client/src/com/vaadin/client/ui/image/VImage.java b/client/src/com/vaadin/client/ui/VImage.java index b05357b547..1b7da97a1c 100644 --- a/client/src/com/vaadin/client/ui/image/VImage.java +++ b/client/src/com/vaadin/client/ui/VImage.java @@ -1,4 +1,4 @@ -package com.vaadin.client.ui.image; +package com.vaadin.client.ui; import com.google.gwt.user.client.ui.Image; diff --git a/client/src/com/vaadin/client/ui/label/VLabel.java b/client/src/com/vaadin/client/ui/VLabel.java index 3874f2adf3..a0a6901502 100644 --- a/client/src/com/vaadin/client/ui/label/VLabel.java +++ b/client/src/com/vaadin/client/ui/VLabel.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.label; +package com.vaadin.client.ui; import com.google.gwt.dom.client.Style.Display; import com.google.gwt.user.client.Event; @@ -75,7 +75,8 @@ public class VLabel extends HTML { } } - void setConnection(ApplicationConnection client) { + /** For internal use only. May be removed or replaced in the future. */ + public void setConnection(ApplicationConnection client) { connection = client; } } diff --git a/client/src/com/vaadin/client/ui/link/VLink.java b/client/src/com/vaadin/client/ui/VLink.java index 54794ac0dc..a4a4e789d6 100644 --- a/client/src/com/vaadin/client/ui/link/VLink.java +++ b/client/src/com/vaadin/client/ui/VLink.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.link; +package com.vaadin.client.ui; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -25,7 +25,6 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HTML; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Util; -import com.vaadin.client.ui.Icon; import com.vaadin.shared.ui.BorderStyle; public class VLink extends HTML implements ClickHandler { @@ -41,27 +40,38 @@ public class VLink extends HTML implements ClickHandler { @Deprecated protected static final BorderStyle BORDER_STYLE_NONE = BorderStyle.NONE; - protected String src; + /** For internal use only. May be removed or replaced in the future. */ + public String src; - protected String target; + /** For internal use only. May be removed or replaced in the future. */ + public String target; - protected BorderStyle borderStyle = BorderStyle.DEFAULT; + /** For internal use only. May be removed or replaced in the future. */ + public BorderStyle borderStyle = BorderStyle.DEFAULT; - protected boolean enabled; + /** For internal use only. May be removed or replaced in the future. */ + public boolean enabled; - protected int targetWidth; + /** For internal use only. May be removed or replaced in the future. */ + public int targetWidth; - protected int targetHeight; + /** For internal use only. May be removed or replaced in the future. */ + public int targetHeight; - protected Element errorIndicatorElement; + /** For internal use only. May be removed or replaced in the future. */ + public Element errorIndicatorElement; - protected final Element anchor = DOM.createAnchor(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element anchor = DOM.createAnchor(); - protected final Element captionElement = DOM.createSpan(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element captionElement = DOM.createSpan(); - protected Icon icon; + /** For internal use only. May be removed or replaced in the future. */ + public Icon icon; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; public VLink() { super(); diff --git a/client/src/com/vaadin/client/ui/listselect/VListSelect.java b/client/src/com/vaadin/client/ui/VListSelect.java index d8d0a43378..e88e188f64 100644 --- a/client/src/com/vaadin/client/ui/listselect/VListSelect.java +++ b/client/src/com/vaadin/client/ui/VListSelect.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.listselect; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Iterator; @@ -22,7 +22,6 @@ import java.util.Iterator; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.user.client.ui.ListBox; import com.vaadin.client.UIDL; -import com.vaadin.client.ui.optiongroup.VOptionGroupBase; public class VListSelect extends VOptionGroupBase { @@ -65,7 +64,7 @@ public class VListSelect extends VOptionGroupBase { } @Override - protected void buildOptions(UIDL uidl) { + public void buildOptions(UIDL uidl) { select.setMultipleSelect(isMultiselect()); select.setEnabled(!isDisabled() && !isReadonly()); select.clear(); @@ -130,7 +129,7 @@ public class VListSelect extends VOptionGroupBase { } @Override - protected void setTabIndex(int tabIndex) { + public void setTabIndex(int tabIndex) { getOptionsContainer().setTabIndex(tabIndex); } diff --git a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/client/ui/VMenuBar.java index 1837cbc8f4..825d7e6f74 100644 --- a/client/src/com/vaadin/client/ui/menubar/VMenuBar.java +++ b/client/src/com/vaadin/client/ui/VMenuBar.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.menubar; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.List; @@ -48,11 +48,6 @@ import com.vaadin.client.LayoutManager; import com.vaadin.client.TooltipInfo; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.Icon; -import com.vaadin.client.ui.SimpleFocusablePanel; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.VLazyExecutor; -import com.vaadin.client.ui.VOverlay; import com.vaadin.shared.ui.menubar.MenuBarConstants; public class VMenuBar extends SimpleFocusablePanel implements @@ -66,19 +61,31 @@ public class VMenuBar extends SimpleFocusablePanel implements public static final String CLASSNAME = "v-menubar"; public static final String SUBMENU_CLASSNAME_PREFIX = "-submenu"; - /** For server connections **/ - protected String uidlId; - protected ApplicationConnection client; + /** + * For server connections. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public String uidlId; + + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected final VMenuBar hostReference = this; - protected CustomMenuItem moreItem = null; + /** For internal use only. May be removed or replaced in the future. */ + public final VMenuBar hostReference = this; - // Only used by the root menu bar - protected VMenuBar collapsedRootItems; + /** For internal use only. May be removed or replaced in the future. */ + public CustomMenuItem moreItem = null; - // Construct an empty command to be used when the item has no command - // associated - protected static final Command emptyCommand = null; + /** For internal use only. May be removed or replaced in the future. */ + public VMenuBar collapsedRootItems; + + /** + * An empty command to be used when the item has no command associated + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public static final Command emptyCommand = null; /** Widget fields **/ protected boolean subMenu; @@ -90,7 +97,8 @@ public class VMenuBar extends SimpleFocusablePanel implements protected VMenuBar parentMenu; protected CustomMenuItem selected; - boolean enabled = true; + /** For internal use only. May be removed or replaced in the future. */ + public boolean enabled = true; private VLazyExecutor iconLoadedExecutioner = new VLazyExecutor(100, new ScheduledCommand() { @@ -101,9 +109,11 @@ public class VMenuBar extends SimpleFocusablePanel implements } }); - boolean openRootOnHover; + /** For internal use only. May be removed or replaced in the future. */ + public boolean openRootOnHover; - boolean htmlContentAllowed; + /** For internal use only. May be removed or replaced in the future. */ + public boolean htmlContentAllowed; public VMenuBar() { // Create an empty horizontal menubar @@ -198,11 +208,10 @@ public class VMenuBar extends SimpleFocusablePanel implements /** * Build the HTML content for a menu item. - * - * @param item - * @return + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected String buildItemHTML(UIDL item) { + public String buildItemHTML(UIDL item) { // Construct html from the text and the optional icon StringBuffer itemHTML = new StringBuffer(); if (item.hasAttribute("separator")) { diff --git a/client/src/com/vaadin/client/ui/nativebutton/VNativeButton.java b/client/src/com/vaadin/client/ui/VNativeButton.java index 2b1ea563e3..f68326c5aa 100644 --- a/client/src/com/vaadin/client/ui/nativebutton/VNativeButton.java +++ b/client/src/com/vaadin/client/ui/VNativeButton.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.nativebutton; +package com.vaadin.client.ui; import com.google.gwt.dom.client.Element; import com.google.gwt.event.dom.client.ClickEvent; @@ -26,7 +26,6 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.MouseEventDetailsBuilder; import com.vaadin.client.Util; -import com.vaadin.client.ui.Icon; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.button.ButtonServerRpc; @@ -36,17 +35,23 @@ public class VNativeButton extends Button implements ClickHandler { protected String width = null; - protected String paintableId; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - ButtonServerRpc buttonRpcProxy; + /** For internal use only. May be removed or replaced in the future. */ + public ButtonServerRpc buttonRpcProxy; - protected Element errorIndicatorElement; + /** For internal use only. May be removed or replaced in the future. */ + public Element errorIndicatorElement; - protected final Element captionElement = DOM.createSpan(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element captionElement = DOM.createSpan(); - protected Icon icon; + /** For internal use only. May be removed or replaced in the future. */ + public Icon icon; /** * Helper flag to handle special-case where the button is moved from under @@ -55,7 +60,8 @@ public class VNativeButton extends Button implements ClickHandler { */ private boolean clickPending; - protected boolean disableOnClick = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean disableOnClick = false; public VNativeButton() { setStyleName(CLASSNAME); diff --git a/client/src/com/vaadin/client/ui/nativeselect/VNativeSelect.java b/client/src/com/vaadin/client/ui/VNativeSelect.java index 876bf27080..5a64c39f01 100644 --- a/client/src/com/vaadin/client/ui/nativeselect/VNativeSelect.java +++ b/client/src/com/vaadin/client/ui/VNativeSelect.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.nativeselect; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Iterator; @@ -22,8 +22,6 @@ import java.util.Iterator; import com.google.gwt.event.dom.client.ChangeEvent; import com.google.gwt.user.client.ui.ListBox; import com.vaadin.client.UIDL; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.optiongroup.VOptionGroupBase; public class VNativeSelect extends VOptionGroupBase implements Field { @@ -47,7 +45,7 @@ public class VNativeSelect extends VOptionGroupBase implements Field { } @Override - protected void buildOptions(UIDL uidl) { + public void buildOptions(UIDL uidl) { select.setEnabled(!isDisabled() && !isReadonly()); select.clear(); firstValueIsTemporaryNullItem = false; @@ -116,7 +114,7 @@ public class VNativeSelect extends VOptionGroupBase implements Field { } @Override - protected void setTabIndex(int tabIndex) { + public void setTabIndex(int tabIndex) { getOptionsContainer().setTabIndex(tabIndex); } diff --git a/client/src/com/vaadin/client/ui/notification/VNotification.java b/client/src/com/vaadin/client/ui/VNotification.java index 436712ac6f..16ae698cbe 100644 --- a/client/src/com/vaadin/client/ui/notification/VNotification.java +++ b/client/src/com/vaadin/client/ui/VNotification.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.notification; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Date; @@ -33,7 +33,6 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.VOverlay; import com.vaadin.shared.Position; import com.vaadin.shared.ui.ui.UIConstants; diff --git a/client/src/com/vaadin/client/ui/optiongroup/VOptionGroup.java b/client/src/com/vaadin/client/ui/VOptionGroup.java index 43bdee162d..b928956214 100644 --- a/client/src/com/vaadin/client/ui/optiongroup/VOptionGroup.java +++ b/client/src/com/vaadin/client/ui/VOptionGroup.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.optiongroup; +package com.vaadin.client.ui; import java.util.HashMap; import java.util.Iterator; @@ -40,8 +40,6 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.Icon; -import com.vaadin.client.ui.checkbox.VCheckBox; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; @@ -50,14 +48,19 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, public static final String CLASSNAME = "v-select-optiongroup"; - protected final Panel panel; + /** For internal use only. May be removed or replaced in the future. */ + public final Panel panel; private final Map<CheckBox, String> optionsToKeys; - protected boolean sendFocusEvents = false; - protected boolean sendBlurEvents = false; - protected List<HandlerRegistration> focusHandlers = null; - protected List<HandlerRegistration> blurHandlers = null; + /** For internal use only. May be removed or replaced in the future. */ + public boolean sendFocusEvents = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean sendBlurEvents = false; + /** For internal use only. May be removed or replaced in the future. */ + public List<HandlerRegistration> focusHandlers = null; + /** For internal use only. May be removed or replaced in the future. */ + public List<HandlerRegistration> blurHandlers = null; private final LoadHandler iconLoadHandler = new LoadHandler() { @Override @@ -75,7 +78,8 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, */ private boolean blurOccured = false; - protected boolean htmlContentAllowed = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean htmlContentAllowed = false; public VOptionGroup() { super(CLASSNAME); @@ -87,7 +91,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, * Return true if no elements were changed, false otherwise. */ @Override - protected void buildOptions(UIDL uidl) { + public void buildOptions(UIDL uidl) { panel.clear(); for (final Iterator<?> it = uidl.getChildIterator(); it.hasNext();) { final UIDL opUidl = (UIDL) it.next(); @@ -157,7 +161,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, } @Override - protected void setTabIndex(int tabIndex) { + public void setTabIndex(int tabIndex) { for (Iterator<Widget> iterator = panel.iterator(); iterator.hasNext();) { FocusWidget widget = (FocusWidget) iterator.next(); widget.setTabIndex(tabIndex); diff --git a/client/src/com/vaadin/client/ui/optiongroup/VOptionGroupBase.java b/client/src/com/vaadin/client/ui/VOptionGroupBase.java index 87f1cc53f0..d372f4caf8 100644 --- a/client/src/com/vaadin/client/ui/optiongroup/VOptionGroupBase.java +++ b/client/src/com/vaadin/client/ui/VOptionGroupBase.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.optiongroup; +package com.vaadin.client.ui; import java.util.Set; @@ -32,51 +32,65 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Focusable; import com.vaadin.client.UIDL; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.nativebutton.VNativeButton; -import com.vaadin.client.ui.textfield.VTextField; public abstract class VOptionGroupBase extends Composite implements Field, ClickHandler, ChangeHandler, KeyPressHandler, Focusable { public static final String CLASSNAME_OPTION = "v-select-option"; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected String paintableId; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; - protected Set<String> selectedKeys; + /** For internal use only. May be removed or replaced in the future. */ + public Set<String> selectedKeys; - protected boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; - protected boolean multiselect; + /** For internal use only. May be removed or replaced in the future. */ + public boolean multiselect; - protected boolean disabled; + /** For internal use only. May be removed or replaced in the future. */ + public boolean disabled; - protected boolean readonly; + /** For internal use only. May be removed or replaced in the future. */ + public boolean readonly; - protected int cols = 0; + /** For internal use only. May be removed or replaced in the future. */ + public int cols = 0; - protected int rows = 0; + /** For internal use only. May be removed or replaced in the future. */ + public int rows = 0; - protected boolean nullSelectionAllowed = true; + /** For internal use only. May be removed or replaced in the future. */ + public boolean nullSelectionAllowed = true; - protected boolean nullSelectionItemAvailable = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean nullSelectionItemAvailable = false; /** * Widget holding the different options (e.g. ListBox or Panel for radio * buttons) (optional, fallbacks to container Panel) + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected Widget optionsContainer; + public Widget optionsContainer; /** - * Panel containing the component + * Panel containing the component. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected final Panel container; + public final Panel container; - protected VTextField newItemField; + /** For internal use only. May be removed or replaced in the future. */ + public VTextField newItemField; - protected VNativeButton newItemButton; + /** For internal use only. May be removed or replaced in the future. */ + public VNativeButton newItemButton; public VOptionGroupBase(String classname) { container = new FlowPanel(); @@ -122,21 +136,24 @@ public abstract class VOptionGroupBase extends Composite implements Field, } /** + * For internal use only. May be removed or replaced in the future. + * * @return "cols" specified in uidl, 0 if not specified */ - protected int getColumns() { + public int getColumns() { return cols; } /** + * For internal use only. May be removed or replaced in the future. + * * @return "rows" specified in uidl, 0 if not specified */ - - protected int getRows() { + public int getRows() { return rows; } - abstract protected void setTabIndex(int tabIndex); + public abstract void setTabIndex(int tabIndex); @Override public void onClick(ClickEvent event) { @@ -167,7 +184,8 @@ public abstract class VOptionGroupBase extends Composite implements Field, } } - protected abstract void buildOptions(UIDL uidl); + /** For internal use only. May be removed or replaced in the future. */ + public abstract void buildOptions(UIDL uidl); protected abstract String[] getSelectedItems(); diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java b/client/src/com/vaadin/client/ui/VOrderedLayout.java index ad1d83795e..bbcb2f85a4 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/VOrderedLayout.java +++ b/client/src/com/vaadin/client/ui/VOrderedLayout.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.orderedlayout; +package com.vaadin.client.ui; import java.util.HashMap; import java.util.List; @@ -47,7 +47,8 @@ public class VOrderedLayout extends FlowPanel { protected boolean spacing = false; - protected boolean vertical = true; + /** For internal use only. May be removed or replaced in the future. */ + public boolean vertical = true; protected boolean definedHeight = false; @@ -63,12 +64,12 @@ public class VOrderedLayout extends FlowPanel { /** * Add or move a slot to another index. - * + * <p> + * For internal use only. May be removed or replaced in the future. * <p> * You should note that the index does not refer to the DOM index if * spacings are used. If spacings are used then the index will be adjusted * to include the spacings when inserted. - * </p> * <p> * For instance when using spacing the index converts to DOM index in the * following way: @@ -89,7 +90,7 @@ public class VOrderedLayout extends FlowPanel { * @param index * The index where the slot should be placed. */ - void addOrMoveSlot(Slot slot, int index) { + public void addOrMoveSlot(Slot slot, int index) { if (slot.getParent() == this) { int currentIndex = getWidgetIndex(slot); if (index == currentIndex) { @@ -443,7 +444,7 @@ public class VOrderedLayout extends FlowPanel { if (spacing && spacer == null) { spacer = DOM.createDiv(); spacer.addClassName("v-spacing"); - + /* * This has to be done here for the initial render. In other * cases where the spacer already exists onAttach will handle @@ -678,7 +679,7 @@ public class VOrderedLayout extends FlowPanel { */ private boolean relativeWidth = false; - protected void setRelativeWidth(boolean relativeWidth) { + public void setRelativeWidth(boolean relativeWidth) { this.relativeWidth = relativeWidth; updateRelativeSize(relativeWidth, "width"); } @@ -692,7 +693,7 @@ public class VOrderedLayout extends FlowPanel { */ private boolean relativeHeight = false; - protected void setRelativeHeight(boolean relativeHeight) { + public void setRelativeHeight(boolean relativeHeight) { this.relativeHeight = relativeHeight; updateRelativeSize(relativeHeight, "height"); } @@ -850,14 +851,16 @@ public class VOrderedLayout extends FlowPanel { } /** - * Deducts the caption position by examining the wrapping element + * Deducts the caption position by examining the wrapping element. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param captionWrap * The wrapping element * * @return The caption position */ - CaptionPosition getCaptionPositionFromElement(Element captionWrap) { + public CaptionPosition getCaptionPositionFromElement(Element captionWrap) { RegExp captionPositionRegexp = RegExp.compile("v-caption-on-(\\S+)"); // Get caption position from the classname @@ -874,11 +877,13 @@ public class VOrderedLayout extends FlowPanel { /** * Update the offset off the caption relative to the slot + * <p> + * For internal use only. May be removed or replaced in the future. * * @param caption * The caption element */ - void updateCaptionOffset(Element caption) { + public void updateCaptionOffset(Element caption) { Element captionWrap = caption.getParentElement().cast(); @@ -1004,9 +1009,11 @@ public class VOrderedLayout extends FlowPanel { } /** - * Removes elements used to expand a slot + * Removes elements used to expand a slot. + * <p> + * For internal use only. May be removed or replaced in the future. */ - void clearExpand() { + public void clearExpand() { if (expandWrapper != null) { for (; expandWrapper.getChildCount() > 0;) { Element el = expandWrapper.getChild(0).cast(); diff --git a/client/src/com/vaadin/client/ui/panel/VPanel.java b/client/src/com/vaadin/client/ui/VPanel.java index 91fdf74aa7..b4927d2052 100644 --- a/client/src/com/vaadin/client/ui/panel/VPanel.java +++ b/client/src/com/vaadin/client/ui/VPanel.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.panel; +package com.vaadin.client.ui; import com.google.gwt.dom.client.DivElement; import com.google.gwt.dom.client.Document; @@ -24,10 +24,7 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.SimplePanel; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Focusable; -import com.vaadin.client.ui.Icon; -import com.vaadin.client.ui.ShortcutActionHandler; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; -import com.vaadin.client.ui.TouchScrollDelegate; import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler; public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, @@ -35,27 +32,35 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, public static final String CLASSNAME = "v-panel"; - ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - String id; + /** For internal use only. May be removed or replaced in the future. */ + public String id; - final Element captionNode = DOM.createDiv(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element captionNode = DOM.createDiv(); private final Element captionText = DOM.createSpan(); private Icon icon; - final Element bottomDecoration = DOM.createDiv(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element bottomDecoration = DOM.createDiv(); - final Element contentNode = DOM.createDiv(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element contentNode = DOM.createDiv(); private Element errorIndicatorElement; - ShortcutActionHandler shortcutHandler; + /** For internal use only. May be removed or replaced in the future. */ + public ShortcutActionHandler shortcutHandler; - int scrollTop; + /** For internal use only. May be removed or replaced in the future. */ + public int scrollTop; - int scrollLeft; + /** For internal use only. May be removed or replaced in the future. */ + public int scrollLeft; private TouchScrollHandler touchScrollHandler; @@ -123,11 +128,13 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, return contentNode; } - void setCaption(String text) { + /** For internal use only. May be removed or replaced in the future. */ + public void setCaption(String text) { DOM.setInnerHTML(captionText, text); } - void setErrorIndicatorVisible(boolean showError) { + /** For internal use only. May be removed or replaced in the future. */ + public void setErrorIndicatorVisible(boolean showError) { if (showError) { if (errorIndicatorElement == null) { errorIndicatorElement = DOM.createSpan(); @@ -143,7 +150,8 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, } } - void setIconUri(String iconUri, ApplicationConnection client) { + /** For internal use only. May be removed or replaced in the future. */ + public void setIconUri(String iconUri, ApplicationConnection client) { if (iconUri == null) { if (icon != null) { DOM.removeChild(captionNode, icon.getElement()); @@ -189,9 +197,11 @@ public class VPanel extends SimplePanel implements ShortcutActionHandlerOwner, } /** - * Ensures the panel is scrollable eg. after style name changes + * Ensures the panel is scrollable eg. after style name changes. + * <p> + * For internal use only. May be removed or replaced in the future. */ - void makeScrollable() { + public void makeScrollable() { if (touchScrollHandler == null) { touchScrollHandler = TouchScrollDelegate.enableTouchScrolling(this); } diff --git a/client/src/com/vaadin/client/ui/passwordfield/VPasswordField.java b/client/src/com/vaadin/client/ui/VPasswordField.java index 4713bc20d8..de27ef1732 100644 --- a/client/src/com/vaadin/client/ui/passwordfield/VPasswordField.java +++ b/client/src/com/vaadin/client/ui/VPasswordField.java @@ -14,10 +14,9 @@ * the License. */ -package com.vaadin.client.ui.passwordfield; +package com.vaadin.client.ui; import com.google.gwt.user.client.DOM; -import com.vaadin.client.ui.textfield.VTextField; /** * This class represents a password field. diff --git a/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java b/client/src/com/vaadin/client/ui/VPopupCalendar.java index 05f1d004f8..941978d129 100644 --- a/client/src/com/vaadin/client/ui/datefield/VPopupCalendar.java +++ b/client/src/com/vaadin/client/ui/VPopupCalendar.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.datefield; +package com.vaadin.client.ui; import java.util.Date; @@ -35,11 +35,8 @@ import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.PopupPanel.PositionCallback; import com.vaadin.client.BrowserInfo; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.VOverlay; -import com.vaadin.client.ui.datefield.VCalendarPanel.FocusOutListener; -import com.vaadin.client.ui.datefield.VCalendarPanel.SubmitListener; +import com.vaadin.client.ui.VCalendarPanel.FocusOutListener; +import com.vaadin.client.ui.VCalendarPanel.SubmitListener; import com.vaadin.shared.ui.datefield.Resolution; /** @@ -55,13 +52,19 @@ import com.vaadin.shared.ui.datefield.Resolution; public class VPopupCalendar extends VTextualDate implements Field, ClickHandler, CloseHandler<PopupPanel>, SubPartAware { - protected final Button calendarToggle = new Button(); + /** For internal use only. May be removed or replaced in the future. */ + public final Button calendarToggle = new Button(); - protected VCalendarPanel calendar; + /** For internal use only. May be removed or replaced in the future. */ + public VCalendarPanel calendar; + + /** For internal use only. May be removed or replaced in the future. */ + public final VOverlay popup; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean parsable = true; - protected final VOverlay popup; private boolean open = false; - protected boolean parsable = true; public VPopupCalendar() { super(); @@ -116,7 +119,7 @@ public class VPopupCalendar extends VTextualDate implements Field, } @SuppressWarnings("deprecation") - protected void updateValue(Date newDate) { + public void updateValue(Date newDate) { Date currentDate = getCurrentDate(); if (currentDate == null || newDate.getTime() != currentDate.getTime()) { setCurrentDate((Date) newDate.clone()); @@ -317,13 +320,13 @@ public class VPopupCalendar extends VTextualDate implements Field, calendar.setFocus(focus); } - /* - * (non-Javadoc) + /** + * For internal use only. May be removed or replaced in the future. * * @see com.vaadin.client.ui.VTextualDate#buildDate() */ @Override - protected void buildDate() { + public void buildDate() { // Save previous value String previousValue = getText(); super.buildDate(); diff --git a/client/src/com/vaadin/client/ui/popupview/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java index e8bc19038d..4e0a9bcf98 100644 --- a/client/src/com/vaadin/client/ui/popupview/VPopupView.java +++ b/client/src/com/vaadin/client/ui/VPopupView.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.popupview; +package com.vaadin.client.ui; import java.util.HashSet; import java.util.Iterator; @@ -37,22 +37,37 @@ import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.ApplicationConnection; import com.vaadin.client.ComponentConnector; import com.vaadin.client.VCaptionWrapper; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.ShortcutActionHandler; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; -import com.vaadin.client.ui.VOverlay; -import com.vaadin.client.ui.richtextarea.VRichTextArea; +import com.vaadin.client.ui.popupview.VisibilityChangeEvent; +import com.vaadin.client.ui.popupview.VisibilityChangeHandler; public class VPopupView extends HTML { public static final String CLASSNAME = "v-popupview"; - /** This variable helps to communicate popup visibility to the server */ - boolean hostPopupVisible; + /** + * For server-client communication. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public String uidlId; + + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - final CustomPopup popup; + /** + * Helps to communicate popup visibility to the server. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public boolean hostPopupVisible; + + /** For internal use only. May be removed or replaced in the future. */ + public final CustomPopup popup; private final Label loading = new Label(); /** @@ -88,8 +103,8 @@ public class VPopupView extends HTML { popup.setAnimationEnabled(true); } - - void preparePopup(final CustomPopup popup) { + /** For internal use only. May be removed or replaced in the future. */ + public void preparePopup(final CustomPopup popup) { popup.setVisible(false); popup.show(); } @@ -105,13 +120,14 @@ public class VPopupView extends HTML { * * @param popup */ - protected void showPopup(final CustomPopup popup) { + public void showPopup(final CustomPopup popup) { popup.setPopupPosition(0, 0); popup.setVisible(true); } - void center() { + /** For internal use only. May be removed or replaced in the future. */ + public void center() { int windowTop = RootPanel.get().getAbsoluteTop(); int windowLeft = RootPanel.get().getAbsoluteLeft(); int windowRight = windowLeft + RootPanel.get().getOffsetWidth(); @@ -167,16 +183,20 @@ public class VPopupView extends HTML { }-*/; /** - * This class is only protected to enable overriding showPopup, and is + * This class is only public to enable overriding showPopup, and is * currently not intended to be extended or otherwise used directly. Its API * (other than it being a VOverlay) is to be considered private and * potentially subject to change. */ - protected class CustomPopup extends VOverlay { + public class CustomPopup extends VOverlay { private ComponentConnector popupComponentConnector = null; - Widget popupComponentWidget = null; - VCaptionWrapper captionWrapper = null; + + /** For internal use only. May be removed or replaced in the future. */ + public Widget popupComponentWidget = null; + + /** For internal use only. May be removed or replaced in the future. */ + public VCaptionWrapper captionWrapper = null; private boolean hasHadMouseOver = false; private boolean hideOnMouseOut = true; diff --git a/client/src/com/vaadin/client/ui/progressindicator/VProgressIndicator.java b/client/src/com/vaadin/client/ui/VProgressIndicator.java index ef3be0320a..0428104219 100644 --- a/client/src/com/vaadin/client/ui/progressindicator/VProgressIndicator.java +++ b/client/src/com/vaadin/client/ui/VProgressIndicator.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.progressindicator; +package com.vaadin.client.ui; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.DOM; diff --git a/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java b/client/src/com/vaadin/client/ui/VRichTextArea.java index ed5d48aaca..2576d02566 100644 --- a/client/src/com/vaadin/client/ui/richtextarea/VRichTextArea.java +++ b/client/src/com/vaadin/client/ui/VRichTextArea.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.richtextarea; +package com.vaadin.client.ui; import com.google.gwt.core.client.Scheduler; import com.google.gwt.event.dom.client.BlurEvent; @@ -40,10 +40,7 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.ConnectorMap; import com.vaadin.client.Util; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.ShortcutActionHandler; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; -import com.vaadin.client.ui.TouchScrollDelegate; /** * This class implements a basic client side rich text editor component. @@ -59,17 +56,22 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, */ public static final String CLASSNAME = "v-richtextarea"; - protected String id; + /** For internal use only. May be removed or replaced in the future. */ + public String id; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - boolean immediate = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate = false; - RichTextArea rta; + /** For internal use only. May be removed or replaced in the future. */ + public RichTextArea rta; private VRichTextToolbar formatter; - HTML html = new HTML(); + /** For internal use only. May be removed or replaced in the future. */ + public HTML html = new HTML(); private final FlowPanel fp = new FlowPanel(); @@ -78,15 +80,18 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, private int extraHorizontalPixels = -1; private int extraVerticalPixels = -1; - int maxLength = -1; + /** For internal use only. May be removed or replaced in the future. */ + public int maxLength = -1; private int toolbarNaturalWidth = 500; - HandlerRegistration keyPressHandler; + /** For internal use only. May be removed or replaced in the future. */ + public HandlerRegistration keyPressHandler; private ShortcutActionHandlerOwner hasShortcutActionHandler; - String currentValue = ""; + /** For internal use only. May be removed or replaced in the future. */ + public String currentValue = ""; private boolean readOnly = false; @@ -137,7 +142,8 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, } } - void selectAll() { + /** For internal use only. May be removed or replaced in the future. */ + public void selectAll() { /* * There is a timing issue if trying to select all immediately on first * render. Simple deferred command is not enough. Using Timer with @@ -159,7 +165,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler, }.schedule(320); } - void setReadOnly(boolean b) { + public void setReadOnly(boolean b) { if (isReadOnly() != b) { swapEditableArea(); readOnly = b; diff --git a/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java b/client/src/com/vaadin/client/ui/VRichTextToolbar.java index 840fb3b309..4d002e923c 100644 --- a/client/src/com/vaadin/client/ui/richtextarea/VRichTextToolbar.java +++ b/client/src/com/vaadin/client/ui/VRichTextToolbar.java @@ -28,7 +28,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.richtextarea; +package com.vaadin.client.ui; import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ChangeEvent; diff --git a/client/src/com/vaadin/client/ui/table/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java index 066c60a2ce..2af58d8578 100644 --- a/client/src/com/vaadin/client/ui/table/VScrollTable.java +++ b/client/src/com/vaadin/client/ui/VScrollTable.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.table; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Collection; @@ -84,11 +84,7 @@ import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.VConsole; import com.vaadin.client.VTooltip; -import com.vaadin.client.ui.Action; -import com.vaadin.client.ui.ActionOwner; -import com.vaadin.client.ui.FocusableScrollPanel; -import com.vaadin.client.ui.TouchScrollDelegate; -import com.vaadin.client.ui.TreeAction; +import com.vaadin.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow; import com.vaadin.client.ui.dd.DDUtil; import com.vaadin.client.ui.dd.VAbstractDropHandler; import com.vaadin.client.ui.dd.VAcceptCallback; @@ -97,9 +93,6 @@ import com.vaadin.client.ui.dd.VDragEvent; import com.vaadin.client.ui.dd.VHasDropHandler; import com.vaadin.client.ui.dd.VTransferable; import com.vaadin.client.ui.embedded.VEmbedded; -import com.vaadin.client.ui.label.VLabel; -import com.vaadin.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow; -import com.vaadin.client.ui.textfield.VTextField; import com.vaadin.shared.ComponentState; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; @@ -184,14 +177,19 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private int pageLength = 15; private int lastRequestedFirstvisible = 0; // to detect "serverside scroll" - protected boolean showRowHeaders = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean showRowHeaders = false; private String[] columnOrder; protected ApplicationConnection client; - protected String paintableId; - boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; + private boolean nullSelectionAllowed = true; private SelectMode selectMode = SelectMode.NONE; @@ -207,26 +205,37 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /* * These are used when jumping between pages when pressing Home and End */ - boolean selectLastItemInNextRender = false; - boolean selectFirstItemInNextRender = false; - boolean focusFirstItemInNextRender = false; - boolean focusLastItemInNextRender = false; - /* - * The currently focused row + /** For internal use only. May be removed or replaced in the future. */ + public boolean selectLastItemInNextRender = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean selectFirstItemInNextRender = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean focusFirstItemInNextRender = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean focusLastItemInNextRender = false; + + /** + * The currently focused row. + * <p> + * For internal use only. May be removed or replaced in the future. */ - VScrollTableRow focusedRow; + public VScrollTableRow focusedRow; - /* + /** * Helper to store selection range start in when using the keyboard + * <p> + * For internal use only. May be removed or replaced in the future. */ - VScrollTableRow selectionRangeStart; + public VScrollTableRow selectionRangeStart; - /* + /** * Flag for notifying when the selection has changed and should be sent to * the server + * <p> + * For internal use only. May be removed or replaced in the future. */ - boolean selectionChanged = false; + public boolean selectionChanged = false; /* * The speed (in pixels) which the scrolling scrolls vertically/horizontally @@ -235,7 +244,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private Timer scrollingVelocityTimer = null; - String[] bodyActionKeys; + /** For internal use only. May be removed or replaced in the future. */ + public String[] bodyActionKeys; private boolean enableDebug = false; @@ -330,18 +340,25 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private final HashSet<SelectionRange> selectedRowRanges = new HashSet<SelectionRange>(); - boolean initializedAndAttached = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean initializedAndAttached = false; /** * Flag to indicate if a column width recalculation is needed due update. + * <p> + * For internal use only. May be removed or replaced in the future. */ - boolean headerChangedDuringUpdate = false; + public boolean headerChangedDuringUpdate = false; - protected final TableHead tHead = new TableHead(); + /** For internal use only. May be removed or replaced in the future. */ + public final TableHead tHead = new TableHead(); - final TableFooter tFoot = new TableFooter(); + /** For internal use only. May be removed or replaced in the future. */ + public final TableFooter tFoot = new TableFooter(); - final FocusableScrollPanel scrollBodyPanel = new FocusableScrollPanel(true); + /** For internal use only. May be removed or replaced in the future. */ + public final FocusableScrollPanel scrollBodyPanel = new FocusableScrollPanel( + true); private KeyPressHandler navKeyPressHandler = new KeyPressHandler() { @@ -434,12 +451,18 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } }; - int totalRows; + + /** For internal use only. May be removed or replaced in the future. */ + public int totalRows; private Set<String> collapsedColumns; - final RowRequestHandler rowRequestHandler; - VScrollTableBody scrollBody; + /** For internal use only. May be removed or replaced in the future. */ + public final RowRequestHandler rowRequestHandler; + + /** For internal use only. May be removed or replaced in the future. */ + public VScrollTableBody scrollBody; + private int firstvisible = 0; private boolean sortAscending; private String sortColumn; @@ -454,29 +477,43 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private String[] visibleColOrder; private boolean initialContentReceived = false; private Element scrollPositionElement; - boolean enabled; - boolean showColHeaders; - boolean showColFooters; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean enabled; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean showColHeaders; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean showColFooters; /** flag to indicate that table body has changed */ private boolean isNewBody = true; - /* + /** * Read from the "recalcWidths" -attribute. When it is true, the table will * recalculate the widths for columns - desirable in some cases. For #1983, * marked experimental. + * <p> + * For internal use only. May be removed or replaced in the future. */ - boolean recalcWidths = false; + public boolean recalcWidths = false; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean rendering = false; - boolean rendering = false; private boolean hasFocus = false; private int dragmode; private int multiselectmode; - int tabIndex; + + /** For internal use only. May be removed or replaced in the future. */ + public int tabIndex; + private TouchScrollDelegate touchScrollDelegate; - int lastRenderedHeight; + /** For internal use only. May be removed or replaced in the future. */ + public int lastRenderedHeight; /** * Values (serverCacheFirst+serverCacheLast) sent by server that tells which @@ -489,29 +526,35 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * If the server side cache contains additional rows with e.g. buttons, * scrolling in the client will cause empty buttons to be rendered * (cached=true request for non-existing components) + * + * For internal use only. May be removed or replaced in the future. */ - int serverCacheFirst = -1; - int serverCacheLast = -1; + public int serverCacheFirst = -1; + public int serverCacheLast = -1; - boolean sizeNeedsInit = true; + /** For internal use only. May be removed or replaced in the future. */ + public boolean sizeNeedsInit = true; /** * Used to recall the position of an open context menu if we need to close * and reopen it during a row update. + * <p> + * For internal use only. May be removed or replaced in the future. */ - class ContextMenuDetails { - String rowKey; - int left; - int top; + public class ContextMenuDetails { + public String rowKey; + public int left; + public int top; - ContextMenuDetails(String rowKey, int left, int top) { + public ContextMenuDetails(String rowKey, int left, int top) { this.rowKey = rowKey; this.left = left; this.top = top; } } - protected ContextMenuDetails contextMenu = null; + /** For internal use only. May be removed or replaced in the future. */ + public ContextMenuDetails contextMenu = null; public VScrollTable() { setMultiSelectMode(MULTISELECT_MODE_DEFAULT); @@ -914,7 +957,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return KeyCodes.KEY_END; } - void initializeRows(UIDL uidl, UIDL rowData) { + /** For internal use only. May be removed or replaced in the future. */ + public void initializeRows(UIDL uidl, UIDL rowData) { if (scrollBody != null) { scrollBody.removeFromParent(); } @@ -934,7 +978,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, scrollBody.restoreRowVisibility(); } - void updateColumnProperties(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateColumnProperties(UIDL uidl) { updateColumnOrder(uidl); updateCollapsedColumns(uidl); @@ -973,7 +1018,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - boolean selectSelectedRows(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public boolean selectSelectedRows(UIDL uidl) { boolean keyboardSelectionOverRowFetchInProgress = false; if (uidl.hasVariable("selected")) { @@ -1010,7 +1056,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return keyboardSelectionOverRowFetchInProgress; } - void updateSortingProperties(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateSortingProperties(UIDL uidl) { oldSortColumn = sortColumn; if (uidl.hasVariable("sortascending")) { sortAscending = uidl.getBooleanVariable("sortascending"); @@ -1018,7 +1065,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - void resizeSortedColumnForSortIndicator() { + /** For internal use only. May be removed or replaced in the future. */ + public void resizeSortedColumnForSortIndicator() { // Force recalculation of the captionContainer element inside the header // cell to accomodate for the size of the sort arrow. HeaderCell sortedHeader = tHead.getHeaderCell(sortColumn); @@ -1033,7 +1081,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - void updateFirstVisibleAndScrollIfNeeded(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateFirstVisibleAndScrollIfNeeded(UIDL uidl) { firstvisible = uidl.hasVariable("firstvisible") ? uidl .getIntVariable("firstvisible") : 0; if (firstvisible != lastRequestedFirstvisible && scrollBody != null) { @@ -1048,7 +1097,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return (int) (rowIx * scrollBody.getRowHeight()); } - void updatePageLength(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updatePageLength(UIDL uidl) { int oldPageLength = pageLength; if (uidl.hasAttribute("pagelength")) { pageLength = uidl.getIntAttribute("pagelength"); @@ -1063,7 +1113,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - void updateSelectionProperties(UIDL uidl, ComponentState state, + /** For internal use only. May be removed or replaced in the future. */ + public void updateSelectionProperties(UIDL uidl, ComponentState state, boolean readOnly) { setMultiSelectMode(uidl.hasAttribute("multiselectmode") ? uidl .getIntAttribute("multiselectmode") : MULTISELECT_MODE_DEFAULT); @@ -1084,7 +1135,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - void updateDragMode(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateDragMode(UIDL uidl) { dragmode = uidl.hasAttribute("dragmode") ? uidl .getIntAttribute("dragmode") : 0; if (BrowserInfo.get().isIE()) { @@ -1097,7 +1149,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - protected void updateTotalRows(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateTotalRows(UIDL uidl) { int newTotalRows = uidl.getIntAttribute("totalrows"); if (newTotalRows != getTotalRows()) { if (scrollBody != null) { @@ -1121,7 +1174,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return totalRows; } - void focusRowFromBody() { + /** For internal use only. May be removed or replaced in the future. */ + public void focusRowFromBody() { if (selectedRowKeys.size() == 1) { // try to focus a row currently selected and in viewport String selectedRowKey = selectedRowKeys.iterator().next(); @@ -1145,11 +1199,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** * Selects the last row visible in the table + * <p> + * For internal use only. May be removed or replaced in the future. * * @param focusOnly * Should the focus only be moved to the last row */ - void selectLastRenderedRowInViewPort(boolean focusOnly) { + public void selectLastRenderedRowInViewPort(boolean focusOnly) { int index = firstRowInViewPort + getFullyVisibleRowCount(); VScrollTableRow lastRowInViewport = scrollBody.getRowByRowIndex(index); if (lastRowInViewport == null) { @@ -1170,11 +1226,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** * Selects the first row visible in the table + * <p> + * For internal use only. May be removed or replaced in the future. * * @param focusOnly * Should the focus only be moved to the first row */ - void selectFirstRenderedRowInViewPort(boolean focusOnly) { + public void selectFirstRenderedRowInViewPort(boolean focusOnly) { int index = firstRowInViewPort; VScrollTableRow firstInViewport = scrollBody.getRowByRowIndex(index); if (firstInViewport == null) { @@ -1188,7 +1246,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - void setCacheRateFromUIDL(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void setCacheRateFromUIDL(UIDL uidl) { setCacheRate(uidl.hasAttribute("cr") ? uidl.getDoubleAttribute("cr") : CACHE_RATE_DEFAULT); } @@ -1200,7 +1259,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - void updateActionMap(UIDL mainUidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateActionMap(UIDL mainUidl) { UIDL actionsUidl = mainUidl.getChildByTagName("actions"); if (actionsUidl == null) { return; @@ -1295,6 +1355,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } /** + * For internal use only. May be removed or replaced in the future. + * * @param uidl * which contains row data * @param firstRow @@ -1302,7 +1364,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * @param reqRows * amount of rows in data set */ - void updateBody(UIDL uidl, int firstRow, int reqRows) { + public void updateBody(UIDL uidl, int firstRow, int reqRows) { if (uidl == null || reqRows < 1) { // container is empty, remove possibly existing rows if (firstRow <= 0) { @@ -1319,7 +1381,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, discardRowsOutsideCacheWindow(); } - void updateRowsInBody(UIDL partialRowUpdates) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateRowsInBody(UIDL partialRowUpdates) { if (partialRowUpdates == null) { return; } @@ -1404,11 +1467,13 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** * Inserts rows in the table body or removes them from the table body based * on the commands in the UIDL. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param partialRowAdditions * the UIDL containing row updates. */ - protected void addAndRemoveRows(UIDL partialRowAdditions) { + public void addAndRemoveRows(UIDL partialRowAdditions) { if (partialRowAdditions == null) { return; } @@ -1480,7 +1545,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } - protected boolean isSelectable() { + /** For internal use only. May be removed or replaced in the future. */ + public boolean isSelectable() { return selectMode.getId() > SelectMode.NONE.getId(); } @@ -1685,8 +1751,10 @@ public class VScrollTable extends FlowPanel implements HasWidgets, * * Sets proper width and height * * * Makes deferred request to get some cache rows + * + * For internal use only. May be removed or replaced in the future. */ - void sizeInit() { + public void sizeInit() { sizeNeedsInit = false; scrollBody.setContainerHeight(); @@ -1997,19 +2065,22 @@ public class VScrollTable extends FlowPanel implements HasWidgets, style.setDisplay(Display.BLOCK); } - void hideScrollPositionAnnotation() { + /** For internal use only. May be removed or replaced in the future. */ + public void hideScrollPositionAnnotation() { if (scrollPositionElement != null) { DOM.setStyleAttribute(scrollPositionElement, "display", "none"); } } - boolean isScrollPositionVisible() { + /** For internal use only. May be removed or replaced in the future. */ + public boolean isScrollPositionVisible() { return scrollPositionElement != null && !scrollPositionElement.getStyle().getDisplay() .equals(Display.NONE.toString()); } - class RowRequestHandler extends Timer { + /** For internal use only. May be removed or replaced in the future. */ + public class RowRequestHandler extends Timer { private int reqFirstRow = 0; private int reqRows = 0; @@ -5841,7 +5912,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } - void updateWidth() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateWidth() { if (!isVisible()) { /* * Do not update size when the table is hidden as all column widths @@ -6090,9 +6162,14 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private int contentAreaBorderHeight = -1; private int scrollLeft; private int scrollTop; - VScrollTableDropHandler dropHandler; + + /** For internal use only. May be removed or replaced in the future. */ + public VScrollTableDropHandler dropHandler; + private boolean navKeyDown; - boolean multiselectPending; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean multiselectPending; /** * @return border top + border bottom of the scrollable area of table @@ -6125,7 +6202,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, super.setHeight(height); } - void updateHeight() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateHeight() { setContainerHeight(); if (initializedAndAttached) { @@ -6915,15 +6993,16 @@ public class VScrollTable extends FlowPanel implements HasWidgets, /** * Sets the proper tabIndex for scrollBodyPanel (the focusable elemen in the * component). - * + * <p> * If the component has no explicit tabIndex a zero is given (default * tabbing order based on dom hierarchy) or -1 if the component does not * need to gain focus. The component needs no focus if it has no scrollabars * (not scrollable) and not selectable. Note that in the future shortcut * actions may need focus. - * + * <p> + * For internal use only. May be removed or replaced in the future. */ - void setProperTabIndex() { + public void setProperTabIndex() { int storedScrollTop = 0; int storedScrollLeft = 0; diff --git a/client/src/com/vaadin/client/ui/slider/VSlider.java b/client/src/com/vaadin/client/ui/VSlider.java index ab080dc17f..3fdd8f0313 100644 --- a/client/src/com/vaadin/client/ui/slider/VSlider.java +++ b/client/src/com/vaadin/client/ui/VSlider.java @@ -14,7 +14,7 @@ * the License. */ // -package com.vaadin.client.ui.slider; +package com.vaadin.client.ui; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; @@ -38,10 +38,6 @@ import com.vaadin.client.BrowserInfo; import com.vaadin.client.ContainerResizedListener; import com.vaadin.client.Util; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.SimpleFocusablePanel; -import com.vaadin.client.ui.VLazyExecutor; -import com.vaadin.client.ui.VOverlay; import com.vaadin.shared.ui.slider.SliderOrientation; public class VSlider extends SimpleFocusablePanel implements Field, @@ -167,7 +163,7 @@ public class VSlider extends SimpleFocusablePanel implements Field, } } - void setFeedbackValue(double value) { + public void setFeedbackValue(double value) { String currentValue = "" + value; if (resolution == 0) { currentValue = "" + new Double(value).intValue(); @@ -189,7 +185,8 @@ public class VSlider extends SimpleFocusablePanel implements Field, } } - void buildBase() { + /** For internal use only. May be removed or replaced in the future. */ + public void buildBase() { final String styleAttribute = isVertical() ? "height" : "width"; final String oppositeStyleAttribute = isVertical() ? "width" : "height"; final String domProperty = isVertical() ? "offsetHeight" diff --git a/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelHorizontal.java b/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java index c277d594b9..29937a6944 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelHorizontal.java +++ b/client/src/com/vaadin/client/ui/VSplitPanelHorizontal.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.splitpanel; +package com.vaadin.client.ui; import com.vaadin.shared.ui.Orientation; diff --git a/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelVertical.java b/client/src/com/vaadin/client/ui/VSplitPanelVertical.java index 4f96d7f746..1e558fe85a 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/VSplitPanelVertical.java +++ b/client/src/com/vaadin/client/ui/VSplitPanelVertical.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.splitpanel; +package com.vaadin.client.ui; import com.vaadin.shared.ui.Orientation; diff --git a/client/src/com/vaadin/client/ui/tabsheet/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index 6ab5f4b6e4..d74665bb6d 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.tabsheet; +package com.vaadin.client.ui; import java.util.Iterator; import java.util.List; @@ -55,7 +55,6 @@ import com.vaadin.client.TooltipInfo; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.VCaption; -import com.vaadin.client.ui.label.VLabel; import com.vaadin.shared.ComponentState; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.ComponentStateUtil; @@ -557,7 +556,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, public static final String TABS_CLASSNAME = "v-tabsheet-tabcontainer"; public static final String SCROLLER_CLASSNAME = "v-tabsheet-scroller"; - final Element tabs; // tabbar and 'scroller' container + /** For internal use only. May be removed or replaced in the future. */ + public final Element tabs; // tabbar and 'scroller' container Tab focusedTab; /** * The tabindex property (position in the browser's focus cycle.) Named like @@ -577,12 +577,15 @@ public class VTabsheet extends VTabsheetBase implements Focusable, private int scrollerIndex = 0; final TabBar tb = new TabBar(this); - final VTabsheetPanel tp = new VTabsheetPanel(); - final Element contentNode; + /** For internal use only. May be removed or replaced in the future. */ + public final VTabsheetPanel tp = new VTabsheetPanel(); + /** For internal use only. May be removed or replaced in the future. */ + public final Element contentNode; private final Element deco; - boolean waitingForResponse; + /** For internal use only. May be removed or replaced in the future. */ + public boolean waitingForResponse; private String currentStyle; @@ -739,7 +742,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, return scrollerIndex > index; } - void handleStyleNames(UIDL uidl, ComponentState state) { + /** For internal use only. May be removed or replaced in the future. */ + public void handleStyleNames(UIDL uidl, ComponentState state) { // Add proper stylenames for all elements (easier to prevent unwanted // style inheritance) if (ComponentStateUtil.hasStyles(state)) { @@ -780,7 +784,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } } - void updateDynamicWidth() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateDynamicWidth() { // Find width consumed by tabs TableCellElement spacerCell = ((TableElement) tb.getElement().cast()) .getRows().getItem(0).getCells().getItem(tb.getTabCount()); @@ -833,7 +838,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } @Override - protected void renderTab(final UIDL tabUidl, int index, boolean selected, + public void renderTab(final UIDL tabUidl, int index, boolean selected, boolean hidden) { Tab tab = tb.getTab(index); if (tab == null) { @@ -954,7 +959,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, VTabsheet.this.removeStyleDependentName("loading"); } - void updateContentNodeHeight() { + /** For internal use only. May be removed or replaced in the future. */ + public void updateContentNodeHeight() { if (!isDynamicHeight()) { int contentHeight = getOffsetHeight(); contentHeight -= DOM.getElementPropertyInt(deco, "offsetHeight"); @@ -978,8 +984,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable, * Sets the size of the visible tab (component). As the tab is set to * position: absolute (to work around a firefox flickering bug) we must keep * this up-to-date by hand. + * <p> + * For internal use only. May be removed or replaced in the future. */ - void updateOpenTabSize() { + public void updateOpenTabSize() { /* * The overflow=auto element must have a height specified, otherwise it * will be just as high as the contents and no scrollbars will appear @@ -1059,7 +1067,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } - void showAllTabs() { + /** For internal use only. May be removed or replaced in the future. */ + public void showAllTabs() { scrollerIndex = tb.getFirstVisibleTab(); for (int i = 0; i < tb.getTabCount(); i++) { Tab t = tb.getTab(i); @@ -1096,13 +1105,14 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } @Override - protected Iterator<Widget> getWidgetIterator() { + public Iterator<Widget> getWidgetIterator() { return tp.iterator(); } private int borderW = -1; - int getContentAreaBorderWidth() { + /** For internal use only. May be removed or replaced in the future. */ + public int getContentAreaBorderWidth() { if (borderW < 0) { borderW = Util.measureHorizontalBorder(contentNode); } @@ -1110,12 +1120,12 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } @Override - protected int getTabCount() { + public int getTabCount() { return tb.getTabCount(); } @Override - protected ComponentConnector getTab(int index) { + public ComponentConnector getTab(int index) { if (tp.getWidgetCount() > index) { Widget widget = tp.getWidget(index); return ConnectorMap.get(client).getConnector(widget); @@ -1124,7 +1134,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } @Override - protected void removeTab(int index) { + public void removeTab(int index) { tb.removeTab(index); /* * This must be checked because renderTab automatically removes the diff --git a/client/src/com/vaadin/client/ui/tabsheet/VTabsheetBase.java b/client/src/com/vaadin/client/ui/VTabsheetBase.java index cde90cdf07..02e29a5a87 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/VTabsheetBase.java +++ b/client/src/com/vaadin/client/ui/VTabsheetBase.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.tabsheet; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.HashSet; @@ -29,14 +29,22 @@ import com.vaadin.client.UIDL; public abstract class VTabsheetBase extends ComplexPanel { - protected String id; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public String id; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected final ArrayList<String> tabKeys = new ArrayList<String>(); - protected int activeTabIndex = 0; - protected boolean disabled; - protected boolean readonly; - protected Set<String> disabledTabKeys = new HashSet<String>(); + /** For internal use only. May be removed or replaced in the future. */ + public final ArrayList<String> tabKeys = new ArrayList<String>(); + /** For internal use only. May be removed or replaced in the future. */ + public Set<String> disabledTabKeys = new HashSet<String>(); + + /** For internal use only. May be removed or replaced in the future. */ + public int activeTabIndex = 0; + /** For internal use only. May be removed or replaced in the future. */ + public boolean disabled; + /** For internal use only. May be removed or replaced in the future. */ + public boolean readonly; public VTabsheetBase(String classname) { setElement(DOM.createDiv()); @@ -46,7 +54,7 @@ public abstract class VTabsheetBase extends ComplexPanel { /** * @return a list of currently shown Widgets */ - abstract protected Iterator<Widget> getWidgetIterator(); + public abstract Iterator<Widget> getWidgetIterator(); /** * Clears current tabs and contents @@ -57,7 +65,7 @@ public abstract class VTabsheetBase extends ComplexPanel { * Implement in extending classes. This method should render needed elements * and set the visibility of the tab according to the 'selected' parameter. */ - protected abstract void renderTab(final UIDL tabUidl, int index, + public abstract void renderTab(final UIDL tabUidl, int index, boolean selected, boolean hidden); /** @@ -71,17 +79,17 @@ public abstract class VTabsheetBase extends ComplexPanel { * Implement in extending classes. This method should return the number of * tabs currently rendered. */ - protected abstract int getTabCount(); + public abstract int getTabCount(); /** * Implement in extending classes. This method should return the Paintable * corresponding to the given index. */ - protected abstract ComponentConnector getTab(int index); + public abstract ComponentConnector getTab(int index); /** * Implement in extending classes. This method should remove the rendered * tab with the specified index. */ - protected abstract void removeTab(int index); + public abstract void removeTab(int index); } diff --git a/client/src/com/vaadin/client/ui/tabsheet/VTabsheetPanel.java b/client/src/com/vaadin/client/ui/VTabsheetPanel.java index 6c1b30dc48..3a4c4f8537 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/VTabsheetPanel.java +++ b/client/src/com/vaadin/client/ui/VTabsheetPanel.java @@ -14,19 +14,18 @@ * the License. */ -package com.vaadin.client.ui.tabsheet; +package com.vaadin.client.ui; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.Widget; -import com.vaadin.client.ui.TouchScrollDelegate; import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler; /** * A panel that displays all of its child widgets in a 'deck', where only one * can be visible at a time. It is used by - * {@link com.vaadin.client.ui.tabsheet.VTabsheet}. + * {@link com.vaadin.client.ui.VTabsheet}. * * This class has the same basic functionality as the GWT DeckPanel * {@link com.google.gwt.user.client.ui.DeckPanel}, with the exception that it diff --git a/client/src/com/vaadin/client/ui/textarea/VTextArea.java b/client/src/com/vaadin/client/ui/VTextArea.java index c4b1c2dd0b..03c51636b3 100644 --- a/client/src/com/vaadin/client/ui/textarea/VTextArea.java +++ b/client/src/com/vaadin/client/ui/VTextArea.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.textarea; +package com.vaadin.client.ui; import com.google.gwt.core.client.Scheduler; import com.google.gwt.dom.client.Style.Overflow; @@ -28,7 +28,6 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Event; import com.vaadin.client.BrowserInfo; import com.vaadin.client.Util; -import com.vaadin.client.ui.textfield.VTextField; /** * This class represents a multiline textfield (textarea). diff --git a/client/src/com/vaadin/client/ui/textfield/VTextField.java b/client/src/com/vaadin/client/ui/VTextField.java index 4b7e620ab1..f757b177f3 100644 --- a/client/src/com/vaadin/client/ui/textfield/VTextField.java +++ b/client/src/com/vaadin/client/ui/VTextField.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.textfield; +package com.vaadin.client.ui; import com.google.gwt.event.dom.client.BlurEvent; import com.google.gwt.event.dom.client.BlurHandler; @@ -33,7 +33,6 @@ import com.google.gwt.user.client.ui.TextBoxBase; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.Util; -import com.vaadin.client.ui.Field; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.textfield.TextFieldConstants; @@ -55,11 +54,14 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, */ public static final String CLASSNAME_FOCUS = "focus"; - protected String paintableId; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected String valueBeforeEdit = null; + /** For internal use only. May be removed or replaced in the future. */ + public String valueBeforeEdit = null; /** * Set to false if a text change event has been sent since the last value @@ -95,18 +97,20 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, addBlurHandler(this); } - /* + /** + * For internal use only. May be removed or replaced in the future. + * <p> * TODO When GWT adds ONCUT, add it there and remove workaround. See * http://code.google.com/p/google-web-toolkit/issues/detail?id=4030 - * + * <p> * Also note that the cut/paste are not totally crossbrowsers compatible. * E.g. in Opera mac works via context menu, but on via File->Paste/Cut. * Opera might need the polling method for 100% working textchanceevents. * Eager polling for a change is bit dum and heavy operation, so I guess we * should first try to survive without. */ - protected static final int TEXTCHANGE_EVENTS = Event.ONPASTE - | Event.KEYEVENTS | Event.ONMOUSEUP; + public static final int TEXTCHANGE_EVENTS = Event.ONPASTE | Event.KEYEVENTS + | Event.ONMOUSEUP; @Override public void onBrowserEvent(Event event) { @@ -170,10 +174,14 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, } } }; + private boolean scheduled = false; - protected boolean listenTextChangeEvents; - protected String textChangeEventMode; - protected int textChangeEventTimeout; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean listenTextChangeEvents; + /** For internal use only. May be removed or replaced in the future. */ + public String textChangeEventMode; + public int textChangeEventTimeout; private void deferTextChangeEvent() { if (textChangeEventMode.equals(TEXTCHANGE_MODE_TIMEOUT) && scheduled) { @@ -206,7 +214,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, super.setReadOnly(readOnly); } - protected void updateFieldContent(final String text) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateFieldContent(final String text) { setPrompting(inputPrompt != null && focusedTextField != this && (text.equals(""))); @@ -230,7 +239,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, } } - protected native void attachCutEventListener(Element el) + /** For internal use only. May be removed or replaced in the future. */ + public native void attachCutEventListener(Element el) /*-{ var me = this; el.oncut = $entry(function() { @@ -260,7 +270,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, } } - protected void setMaxLength(int newMaxLength) { + /** For internal use only. May be removed or replaced in the future. */ + public void setMaxLength(int newMaxLength) { if (newMaxLength >= 0 && newMaxLength != maxLength) { maxLength = newMaxLength; updateMaxLength(maxLength); diff --git a/client/src/com/vaadin/client/ui/datefield/VTextualDate.java b/client/src/com/vaadin/client/ui/VTextualDate.java index 9bacfded13..9396a830d4 100644 --- a/client/src/com/vaadin/client/ui/datefield/VTextualDate.java +++ b/client/src/com/vaadin/client/ui/VTextualDate.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.datefield; +package com.vaadin.client.ui; import java.util.Date; @@ -30,9 +30,6 @@ import com.vaadin.client.Focusable; import com.vaadin.client.LocaleNotLoadedException; import com.vaadin.client.LocaleService; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.Field; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.textfield.VTextField; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.datefield.Resolution; @@ -41,15 +38,23 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, private static final String PARSE_ERROR_CLASSNAME = "-parseerror"; - protected final TextBox text; + /** For internal use only. May be removed or replaced in the future. */ + public final TextBox text; - protected String formatStr; + /** For internal use only. May be removed or replaced in the future. */ + public String formatStr; - protected boolean lenient; + /** For internal use only. May be removed or replaced in the future. */ + public boolean lenient; private static final String CLASSNAME_PROMPT = "prompt"; - protected static final String ATTR_INPUTPROMPT = "prompt"; - protected String inputPrompt = ""; + + /** For internal use only. May be removed or replaced in the future. */ + public static final String ATTR_INPUTPROMPT = "prompt"; + + /** For internal use only. May be removed or replaced in the future. */ + public String inputPrompt = ""; + private boolean prompting = false; public VTextualDate() { @@ -149,11 +154,13 @@ public class VTextualDate extends VDateField implements Field, ChangeHandler, * Updates the text field according to the current date (provided by * {@link #getDate()}). Takes care of updating text, enabling and disabling * the field, setting/removing readonly status and updating readonly styles. - * + * <p> + * For internal use only. May be removed or replaced in the future. + * <p> * TODO: Split part of this into a method that only updates the text as this * is what usually is needed except for updateFromUIDL. */ - protected void buildDate() { + public void buildDate() { removeStyleName(getStylePrimaryName() + PARSE_ERROR_CLASSNAME); // Create the initial text for the textfield String dateText; diff --git a/client/src/com/vaadin/client/ui/tree/VTree.java b/client/src/com/vaadin/client/ui/VTree.java index ca021b6dfc..d8985f0351 100644 --- a/client/src/com/vaadin/client/ui/tree/VTree.java +++ b/client/src/com/vaadin/client/ui/VTree.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.tree; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.HashMap; @@ -56,13 +56,6 @@ import com.vaadin.client.ConnectorMap; import com.vaadin.client.MouseEventDetailsBuilder; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.Action; -import com.vaadin.client.ui.ActionOwner; -import com.vaadin.client.ui.FocusElementPanel; -import com.vaadin.client.ui.Icon; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.TreeAction; -import com.vaadin.client.ui.VLazyExecutor; import com.vaadin.client.ui.dd.DDUtil; import com.vaadin.client.ui.dd.VAbstractDropHandler; import com.vaadin.client.ui.dd.VAcceptCallback; @@ -100,17 +93,34 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, private static final int CHARCODE_SPACE = 32; - final FlowPanel body = new FlowPanel(); + /** For internal use only. May be removed or replaced in the future. */ + public final FlowPanel body = new FlowPanel(); + + /** For internal use only. May be removed or replaced in the future. */ + public Set<String> selectedIds = new HashSet<String>(); + + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; + + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean selectable; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean isMultiselect; - Set<String> selectedIds = new HashSet<String>(); - ApplicationConnection client; - String paintableId; - boolean selectable; - boolean isMultiselect; private String currentMouseOverKey; - TreeNode lastSelection; - TreeNode focusedNode; - MultiSelectMode multiSelectMode = MultiSelectMode.DEFAULT; + + /** For internal use only. May be removed or replaced in the future. */ + public TreeNode lastSelection; + + /** For internal use only. May be removed or replaced in the future. */ + public TreeNode focusedNode; + + /** For internal use only. May be removed or replaced in the future. */ + public MultiSelectMode multiSelectMode = MultiSelectMode.DEFAULT; private final HashMap<String, TreeNode> keyToNode = new HashMap<String, TreeNode>(); @@ -120,23 +130,30 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, */ private final HashMap<String, String> actionMap = new HashMap<String, String>(); - boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; - boolean isNullSelectionAllowed = true; + /** For internal use only. May be removed or replaced in the future. */ + public boolean isNullSelectionAllowed = true; - boolean disabled = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean disabled = false; - boolean readonly; + /** For internal use only. May be removed or replaced in the future. */ + public boolean readonly; - boolean rendering; + /** For internal use only. May be removed or replaced in the future. */ + public boolean rendering; private VAbstractDropHandler dropHandler; - int dragMode; + /** For internal use only. May be removed or replaced in the future. */ + public int dragMode; private boolean selectionHasChanged = false; - String[] bodyActionKeys; + /** For internal use only. May be removed or replaced in the future. */ + public String[] bodyActionKeys; public VLazyExecutor iconLoaded = new VLazyExecutor(50, new ScheduledCommand() { @@ -313,7 +330,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return treeNode == null ? null : treeNode.key; } - void updateDropHandler(UIDL childUidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateDropHandler(UIDL childUidl) { if (dropHandler == null) { dropHandler = new VAbstractDropHandler() { @@ -479,15 +497,18 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, public String key; - String[] actionKeys = null; + /** For internal use only. May be removed or replaced in the future. */ + public String[] actionKeys = null; - boolean childrenLoaded; + /** For internal use only. May be removed or replaced in the future. */ + public boolean childrenLoaded; Element nodeCaptionDiv; protected Element nodeCaptionSpan; - FlowPanel childNodeContainer; + /** For internal use only. May be removed or replaced in the future. */ + public FlowPanel childNodeContainer; private boolean open; @@ -878,7 +899,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, return false; } - void setState(boolean state, boolean notifyServer) { + /** For internal use only. May be removed or replaced in the future. */ + public void setState(boolean state, boolean notifyServer) { if (open == state) { return; } @@ -909,11 +931,13 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } } - boolean getState() { + /** For internal use only. May be removed or replaced in the future. */ + public boolean getState() { return open; } - void setText(String text) { + /** For internal use only. May be removed or replaced in the future. */ + public void setText(String text) { DOM.setInnerText(nodeCaptionSpan, text); } @@ -967,12 +991,13 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, } /** - * Adds/removes Vaadin specific style name. This method ought to be - * called only from VTree. + * Adds/removes Vaadin specific style name. + * <p> + * For internal use only. May be removed or replaced in the future. * * @param selected */ - protected void setSelected(boolean selected) { + public void setSelected(boolean selected) { // add style name to caption dom structure only, not to subtree setStyleName(nodeCaptionDiv, "v-tree-node-selected", selected); } diff --git a/client/src/com/vaadin/client/ui/treetable/VTreeTable.java b/client/src/com/vaadin/client/ui/VTreeTable.java index 807c1f4a42..f4e3974505 100644 --- a/client/src/com/vaadin/client/ui/treetable/VTreeTable.java +++ b/client/src/com/vaadin/client/ui/VTreeTable.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.treetable; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Iterator; @@ -39,15 +39,15 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ComputedStyle; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.table.VScrollTable; -import com.vaadin.client.ui.treetable.VTreeTable.VTreeTableScrollBody.VTreeTableRow; +import com.vaadin.client.ui.VTreeTable.VTreeTableScrollBody.VTreeTableRow; public class VTreeTable extends VScrollTable { - static class PendingNavigationEvent { - final int keycode; - final boolean ctrl; - final boolean shift; + /** For internal use only. May be removed or replaced in the future. */ + public static class PendingNavigationEvent { + public final int keycode; + public final boolean ctrl; + public final boolean shift; public PendingNavigationEvent(int keycode, boolean ctrl, boolean shift) { this.keycode = keycode; @@ -68,14 +68,28 @@ public class VTreeTable extends VScrollTable { } } - boolean collapseRequest; + /** For internal use only. May be removed or replaced in the future. */ + public boolean collapseRequest; + private boolean selectionPending; - int colIndexOfHierarchy; - String collapsedRowKey; - VTreeTableScrollBody scrollBody; - boolean animationsEnabled; - LinkedList<PendingNavigationEvent> pendingNavigationEvents = new LinkedList<VTreeTable.PendingNavigationEvent>(); - boolean focusParentResponsePending; + + /** For internal use only. May be removed or replaced in the future. */ + public int colIndexOfHierarchy; + + /** For internal use only. May be removed or replaced in the future. */ + public String collapsedRowKey; + + /** For internal use only. May be removed or replaced in the future. */ + public VTreeTableScrollBody scrollBody; + + /** For internal use only. May be removed or replaced in the future. */ + public boolean animationsEnabled; + + /** For internal use only. May be removed or replaced in the future. */ + public LinkedList<PendingNavigationEvent> pendingNavigationEvents = new LinkedList<VTreeTable.PendingNavigationEvent>(); + + /** For internal use only. May be removed or replaced in the future. */ + public boolean focusParentResponsePending; @Override protected VScrollTableBody createScrollBody() { @@ -87,7 +101,7 @@ public class VTreeTable extends VScrollTable { * Overridden to allow animation of expands and collapses of nodes. */ @Override - protected void addAndRemoveRows(UIDL partialRowAdditions) { + public void addAndRemoveRows(UIDL partialRowAdditions) { if (partialRowAdditions == null) { return; } @@ -749,8 +763,9 @@ public class VTreeTable extends VScrollTable { } } + /** For internal use only. May be removed or replaced in the future. */ @Override - protected boolean handleNavigation(int keycode, boolean ctrl, boolean shift) { + public boolean handleNavigation(int keycode, boolean ctrl, boolean shift) { if (collapseRequest || focusParentResponsePending) { // Enqueue the event if there might be pending content changes from // the server @@ -855,7 +870,7 @@ public class VTreeTable extends VScrollTable { } @Override - protected void updateTotalRows(UIDL uidl) { + public void updateTotalRows(UIDL uidl) { // Make sure that initializedAndAttached & al are not reset when the // totalrows are updated on expand/collapse requests. int newTotalRows = uidl.getIntAttribute("totalrows"); diff --git a/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java b/client/src/com/vaadin/client/ui/VTwinColSelect.java index 494db81e40..22aa74526c 100644 --- a/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java +++ b/client/src/com/vaadin/client/ui/VTwinColSelect.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.twincolselect; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.HashSet; @@ -40,9 +40,6 @@ import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Panel; import com.vaadin.client.UIDL; import com.vaadin.client.Util; -import com.vaadin.client.ui.SubPartAware; -import com.vaadin.client.ui.button.VButton; -import com.vaadin.client.ui.optiongroup.VOptionGroupBase; import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, @@ -58,7 +55,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, private final DoubleClickListBox selections; - FlowPanel captionWrapper; + /** For internal use only. May be removed or replaced in the future. */ + public FlowPanel captionWrapper; private HTML optionsCaption = null; @@ -167,7 +165,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, return selectionsCaption; } - protected void updateCaptions(UIDL uidl) { + /** For internal use only. May be removed or replaced in the future. */ + public void updateCaptions(UIDL uidl) { String leftCaption = (uidl .hasAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) ? uidl .getStringAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) @@ -220,7 +219,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } @Override - protected void buildOptions(UIDL uidl) { + public void buildOptions(UIDL uidl) { final boolean enabled = !isDisabled() && !isReadonly(); options.setMultipleSelect(isMultiselect()); selections.setMultipleSelect(isMultiselect()); @@ -351,12 +350,14 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } } - void clearInternalHeights() { + /** For internal use only. May be removed or replaced in the future. */ + public void clearInternalHeights() { selections.setHeight(""); options.setHeight(""); } - void setInternalHeights() { + /** For internal use only. May be removed or replaced in the future. */ + public void setInternalHeights() { int captionHeight = Util.getRequiredHeight(captionWrapper); int totalHeight = getOffsetHeight(); @@ -364,10 +365,10 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, selections.setHeight(selectHeight); options.setHeight(selectHeight); - } - void clearInternalWidths() { + /** For internal use only. May be removed or replaced in the future. */ + public void clearInternalWidths() { int cols = -1; if (getColumns() > 0) { cols = getColumns(); @@ -396,7 +397,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } } - void setInternalWidths() { + /** For internal use only. May be removed or replaced in the future. */ + public void setInternalWidths() { DOM.setStyleAttribute(getElement(), "position", "relative"); int bordersAndPaddings = Util.measureHorizontalPaddingAndBorder( buttons.getElement(), 0); @@ -419,7 +421,7 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } @Override - protected void setTabIndex(int tabIndex) { + public void setTabIndex(int tabIndex) { options.setTabIndex(tabIndex); selections.setTabIndex(tabIndex); add.setTabIndex(tabIndex); diff --git a/client/src/com/vaadin/client/ui/ui/VUI.java b/client/src/com/vaadin/client/ui/VUI.java index d650b1734c..7f067c605d 100644 --- a/client/src/com/vaadin/client/ui/ui/VUI.java +++ b/client/src/com/vaadin/client/ui/VUI.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.ui; +package com.vaadin.client.ui; import java.util.ArrayList; @@ -39,12 +39,8 @@ import com.vaadin.client.ConnectorMap; import com.vaadin.client.Focusable; import com.vaadin.client.LayoutManager; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.ShortcutActionHandler; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; -import com.vaadin.client.ui.TouchScrollDelegate; import com.vaadin.client.ui.TouchScrollDelegate.TouchScrollHandler; -import com.vaadin.client.ui.VLazyExecutor; -import com.vaadin.client.ui.textfield.VTextField; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.ui.ui.UIConstants; @@ -59,11 +55,14 @@ public class VUI extends SimplePanel implements ResizeHandler, private static int MONITOR_PARENT_TIMER_INTERVAL = 1000; - String theme; + /** For internal use only. May be removed or replaced in the future. */ + public String theme; - String id; + /** For internal use only. May be removed or replaced in the future. */ + public String id; - ShortcutActionHandler actionHandler; + /** For internal use only. May be removed or replaced in the future. */ + public ShortcutActionHandler actionHandler; /* * Last known window size used to detect whether VView should be layouted @@ -80,7 +79,8 @@ public class VUI extends SimplePanel implements ResizeHandler, private int viewWidth; private int viewHeight; - ApplicationConnection connection; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection connection; /** * Keep track of possible parent size changes when an embedded application. @@ -96,17 +96,23 @@ public class VUI extends SimplePanel implements ResizeHandler, /** stored height of parent for embedded application auto-resize */ private int parentHeight; - int scrollTop; + /** For internal use only. May be removed or replaced in the future. */ + public int scrollTop; - int scrollLeft; + /** For internal use only. May be removed or replaced in the future. */ + public int scrollLeft; - boolean rendering; + /** For internal use only. May be removed or replaced in the future. */ + public boolean rendering; - boolean scrollable; + /** For internal use only. May be removed or replaced in the future. */ + public boolean scrollable; - boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; - boolean resizeLazy = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean resizeLazy = false; private HandlerRegistration historyHandlerRegistration; @@ -115,8 +121,10 @@ public class VUI extends SimplePanel implements ResizeHandler, /** * The current URI fragment, used to avoid sending updates if nothing has * changed. + * <p> + * For internal use only. May be removed or replaced in the future. */ - String currentFragment; + public String currentFragment; /** * Listener for URI fragment changes. Notifies the server of the new value @@ -302,8 +310,10 @@ public class VUI extends SimplePanel implements ResizeHandler, /** * Used to reload host page on theme changes. + * <p> + * For internal use only. May be removed or replaced in the future. */ - static native void reloadHostPage() + public static native void reloadHostPage() /*-{ $wnd.location.reload(); }-*/; @@ -403,8 +413,10 @@ public class VUI extends SimplePanel implements ResizeHandler, /** * Send new dimensions to the server. + * <p> + * For internal use only. May be removed or replaced in the future. */ - void sendClientResized() { + public void sendClientResized() { Element parentElement = getElement().getParentElement(); int viewHeight = parentElement.getClientHeight(); int viewWidth = parentElement.getClientWidth(); @@ -449,8 +461,10 @@ public class VUI extends SimplePanel implements ResizeHandler, /** * Ensures the root is scrollable eg. after style name changes. + * <p> + * For internal use only. May be removed or replaced in the future. */ - void makeScrollable() { + public void makeScrollable() { if (touchScrollHandler == null) { touchScrollHandler = TouchScrollDelegate.enableTouchScrolling(this); } diff --git a/client/src/com/vaadin/client/ui/upload/VUpload.java b/client/src/com/vaadin/client/ui/VUpload.java index 42fd285f6b..bad22e3a50 100644 --- a/client/src/com/vaadin/client/ui/upload/VUpload.java +++ b/client/src/com/vaadin/client/ui/VUpload.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.upload; +package com.vaadin.client.ui; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; @@ -36,7 +36,7 @@ import com.google.gwt.user.client.ui.SimplePanel; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.BrowserInfo; import com.vaadin.client.VConsole; -import com.vaadin.client.ui.button.VButton; +import com.vaadin.client.ui.upload.UploadIFrameOnloadStrategy; /** * @@ -72,29 +72,37 @@ public class VUpload extends SimplePanel { /** * FileUpload component that opens native OS dialog to select file. + * <p> + * For internal use only. May be removed or replaced in the future. */ - FileUpload fu = new MyFileUpload(); + public FileUpload fu = new MyFileUpload(); Panel panel = new FlowPanel(); UploadIFrameOnloadStrategy onloadstrategy = GWT .create(UploadIFrameOnloadStrategy.class); - ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - protected String paintableId; + /** For internal use only. May be removed or replaced in the future. */ + public String paintableId; /** - * Button that initiates uploading + * Button that initiates uploading. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected final VButton submitButton; + public final VButton submitButton; /** * When expecting big files, programmer may initiate some UI changes when * uploading the file starts. Bit after submitting file we'll visit the * server to check possible changes. + * <p> + * For internal use only. May be removed or replaced in the future. */ - protected Timer t; + public Timer t; /** * some browsers tries to send form twice if submit is called in button @@ -109,11 +117,13 @@ public class VUpload extends SimplePanel { private Hidden maxfilesize = new Hidden(); - protected FormElement element; + /** For internal use only. May be removed or replaced in the future. */ + public FormElement element; private com.google.gwt.dom.client.Element synthesizedFrame; - protected int nextUploadId; + /** For internal use only. May be removed or replaced in the future. */ + public int nextUploadId; public VUpload() { super(com.google.gwt.dom.client.Document.get().createFormElement()); @@ -147,7 +157,8 @@ public class VUpload extends SimplePanel { form.enctype = encoding; }-*/; - protected void setImmediate(boolean booleanAttribute) { + /** For internal use only. May be removed or replaced in the future. */ + public void setImmediate(boolean booleanAttribute) { if (immediate != booleanAttribute) { immediate = booleanAttribute; if (immediate) { @@ -168,7 +179,8 @@ public class VUpload extends SimplePanel { element.blur(); }-*/; - protected void disableUpload() { + /** For internal use only. May be removed or replaced in the future. */ + public void disableUpload() { submitButton.setEnabled(false); if (!submitted) { // Cannot disable the fileupload while submitting or the file won't @@ -178,7 +190,8 @@ public class VUpload extends SimplePanel { enabled = false; } - protected void enableUpload() { + /** For internal use only. May be removed or replaced in the future. */ + public void enableUpload() { submitButton.setEnabled(true); fu.getElement().setPropertyBoolean("disabled", false); enabled = true; @@ -242,7 +255,8 @@ public class VUpload extends SimplePanel { }); } - protected void submit() { + /** For internal use only. May be removed or replaced in the future. */ + public void submit() { if (fu.getFilename().length() == 0 || submitted || !enabled) { VConsole.log("Submit cancelled (disabled, no file or already submitted)"); return; @@ -280,7 +294,8 @@ public class VUpload extends SimplePanel { } } - protected void ensureTargetFrame() { + /** For internal use only. May be removed or replaced in the future. */ + public void ensureTargetFrame() { if (synthesizedFrame == null) { // Attach a hidden IFrame to the form. This is the target iframe to // which the form will be submitted. We have to create the iframe diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VVerticalLayout.java b/client/src/com/vaadin/client/ui/VVerticalLayout.java index bea85f7cee..1a3ce332f5 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/VVerticalLayout.java +++ b/client/src/com/vaadin/client/ui/VVerticalLayout.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.client.ui.orderedlayout; +package com.vaadin.client.ui; import com.vaadin.client.StyleConstants; diff --git a/client/src/com/vaadin/client/ui/video/VVideo.java b/client/src/com/vaadin/client/ui/VVideo.java index 2f9fbe44be..754af8658f 100644 --- a/client/src/com/vaadin/client/ui/video/VVideo.java +++ b/client/src/com/vaadin/client/ui/VVideo.java @@ -14,14 +14,13 @@ * the License. */ -package com.vaadin.client.ui.video; +package com.vaadin.client.ui; import com.google.gwt.dom.client.Document; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.dom.client.VideoElement; import com.google.gwt.user.client.Element; import com.vaadin.client.Util; -import com.vaadin.client.ui.VMediaBase; public class VVideo extends VMediaBase { diff --git a/client/src/com/vaadin/client/ui/window/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java index 056de6d018..0885077111 100644 --- a/client/src/com/vaadin/client/ui/window/VWindow.java +++ b/client/src/com/vaadin/client/ui/VWindow.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.client.ui.window; +package com.vaadin.client.ui; import java.util.ArrayList; import java.util.Arrays; @@ -45,12 +45,7 @@ import com.vaadin.client.Console; import com.vaadin.client.Focusable; import com.vaadin.client.LayoutManager; import com.vaadin.client.Util; -import com.vaadin.client.ui.FocusableScrollPanel; -import com.vaadin.client.ui.ShortcutActionHandler; import com.vaadin.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; -import com.vaadin.client.ui.VLazyExecutor; -import com.vaadin.client.ui.VOverlay; -import com.vaadin.client.ui.notification.VNotification; import com.vaadin.shared.EventId; /** @@ -83,17 +78,22 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, public static final int Z_INDEX = 10000; - ComponentConnector layout; + /** For internal use only. May be removed or replaced in the future. */ + public ComponentConnector layout; - Element contents; + /** For internal use only. May be removed or replaced in the future. */ + public Element contents; - Element header; + /** For internal use only. May be removed or replaced in the future. */ + public Element header; - Element footer; + /** For internal use only. May be removed or replaced in the future. */ + public Element footer; private Element resizeBox; - final FocusableScrollPanel contentPanel = new FocusableScrollPanel(); + /** For internal use only. May be removed or replaced in the future. */ + public final FocusableScrollPanel contentPanel = new FocusableScrollPanel(); private boolean dragging; @@ -111,13 +111,17 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, private int origH; - Element closeBox; + /** For internal use only. May be removed or replaced in the future. */ + public Element closeBox; - protected ApplicationConnection client; + /** For internal use only. May be removed or replaced in the future. */ + public ApplicationConnection client; - String id; + /** For internal use only. May be removed or replaced in the future. */ + public String id; - ShortcutActionHandler shortcutHandler; + /** For internal use only. May be removed or replaced in the future. */ + public ShortcutActionHandler shortcutHandler; /** Last known positionx read from UIDL or updated to application connection */ private int uidlPositionX = -1; @@ -125,13 +129,16 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, /** Last known positiony read from UIDL or updated to application connection */ private int uidlPositionY = -1; - boolean vaadinModality = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean vaadinModality = false; - boolean resizable = true; + /** For internal use only. May be removed or replaced in the future. */ + public boolean resizable = true; private boolean draggable = true; - boolean resizeLazy = false; + /** For internal use only. May be removed or replaced in the future. */ + public boolean resizeLazy = false; private Element modalityCurtain; private Element draggingCurtain; @@ -141,18 +148,25 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, private boolean closable = true; - // If centered (via UIDL), the window should stay in the centered -mode - // until a position is received from the server, or the user moves or - // resizes the window. - boolean centered = false; + /** + * If centered (via UIDL), the window should stay in the centered -mode + * until a position is received from the server, or the user moves or + * resizes the window. + * <p> + * For internal use only. May be removed or replaced in the future. + */ + public boolean centered = false; - boolean immediate; + /** For internal use only. May be removed or replaced in the future. */ + public boolean immediate; private Element wrapper; - boolean visibilityChangesDisabled; + /** For internal use only. May be removed or replaced in the future. */ + public boolean visibilityChangesDisabled; - int bringToFrontSequence = -1; + /** For internal use only. May be removed or replaced in the future. */ + public int bringToFrontSequence = -1; private VLazyExecutor delayedContentsSizeUpdater = new VLazyExecutor(200, new ScheduledCommand() { @@ -199,7 +213,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, return windowOrder.get(windowOrder.size() - 1); } - void setWindowOrderAndPosition() { + /** For internal use only. May be removed or replaced in the future. */ + public void setWindowOrderAndPosition() { // This cannot be done in the constructor as the widgets are created in // a different order than on they should appear on screen if (windowOrder.contains(this)) { @@ -272,8 +287,10 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, * Calling this method will defer ordering algorithm, to order windows based * on servers bringToFront and modality instructions. Non changed windows * will be left intact. + * <p> + * For internal use only. May be removed or replaced in the future. */ - static void deferOrdering() { + public static void deferOrdering() { if (!orderingDefered) { orderingDefered = true; Scheduler.get().scheduleFinally(new Command() { @@ -333,7 +350,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, } } - void setDraggable(boolean draggable) { + /** For internal use only. May be removed or replaced in the future. */ + public void setDraggable(boolean draggable) { if (this.draggable == draggable) { return; } @@ -360,7 +378,7 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, * @param closable * true if the window can be closed by the user */ - protected void setClosable(boolean closable) { + public void setClosable(boolean closable) { if (this.closable == closable) { return; } @@ -412,7 +430,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, windowOrder.remove(this); } - void setVaadinModality(boolean modality) { + /** For internal use only. May be removed or replaced in the future. */ + public void setVaadinModality(boolean modality) { vaadinModality = modality; if (vaadinModality) { if (isAttached()) { @@ -507,7 +526,8 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, return curtain; } - void setResizable(boolean resizability) { + /** For internal use only. May be removed or replaced in the future. */ + public void setResizable(boolean resizability) { resizable = resizability; if (resizability) { DOM.setElementProperty(footer, "className", CLASSNAME + "-footer"); diff --git a/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java index 40830531b6..d13b079388 100644 --- a/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/absolutelayout/AbsoluteLayoutConnector.java @@ -27,6 +27,7 @@ import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler; import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.LayoutClickEventHandler; +import com.vaadin.client.ui.VAbsoluteLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.LayoutClickRpc; import com.vaadin.shared.ui.absolutelayout.AbsoluteLayoutServerRpc; diff --git a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java index ec33ed72fd..d5ff4f16b1 100644 --- a/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java +++ b/client/src/com/vaadin/client/ui/accordion/AccordionConnector.java @@ -22,7 +22,8 @@ import com.vaadin.client.ComponentConnector; import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.UIDL; import com.vaadin.client.ui.SimpleManagedLayout; -import com.vaadin.client.ui.accordion.VAccordion.StackItem; +import com.vaadin.client.ui.VAccordion; +import com.vaadin.client.ui.VAccordion.StackItem; import com.vaadin.client.ui.layout.MayScrollChildren; import com.vaadin.client.ui.tabsheet.TabsheetBaseConnector; import com.vaadin.shared.ui.Connect; diff --git a/client/src/com/vaadin/client/ui/audio/AudioConnector.java b/client/src/com/vaadin/client/ui/audio/AudioConnector.java index bfa282ca09..55b154b2c2 100644 --- a/client/src/com/vaadin/client/ui/audio/AudioConnector.java +++ b/client/src/com/vaadin/client/ui/audio/AudioConnector.java @@ -22,6 +22,7 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.BrowserInfo; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.MediaBaseConnector; +import com.vaadin.client.ui.VAudio; import com.vaadin.shared.ui.Connect; import com.vaadin.ui.Audio; diff --git a/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java b/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java index c22d92235b..09d4fc337d 100644 --- a/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java +++ b/client/src/com/vaadin/client/ui/browserframe/BrowserFrameConnector.java @@ -2,6 +2,7 @@ package com.vaadin.client.ui.browserframe; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.VBrowserFrame; import com.vaadin.shared.ui.AbstractEmbeddedState; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.browserframe.BrowserFrameState; diff --git a/client/src/com/vaadin/client/ui/button/ButtonConnector.java b/client/src/com/vaadin/client/ui/button/ButtonConnector.java index bc1e7b0e69..f84659ece1 100644 --- a/client/src/com/vaadin/client/ui/button/ButtonConnector.java +++ b/client/src/com/vaadin/client/ui/button/ButtonConnector.java @@ -34,6 +34,7 @@ import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.Icon; import com.vaadin.client.ui.ShortcutAction; import com.vaadin.client.ui.ShortcutActionTarget; +import com.vaadin.client.ui.VButton; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.shared.ui.Connect; diff --git a/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java b/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java index cf771bed0d..46f6dcbb65 100644 --- a/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java +++ b/client/src/com/vaadin/client/ui/checkbox/CheckBoxConnector.java @@ -30,6 +30,7 @@ import com.vaadin.client.VTooltip; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.client.ui.Icon; +import com.vaadin.client.ui.VCheckBox; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.shared.ui.Connect; diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java index 697ade43e7..5f9a3ded58 100644 --- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -23,7 +23,8 @@ import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.client.ui.SimpleManagedLayout; -import com.vaadin.client.ui.combobox.VFilterSelect.FilterSelectSuggestion; +import com.vaadin.client.ui.VFilterSelect; +import com.vaadin.client.ui.VFilterSelect.FilterSelectSuggestion; import com.vaadin.client.ui.menubar.MenuItem; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.combobox.ComboBoxConstants; diff --git a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java index 1a83ae90b4..98969d881a 100644 --- a/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/csslayout/CssLayoutConnector.java @@ -29,6 +29,7 @@ import com.vaadin.client.VCaption; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractLayoutConnector; import com.vaadin.client.ui.LayoutClickEventHandler; +import com.vaadin.client.ui.VCssLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.LayoutClickRpc; import com.vaadin.shared.ui.csslayout.CssLayoutServerRpc; diff --git a/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java b/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java index 09c90b3577..7a7a7c3456 100644 --- a/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java +++ b/client/src/com/vaadin/client/ui/customcomponent/CustomComponentConnector.java @@ -18,6 +18,7 @@ package com.vaadin.client.ui.customcomponent; import com.vaadin.client.ComponentConnector; import com.vaadin.client.ConnectorHierarchyChangeEvent; import com.vaadin.client.ui.AbstractComponentContainerConnector; +import com.vaadin.client.ui.VCustomComponent; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.ui.CustomComponent; diff --git a/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java b/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java index 199f3cb3cc..4472a06852 100644 --- a/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/customlayout/CustomLayoutConnector.java @@ -25,6 +25,7 @@ import com.vaadin.client.UIDL; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractLayoutConnector; import com.vaadin.client.ui.SimpleManagedLayout; +import com.vaadin.client.ui.VCustomLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.customlayout.CustomLayoutState; import com.vaadin.ui.CustomLayout; diff --git a/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java index 2f48d7411c..5cefdd2d38 100644 --- a/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java +++ b/client/src/com/vaadin/client/ui/datefield/AbstractDateFieldConnector.java @@ -23,6 +23,7 @@ import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.VConsole; import com.vaadin.client.ui.AbstractFieldConnector; +import com.vaadin.client.ui.VDateField; import com.vaadin.shared.ui.datefield.DateFieldConstants; import com.vaadin.shared.ui.datefield.Resolution; @@ -40,28 +41,28 @@ public class AbstractDateFieldConnector extends AbstractFieldConnector getWidget().paintableId = uidl.getId(); getWidget().immediate = getState().immediate; - getWidget().readonly = isReadOnly(); - getWidget().enabled = isEnabled(); + getWidget().setReadonly(isReadOnly()); + getWidget().setEnabled(isEnabled()); if (uidl.hasAttribute("locale")) { final String locale = uidl.getStringAttribute("locale"); try { getWidget().dts.setLocale(locale); - getWidget().currentLocale = locale; + getWidget().setCurrentLocale(locale); } catch (final LocaleNotLoadedException e) { - getWidget().currentLocale = getWidget().dts.getLocale(); + getWidget().setCurrentLocale(getWidget().dts.getLocale()); VConsole.error("Tried to use an unloaded locale \"" + locale + "\". Using default locale (" - + getWidget().currentLocale + ")."); + + getWidget().getCurrentLocale() + ")."); VConsole.error(e); } } // We show week numbers only if the week starts with Monday, as ISO 8601 // specifies - getWidget().showISOWeekNumbers = uidl - .getBooleanAttribute(DateFieldConstants.ATTR_WEEK_NUMBERS) - && getWidget().dts.getFirstDayOfWeek() == 1; + getWidget().setShowISOWeekNumbers( + uidl.getBooleanAttribute(DateFieldConstants.ATTR_WEEK_NUMBERS) + && getWidget().dts.getFirstDayOfWeek() == 1); Resolution newResolution; if (uidl.hasVariable("sec")) { @@ -82,30 +83,29 @@ public class AbstractDateFieldConnector extends AbstractFieldConnector setWidgetStyleName( getWidget().getStylePrimaryName() + "-" - + VDateField - .resolutionToString(getWidget().currentResolution), - false); + + VDateField.resolutionToString(getWidget() + .getCurrentResolution()), false); - getWidget().currentResolution = newResolution; + getWidget().setCurrentResolution(newResolution); // Add stylename that indicates current resolution setWidgetStyleName( getWidget().getStylePrimaryName() + "-" - + VDateField - .resolutionToString(getWidget().currentResolution), - true); + + VDateField.resolutionToString(getWidget() + .getCurrentResolution()), true); + final Resolution resolution = getWidget().getCurrentResolution(); final int year = uidl.getIntVariable("year"); - final int month = (getWidget().currentResolution.getCalendarField() >= Resolution.MONTH + final int month = (resolution.getCalendarField() >= Resolution.MONTH .getCalendarField()) ? uidl.getIntVariable("month") : -1; - final int day = (getWidget().currentResolution.getCalendarField() >= Resolution.DAY + final int day = (resolution.getCalendarField() >= Resolution.DAY .getCalendarField()) ? uidl.getIntVariable("day") : -1; - final int hour = (getWidget().currentResolution.getCalendarField() >= Resolution.HOUR + final int hour = (resolution.getCalendarField() >= Resolution.HOUR .getCalendarField()) ? uidl.getIntVariable("hour") : 0; - final int min = (getWidget().currentResolution.getCalendarField() >= Resolution.MINUTE + final int min = (resolution.getCalendarField() >= Resolution.MINUTE .getCalendarField()) ? uidl.getIntVariable("min") : 0; - final int sec = (getWidget().currentResolution.getCalendarField() >= Resolution.SECOND + final int sec = (resolution.getCalendarField() >= Resolution.SECOND .getCalendarField()) ? uidl.getIntVariable("sec") : 0; // Construct new date for this datefield (only if not null) diff --git a/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java index 1800125402..ca3488af87 100644 --- a/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java +++ b/client/src/com/vaadin/client/ui/datefield/InlineDateFieldConnector.java @@ -20,8 +20,9 @@ import java.util.Date; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.DateTimeService; import com.vaadin.client.UIDL; -import com.vaadin.client.ui.datefield.VCalendarPanel.FocusChangeListener; -import com.vaadin.client.ui.datefield.VCalendarPanel.TimeChangeListener; +import com.vaadin.client.ui.VCalendarPanel.FocusChangeListener; +import com.vaadin.client.ui.VCalendarPanel.TimeChangeListener; +import com.vaadin.client.ui.VDateFieldCalendar; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.datefield.InlineDateFieldState; import com.vaadin.shared.ui.datefield.Resolution; @@ -51,7 +52,7 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector { getWidget().calendarPanel.setDate(null); } - if (getWidget().currentResolution.getCalendarField() > Resolution.DAY + if (getWidget().getCurrentResolution().getCalendarField() > Resolution.DAY .getCalendarField()) { getWidget().calendarPanel .setTimeChangeListener(new TimeChangeListener() { @@ -77,7 +78,7 @@ public class InlineDateFieldConnector extends AbstractDateFieldConnector { }); } - if (getWidget().currentResolution.getCalendarField() <= Resolution.MONTH + if (getWidget().getCurrentResolution().getCalendarField() <= Resolution.MONTH .getCalendarField()) { getWidget().calendarPanel .setFocusChangeListener(new FocusChangeListener() { diff --git a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java index 6f23d42de9..3859a22046 100644 --- a/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java +++ b/client/src/com/vaadin/client/ui/datefield/PopupDateFieldConnector.java @@ -21,8 +21,9 @@ import java.util.Date; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.DateTimeService; import com.vaadin.client.UIDL; -import com.vaadin.client.ui.datefield.VCalendarPanel.FocusChangeListener; -import com.vaadin.client.ui.datefield.VCalendarPanel.TimeChangeListener; +import com.vaadin.client.ui.VCalendarPanel.FocusChangeListener; +import com.vaadin.client.ui.VCalendarPanel.TimeChangeListener; +import com.vaadin.client.ui.VPopupCalendar; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.datefield.PopupDateFieldState; import com.vaadin.shared.ui.datefield.Resolution; @@ -40,7 +41,7 @@ public class PopupDateFieldConnector extends TextualDateConnector { @Override @SuppressWarnings("deprecation") public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { - boolean lastReadOnlyState = getWidget().readonly; + boolean lastReadOnlyState = getWidget().isReadonly(); boolean lastEnabledState = getWidget().isEnabled(); getWidget().parsable = uidl.getBooleanAttribute("parsable"); @@ -51,8 +52,10 @@ public class PopupDateFieldConnector extends TextualDateConnector { .getDateTimeService()); getWidget().calendar.setShowISOWeekNumbers(getWidget() .isShowISOWeekNumbers()); - if (getWidget().calendar.getResolution() != getWidget().currentResolution) { - getWidget().calendar.setResolution(getWidget().currentResolution); + if (getWidget().calendar.getResolution() != getWidget() + .getCurrentResolution()) { + getWidget().calendar.setResolution(getWidget() + .getCurrentResolution()); if (getWidget().calendar.getDate() != null) { getWidget().calendar.setDate((Date) getWidget() .getCurrentDate().clone()); @@ -60,9 +63,9 @@ public class PopupDateFieldConnector extends TextualDateConnector { getWidget().calendar.renderCalendar(); } } - getWidget().calendarToggle.setEnabled(getWidget().enabled); + getWidget().calendarToggle.setEnabled(getWidget().isEnabled()); - if (getWidget().currentResolution.getCalendarField() <= Resolution.MONTH + if (getWidget().getCurrentResolution().getCalendarField() <= Resolution.MONTH .getCalendarField()) { getWidget().calendar .setFocusChangeListener(new FocusChangeListener() { @@ -79,7 +82,7 @@ public class PopupDateFieldConnector extends TextualDateConnector { getWidget().calendar.setFocusChangeListener(null); } - if (getWidget().currentResolution.getCalendarField() > Resolution.DAY + if (getWidget().getCurrentResolution().getCalendarField() > Resolution.DAY .getCalendarField()) { getWidget().calendar .setTimeChangeListener(new TimeChangeListener() { @@ -107,7 +110,7 @@ public class PopupDateFieldConnector extends TextualDateConnector { }); } - if (getWidget().readonly) { + if (getWidget().isReadonly()) { getWidget().calendarToggle.addStyleName(VPopupCalendar.CLASSNAME + "-button-readonly"); } else { diff --git a/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java b/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java index ececdb6775..b5297f535a 100644 --- a/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java +++ b/client/src/com/vaadin/client/ui/datefield/TextualDateConnector.java @@ -18,6 +18,7 @@ package com.vaadin.client.ui.datefield; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.UIDL; +import com.vaadin.client.ui.VTextualDate; import com.vaadin.shared.ui.datefield.Resolution; import com.vaadin.shared.ui.datefield.TextualDateFieldState; @@ -25,11 +26,11 @@ public class TextualDateConnector extends AbstractDateFieldConnector { @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { - Resolution origRes = getWidget().currentResolution; - String oldLocale = getWidget().currentLocale; + Resolution origRes = getWidget().getCurrentResolution(); + String oldLocale = getWidget().getCurrentLocale(); super.updateFromUIDL(uidl, client); - if (origRes != getWidget().currentResolution - || oldLocale != getWidget().currentLocale) { + if (origRes != getWidget().getCurrentResolution() + || oldLocale != getWidget().getCurrentLocale()) { // force recreating format string getWidget().formatStr = null; } @@ -48,7 +49,7 @@ public class TextualDateConnector extends AbstractDateFieldConnector { getWidget().text.setTabIndex(uidl.getIntAttribute("tabindex")); } - if (getWidget().readonly) { + if (getWidget().isReadonly()) { getWidget().text.addStyleDependentName("readonly"); } else { getWidget().text.removeStyleDependentName("readonly"); diff --git a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java index c5923c7436..078b3eff8f 100644 --- a/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java +++ b/client/src/com/vaadin/client/ui/dd/VTargetInSubtree.java @@ -20,8 +20,8 @@ package com.vaadin.client.ui.dd; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.UIDL; -import com.vaadin.client.ui.tree.VTree; -import com.vaadin.client.ui.tree.VTree.TreeNode; +import com.vaadin.client.ui.VTree; +import com.vaadin.client.ui.VTree.TreeNode; import com.vaadin.shared.ui.dd.AcceptCriterion; import com.vaadin.ui.Tree; diff --git a/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java index 3bbc6f05d1..65c62492e8 100644 --- a/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java +++ b/client/src/com/vaadin/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java @@ -21,6 +21,7 @@ import java.util.Set; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; +import com.vaadin.client.ui.VDragAndDropWrapper; import com.vaadin.client.ui.customcomponent.CustomComponentConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants; diff --git a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java index 1dfeadc1ff..16125f883e 100644 --- a/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java @@ -30,7 +30,8 @@ import com.vaadin.client.VCaption; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.LayoutClickEventHandler; -import com.vaadin.client.ui.gridlayout.VGridLayout.Cell; +import com.vaadin.client.ui.VGridLayout; +import com.vaadin.client.ui.VGridLayout.Cell; import com.vaadin.client.ui.layout.VLayoutSlot; import com.vaadin.shared.ui.AlignmentInfo; import com.vaadin.shared.ui.Connect; diff --git a/client/src/com/vaadin/client/ui/image/ImageConnector.java b/client/src/com/vaadin/client/ui/image/ImageConnector.java index e3fdd74aab..a3b48ac9d6 100644 --- a/client/src/com/vaadin/client/ui/image/ImageConnector.java +++ b/client/src/com/vaadin/client/ui/image/ImageConnector.java @@ -6,6 +6,7 @@ import com.google.gwt.event.dom.client.LoadHandler; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.ClickEventHandler; +import com.vaadin.client.ui.VImage; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.AbstractEmbeddedState; import com.vaadin.shared.ui.Connect; diff --git a/client/src/com/vaadin/client/ui/label/LabelConnector.java b/client/src/com/vaadin/client/ui/label/LabelConnector.java index 9ec530ba2c..d2709b815b 100644 --- a/client/src/com/vaadin/client/ui/label/LabelConnector.java +++ b/client/src/com/vaadin/client/ui/label/LabelConnector.java @@ -20,6 +20,7 @@ import com.google.gwt.dom.client.PreElement; import com.vaadin.client.Util; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.label.LabelState; diff --git a/client/src/com/vaadin/client/ui/link/LinkConnector.java b/client/src/com/vaadin/client/ui/link/LinkConnector.java index f970855769..a53eac9234 100644 --- a/client/src/com/vaadin/client/ui/link/LinkConnector.java +++ b/client/src/com/vaadin/client/ui/link/LinkConnector.java @@ -24,6 +24,7 @@ import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.Icon; +import com.vaadin.client.ui.VLink; import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.link.LinkConstants; diff --git a/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java b/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java index 640521e170..7abcaa9520 100644 --- a/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java +++ b/client/src/com/vaadin/client/ui/listselect/ListSelectConnector.java @@ -16,6 +16,7 @@ package com.vaadin.client.ui.listselect; +import com.vaadin.client.ui.VListSelect; import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.ui.ListSelect; diff --git a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java index 817e027283..f3db9c98f1 100644 --- a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java +++ b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java @@ -29,6 +29,7 @@ import com.vaadin.client.Util; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.Icon; import com.vaadin.client.ui.SimpleManagedLayout; +import com.vaadin.client.ui.VMenuBar; import com.vaadin.shared.ui.ComponentStateUtil; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; diff --git a/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java b/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java index fa523e65c5..f8de70f578 100644 --- a/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java +++ b/client/src/com/vaadin/client/ui/nativebutton/NativeButtonConnector.java @@ -25,6 +25,7 @@ import com.vaadin.client.EventHelper; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; import com.vaadin.client.ui.Icon; +import com.vaadin.client.ui.VNativeButton; import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.button.ButtonServerRpc; diff --git a/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java b/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java index e579f9c241..1607520edb 100644 --- a/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java +++ b/client/src/com/vaadin/client/ui/nativeselect/NativeSelectConnector.java @@ -16,6 +16,7 @@ package com.vaadin.client.ui.nativeselect; +import com.vaadin.client.ui.VNativeSelect; import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.ui.NativeSelect; diff --git a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java index 0081ff3c70..5d50b84833 100644 --- a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java +++ b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupBaseConnector.java @@ -20,8 +20,9 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.ui.AbstractFieldConnector; -import com.vaadin.client.ui.nativebutton.VNativeButton; -import com.vaadin.client.ui.textfield.VTextField; +import com.vaadin.client.ui.VNativeButton; +import com.vaadin.client.ui.VOptionGroupBase; +import com.vaadin.client.ui.VTextField; public abstract class OptionGroupBaseConnector extends AbstractFieldConnector implements Paintable { diff --git a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java index 0c3c06a270..045dde1959 100644 --- a/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java +++ b/client/src/com/vaadin/client/ui/optiongroup/OptionGroupConnector.java @@ -23,6 +23,7 @@ import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.UIDL; +import com.vaadin.client.ui.VOptionGroup; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; diff --git a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java index 23308e2004..c21155e26d 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/AbstractOrderedLayoutConnector.java @@ -29,10 +29,11 @@ import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler; import com.vaadin.client.ui.AbstractFieldConnector; import com.vaadin.client.ui.AbstractLayoutConnector; import com.vaadin.client.ui.LayoutClickEventHandler; +import com.vaadin.client.ui.VOrderedLayout; +import com.vaadin.client.ui.VOrderedLayout.CaptionPosition; +import com.vaadin.client.ui.VOrderedLayout.Slot; import com.vaadin.client.ui.layout.ElementResizeEvent; import com.vaadin.client.ui.layout.ElementResizeListener; -import com.vaadin.client.ui.orderedlayout.VOrderedLayout.CaptionPosition; -import com.vaadin.client.ui.orderedlayout.VOrderedLayout.Slot; import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.ComponentConstants; import com.vaadin.shared.communication.URLReference; diff --git a/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java index e6829563f9..75cca64059 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/HorizontalLayoutConnector.java @@ -15,6 +15,7 @@ */ package com.vaadin.client.ui.orderedlayout; +import com.vaadin.client.ui.VHorizontalLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.orderedlayout.HorizontalLayoutState; diff --git a/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java b/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java index d073e78c9c..993607a157 100644 --- a/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java +++ b/client/src/com/vaadin/client/ui/orderedlayout/VerticalLayoutConnector.java @@ -15,6 +15,7 @@ */ package com.vaadin.client.ui.orderedlayout; +import com.vaadin.client.ui.VVerticalLayout; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.orderedlayout.VerticalLayoutState; diff --git a/client/src/com/vaadin/client/ui/panel/PanelConnector.java b/client/src/com/vaadin/client/ui/panel/PanelConnector.java index 679a046518..9642aaa268 100644 --- a/client/src/com/vaadin/client/ui/panel/PanelConnector.java +++ b/client/src/com/vaadin/client/ui/panel/PanelConnector.java @@ -30,6 +30,7 @@ import com.vaadin.client.ui.ClickEventHandler; import com.vaadin.client.ui.PostLayoutListener; import com.vaadin.client.ui.ShortcutActionHandler; import com.vaadin.client.ui.SimpleManagedLayout; +import com.vaadin.client.ui.VPanel; import com.vaadin.client.ui.layout.MayScrollChildren; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.ComponentStateUtil; diff --git a/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java b/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java index 35e555c5f0..22ff9181c2 100644 --- a/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java +++ b/client/src/com/vaadin/client/ui/passwordfield/PasswordFieldConnector.java @@ -16,6 +16,7 @@ package com.vaadin.client.ui.passwordfield; +import com.vaadin.client.ui.VPasswordField; import com.vaadin.client.ui.textfield.TextFieldConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.ui.PasswordField; diff --git a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java index ca06b28bdd..c1048766fe 100644 --- a/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java +++ b/client/src/com/vaadin/client/ui/popupview/PopupViewConnector.java @@ -26,6 +26,7 @@ import com.vaadin.client.VCaptionWrapper; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.PostLayoutListener; +import com.vaadin.client.ui.VPopupView; import com.vaadin.shared.ui.ComponentStateUtil; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.popupview.PopupViewServerRpc; @@ -138,4 +139,4 @@ public class PopupViewConnector extends AbstractComponentContainerConnector event.isVisible()); } -}
\ No newline at end of file +} diff --git a/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java b/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java index 6e7a556629..823412755d 100644 --- a/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java +++ b/client/src/com/vaadin/client/ui/progressindicator/ProgressIndicatorConnector.java @@ -19,6 +19,7 @@ package com.vaadin.client.ui.progressindicator; import com.google.gwt.user.client.Timer; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractFieldConnector; +import com.vaadin.client.ui.VProgressIndicator; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.progressindicator.ProgressIndicatorServerRpc; import com.vaadin.shared.ui.progressindicator.ProgressIndicatorState; diff --git a/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java b/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java index 5933286f8f..79479fd3ed 100644 --- a/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java +++ b/client/src/com/vaadin/client/ui/richtextarea/RichTextAreaConnector.java @@ -20,6 +20,7 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.ui.AbstractFieldConnector; +import com.vaadin.client.ui.VRichTextArea; import com.vaadin.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; diff --git a/client/src/com/vaadin/client/ui/slider/SliderConnector.java b/client/src/com/vaadin/client/ui/slider/SliderConnector.java index e4c76b6ce8..e155336d75 100644 --- a/client/src/com/vaadin/client/ui/slider/SliderConnector.java +++ b/client/src/com/vaadin/client/ui/slider/SliderConnector.java @@ -20,6 +20,7 @@ import com.google.gwt.event.logical.shared.ValueChangeHandler; import com.vaadin.client.communication.RpcProxy; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractFieldConnector; +import com.vaadin.client.ui.VSlider; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.slider.SliderServerRpc; import com.vaadin.shared.ui.slider.SliderState; diff --git a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java index aa14492849..3548534038 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java +++ b/client/src/com/vaadin/client/ui/splitpanel/AbstractSplitPanelConnector.java @@ -33,8 +33,9 @@ import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.ClickEventHandler; import com.vaadin.client.ui.SimpleManagedLayout; -import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler; -import com.vaadin.client.ui.splitpanel.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent; +import com.vaadin.client.ui.VAbstractSplitPanel; +import com.vaadin.client.ui.VAbstractSplitPanel.SplitterMoveHandler; +import com.vaadin.client.ui.VAbstractSplitPanel.SplitterMoveHandler.SplitterMoveEvent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.ComponentStateUtil; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelRpc; diff --git a/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java index 848e9068fe..4f6f7efa04 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java +++ b/client/src/com/vaadin/client/ui/splitpanel/HorizontalSplitPanelConnector.java @@ -15,6 +15,7 @@ */ package com.vaadin.client.ui.splitpanel; +import com.vaadin.client.ui.VSplitPanelHorizontal; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.splitpanel.HorizontalSplitPanelState; diff --git a/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java b/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java index 2a57be7523..5232fa539b 100644 --- a/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java +++ b/client/src/com/vaadin/client/ui/splitpanel/VerticalSplitPanelConnector.java @@ -15,6 +15,7 @@ */ package com.vaadin.client.ui.splitpanel; +import com.vaadin.client.ui.VSplitPanelVertical; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.splitpanel.VerticalSplitPanelState; diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java index b79cc39297..35e7020ce0 100644 --- a/client/src/com/vaadin/client/ui/table/TableConnector.java +++ b/client/src/com/vaadin/client/ui/table/TableConnector.java @@ -35,8 +35,9 @@ import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.PostLayoutListener; -import com.vaadin.client.ui.table.VScrollTable.ContextMenuDetails; -import com.vaadin.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow; +import com.vaadin.client.ui.VScrollTable; +import com.vaadin.client.ui.VScrollTable.ContextMenuDetails; +import com.vaadin.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.shared.ui.table.TableState; diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java index 160ee5e629..8e0ccaaa79 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java +++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetBaseConnector.java @@ -24,6 +24,7 @@ import com.vaadin.client.ComponentConnector; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.ui.AbstractComponentContainerConnector; +import com.vaadin.client.ui.VTabsheetBase; import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; public abstract class TabsheetBaseConnector extends diff --git a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java index fd09b03160..edf257ad52 100644 --- a/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java +++ b/client/src/com/vaadin/client/ui/tabsheet/TabsheetConnector.java @@ -24,6 +24,7 @@ import com.vaadin.client.TooltipInfo; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.ui.SimpleManagedLayout; +import com.vaadin.client.ui.VTabsheet; import com.vaadin.client.ui.layout.MayScrollChildren; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.tabsheet.TabsheetState; diff --git a/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java b/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java index bda667e501..cc00425a5f 100644 --- a/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java +++ b/client/src/com/vaadin/client/ui/textarea/TextAreaConnector.java @@ -16,6 +16,7 @@ package com.vaadin.client.ui.textarea; +import com.vaadin.client.ui.VTextArea; import com.vaadin.client.ui.textfield.TextFieldConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.textarea.TextAreaState; diff --git a/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java b/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java index 7fa68f2bc6..25d6ab8369 100644 --- a/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java +++ b/client/src/com/vaadin/client/ui/textfield/TextFieldConnector.java @@ -23,6 +23,7 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.ui.AbstractFieldConnector; +import com.vaadin.client.ui.VTextField; import com.vaadin.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; diff --git a/client/src/com/vaadin/client/ui/tree/TreeConnector.java b/client/src/com/vaadin/client/ui/tree/TreeConnector.java index b7491f8d92..0ddbc7e96c 100644 --- a/client/src/com/vaadin/client/ui/tree/TreeConnector.java +++ b/client/src/com/vaadin/client/ui/tree/TreeConnector.java @@ -27,7 +27,8 @@ import com.vaadin.client.TooltipInfo; import com.vaadin.client.UIDL; import com.vaadin.client.Util; import com.vaadin.client.ui.AbstractComponentConnector; -import com.vaadin.client.ui.tree.VTree.TreeNode; +import com.vaadin.client.ui.VTree; +import com.vaadin.client.ui.VTree.TreeNode; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.MultiSelectMode; import com.vaadin.shared.ui.tree.TreeConstants; diff --git a/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java b/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java index 4539fbd12a..11200f28b7 100644 --- a/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java +++ b/client/src/com/vaadin/client/ui/treetable/TreeTableConnector.java @@ -18,9 +18,10 @@ package com.vaadin.client.ui.treetable; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.UIDL; import com.vaadin.client.ui.FocusableScrollPanel; +import com.vaadin.client.ui.VTreeTable; +import com.vaadin.client.ui.VScrollTable.VScrollTableBody.VScrollTableRow; +import com.vaadin.client.ui.VTreeTable.PendingNavigationEvent; import com.vaadin.client.ui.table.TableConnector; -import com.vaadin.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow; -import com.vaadin.client.ui.treetable.VTreeTable.PendingNavigationEvent; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.treetable.TreeTableConstants; import com.vaadin.shared.ui.treetable.TreeTableState; diff --git a/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java b/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java index f9767bb727..45b7a13055 100644 --- a/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java +++ b/client/src/com/vaadin/client/ui/twincolselect/TwinColSelectConnector.java @@ -19,6 +19,7 @@ package com.vaadin.client.ui.twincolselect; import com.vaadin.client.ApplicationConnection; import com.vaadin.client.DirectionalManagedLayout; import com.vaadin.client.UIDL; +import com.vaadin.client.ui.VTwinColSelect; import com.vaadin.client.ui.optiongroup.OptionGroupBaseConnector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.twincolselect.TwinColSelectState; diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java index e4da9afb24..c1083a2bb4 100644 --- a/client/src/com/vaadin/client/ui/ui/UIConnector.java +++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java @@ -47,8 +47,9 @@ import com.vaadin.client.communication.StateChangeEvent.StateChangeHandler; import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.ClickEventHandler; import com.vaadin.client.ui.ShortcutActionHandler; +import com.vaadin.client.ui.VNotification; +import com.vaadin.client.ui.VUI; import com.vaadin.client.ui.layout.MayScrollChildren; -import com.vaadin.client.ui.notification.VNotification; import com.vaadin.client.ui.window.WindowConnector; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.ComponentStateUtil; diff --git a/client/src/com/vaadin/client/ui/upload/UploadConnector.java b/client/src/com/vaadin/client/ui/upload/UploadConnector.java index 7a69138d21..fce35ed6e7 100644 --- a/client/src/com/vaadin/client/ui/upload/UploadConnector.java +++ b/client/src/com/vaadin/client/ui/upload/UploadConnector.java @@ -20,6 +20,7 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; import com.vaadin.client.ui.AbstractComponentConnector; +import com.vaadin.client.ui.VUpload; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.ui.Upload; diff --git a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java index 8dfd30ed8e..4ce50e7133 100644 --- a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java +++ b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategy.java @@ -15,9 +15,11 @@ */ package com.vaadin.client.ui.upload; +import com.vaadin.client.ui.VUpload; + public class UploadIFrameOnloadStrategy { - native void hookEvents(com.google.gwt.dom.client.Element iframe, + public native void hookEvents(com.google.gwt.dom.client.Element iframe, VUpload upload) /*-{ iframe.onload = $entry(function() { @@ -29,7 +31,7 @@ public class UploadIFrameOnloadStrategy { * @param iframe * the iframe whose onLoad event is to be cleaned */ - native void unHookEvents(com.google.gwt.dom.client.Element iframe) + public native void unHookEvents(com.google.gwt.dom.client.Element iframe) /*-{ iframe.onload = null; }-*/; diff --git a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java index 9ef1066d22..cdbc41be93 100644 --- a/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java +++ b/client/src/com/vaadin/client/ui/upload/UploadIFrameOnloadStrategyIE.java @@ -16,6 +16,7 @@ package com.vaadin.client.ui.upload; import com.google.gwt.dom.client.Element; +import com.vaadin.client.ui.VUpload; /** * IE does not have onload, detect onload via readystatechange @@ -23,7 +24,7 @@ import com.google.gwt.dom.client.Element; */ public class UploadIFrameOnloadStrategyIE extends UploadIFrameOnloadStrategy { @Override - native void hookEvents(Element iframe, VUpload upload) + public native void hookEvents(Element iframe, VUpload upload) /*-{ iframe.onreadystatechange = $entry(function() { if (iframe.readyState == 'complete') { @@ -33,7 +34,7 @@ public class UploadIFrameOnloadStrategyIE extends UploadIFrameOnloadStrategy { }-*/; @Override - native void unHookEvents(Element iframe) + public native void unHookEvents(Element iframe) /*-{ iframe.onreadystatechange = null; }-*/; diff --git a/client/src/com/vaadin/client/ui/video/VideoConnector.java b/client/src/com/vaadin/client/ui/video/VideoConnector.java index d2d9804f66..052f9694d1 100644 --- a/client/src/com/vaadin/client/ui/video/VideoConnector.java +++ b/client/src/com/vaadin/client/ui/video/VideoConnector.java @@ -17,6 +17,7 @@ package com.vaadin.client.ui.video; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.MediaBaseConnector; +import com.vaadin.client.ui.VVideo; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.video.VideoConstants; import com.vaadin.shared.ui.video.VideoState; diff --git a/client/src/com/vaadin/client/ui/window/WindowConnector.java b/client/src/com/vaadin/client/ui/window/WindowConnector.java index ebcdd24fee..8b4c5d9f37 100644 --- a/client/src/com/vaadin/client/ui/window/WindowConnector.java +++ b/client/src/com/vaadin/client/ui/window/WindowConnector.java @@ -35,6 +35,7 @@ import com.vaadin.client.ui.AbstractComponentContainerConnector; import com.vaadin.client.ui.ClickEventHandler; import com.vaadin.client.ui.PostLayoutListener; import com.vaadin.client.ui.ShortcutActionHandler; +import com.vaadin.client.ui.VWindow; import com.vaadin.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; import com.vaadin.client.ui.SimpleManagedLayout; import com.vaadin.client.ui.layout.MayScrollChildren; diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java index 601ec6db1f..4b9938079f 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/DummyLabelConnector.java @@ -18,7 +18,7 @@ package com.vaadin.tests.widgetset.client; import com.vaadin.client.communication.StateChangeEvent; import com.vaadin.client.ui.AbstractComponentConnector; -import com.vaadin.client.ui.label.VLabel; +import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.DummyLabel; diff --git a/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java index bc514047f9..a2f8ab6333 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/MissingFromDefaultWidgetsetConnector.java @@ -16,7 +16,7 @@ package com.vaadin.tests.widgetset.client; import com.vaadin.client.ui.AbstractComponentConnector; -import com.vaadin.client.ui.label.VLabel; +import com.vaadin.client.ui.VLabel; import com.vaadin.shared.ui.Connect; import com.vaadin.tests.widgetset.server.MissingFromDefaultWidgetsetComponent; diff --git a/uitest/src/com/vaadin/tests/widgetset/client/VExtendedTextArea.java b/uitest/src/com/vaadin/tests/widgetset/client/VExtendedTextArea.java index 704b9cc6d9..abe1be12a9 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/VExtendedTextArea.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/VExtendedTextArea.java @@ -16,7 +16,7 @@ package com.vaadin.tests.widgetset.client; -import com.vaadin.client.ui.textarea.VTextArea; +import com.vaadin.client.ui.VTextArea; public class VExtendedTextArea extends VTextArea { |