diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-13 19:13:24 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-13 19:18:50 +0300 |
| commit | acf099b41fe1f983d416e598b5b49eaea9f35c66 (patch) | |
| tree | da664e675e639a074b6d8abde3af4d7a7b52055a /client | |
| parent | e85d933b25cc3c5cc85eb7eb4b13b950fd8e1569 (diff) | |
| download | vaadin-framework-acf099b41fe1f983d416e598b5b49eaea9f35c66.tar.gz vaadin-framework-acf099b41fe1f983d416e598b5b49eaea9f35c66.zip | |
Eliminated dependencies from server to client (#9279)
Diffstat (limited to 'client')
33 files changed, 206 insertions, 284 deletions
diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java index 71707e723a..ae5e8ed42e 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java @@ -19,12 +19,11 @@ import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector; public class ApplicationConfiguration implements EntryPoint { - public static final String PORTLET_RESOUCE_URL_BASE = "portletAppURLBase"; - /** * Helper class for reading configuration options from the bootstap * javascript @@ -230,8 +229,8 @@ public class ApplicationConfiguration implements EntryPoint { } public String getPortletResourceUrl() { - return getJsoConfiguration(id) - .getConfigString(PORTLET_RESOUCE_URL_BASE); + return getJsoConfiguration(id).getConfigString( + ApplicationConstants.PORTLET_RESOUCE_URL_BASE); } public String getRootPanelId() { diff --git a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index d757bf89a2..b7df9d5156 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/client/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -39,6 +39,7 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.ComponentState; import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.shared.communication.SharedState; @@ -78,21 +79,6 @@ import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; * Entry point classes (widgetsets) define <code>onModuleLoad()</code>. */ public class ApplicationConnection { - public static final String APP_REQUEST_PATH = "APP/"; - - public static final String UIDL_REQUEST_PATH = "UIDL/"; - - public static final String APP_PROTOCOL_PREFIX = "app://"; - - public static final String V_RESOURCE_PATH = "v-resourcePath"; - - public static final String CONNECTOR_PROTOCOL_PREFIX = "connector://"; - - public static final String CONNECTOR_RESOURCE_PREFIX = APP_REQUEST_PATH - + "CONNECTOR"; - - // This indicates the whole page is generated by us (not embedded) - public static final String GENERATED_BODY_CLASSNAME = "v-generated-body"; public static final String MODIFIED_CLASSNAME = "v-modified"; @@ -102,28 +88,10 @@ public class ApplicationConnection { public static final String ERROR_CLASSNAME_EXT = "-error"; - public static final String UPDATE_VARIABLE_INTERFACE = "v"; - public static final String UPDATE_VARIABLE_METHOD = "v"; - public static final char VAR_BURST_SEPARATOR = '\u001d'; public static final char VAR_ESCAPE_CHARACTER = '\u001b'; - public static final String UIDL_SECURITY_TOKEN_ID = "Vaadin-Security-Key"; - - /** - * Name of the parameter used to transmit root ids back and forth - */ - public static final String ROOT_ID_PARAMETER = "rootId"; - - /** - * @deprecated use UIDL_SECURITY_TOKEN_ID instead - */ - @Deprecated - public static final String UIDL_SECURITY_HEADER = UIDL_SECURITY_TOKEN_ID; - - public static final String PARAM_UNLOADBURST = "onunloadburst"; - private static SerializerMap serializerMap; /** @@ -520,13 +488,14 @@ public class ApplicationConnection { final String payload = uidlSecurityKey + VAR_BURST_SEPARATOR + requestData; VConsole.log("Making UIDL Request with params: " + payload); - String uri = translateVaadinUri(APP_PROTOCOL_PREFIX + UIDL_REQUEST_PATH); + String uri = translateVaadinUri(ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.UIDL_REQUEST_PATH); if (extraParams != null && extraParams.length() > 0) { uri = addGetParameters(uri, extraParams); } - uri = addGetParameters(uri, - ROOT_ID_PARAMETER + "=" + configuration.getRootId()); + uri = addGetParameters(uri, ApplicationConstants.ROOT_ID_PARAMETER + + "=" + configuration.getRootId()); doUidlRequest(uri, payload, forceSync); @@ -651,8 +620,8 @@ public class ApplicationConnection { } else { // Synchronized call, discarded response (leaving the page) SynchronousXHR syncXHR = (SynchronousXHR) SynchronousXHR.create(); - syncXHR.synchronousPost(uri + "&" + PARAM_UNLOADBURST + "=1", - payload); + syncXHR.synchronousPost(uri + "&" + + ApplicationConstants.PARAM_UNLOADBURST + "=1", payload); /* * Although we are in theory leaving the page, the page may still * stay open. End request properly here too. See #3289 @@ -1046,8 +1015,9 @@ public class ApplicationConnection { final MultiStepDuration handleUIDLDuration = new MultiStepDuration(); // Get security key - if (json.containsKey(UIDL_SECURITY_TOKEN_ID)) { - uidlSecurityKey = json.getString(UIDL_SECURITY_TOKEN_ID); + if (json.containsKey(ApplicationConstants.UIDL_SECURITY_TOKEN_ID)) { + uidlSecurityKey = json + .getString(ApplicationConstants.UIDL_SECURITY_TOKEN_ID); } VConsole.log(" * Handling resources from server"); @@ -1714,8 +1684,9 @@ public class ApplicationConnection { // note that type is now deduced from value // TODO could eliminate invocations of same shared variable setter addMethodInvocationToQueue(new MethodInvocation(connectorId, - UPDATE_VARIABLE_INTERFACE, UPDATE_VARIABLE_METHOD, - new Object[] { variableName, new UidlValue(value) }), immediate); + ApplicationConstants.UPDATE_VARIABLE_INTERFACE, + ApplicationConstants.UPDATE_VARIABLE_METHOD, new Object[] { + variableName, new UidlValue(value) }), immediate); } /** @@ -1857,9 +1828,9 @@ public class ApplicationConnection { } private boolean isLegacyVariableChange(MethodInvocation invocation) { - return ApplicationConnection.UPDATE_VARIABLE_METHOD.equals(invocation + return ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(invocation .getInterfaceName()) - && ApplicationConnection.UPDATE_VARIABLE_METHOD + && ApplicationConstants.UPDATE_VARIABLE_METHOD .equals(invocation.getMethodName()); } @@ -2304,17 +2275,21 @@ public class ApplicationConnection { uidlUri = themeUri + uidlUri.substring(7); } - if (uidlUri.startsWith(CONNECTOR_PROTOCOL_PREFIX)) { + if (uidlUri.startsWith(ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX)) { // getAppUri *should* always end with / // substring *should* always start with / (connector:///foo.bar // without connector://) - uidlUri = APP_PROTOCOL_PREFIX + CONNECTOR_RESOURCE_PREFIX - + uidlUri.substring(CONNECTOR_PROTOCOL_PREFIX.length()); + uidlUri = ApplicationConstants.APP_PROTOCOL_PREFIX + + ApplicationConstants.CONNECTOR_RESOURCE_PREFIX + + uidlUri + .substring(ApplicationConstants.CONNECTOR_PROTOCOL_PREFIX + .length()); // Let translation of app:// urls take care of the rest } - if (uidlUri.startsWith(APP_PROTOCOL_PREFIX)) { + if (uidlUri.startsWith(ApplicationConstants.APP_PROTOCOL_PREFIX)) { String relativeUrl = uidlUri - .substring(APP_PROTOCOL_PREFIX.length()); + .substring(ApplicationConstants.APP_PROTOCOL_PREFIX + .length()); if (getConfiguration().usePortletURLs()) { // Should put path in v-resourcePath parameter and append query // params to base portlet url @@ -2332,7 +2307,7 @@ public class ApplicationConnection { if (!path.startsWith("/")) { path = '/' + path; } - String pathParam = V_RESOURCE_PATH + "=" + String pathParam = ApplicationConstants.V_RESOURCE_PATH + "=" + URL.encodeQueryString(path); url = addGetParameters(url, pathParam); uidlUri = url; diff --git a/client/src/com/vaadin/terminal/gwt/client/Util.java b/client/src/com/vaadin/terminal/gwt/client/Util.java index a27c77fa45..04c83c353e 100644 --- a/client/src/com/vaadin/terminal/gwt/client/Util.java +++ b/client/src/com/vaadin/terminal/gwt/client/Util.java @@ -27,6 +27,7 @@ import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.HasWidgets; import com.google.gwt.user.client.ui.RootPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.ComponentState; import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize; @@ -841,7 +842,7 @@ public class Util { for (MethodInvocation invocation : invocations) { Object[] parameters = invocation.getParameters(); String formattedParams = null; - if (ApplicationConnection.UPDATE_VARIABLE_METHOD.equals(invocation + if (ApplicationConstants.UPDATE_VARIABLE_METHOD.equals(invocation .getMethodName()) && parameters.length == 2) { // name, value Object value = parameters[1]; diff --git a/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java b/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java index 404f1238e0..e08aa37e73 100644 --- a/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java +++ b/client/src/com/vaadin/terminal/gwt/client/communication/JsonEncoder.java @@ -18,6 +18,7 @@ import com.google.gwt.json.client.JSONObject; import com.google.gwt.json.client.JSONString; import com.google.gwt.json.client.JSONValue; import com.vaadin.shared.Connector; +import com.vaadin.shared.JsonConstants; import com.vaadin.shared.communication.UidlValue; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -34,20 +35,6 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection; */ public class JsonEncoder { - public static final String VTYPE_CONNECTOR = "c"; - public static final String VTYPE_BOOLEAN = "b"; - public static final String VTYPE_DOUBLE = "d"; - public static final String VTYPE_FLOAT = "f"; - public static final String VTYPE_LONG = "l"; - public static final String VTYPE_INTEGER = "i"; - public static final String VTYPE_STRING = "s"; - public static final String VTYPE_ARRAY = "a"; - public static final String VTYPE_STRINGARRAY = "S"; - public static final String VTYPE_MAP = "m"; - public static final String VTYPE_LIST = "L"; - public static final String VTYPE_SET = "q"; - public static final String VTYPE_NULL = "n"; - /** * Encode a value to a JSON representation for transport from the client to * the server. @@ -252,34 +239,34 @@ public class JsonEncoder { */ private static String getTransportType(Object value) { if (value == null) { - return VTYPE_NULL; + return JsonConstants.VTYPE_NULL; } else if (value instanceof String) { - return VTYPE_STRING; + return JsonConstants.VTYPE_STRING; } else if (value instanceof Connector) { - return VTYPE_CONNECTOR; + return JsonConstants.VTYPE_CONNECTOR; } else if (value instanceof Boolean) { - return VTYPE_BOOLEAN; + return JsonConstants.VTYPE_BOOLEAN; } else if (value instanceof Integer) { - return VTYPE_INTEGER; + return JsonConstants.VTYPE_INTEGER; } else if (value instanceof Float) { - return VTYPE_FLOAT; + return JsonConstants.VTYPE_FLOAT; } else if (value instanceof Double) { - return VTYPE_DOUBLE; + return JsonConstants.VTYPE_DOUBLE; } else if (value instanceof Long) { - return VTYPE_LONG; + return JsonConstants.VTYPE_LONG; } else if (value instanceof List) { - return VTYPE_LIST; + return JsonConstants.VTYPE_LIST; } else if (value instanceof Set) { - return VTYPE_SET; + return JsonConstants.VTYPE_SET; } else if (value instanceof String[]) { - return VTYPE_STRINGARRAY; + return JsonConstants.VTYPE_STRINGARRAY; } else if (value instanceof Object[]) { - return VTYPE_ARRAY; + return JsonConstants.VTYPE_ARRAY; } else if (value instanceof Map) { - return VTYPE_MAP; + return JsonConstants.VTYPE_MAP; } else if (value instanceof Enum<?>) { // Enum value is processed as a string - return VTYPE_STRING; + return JsonConstants.VTYPE_STRING; } return null; } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java index b7b6b13d3c..d1ed741590 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/ClickEventHandler.java @@ -4,16 +4,15 @@ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.dom.client.NativeEvent; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder; public abstract class ClickEventHandler extends AbstractClickEventHandler { - public static final String CLICK_EVENT_IDENTIFIER = "click"; - public ClickEventHandler(ComponentConnector connector) { - this(connector, CLICK_EVENT_IDENTIFIER); + this(connector, EventId.CLICK_EVENT_IDENTIFIER); } public ClickEventHandler(ComponentConnector connector, diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java b/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java index 9aafaa0bbf..444e44495c 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/LayoutClickEventHandler.java @@ -5,6 +5,7 @@ package com.vaadin.terminal.gwt.client.ui; import com.google.gwt.dom.client.NativeEvent; import com.google.gwt.user.client.Element; +import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.LayoutClickRpc; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -12,10 +13,8 @@ import com.vaadin.terminal.gwt.client.MouseEventDetailsBuilder; public abstract class LayoutClickEventHandler extends AbstractClickEventHandler { - public static final String LAYOUT_CLICK_EVENT_IDENTIFIER = "lClick"; - public LayoutClickEventHandler(ComponentConnector connector) { - this(connector, LAYOUT_CLICK_EVENT_IDENTIFIER); + this(connector, EventId.LAYOUT_CLICK_EVENT_IDENTIFIER); } public LayoutClickEventHandler(ComponentConnector connector, diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java b/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java index d9320787e8..53498d9108 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/accordion/VAccordion.java @@ -15,6 +15,7 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.ComplexPanel; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.ConnectorMap; import com.vaadin.terminal.gwt.client.UIDL; @@ -22,7 +23,6 @@ import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.VCaption; import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate; import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler; -import com.vaadin.terminal.gwt.client.ui.tabsheet.TabsheetBaseConnector; import com.vaadin.terminal.gwt.client.ui.tabsheet.VTabsheetBase; public class VAccordion extends VTabsheetBase { @@ -442,11 +442,11 @@ public class VAccordion extends VTabsheetBase { public void updateCaption(UIDL uidl) { // TODO need to call this because the caption does not have an owner caption.updateCaptionWithoutOwner( - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE), - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ICON)); + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_CAPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE), + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ICON)); } public int getWidgetWidth() { diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java index 0fa71bb7a6..65d9f3a09f 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java @@ -6,6 +6,7 @@ package com.vaadin.terminal.gwt.client.ui.combobox; import java.util.Iterator; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.combobox.ComboBoxConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -46,8 +47,8 @@ public class ComboBoxConnector extends AbstractFieldConnector implements // Inverse logic here to make the default case (text input enabled) // work without additional UIDL messages boolean noTextInput = uidl - .hasAttribute(VFilterSelect.ATTR_NO_TEXT_INPUT) - && uidl.getBooleanAttribute(VFilterSelect.ATTR_NO_TEXT_INPUT); + .hasAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT) + && uidl.getBooleanAttribute(ComboBoxConstants.ATTR_NO_TEXT_INPUT); getWidget().setTextInputEnabled(!noTextInput); // not a FocusWidget -> needs own tabindex handling @@ -72,10 +73,10 @@ public class ComboBoxConnector extends AbstractFieldConnector implements getWidget().pageLength = uidl.getIntAttribute("pagelength"); } - if (uidl.hasAttribute(VFilterSelect.ATTR_INPUTPROMPT)) { + if (uidl.hasAttribute(ComboBoxConstants.ATTR_INPUTPROMPT)) { // input prompt changed from server getWidget().inputPrompt = uidl - .getStringAttribute(VFilterSelect.ATTR_INPUTPROMPT); + .getStringAttribute(ComboBoxConstants.ATTR_INPUTPROMPT); } else { getWidget().inputPrompt = ""; } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java index 6e24a74e04..c7c071f225 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/combobox/VFilterSelect.java @@ -919,8 +919,6 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, // shown in unfocused empty field, disappears on focus (e.g "Search here") private static final String CLASSNAME_PROMPT = "prompt"; - protected static final String ATTR_INPUTPROMPT = "prompt"; - public static final String ATTR_NO_TEXT_INPUT = "noInput"; protected String inputPrompt = ""; protected boolean prompting = false; @@ -1688,9 +1686,9 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler, @Override public Element getSubPartElement(String subPart) { if ("textbox".equals(subPart)) { - return this.tb.getElement(); + return tb.getElement(); } else if ("button".equals(subPart)) { - return this.popupOpener.getElement(); + return popupOpener.getElement(); } return null; } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java index 159b5bc414..f0b3510a55 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/AbstractDateFieldConnector.java @@ -5,6 +5,7 @@ package com.vaadin.terminal.gwt.client.ui.datefield; import java.util.Date; +import com.vaadin.shared.ui.datefield.DateFieldConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.LocaleNotLoadedException; import com.vaadin.terminal.gwt.client.Paintable; @@ -46,7 +47,7 @@ public class AbstractDateFieldConnector extends AbstractFieldConnector // We show week numbers only if the week starts with Monday, as ISO 8601 // specifies getWidget().showISOWeekNumbers = uidl - .getBooleanAttribute(VDateField.WEEK_NUMBERS) + .getBooleanAttribute(DateFieldConstants.ATTR_WEEK_NUMBERS) && getWidget().dts.getFirstDayOfWeek() == 1; int newResolution; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java index 614c4febdd..130e3f2325 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/datefield/VDateField.java @@ -28,8 +28,6 @@ public class VDateField extends FlowPanel implements Field { public static final int RESOLUTION_MIN = 16; public static final int RESOLUTION_SEC = 32; - public static final String WEEK_NUMBERS = "wn"; - static String resolutionToString(int res) { if (res > RESOLUTION_DAY) { return "full"; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java index 6914b451fa..4b7a0ae109 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.Set; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -54,10 +55,10 @@ public class DragAndDropWrapperConnector extends CustomComponentConnector getWidget().startNextUpload(); getWidget().dragStartMode = uidl - .getIntAttribute(VDragAndDropWrapper.DRAG_START_MODE); + .getIntAttribute(DragAndDropWrapperConstants.DRAG_START_MODE); getWidget().initDragStartMode(); getWidget().html5DataFlavors = uidl - .getMapAttribute(VDragAndDropWrapper.HTML5_DATA_FLAVORS); + .getMapAttribute(DragAndDropWrapperConstants.HTML5_DATA_FLAVORS); // Used to prevent wrapper from stealing tooltips when not defined getWidget().hasTooltip = getState().hasDescription(); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java index e77055764e..0be1e899a3 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/VDragAndDropWrapper.java @@ -53,8 +53,6 @@ import com.vaadin.terminal.gwt.client.ui.dd.VTransferable; */ public class VDragAndDropWrapper extends VCustomComponent implements VHasDropHandler { - public static final String DRAG_START_MODE = "dragStartMode"; - public static final String HTML5_DATA_FLAVORS = "html5-data-flavors"; private static final String CLASSNAME = "v-ddwrapper"; protected static final String DRAGGABLE = "draggable"; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java index a1851d9c84..9071324e56 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java @@ -17,6 +17,7 @@ import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.embedded.EmbeddedConstants; import com.vaadin.shared.ui.embedded.EmbeddedServerRpc; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; @@ -32,8 +33,6 @@ import com.vaadin.ui.Embedded; public class EmbeddedConnector extends AbstractComponentConnector implements Paintable { - public static final String ALTERNATE_TEXT = "alt"; - EmbeddedServerRpc rpc; @Override @@ -96,9 +95,10 @@ public class EmbeddedConnector extends AbstractComponentConnector implements DOM.setElementProperty(el, "src", getWidget().getSrc(uidl, client)); - if (uidl.hasAttribute(ALTERNATE_TEXT)) { - el.setPropertyString(ALTERNATE_TEXT, - uidl.getStringAttribute(ALTERNATE_TEXT)); + if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { + el.setPropertyString( + EmbeddedConstants.ALTERNATE_TEXT, + uidl.getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } if (created) { @@ -188,8 +188,9 @@ public class EmbeddedConnector extends AbstractComponentConnector implements uidl.getStringAttribute("standby")); } getWidget().getElement().appendChild(obj); - if (uidl.hasAttribute(ALTERNATE_TEXT)) { - obj.setInnerText(uidl.getStringAttribute(ALTERNATE_TEXT)); + if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { + obj.setInnerText(uidl + .getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } } else { VConsole.log("Unknown Embedded mimetype '" + mime + "'"); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java index 1d2a5a156a..70703c1b06 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/embedded/VEmbedded.java @@ -12,6 +12,7 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.ui.HTML; +import com.vaadin.shared.ui.embedded.EmbeddedConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -153,9 +154,9 @@ public class VEmbedded extends HTML { // End embed tag html.append("></embed>"); - if (uidl.hasAttribute(EmbeddedConnector.ALTERNATE_TEXT)) { + if (uidl.hasAttribute(EmbeddedConstants.ALTERNATE_TEXT)) { html.append(uidl - .getStringAttribute(EmbeddedConnector.ALTERNATE_TEXT)); + .getStringAttribute(EmbeddedConstants.ALTERNATE_TEXT)); } // End object tag diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java index 2a8923bbc0..539e6aa0e7 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java @@ -11,6 +11,7 @@ import com.google.gwt.dom.client.Element; import com.google.gwt.user.client.Command; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; +import com.vaadin.shared.ui.menubar.MenuBarConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.TooltipInfo; @@ -19,11 +20,11 @@ import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector; import com.vaadin.terminal.gwt.client.ui.Icon; import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout; -import com.vaadin.terminal.gwt.client.ui.menubar.VMenuBar.CustomMenuItem; @Connect(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY) public class MenuBarConnector extends AbstractComponentConnector implements Paintable, SimpleManagedLayout { + /** * This method must be implemented to update the client-side component from * UIDL data received from server. @@ -38,10 +39,10 @@ public class MenuBarConnector extends AbstractComponentConnector implements } getWidget().htmlContentAllowed = uidl - .hasAttribute(VMenuBar.HTML_CONTENT_ALLOWED); + .hasAttribute(MenuBarConstants.HTML_CONTENT_ALLOWED); getWidget().openRootOnHover = uidl - .getBooleanAttribute(VMenuBar.OPEN_ROOT_MENU_ON_HOWER); + .getBooleanAttribute(MenuBarConstants.OPEN_ROOT_MENU_ON_HOWER); getWidget().enabled = isEnabled(); @@ -74,7 +75,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements } itemHTML.append(moreItemText); - getWidget().moreItem = GWT.create(CustomMenuItem.class); + getWidget().moreItem = GWT.create(VMenuBar.CustomMenuItem.class); getWidget().moreItem.setHTML(itemHTML.toString()); getWidget().moreItem.setCommand(VMenuBar.emptyCommand); @@ -92,13 +93,13 @@ public class MenuBarConnector extends AbstractComponentConnector implements while (itr.hasNext()) { UIDL item = (UIDL) itr.next(); - CustomMenuItem currentItem = null; + VMenuBar.CustomMenuItem currentItem = null; final int itemId = item.getIntAttribute("id"); boolean itemHasCommand = item.hasAttribute("command"); boolean itemIsCheckable = item - .hasAttribute(VMenuBar.ATTRIBUTE_CHECKED); + .hasAttribute(MenuBarConstants.ATTRIBUTE_CHECKED); String itemHTML = getWidget().buildItemHTML(item); @@ -138,7 +139,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements while (!itr.hasNext() && !iteratorStack.empty()) { boolean hasCheckableItem = false; - for (CustomMenuItem menuItem : currentMenu.getItems()) { + for (VMenuBar.CustomMenuItem menuItem : currentMenu.getItems()) { hasCheckableItem = hasCheckableItem || menuItem.isCheckable(); } @@ -174,7 +175,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements // Check content of widget to find tooltip for element if (element != getWidget().getElement()) { - CustomMenuItem item = getWidget().getMenuItemWithElement( + VMenuBar.CustomMenuItem item = getWidget().getMenuItemWithElement( (com.google.gwt.user.client.Element) element); if (item != null) { info = item.getTooltip(); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java index 47bda81362..eaffb058d1 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/menubar/VMenuBar.java @@ -30,6 +30,7 @@ import com.google.gwt.user.client.ui.HasHTML; 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.shared.ui.menubar.MenuBarConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.LayoutManager; @@ -66,16 +67,6 @@ public class VMenuBar extends SimpleFocusablePanel implements // associated protected static final Command emptyCommand = null; - public static final String OPEN_ROOT_MENU_ON_HOWER = "ormoh"; - - public static final String ATTRIBUTE_CHECKED = "checked"; - public static final String ATTRIBUTE_ITEM_DESCRIPTION = "description"; - public static final String ATTRIBUTE_ITEM_ICON = "icon"; - public static final String ATTRIBUTE_ITEM_DISABLED = "disabled"; - public static final String ATTRIBUTE_ITEM_STYLE = "style"; - - public static final String HTML_CONTENT_ALLOWED = "usehtml"; - /** Widget fields **/ protected boolean subMenu; protected ArrayList<CustomMenuItem> items; @@ -905,26 +896,29 @@ public class VMenuBar extends SimpleFocusablePanel implements public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { setSeparator(uidl.hasAttribute("separator")); - setEnabled(!uidl.hasAttribute(ATTRIBUTE_ITEM_DISABLED)); + setEnabled(!uidl + .hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DISABLED)); - if (!isSeparator() && uidl.hasAttribute(ATTRIBUTE_CHECKED)) { + if (!isSeparator() + && uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_CHECKED)) { // if the selected attribute is present (either true or false), // the item is selectable setCheckable(true); - setChecked(uidl.getBooleanAttribute(ATTRIBUTE_CHECKED)); + setChecked(uidl + .getBooleanAttribute(MenuBarConstants.ATTRIBUTE_CHECKED)); } else { setCheckable(false); } - if (uidl.hasAttribute(ATTRIBUTE_ITEM_STYLE)) { + if (uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE)) { String itemStyle = uidl - .getStringAttribute(ATTRIBUTE_ITEM_STYLE); + .getStringAttribute(MenuBarConstants.ATTRIBUTE_ITEM_STYLE); addStyleDependentName(itemStyle); } - if (uidl.hasAttribute(ATTRIBUTE_ITEM_DESCRIPTION)) { + if (uidl.hasAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION)) { description = uidl - .getStringAttribute(ATTRIBUTE_ITEM_DESCRIPTION); + .getStringAttribute(MenuBarConstants.ATTRIBUTE_ITEM_DESCRIPTION); } } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java b/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java index 1309155443..e48f504464 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/notification/VNotification.java @@ -17,12 +17,12 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ui.VOverlay; -import com.vaadin.terminal.gwt.client.ui.root.VRoot; public class VNotification extends VOverlay { @@ -60,13 +60,6 @@ public class VNotification extends VOverlay { private ArrayList<EventListener> listeners; private static final int TOUCH_DEVICE_IDLE_DELAY = 1000; - public static final String ATTRIBUTE_NOTIFICATION_STYLE = "style"; - public static final String ATTRIBUTE_NOTIFICATION_CAPTION = "caption"; - public static final String ATTRIBUTE_NOTIFICATION_MESSAGE = "message"; - public static final String ATTRIBUTE_NOTIFICATION_ICON = "icon"; - public static final String ATTRIBUTE_NOTIFICATION_POSITION = "position"; - public static final String ATTRIBUTE_NOTIFICATION_DELAY = "delay"; - /** * Default constructor. You should use GWT.create instead. */ @@ -378,25 +371,29 @@ public class VNotification extends VOverlay { public static void showNotification(ApplicationConnection client, final UIDL notification) { boolean onlyPlainText = notification - .hasAttribute(VRoot.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED); + .hasAttribute(RootConstants.NOTIFICATION_HTML_CONTENT_NOT_ALLOWED); String html = ""; - if (notification.hasAttribute(ATTRIBUTE_NOTIFICATION_ICON)) { - final String parsedUri = client.translateVaadinUri(notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_ICON)); + if (notification + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_ICON)) { + final String parsedUri = client + .translateVaadinUri(notification + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_ICON)); html += "<img src=\"" + Util.escapeAttribute(parsedUri) + "\" />"; } - if (notification.hasAttribute(ATTRIBUTE_NOTIFICATION_CAPTION)) { + if (notification + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_CAPTION)) { String caption = notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_CAPTION); + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_CAPTION); if (onlyPlainText) { caption = Util.escapeHTML(caption); caption = caption.replaceAll("\\n", "<br />"); } html += "<h1>" + caption + "</h1>"; } - if (notification.hasAttribute(ATTRIBUTE_NOTIFICATION_MESSAGE)) { + if (notification + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_MESSAGE)) { String message = notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_MESSAGE); + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_MESSAGE); if (onlyPlainText) { message = Util.escapeHTML(message); message = message.replaceAll("\\n", "<br />"); @@ -405,12 +402,13 @@ public class VNotification extends VOverlay { } final String style = notification - .hasAttribute(ATTRIBUTE_NOTIFICATION_STYLE) ? notification - .getStringAttribute(ATTRIBUTE_NOTIFICATION_STYLE) : null; + .hasAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_STYLE) ? notification + .getStringAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_STYLE) + : null; final int position = notification - .getIntAttribute(ATTRIBUTE_NOTIFICATION_POSITION); + .getIntAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_POSITION); final int delay = notification - .getIntAttribute(ATTRIBUTE_NOTIFICATION_DELAY); + .getIntAttribute(RootConstants.ATTRIBUTE_NOTIFICATION_DELAY); createNotification(delay).show(html, position, style); } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java index caf85348d4..3376ca3292 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java @@ -11,6 +11,7 @@ import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.EventId; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.ui.OptionGroup; @@ -21,7 +22,7 @@ public class OptionGroupConnector extends OptionGroupBaseConnector { @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().htmlContentAllowed = uidl - .hasAttribute(VOptionGroup.HTML_CONTENT_ALLOWED); + .hasAttribute(OptionGroupConstants.HTML_CONTENT_ALLOWED); super.updateFromUIDL(uidl, client); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java index a6cdf7e888..130282ac1b 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/optiongroup/VOptionGroup.java @@ -26,6 +26,7 @@ import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.RadioButton; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.EventId; +import com.vaadin.shared.ui.optiongroup.OptionGroupConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; @@ -35,12 +36,8 @@ import com.vaadin.terminal.gwt.client.ui.checkbox.VCheckBox; public class VOptionGroup extends VOptionGroupBase implements FocusHandler, BlurHandler { - public static final String HTML_CONTENT_ALLOWED = "usehtml"; - public static final String CLASSNAME = "v-select-optiongroup"; - public static final String ATTRIBUTE_OPTION_DISABLED = "disabled"; - protected final Panel panel; private final Map<CheckBox, String> optionsToKeys; @@ -112,7 +109,7 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler, op.addStyleName(CLASSNAME_OPTION); op.setValue(opUidl.getBooleanAttribute("selected")); boolean enabled = !opUidl - .getBooleanAttribute(ATTRIBUTE_OPTION_DISABLED) + .getBooleanAttribute(OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED) && !isReadonly() && !isDisabled(); op.setEnabled(enabled); setStyleName(op.getElement(), diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java index 7b5097ff77..6d339d2c13 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java @@ -23,6 +23,7 @@ import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.root.PageClientRpc; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.shared.ui.root.RootServerRpc; import com.vaadin.shared.ui.root.RootState; import com.vaadin.terminal.gwt.client.ApplicationConnection; @@ -82,7 +83,7 @@ public class RootConnector extends AbstractComponentContainerConnector getWidget().connection = client; getWidget().immediate = getState().isImmediate(); - getWidget().resizeLazy = uidl.hasAttribute(VRoot.RESIZE_LAZY); + getWidget().resizeLazy = uidl.hasAttribute(RootConstants.RESIZE_LAZY); String newTheme = uidl.getStringAttribute("theme"); if (getWidget().theme != null && !newTheme.equals(getWidget().theme)) { // Complete page refresh is needed due css can affect layout @@ -238,9 +239,9 @@ public class RootConnector extends AbstractComponentContainerConnector scrollIntoView(connector); } - if (uidl.hasAttribute(VRoot.FRAGMENT_VARIABLE)) { + if (uidl.hasAttribute(RootConstants.FRAGMENT_VARIABLE)) { getWidget().currentFragment = uidl - .getStringAttribute(VRoot.FRAGMENT_VARIABLE); + .getStringAttribute(RootConstants.FRAGMENT_VARIABLE); if (!getWidget().currentFragment.equals(History.getToken())) { History.newItem(getWidget().currentFragment, true); } @@ -250,7 +251,8 @@ public class RootConnector extends AbstractComponentContainerConnector getWidget().currentFragment = History.getToken(); // Include current fragment in the next request - client.updateVariable(getWidget().id, VRoot.FRAGMENT_VARIABLE, + client.updateVariable(getWidget().id, + RootConstants.FRAGMENT_VARIABLE, getWidget().currentFragment, false); } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java b/client/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java index fddb76e755..7b8a5091ba 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/root/VRoot.java @@ -19,6 +19,8 @@ import com.google.gwt.user.client.History; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.SimplePanel; +import com.vaadin.shared.ApplicationConstants; +import com.vaadin.shared.ui.root.RootConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -38,16 +40,8 @@ import com.vaadin.terminal.gwt.client.ui.textfield.VTextField; public class VRoot extends SimplePanel implements ResizeHandler, Window.ClosingHandler, ShortcutActionHandlerOwner, Focusable { - public static final String FRAGMENT_VARIABLE = "fragment"; - - public static final String BROWSER_HEIGHT_VAR = "browserHeight"; - - public static final String BROWSER_WIDTH_VAR = "browserWidth"; - private static final String CLASSNAME = "v-view"; - public static final String NOTIFICATION_HTML_CONTENT_NOT_ALLOWED = "useplain"; - private static int MONITOR_PARENT_TIMER_INTERVAL = 1000; String theme; @@ -73,9 +67,6 @@ public class VRoot extends SimplePanel implements ResizeHandler, ApplicationConnection connection; - /** Identifies the click event */ - public static final String CLICK_EVENT_ID = "click"; - /** * Keep track of possible parent size changes when an embedded application. * @@ -102,11 +93,6 @@ public class VRoot extends SimplePanel implements ResizeHandler, boolean resizeLazy = false; - /** - * Attribute name for the lazy resize setting . - */ - public static final String RESIZE_LAZY = "rL"; - private HandlerRegistration historyHandlerRegistration; private TouchScrollHandler touchScrollHandler; @@ -130,8 +116,8 @@ public class VRoot extends SimplePanel implements ResizeHandler, // Send the new fragment to the server if it has changed if (!newFragment.equals(currentFragment) && connection != null) { currentFragment = newFragment; - connection.updateVariable(id, FRAGMENT_VARIABLE, newFragment, - true); + connection.updateVariable(id, RootConstants.FRAGMENT_VARIABLE, + newFragment, true); } } }; @@ -311,7 +297,7 @@ public class VRoot extends SimplePanel implements ResizeHandler, */ public boolean isEmbedded() { return !getElement().getOwnerDocument().getBody().getClassName() - .contains(ApplicationConnection.GENERATED_BODY_CLASSNAME); + .contains(ApplicationConstants.GENERATED_BODY_CLASSNAME); } /** @@ -409,9 +395,10 @@ public class VRoot extends SimplePanel implements ResizeHandler, int windowWidth = Window.getClientWidth(); int windowHeight = Window.getClientHeight(); - connection.updateVariable(id, BROWSER_WIDTH_VAR, windowWidth, false); - connection.updateVariable(id, BROWSER_HEIGHT_VAR, windowHeight, - immediate); + connection.updateVariable(id, RootConstants.BROWSER_WIDTH_VAR, + windowWidth, false); + connection.updateVariable(id, RootConstants.BROWSER_HEIGHT_VAR, + windowHeight, immediate); } public native static void goTo(String url) @@ -458,4 +445,5 @@ public class VRoot extends SimplePanel implements ResizeHandler, } touchScrollHandler.addElement(getElement()); } + } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java index 7721a3d763..2c5a36ee3c 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java @@ -13,6 +13,7 @@ import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -53,11 +54,11 @@ public class TableConnector extends AbstractComponentContainerConnector // required. ContextMenuDetails contextMenuBeforeUpdate = getWidget().contextMenu; - if (uidl.hasAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_FIRST)) { + if (uidl.hasAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_FIRST)) { getWidget().serverCacheFirst = uidl - .getIntAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_FIRST); + .getIntAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_FIRST); getWidget().serverCacheLast = uidl - .getIntAttribute(VScrollTable.ATTRIBUTE_PAGEBUFFER_LAST); + .getIntAttribute(TableConstants.ATTRIBUTE_PAGEBUFFER_LAST); } else { getWidget().serverCacheFirst = -1; getWidget().serverCacheLast = -1; @@ -255,8 +256,8 @@ public class TableConnector extends AbstractComponentContainerConnector * be cleared a little later when the row focus has been restored. * (#8584) */ - if (uidl.hasAttribute(VScrollTable.ATTRIBUTE_KEY_MAPPER_RESET) - && uidl.getBooleanAttribute(VScrollTable.ATTRIBUTE_KEY_MAPPER_RESET) + if (uidl.hasAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) + && uidl.getBooleanAttribute(TableConstants.ATTRIBUTE_KEY_MAPPER_RESET) && getWidget().selectionRangeStart != null) { assert !getWidget().selectionRangeStart.isAttached(); getWidget().selectionRangeStart = getWidget().focusedRow; diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java b/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java index 8a58c28c5b..bab34768ce 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/table/VScrollTable.java @@ -63,6 +63,7 @@ import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.ComponentState; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.table.TableConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -131,26 +132,11 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } - /** - * Tell the client that old keys are no longer valid because the server has - * cleared its key map. - */ - public static final String ATTRIBUTE_KEY_MAPPER_RESET = "clearKeyMap"; - private static final String ROW_HEADER_COLUMN_KEY = "0"; public static final String CLASSNAME = "v-table"; public static final String CLASSNAME_SELECTION_FOCUS = CLASSNAME + "-focus"; - public static final String ATTRIBUTE_PAGEBUFFER_FIRST = "pb-ft"; - public static final String ATTRIBUTE_PAGEBUFFER_LAST = "pb-l"; - - public static final String ITEM_CLICK_EVENT_ID = "itemClick"; - public static final String HEADER_CLICK_EVENT_ID = "handleHeaderClick"; - public static final String FOOTER_CLICK_EVENT_ID = "handleFooterClick"; - public static final String COLUMN_RESIZE_EVENT_ID = "columnResize"; - public static final String COLUMN_REORDER_EVENT_ID = "columnReorder"; - private static final double CACHE_RATE_DEFAULT = 2; /** @@ -1624,7 +1610,8 @@ public class VScrollTable extends FlowPanel implements HasWidgets, } } client.updateVariable(paintableId, "columnorder", columnOrder, false); - if (client.hasEventListeners(this, COLUMN_REORDER_EVENT_ID)) { + if (client.hasEventListeners(this, + TableConstants.COLUMN_REORDER_EVENT_ID)) { client.sendPendingVariableChanges(); } } @@ -2324,7 +2311,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, boolean stopPropagation = true; if (event.getTypeInt() == Event.ONCONTEXTMENU && !client.hasEventListeners(VScrollTable.this, - HEADER_CLICK_EVENT_ID)) { + TableConstants.HEADER_CLICK_EVENT_ID)) { // Prevent showing the browser's context menu only when // there is a header click listener. stopPropagation = false; @@ -2377,7 +2364,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ private void fireHeaderClickedEvent(Event event) { if (client.hasEventListeners(VScrollTable.this, - HEADER_CLICK_EVENT_ID)) { + TableConstants.HEADER_CLICK_EVENT_ID)) { MouseEventDetails details = MouseEventDetailsBuilder .buildMouseEventDetails(event); client.updateVariable(paintableId, "headerClickEvent", @@ -3424,7 +3411,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, boolean stopPropagation = true; if (event.getTypeInt() == Event.ONCONTEXTMENU && !client.hasEventListeners(VScrollTable.this, - FOOTER_CLICK_EVENT_ID)) { + TableConstants.FOOTER_CLICK_EVENT_ID)) { // Show browser context menu if a footer click listener is // not present stopPropagation = false; @@ -3458,7 +3445,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, */ private void fireFooterClickedEvent(Event event) { if (client.hasEventListeners(VScrollTable.this, - FOOTER_CLICK_EVENT_ID)) { + TableConstants.FOOTER_CLICK_EVENT_ID)) { MouseEventDetails details = MouseEventDetailsBuilder .buildMouseEventDetails(event); client.updateVariable(paintableId, "footerClickEvent", @@ -4786,7 +4773,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets, private boolean handleClickEvent(Event event, Element targetTdOrTr, boolean immediate) { if (!client.hasEventListeners(VScrollTable.this, - ITEM_CLICK_EVENT_ID)) { + TableConstants.ITEM_CLICK_EVENT_ID)) { // Don't send an event if nobody is listening return false; } @@ -4960,8 +4947,9 @@ public class VScrollTable extends FlowPanel implements HasWidgets, showContextMenu(event); if (enabled && (actionKeys != null || client - .hasEventListeners(VScrollTable.this, - ITEM_CLICK_EVENT_ID))) { + .hasEventListeners( + VScrollTable.this, + TableConstants.ITEM_CLICK_EVENT_ID))) { /* * Prevent browser context menu only if there are * action handlers or item click listeners diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java index ea0bea6b04..35d5b65b04 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetBaseConnector.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.Iterator; import com.google.gwt.user.client.ui.Widget; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.ComponentConnector; import com.vaadin.terminal.gwt.client.Paintable; @@ -16,12 +17,6 @@ import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector; public abstract class TabsheetBaseConnector extends AbstractComponentContainerConnector implements Paintable { - public static final String ATTRIBUTE_TAB_DISABLED = "disabled"; - public static final String ATTRIBUTE_TAB_DESCRIPTION = "description"; - public static final String ATTRIBUTE_TAB_ERROR_MESSAGE = "error"; - public static final String ATTRIBUTE_TAB_CAPTION = "caption"; - public static final String ATTRIBUTE_TAB_ICON = "icon"; - @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { getWidget().client = client; @@ -55,7 +50,7 @@ public abstract class TabsheetBaseConnector extends final boolean selected = tab.getBooleanAttribute("selected"); final boolean hidden = tab.getBooleanAttribute("hidden"); - if (tab.getBooleanAttribute(ATTRIBUTE_TAB_DISABLED)) { + if (tab.getBooleanAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED)) { getWidget().disabledTabKeys.add(key); } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java index ce19f1e02a..86e73149c3 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java @@ -19,6 +19,7 @@ import com.vaadin.ui.TabSheet; public class TabsheetConnector extends TabsheetBaseConnector implements SimpleManagedLayout, MayScrollChildren { + // Can't use "style" as it's already in use @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java index 1f6314050e..517876db19 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tabsheet/VTabsheet.java @@ -36,6 +36,8 @@ import com.google.gwt.user.client.ui.Widget; import com.google.gwt.user.client.ui.impl.FocusImpl; import com.vaadin.shared.ComponentState; import com.vaadin.shared.EventId; +import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; +import com.vaadin.shared.ui.tabsheet.TabsheetConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -187,7 +189,8 @@ public class VTabsheet extends VTabsheetBase implements Focusable, tabCaption.updateCaption(tabUidl); // Apply the styleName set for the tab - String newStyleName = tabUidl.getStringAttribute(TAB_STYLE_NAME); + String newStyleName = tabUidl + .getStringAttribute(TabsheetConstants.TAB_STYLE_NAME); // Find the nth td element if (newStyleName != null && newStyleName.length() != 0) { if (!newStyleName.equals(styleName)) { @@ -250,10 +253,10 @@ public class VTabsheet extends VTabsheetBase implements Focusable, } public boolean updateCaption(UIDL uidl) { - if (uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION)) { + if (uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION)) { setTooltipInfo(new TooltipInfo( - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION), - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE))); + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION), + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE))); } else { setTooltipInfo(null); } @@ -261,11 +264,11 @@ public class VTabsheet extends VTabsheetBase implements Focusable, // TODO need to call this instead of super because the caption does // not have an owner boolean ret = updateCaptionWithoutOwner( - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_CAPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DISABLED), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_DESCRIPTION), - uidl.hasAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ERROR_MESSAGE), - uidl.getStringAttribute(TabsheetBaseConnector.ATTRIBUTE_TAB_ICON)); + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_CAPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DISABLED), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_DESCRIPTION), + uidl.hasAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ERROR_MESSAGE), + uidl.getStringAttribute(TabsheetBaseConstants.ATTRIBUTE_TAB_ICON)); setClosable(uidl.hasAttribute("closable")); @@ -541,9 +544,6 @@ 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"; - // Can't use "style" as it's already in use - public static final String TAB_STYLE_NAME = "tabstyle"; - final Element tabs; // tabbar and 'scroller' container Tab focusedTab; /** diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java index d98d27942a..10bfe75e7b 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java @@ -10,6 +10,7 @@ import com.google.gwt.user.client.Event; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; import com.vaadin.shared.ui.textfield.AbstractTextFieldState; +import com.vaadin.shared.ui.textfield.TextFieldConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; @@ -45,13 +46,13 @@ public class TextFieldConnector extends AbstractFieldConnector implements getWidget().listenTextChangeEvents = hasEventListener("ie"); if (getWidget().listenTextChangeEvents) { getWidget().textChangeEventMode = uidl - .getStringAttribute(VTextField.ATTR_TEXTCHANGE_EVENTMODE); + .getStringAttribute(TextFieldConstants.ATTR_TEXTCHANGE_EVENTMODE); if (getWidget().textChangeEventMode - .equals(VTextField.TEXTCHANGE_MODE_EAGER)) { + .equals(TextFieldConstants.TEXTCHANGE_MODE_EAGER)) { getWidget().textChangeEventTimeout = 1; } else { getWidget().textChangeEventTimeout = uidl - .getIntAttribute(VTextField.ATTR_TEXTCHANGE_TIMEOUT); + .getIntAttribute(TextFieldConstants.ATTR_TEXTCHANGE_TIMEOUT); if (getWidget().textChangeEventTimeout < 1) { // Sanitize and allow lazy/timeout with timeout set to 0 to // work as eager @@ -72,7 +73,7 @@ public class TextFieldConnector extends AbstractFieldConnector implements * value). */ if (!(uidl - .getBooleanAttribute(VTextField.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS) + .getBooleanAttribute(TextFieldConstants.ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS) && getWidget().valueBeforeEdit != null && text .equals(getWidget().valueBeforeEdit))) { getWidget().updateFieldContent(text); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java index 7f8e549550..2d817592d2 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/textfield/VTextField.java @@ -19,6 +19,7 @@ import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.ui.TextBoxBase; import com.vaadin.shared.EventId; +import com.vaadin.shared.ui.textfield.TextFieldConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Util; @@ -33,9 +34,6 @@ import com.vaadin.terminal.gwt.client.ui.Field; public class VTextField extends TextBoxBase implements Field, ChangeHandler, FocusHandler, BlurHandler, KeyDownHandler { - public static final String VAR_CUR_TEXT = "curText"; - - public static final String ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS = "nvc"; /** * The input node CSS classname. */ @@ -62,10 +60,6 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, private int maxLength = -1; private static final String CLASSNAME_PROMPT = "prompt"; - public static final String ATTR_TEXTCHANGE_TIMEOUT = "iet"; - public static final String VAR_CURSOR = "c"; - public static final String ATTR_TEXTCHANGE_EVENTMODE = "iem"; - protected static final String TEXTCHANGE_MODE_EAGER = "EAGER"; private static final String TEXTCHANGE_MODE_TIMEOUT = "TIMEOUT"; private String inputPrompt = null; @@ -142,7 +136,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, client.sendPendingVariableChanges(); } else { // Default case - just send an immediate text change message - client.updateVariable(paintableId, VAR_CUR_TEXT, text, true); + client.updateVariable(paintableId, + TextFieldConstants.VAR_CUR_TEXT, text, true); // Shouldn't investigate valueBeforeEdit to avoid duplicate text // change events as the states are not in sync any more @@ -334,7 +329,8 @@ public class VTextField extends TextBoxBase implements Field, ChangeHandler, if (Util.isAttachedAndDisplayed(this)) { int cursorPos = getCursorPos(); if (lastCursorPos != cursorPos) { - client.updateVariable(paintableId, VAR_CURSOR, cursorPos, false); + client.updateVariable(paintableId, + TextFieldConstants.VAR_CURSOR, cursorPos, false); lastCursorPos = cursorPos; return true; } diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java index def63edae9..991b81821c 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java @@ -10,6 +10,7 @@ import java.util.Map; import com.google.gwt.dom.client.Element; import com.vaadin.shared.AbstractFieldState; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Paintable; @@ -24,13 +25,6 @@ import com.vaadin.ui.Tree; public class TreeConnector extends AbstractComponentConnector implements Paintable { - public static final String ATTRIBUTE_NODE_STYLE = "style"; - public static final String ATTRIBUTE_NODE_CAPTION = "caption"; - public static final String ATTRIBUTE_NODE_ICON = "icon"; - - public static final String ATTRIBUTE_ACTION_CAPTION = "caption"; - public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON; - protected final Map<TreeNode, TooltipInfo> tooltipMap = new HashMap<TreeNode, TooltipInfo>(); @Override @@ -165,11 +159,12 @@ public class TreeConnector extends AbstractComponentConnector implements final UIDL action = (UIDL) it.next(); final String key = action.getStringAttribute("key"); final String caption = action - .getStringAttribute(ATTRIBUTE_ACTION_CAPTION); + .getStringAttribute(TreeConstants.ATTRIBUTE_ACTION_CAPTION); String iconUrl = null; - if (action.hasAttribute(ATTRIBUTE_ACTION_ICON)) { - iconUrl = getConnection().translateVaadinUri( - action.getStringAttribute(ATTRIBUTE_ACTION_ICON)); + if (action.hasAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON)) { + iconUrl = getConnection() + .translateVaadinUri( + action.getStringAttribute(TreeConstants.ATTRIBUTE_ACTION_ICON)); } getWidget().registerAction(key, caption, iconUrl); } @@ -178,7 +173,8 @@ public class TreeConnector extends AbstractComponentConnector implements public void updateNodeFromUIDL(TreeNode treeNode, UIDL uidl) { String nodeKey = uidl.getStringAttribute("key"); - treeNode.setText(uidl.getStringAttribute(ATTRIBUTE_NODE_CAPTION)); + treeNode.setText(uidl + .getStringAttribute(TreeConstants.ATTRIBUTE_NODE_CAPTION)); treeNode.key = nodeKey; getWidget().registerNode(treeNode); @@ -197,9 +193,9 @@ public class TreeConnector extends AbstractComponentConnector implements } else { treeNode.addStyleName(TreeNode.CLASSNAME + "-leaf"); } - if (uidl.hasAttribute(ATTRIBUTE_NODE_STYLE)) { + if (uidl.hasAttribute(TreeConstants.ATTRIBUTE_NODE_STYLE)) { treeNode.setNodeStyleName(uidl - .getStringAttribute(ATTRIBUTE_NODE_STYLE)); + .getStringAttribute(TreeConstants.ATTRIBUTE_NODE_STYLE)); } String description = uidl.getStringAttribute("descr"); @@ -218,7 +214,8 @@ public class TreeConnector extends AbstractComponentConnector implements getWidget().selectedIds.add(nodeKey); } - treeNode.setIcon(uidl.getStringAttribute(ATTRIBUTE_NODE_ICON)); + treeNode.setIcon(uidl + .getStringAttribute(TreeConstants.ATTRIBUTE_NODE_ICON)); } void renderChildNodes(TreeNode containerNode, Iterator<UIDL> i) { diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java b/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java index f5fe6bce1a..430e8d81ba 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/tree/VTree.java @@ -39,6 +39,7 @@ import com.google.gwt.user.client.ui.UIObject; import com.google.gwt.user.client.ui.Widget; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.VerticalDropLocation; +import com.vaadin.shared.ui.tree.TreeConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.ComponentConnector; @@ -71,8 +72,6 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, public static final String CLASSNAME = "v-tree"; - public static final String ITEM_CLICK_EVENT_ID = "itemClick"; - /** * Click selects the current node, ctrl/shift toggles multi selection */ @@ -663,8 +662,8 @@ public class VTree extends FocusElementPanel implements VHasDropHandler, final boolean inCaption = isCaptionElement(target); if (inCaption - && client - .hasEventListeners(VTree.this, ITEM_CLICK_EVENT_ID) + && client.hasEventListeners(VTree.this, + TreeConstants.ITEM_CLICK_EVENT_ID) && (type == Event.ONDBLCLICK || type == Event.ONMOUSEUP)) { fireClick(event); diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java b/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java index 06e916fbc9..2cfbdf703e 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java @@ -4,6 +4,7 @@ package com.vaadin.terminal.gwt.client.ui.treetable; import com.vaadin.shared.ui.Connect; +import com.vaadin.shared.ui.treetable.TreeTableConstants; import com.vaadin.terminal.gwt.client.ApplicationConnection; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel; @@ -14,7 +15,6 @@ import com.vaadin.ui.TreeTable; @Connect(TreeTable.class) public class TreeTableConnector extends TableConnector { - public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci"; @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { @@ -26,8 +26,9 @@ public class TreeTableConnector extends TableConnector { } getWidget().animationsEnabled = uidl.getBooleanAttribute("animate"); getWidget().colIndexOfHierarchy = uidl - .hasAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl - .getIntAttribute(ATTRIBUTE_HIERARCHY_COLUMN_INDEX) : 0; + .hasAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) ? uidl + .getIntAttribute(TreeTableConstants.ATTRIBUTE_HIERARCHY_COLUMN_INDEX) + : 0; int oldTotalRows = getWidget().getTotalRows(); super.updateFromUIDL(uidl, client); if (getWidget().collapseRequest) { diff --git a/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java b/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java index 1a2deae3b4..9c7ea76fb2 100644 --- a/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java +++ b/client/src/com/vaadin/terminal/gwt/client/ui/twincolselect/VTwinColSelect.java @@ -26,6 +26,7 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.ListBox; import com.google.gwt.user.client.ui.Panel; +import com.vaadin.shared.ui.twincolselect.TwinColSelectConstants; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.Util; import com.vaadin.terminal.gwt.client.ui.SubPartAware; @@ -36,8 +37,6 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, MouseDownHandler, DoubleClickHandler, SubPartAware { private static final String CLASSNAME = "v-select-twincol"; - public static final String ATTRIBUTE_LEFT_CAPTION = "lc"; - public static final String ATTRIBUTE_RIGHT_CAPTION = "rc"; private static final int VISIBLE_COUNT = 10; @@ -157,10 +156,14 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } protected void updateCaptions(UIDL uidl) { - String leftCaption = (uidl.hasAttribute(ATTRIBUTE_LEFT_CAPTION) ? uidl - .getStringAttribute(ATTRIBUTE_LEFT_CAPTION) : null); - String rightCaption = (uidl.hasAttribute(ATTRIBUTE_RIGHT_CAPTION) ? uidl - .getStringAttribute(ATTRIBUTE_RIGHT_CAPTION) : null); + String leftCaption = (uidl + .hasAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) ? uidl + .getStringAttribute(TwinColSelectConstants.ATTRIBUTE_LEFT_CAPTION) + : null); + String rightCaption = (uidl + .hasAttribute(TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION) ? uidl + .getStringAttribute(TwinColSelectConstants.ATTRIBUTE_RIGHT_CAPTION) + : null); boolean hasCaptions = (leftCaption != null || rightCaption != null); |