diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-09 17:19:39 +0200 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2016-03-10 10:24:42 +0200 |
| commit | 6c4c67234a3c2bbfea659006b9d85c2ce1375b8a (patch) | |
| tree | efc73a520271d67f5abf962778b050b10f3edd72 /shared/src/com | |
| parent | 16eae732958e7a5841e3f46a5968fa85833da05b (diff) | |
| download | vaadin-framework-6c4c67234a3c2bbfea659006b9d85c2ce1375b8a.tar.gz vaadin-framework-6c4c67234a3c2bbfea659006b9d85c2ce1375b8a.zip | |
Migrate vaadin-shared build to maven
Change-Id: I4ddc5050874faeb091740ac5ab4f9cafecf5696b
Diffstat (limited to 'shared/src/com')
187 files changed, 0 insertions, 9888 deletions
diff --git a/shared/src/com/vaadin/shared/AbstractComponentState.java b/shared/src/com/vaadin/shared/AbstractComponentState.java deleted file mode 100644 index 1c32a67c70..0000000000 --- a/shared/src/com/vaadin/shared/AbstractComponentState.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared; - -import java.util.List; - -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.communication.SharedState; - -/** - * Default shared state implementation for AbstractComponent. - * - * State classes of components should typically extend this class. - * - * @since 7.0 - */ -public class AbstractComponentState extends SharedState { - public String height = ""; - public String width = ""; - public boolean readOnly = false; - @NoLayout - public boolean immediate = false; - @NoLayout - public String description = ""; - // Note: for the caption, there is a difference between null and an empty - // string! - public String caption = null; - public List<String> styles = null; - public String id = null; - public String primaryStyleName = null; - - // HTML formatted error message for the component - // TODO this could be an object with more information, but currently the UI - // only uses the message - public String errorMessage = null; - public boolean captionAsHtml = false; -} diff --git a/shared/src/com/vaadin/shared/AbstractFieldState.java b/shared/src/com/vaadin/shared/AbstractFieldState.java deleted file mode 100644 index 3e9fd811de..0000000000 --- a/shared/src/com/vaadin/shared/AbstractFieldState.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import com.vaadin.shared.ui.TabIndexState; - -/** - * Shared state for {@link com.vaadin.ui.AbstractField}. - * - * @author Vaadin Ltd - * @since 7.0.0 - * - */ -public class AbstractFieldState extends TabIndexState { - public boolean propertyReadOnly = false; - public boolean hideErrors = false; - public boolean required = false; - public boolean modified = false; -} diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java deleted file mode 100644 index e5da716eb3..0000000000 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -public class ApplicationConstants implements Serializable { - - // 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 APP_PATH = "APP"; - - public static final String UIDL_PATH = "UIDL"; - - public static final String HEARTBEAT_PATH = "HEARTBEAT"; - - public static final String PUSH_PATH = "PUSH"; - - public static final String PUBLISHED_FILE_PATH = APP_PATH + '/' - + "PUBLISHED"; - - public static final String APP_PROTOCOL_PREFIX = "app://"; - public static final String VAADIN_PROTOCOL_PREFIX = "vaadin://"; - public static final String FONTICON_PROTOCOL_PREFIX = "fonticon://"; - public static final String PUBLISHED_PROTOCOL_NAME = "published"; - public static final String PUBLISHED_PROTOCOL_PREFIX = PUBLISHED_PROTOCOL_NAME - + "://"; - /** - * Prefix used for theme resource URLs - * - * @see com.vaadin.server.ThemeResource - * @since 7.5.0 - */ - public static final String THEME_PROTOCOL_PREFIX = "theme://"; - - public static final String UIDL_SECURITY_TOKEN_ID = "Vaadin-Security-Key"; - - @Deprecated - public static final String UPDATE_VARIABLE_INTERFACE = "v"; - @Deprecated - public static final String UPDATE_VARIABLE_METHOD = "v"; - - public static final String SERVICE_URL = "serviceUrl"; - - public static final String SERVICE_URL_PARAMETER_NAME = "pathParameterName"; - - // Javadocs in ApplicationConfiguration should be updated if this is changed - public static final String V_RESOURCE_PATH = "v-resourcePath"; - - @Deprecated - public static final String DRAG_AND_DROP_CONNECTOR_ID = "DD"; - - /** - * URL parameter used in UIDL requests to indicate that the full server-side - * state should be returned to the client, i.e. without any incremental - * changes. - */ - public static final String URL_PARAMETER_REPAINT_ALL = "repaintAll"; - - /** - * Configuration parameter giving the (in some cases relative) URL to the - * VAADIN folder from where themes and widgetsets are loaded. - * <p> - * <b>Refactor warning:</b> This value is also hardcoded in - * vaadinBootstrap.js. - * </p> - */ - public static final String VAADIN_DIR_URL = "vaadinDir"; - - /** - * The name of the javascript containing the bootstrap code. The file is - * located in the VAADIN directory. - * - * @since 7.3 - */ - public static final String VAADIN_BOOTSTRAP_JS = "vaadinBootstrap.js"; - - /** - * The name of the javascript containing push support. The file is located - * in the VAADIN directory. - */ - public static final String VAADIN_PUSH_JS = "vaadinPush.js"; - - /** - * The name of the debug version of the javascript containing push support. - * The file is located in the VAADIN directory. - * - * @since 7.1.6 - */ - public static final String VAADIN_PUSH_DEBUG_JS = "vaadinPush.debug.js"; - - /** - * Name of the parameter used to transmit the CSRF token. - */ - public static final String CSRF_TOKEN_PARAMETER = "v-csrfToken"; - - /** - * The name of the parameter used to transmit RPC invocations - * - * @since 7.2 - */ - public static final String RPC_INVOCATIONS = "rpc"; - - /** - * The name of the parameter used to transmit the CSRF token - * - * @since 7.2 - */ - public static final String CSRF_TOKEN = "csrfToken"; - - /** - * The name of the parameter used to transmit the sync id. The value can be - * set to -1 e.g. when testing with pre-recorded requests to make the - * framework ignore the sync id. - * - * @see com.vaadin.ui.ConnectorTracker#getCurrentSyncId() - * @since 7.2 - */ - public static final String SERVER_SYNC_ID = "syncId"; - - /** - * The name of the parameter used to transmit the id of the client to server - * messages. - * - * @since 7.6 - */ - public static final String CLIENT_TO_SERVER_ID = "clientId"; - - /** - * Default value to use in case the security protection is disabled. - */ - public static final String CSRF_TOKEN_DEFAULT_VALUE = "init"; - - /** - * The name of the parameter used for re-synchronizing. - */ - public static final String RESYNCHRONIZE_ID = "resynchronize"; - - /** - * The name of the parameter used for sending the widget set version to the - * server - * - * @since 7.6 - */ - public static final String WIDGETSET_VERSION_ID = "wsver"; - -} diff --git a/shared/src/com/vaadin/shared/ComponentConstants.java b/shared/src/com/vaadin/shared/ComponentConstants.java deleted file mode 100644 index dae1382256..0000000000 --- a/shared/src/com/vaadin/shared/ComponentConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared; - -import java.io.Serializable; - -public class ComponentConstants implements Serializable { - public static final String ICON_RESOURCE = "icon"; -} diff --git a/shared/src/com/vaadin/shared/Connector.java b/shared/src/com/vaadin/shared/Connector.java deleted file mode 100644 index c4a880f5ea..0000000000 --- a/shared/src/com/vaadin/shared/Connector.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -/** - * Interface implemented by all classes that are capable of communicating with - * the server or the client side. - * <p> - * A connector consists of a shared state (server sets the state and - * automatically communicates changes to the client) and the possibility to do - * RPC calls either from the server to the client or from the client to the - * server. - * </p> - * <p> - * No classes should implement this interface directly, client side classes - * wanting to communicate with server side should implement - * {@link com.vaadin.client.ServerConnector} and server side classes should - * implement {@link com.vaadin.server.ClientConnector}. - * </p> - * - * @author Vaadin Ltd - * @since 7.0.0 - */ -public interface Connector extends Serializable { - /** - * Returns the id for this connector. This is set by the framework and does - * not change during the lifetime of a connector. - * - * @return The id for the connector. - */ - public String getConnectorId(); - - /** - * Gets the parent connector of this connector, or <code>null</code> if the - * connector is not attached to any parent. - * - * @return the parent connector, or <code>null</code> if there is no parent. - */ - public Connector getParent(); - -} diff --git a/shared/src/com/vaadin/shared/ContextClickRpc.java b/shared/src/com/vaadin/shared/ContextClickRpc.java deleted file mode 100644 index 2152de0863..0000000000 --- a/shared/src/com/vaadin/shared/ContextClickRpc.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * Client-to-server RPC interface for context click events - * - * @since 7.6 - * @author Vaadin Ltd - */ -public interface ContextClickRpc extends ServerRpc { - - public void contextClick(MouseEventDetails details); -} diff --git a/shared/src/com/vaadin/shared/EventId.java b/shared/src/com/vaadin/shared/EventId.java deleted file mode 100644 index ad840d1e5d..0000000000 --- a/shared/src/com/vaadin/shared/EventId.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -public interface EventId extends Serializable { - public static final String BLUR = "blur"; - public static final String FOCUS = "focus"; - public static final String CLICK_EVENT_IDENTIFIER = "click"; - public static final String LAYOUT_CLICK_EVENT_IDENTIFIER = "lClick"; - public static final String POLL = "poll"; - public static final String CHANGE = "change"; - public static final String CONTEXT_CLICK = "cClick"; -} diff --git a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java b/shared/src/com/vaadin/shared/JavaScriptConnectorState.java deleted file mode 100644 index 12c9728628..0000000000 --- a/shared/src/com/vaadin/shared/JavaScriptConnectorState.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared; - -import java.io.Serializable; -import java.util.Map; -import java.util.Set; - -public interface JavaScriptConnectorState extends Serializable { - public Set<String> getCallbackNames(); - - public Map<String, Set<String>> getRpcInterfaces(); -} diff --git a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java b/shared/src/com/vaadin/shared/JavaScriptExtensionState.java deleted file mode 100644 index 5050ffec10..0000000000 --- a/shared/src/com/vaadin/shared/JavaScriptExtensionState.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import com.vaadin.shared.communication.SharedState; - -public class JavaScriptExtensionState extends SharedState implements - JavaScriptConnectorState { - - private Set<String> callbackNames = new HashSet<String>(); - private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); - - @Override - public Set<String> getCallbackNames() { - return callbackNames; - } - - public void setCallbackNames(Set<String> callbackNames) { - this.callbackNames = callbackNames; - } - - @Override - public Map<String, Set<String>> getRpcInterfaces() { - return rpcInterfaces; - } - - public void setRpcInterfaces(Map<String, Set<String>> rpcInterfaces) { - this.rpcInterfaces = rpcInterfaces; - } -} diff --git a/shared/src/com/vaadin/shared/JsonConstants.java b/shared/src/com/vaadin/shared/JsonConstants.java deleted file mode 100644 index fd26d2ab74..0000000000 --- a/shared/src/com/vaadin/shared/JsonConstants.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -public class JsonConstants implements Serializable { - 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"; - - public static final String JSON_CONTENT_TYPE = "application/json; charset=UTF-8"; - -} diff --git a/shared/src/com/vaadin/shared/MouseEventDetails.java b/shared/src/com/vaadin/shared/MouseEventDetails.java deleted file mode 100644 index 3c06ee80f3..0000000000 --- a/shared/src/com/vaadin/shared/MouseEventDetails.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -/** - * Helper class to store and transfer mouse event details. - */ -public class MouseEventDetails implements Serializable { - /** - * @deprecated use {@link MouseButton#LEFT} instead. - */ - @Deprecated - public static final MouseButton BUTTON_LEFT = MouseButton.LEFT; - /** - * @deprecated use {@link MouseButton#MIDDLE} instead. - */ - @Deprecated - public static final MouseButton BUTTON_MIDDLE = MouseButton.MIDDLE; - /** - * @deprecated use {@link MouseButton#RIGHT} instead. - */ - @Deprecated - public static final MouseButton BUTTON_RIGHT = MouseButton.RIGHT; - - /** - * Constants for mouse buttons. - * - * @author Vaadin Ltd - * @version @VERSION@ - * @since 7.0 - * - */ - public enum MouseButton { - LEFT("left"), RIGHT("right"), MIDDLE("middle"); - - private String name; - - private MouseButton(String name) { - this.name = name; - } - - /** - * Returns a human readable text representing the button - * - * @return - */ - public String getName() { - return name; - } - - } - - private static final char DELIM = ','; - // From com.google.gwt.user.client.Event - private static final int ONDBLCLICK = 0x00002; - - private MouseButton button; - private int clientX; - private int clientY; - private boolean altKey; - private boolean ctrlKey; - private boolean metaKey; - private boolean shiftKey; - private int type; - private int relativeX = -1; - private int relativeY = -1; - - public MouseButton getButton() { - return button; - } - - public int getClientX() { - return clientX; - } - - public int getClientY() { - return clientY; - } - - public boolean isAltKey() { - return altKey; - } - - public boolean isCtrlKey() { - return ctrlKey; - } - - public boolean isMetaKey() { - return metaKey; - } - - public boolean isShiftKey() { - return shiftKey; - } - - public int getRelativeX() { - return relativeX; - } - - public int getRelativeY() { - return relativeY; - } - - public void setButton(MouseButton button) { - this.button = button; - } - - public void setClientX(int clientX) { - this.clientX = clientX; - } - - public void setClientY(int clientY) { - this.clientY = clientY; - } - - public void setAltKey(boolean altKey) { - this.altKey = altKey; - } - - public void setCtrlKey(boolean ctrlKey) { - this.ctrlKey = ctrlKey; - } - - public void setMetaKey(boolean metaKey) { - this.metaKey = metaKey; - } - - public void setShiftKey(boolean shiftKey) { - this.shiftKey = shiftKey; - } - - public void setType(int type) { - this.type = type; - } - - public void setRelativeX(int relativeX) { - this.relativeX = relativeX; - } - - public void setRelativeY(int relativeY) { - this.relativeY = relativeY; - } - - public MouseEventDetails() { - } - - @Override - public String toString() { - return serialize(); - } - - public String serialize() { - return button.toString() + DELIM + clientX + DELIM + clientY + DELIM - + altKey + DELIM + ctrlKey + DELIM + metaKey + DELIM + shiftKey - + DELIM + type + DELIM + relativeX + DELIM + relativeY; - } - - public static MouseEventDetails deSerialize(String serializedString) { - MouseEventDetails instance = new MouseEventDetails(); - String[] fields = serializedString.split(","); - instance.button = MouseButton.valueOf(fields[0]); - instance.clientX = Integer.parseInt(fields[1]); - instance.clientY = Integer.parseInt(fields[2]); - instance.altKey = Boolean.valueOf(fields[3]).booleanValue(); - instance.ctrlKey = Boolean.valueOf(fields[4]).booleanValue(); - instance.metaKey = Boolean.valueOf(fields[5]).booleanValue(); - instance.shiftKey = Boolean.valueOf(fields[6]).booleanValue(); - instance.type = Integer.parseInt(fields[7]); - instance.relativeX = Integer.parseInt(fields[8]); - instance.relativeY = Integer.parseInt(fields[9]); - return instance; - } - - public String getButtonName() { - return button == null ? "" : button.getName(); - } - - public int getType() { - return type; - } - - public boolean isDoubleClick() { - return type == ONDBLCLICK; - } - -} diff --git a/shared/src/com/vaadin/shared/Position.java b/shared/src/com/vaadin/shared/Position.java deleted file mode 100755 index 9234c798d1..0000000000 --- a/shared/src/com/vaadin/shared/Position.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -public enum Position { - TOP_LEFT, TOP_CENTER, TOP_RIGHT, MIDDLE_LEFT, MIDDLE_CENTER, MIDDLE_RIGHT, BOTTOM_LEFT, BOTTOM_CENTER, BOTTOM_RIGHT, - /** - * Position that is only accessible for assistive devices, invisible for - * visual users. - **/ - ASSISTIVE; -} diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java deleted file mode 100644 index a7426d2022..0000000000 --- a/shared/src/com/vaadin/shared/VBrowserDetails.java +++ /dev/null @@ -1,582 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -/** - * Class that parses the user agent string from the browser and provides - * information about the browser. Used internally by - * {@link com.vaadin.client.BrowserInfo} and - * {@link com.vaadin.server.WebBrowser}. Should not be used directly. - * - * @author Vaadin Ltd. - * @since 6.3 - */ -public class VBrowserDetails implements Serializable { - - private boolean isGecko = false; - private boolean isWebKit = false; - private boolean isPresto = false; - private boolean isTrident = false; - - private boolean isChromeFrameCapable = false; - private boolean isChromeFrame = false; - - private boolean isSafari = false; - private boolean isChrome = false; - private boolean isFirefox = false; - private boolean isOpera = false; - private boolean isIE = false; - private boolean isEdge = false; - private boolean isPhantomJS = false; - - private boolean isWindowsPhone; - private boolean isIPad; - private boolean isIPhone; - - private OperatingSystem os = OperatingSystem.UNKNOWN; - - public enum OperatingSystem { - UNKNOWN, WINDOWS, MACOSX, LINUX, IOS, ANDROID; - } - - private float browserEngineVersion = -1; - private int browserMajorVersion = -1; - private int browserMinorVersion = -1; - - private int osMajorVersion = -1; - private int osMinorVersion = -1; - - /** - * Create an instance based on the given user agent. - * - * @param userAgent - * User agent as provided by the browser. - */ - public VBrowserDetails(String userAgent) { - userAgent = userAgent.toLowerCase(); - - // browser engine name - isGecko = userAgent.indexOf("gecko") != -1 - && userAgent.indexOf("webkit") == -1 - && userAgent.indexOf("trident/") == -1; - isPresto = userAgent.indexOf(" presto/") != -1; - isTrident = userAgent.indexOf("trident/") != -1; - isWebKit = !isTrident && userAgent.indexOf("applewebkit") != -1; - - // browser name - isChrome = userAgent.indexOf(" chrome/") != -1; - isOpera = userAgent.indexOf("opera") != -1; - isIE = userAgent.indexOf("msie") != -1 && !isOpera - && (userAgent.indexOf("webtv") == -1); - // IE 11 no longer contains MSIE in the user agent - isIE = isIE || isTrident; - - isSafari = !isChrome && !isIE && userAgent.indexOf("safari") != -1; - isFirefox = userAgent.indexOf(" firefox/") != -1; - isPhantomJS = userAgent.indexOf("phantomjs/") != -1; - if (userAgent.indexOf(" edge/") != -1) { - isEdge = true; - isChrome = false; - isOpera = false; - isIE = false; - isSafari = false; - isFirefox = false; - isWebKit = false; - isGecko = false; - } - - // chromeframe - isChromeFrameCapable = userAgent.indexOf("chromeframe") != -1; - isChromeFrame = isChromeFrameCapable && !isChrome; - - // Rendering engine version - try { - if (isGecko) { - int rvPos = userAgent.indexOf("rv:"); - if (rvPos >= 0) { - String tmp = userAgent.substring(rvPos + 3); - tmp = tmp.replaceFirst("(\\.[0-9]+).+", "$1"); - browserEngineVersion = Float.parseFloat(tmp); - } - } else if (isWebKit) { - String tmp = userAgent - .substring(userAgent.indexOf("webkit/") + 7); - tmp = tmp.replaceFirst("([0-9]+)[^0-9].+", "$1"); - browserEngineVersion = Float.parseFloat(tmp); - } else if (isIE) { - int tridentPos = userAgent.indexOf("trident/"); - if (tridentPos >= 0) { - String tmp = userAgent.substring(tridentPos - + "Trident/".length()); - tmp = tmp.replaceFirst("([0-9]+\\.[0-9]+).*", "$1"); - browserEngineVersion = Float.parseFloat(tmp); - } - } else if (isEdge) { - browserEngineVersion = 0; - } - } catch (Exception e) { - // Browser engine version parsing failed - System.err.println("Browser engine version parsing failed for: " - + userAgent); - } - - // Browser version - try { - if (isIE) { - if (userAgent.indexOf("msie") == -1) { - // IE 11+ - int rvPos = userAgent.indexOf("rv:"); - if (rvPos >= 0) { - String tmp = userAgent.substring(rvPos + 3); - tmp = tmp.replaceFirst("(\\.[0-9]+).+", "$1"); - parseVersionString(tmp); - } - } else { - String ieVersionString = userAgent.substring(userAgent - .indexOf("msie ") + 5); - ieVersionString = safeSubstring(ieVersionString, 0, - ieVersionString.indexOf(";")); - parseVersionString(ieVersionString); - } - } else if (isFirefox) { - int i = userAgent.indexOf(" firefox/") + 9; - parseVersionString(safeSubstring(userAgent, i, i + 5)); - } else if (isChrome) { - int i = userAgent.indexOf(" chrome/") + 8; - parseVersionString(safeSubstring(userAgent, i, i + 5)); - } else if (isSafari) { - int i = userAgent.indexOf(" version/") + 9; - parseVersionString(safeSubstring(userAgent, i, i + 5)); - } else if (isOpera) { - int i = userAgent.indexOf(" version/"); - if (i != -1) { - // Version present in Opera 10 and newer - i += 9; // " version/".length - } else { - i = userAgent.indexOf("opera/") + 6; - } - parseVersionString(safeSubstring(userAgent, i, i + 5)); - } else if (isEdge) { - int i = userAgent.indexOf(" edge/") + 6; - parseVersionString(safeSubstring(userAgent, i, i + 8)); - } - } catch (Exception e) { - // Browser version parsing failed - System.err.println("Browser version parsing failed for: " - + userAgent); - } - - // Operating system - if (userAgent.contains("windows ")) { - os = OperatingSystem.WINDOWS; - isWindowsPhone = userAgent.contains("windows phone"); - } else if (userAgent.contains("android")) { - os = OperatingSystem.ANDROID; - parseAndroidVersion(userAgent); - } else if (userAgent.contains("linux")) { - os = OperatingSystem.LINUX; - } else if (userAgent.contains("macintosh") - || userAgent.contains("mac osx") - || userAgent.contains("mac os x")) { - isIPad = userAgent.contains("ipad"); - isIPhone = userAgent.contains("iphone"); - if (isIPad || userAgent.contains("ipod") || isIPhone) { - os = OperatingSystem.IOS; - parseIOSVersion(userAgent); - } else { - os = OperatingSystem.MACOSX; - } - } - } - - private void parseAndroidVersion(String userAgent) { - // Android 5.1; - if (!userAgent.contains("android")) { - return; - } - - String osVersionString = safeSubstring(userAgent, - userAgent.indexOf("android ") + "android ".length(), - userAgent.length()); - osVersionString = safeSubstring(osVersionString, 0, - osVersionString.indexOf(";")); - String[] parts = osVersionString.split("\\."); - parseOsVersion(parts); - } - - private void parseIOSVersion(String userAgent) { - // OS 5_1 like Mac OS X - if (!userAgent.contains("os ") || !userAgent.contains(" like mac")) { - return; - } - - String osVersionString = safeSubstring(userAgent, - userAgent.indexOf("os ") + 3, userAgent.indexOf(" like mac")); - String[] parts = osVersionString.split("_"); - parseOsVersion(parts); - } - - private void parseOsVersion(String[] parts) { - osMajorVersion = -1; - osMinorVersion = -1; - - if (parts.length >= 1) { - try { - osMajorVersion = Integer.parseInt(parts[0]); - } catch (Exception e) { - } - } - if (parts.length >= 2) { - try { - osMinorVersion = Integer.parseInt(parts[1]); - } catch (Exception e) { - } - // Some Androids report version numbers as "2.1-update1" - if (osMinorVersion == -1 && parts[1].contains("-")) { - try { - osMinorVersion = Integer.parseInt(parts[1].substring(0, - parts[1].indexOf('-'))); - } catch (Exception ee) { - } - } - } - - } - - private void parseVersionString(String versionString) { - int idx = versionString.indexOf('.'); - if (idx < 0) { - idx = versionString.length(); - } - browserMajorVersion = Integer.parseInt(safeSubstring(versionString, 0, - idx)); - - int idx2 = versionString.indexOf('.', idx + 1); - if (idx2 < 0) { - idx2 = versionString.length(); - } - try { - browserMinorVersion = Integer.parseInt(safeSubstring(versionString, - idx + 1, idx2).replaceAll("[^0-9].*", "")); - } catch (NumberFormatException e) { - // leave the minor version unmodified (-1 = unknown) - } - } - - private String safeSubstring(String string, int beginIndex, int endIndex) { - if (beginIndex < 0) { - beginIndex = 0; - } - if (endIndex < 0 || endIndex > string.length()) { - endIndex = string.length(); - } - return string.substring(beginIndex, endIndex); - } - - /** - * Tests if the browser is Firefox. - * - * @return true if it is Firefox, false otherwise - */ - public boolean isFirefox() { - return isFirefox; - } - - /** - * Tests if the browser is using the Gecko engine - * - * @return true if it is Gecko, false otherwise - */ - public boolean isGecko() { - return isGecko; - } - - /** - * Tests if the browser is using the WebKit engine - * - * @return true if it is WebKit, false otherwise - */ - public boolean isWebKit() { - return isWebKit; - } - - /** - * Tests if the browser is using the Presto engine - * - * @return true if it is Presto, false otherwise - */ - public boolean isPresto() { - return isPresto; - } - - /** - * Tests if the browser is using the Trident engine - * - * @since 7.1.7 - * @return true if it is Trident, false otherwise - */ - public boolean isTrident() { - return isTrident; - } - - /** - * Tests if the browser is Safari. - * - * @return true if it is Safari, false otherwise - */ - public boolean isSafari() { - return isSafari; - } - - /** - * Tests if the browser is Chrome. - * - * @return true if it is Chrome, false otherwise - */ - public boolean isChrome() { - return isChrome; - } - - /** - * Tests if the browser is capable of running ChromeFrame. - * - * @return true if it has ChromeFrame, false otherwise - */ - public boolean isChromeFrameCapable() { - return isChromeFrameCapable; - } - - /** - * Tests if the browser is running ChromeFrame. - * - * @return true if it is ChromeFrame, false otherwise - */ - public boolean isChromeFrame() { - return isChromeFrame; - } - - /** - * Tests if the browser is Opera. - * - * @return true if it is Opera, false otherwise - */ - public boolean isOpera() { - return isOpera; - } - - /** - * Tests if the browser is Internet Explorer. - * - * @return true if it is Internet Explorer, false otherwise - */ - public boolean isIE() { - return isIE; - } - - /** - * Tests if the browser is Edge. - * - * @since 7.5.3 - * @return true if it is Edge, false otherwise - */ - public boolean isEdge() { - return isEdge; - } - - /** - * Tests if the browser is PhantomJS. - * - * @return true if it is PhantomJS, false otherwise - */ - public boolean isPhantomJS() { - return isPhantomJS; - } - - /** - * Returns the version of the browser engine. For WebKit this is an integer - * e.g., 532.0. For gecko it is a float e.g., 1.8 or 1.9. - * - * @return The version of the browser engine - */ - public float getBrowserEngineVersion() { - return browserEngineVersion; - } - - /** - * Returns the browser major version e.g., 3 for Firefox 3.5, 4 for Chrome - * 4, 8 for Internet Explorer 8. - * <p> - * Note that Internet Explorer 8 and newer will return the document mode so - * IE8 rendering as IE7 will return 7. - * </p> - * - * @return The major version of the browser. - */ - public final int getBrowserMajorVersion() { - return browserMajorVersion; - } - - /** - * Returns the browser minor version e.g., 5 for Firefox 3.5. - * - * @see #getBrowserMajorVersion() - * - * @return The minor version of the browser, or -1 if not known/parsed. - */ - public final int getBrowserMinorVersion() { - return browserMinorVersion; - } - - /** - * Sets the version for IE based on the documentMode. This is used to return - * the correct the correct IE version when the version from the user agent - * string and the value of the documentMode property do not match. - * - * @param documentMode - * The current document mode - */ - public void setIEMode(int documentMode) { - browserMajorVersion = documentMode; - browserMinorVersion = 0; - } - - /** - * Tests if the browser is run on Windows. - * - * @return true if run on Windows, false otherwise - */ - public boolean isWindows() { - return os == OperatingSystem.WINDOWS; - } - - /** - * Tests if the browser is run on Windows Phone. - * - * @return true if run on Windows Phone, false otherwise - * @since 7.3.2 - */ - public boolean isWindowsPhone() { - return isWindowsPhone; - } - - /** - * Tests if the browser is run on Mac OSX. - * - * @return true if run on Mac OSX, false otherwise - */ - public boolean isMacOSX() { - return os == OperatingSystem.MACOSX; - } - - /** - * Tests if the browser is run on Linux. - * - * @return true if run on Linux, false otherwise - */ - public boolean isLinux() { - return os == OperatingSystem.LINUX; - } - - /** - * Tests if the browser is run on Android. - * - * @return true if run on Android, false otherwise - */ - public boolean isAndroid() { - return os == OperatingSystem.ANDROID; - } - - /** - * Tests if the browser is run in iOS. - * - * @return true if run in iOS, false otherwise - */ - public boolean isIOS() { - return os == OperatingSystem.IOS; - } - - /** - * Tests if the browser is run on iPhone. - * - * @return true if run on iPhone, false otherwise - * @since 7.3.3 - */ - public boolean isIPhone() { - return isIPhone; - } - - /** - * Tests if the browser is run on iPad. - * - * @return true if run on iPad, false otherwise - * @since 7.3.3 - */ - public boolean isIPad() { - return isIPad; - } - - /** - * Returns the major version of the operating system. Currently only - * supported for mobile devices (iOS/Android) - * - * @return The major version or -1 if unknown - */ - public int getOperatingSystemMajorVersion() { - return osMajorVersion; - } - - /** - * Returns the minor version of the operating system. Currently only - * supported for mobile devices (iOS/Android) - * - * @return The minor version or -1 if unknown - */ - public int getOperatingSystemMinorVersion() { - return osMinorVersion; - } - - /** - * Checks if the browser is so old that it simply won't work with a Vaadin - * application. NOTE that the browser might still be capable of running - * Crome Frame, so you might still want to check - * {@link #isChromeFrameCapable()} if this returns true. - * - * @return true if the browser won't work, false if not the browser is - * supported or might work - */ - public boolean isTooOldToFunctionProperly() { - // Check Trident version to detect compatibility mode - if (isIE() && getBrowserMajorVersion() < 8 - && getBrowserEngineVersion() < 4) { - return true; - } - // Webkit 533 in Safari 4.1+, Android 2.2+, iOS 4+ - if (isSafari() && getBrowserEngineVersion() < 533) { - return true; - } - if (isFirefox() && getBrowserMajorVersion() < 4) { - return true; - } - if (isOpera() && getBrowserMajorVersion() < 11) { - return true; - } - - return false; - } - -} diff --git a/shared/src/com/vaadin/shared/VaadinUriResolver.java b/shared/src/com/vaadin/shared/VaadinUriResolver.java deleted file mode 100644 index ee8d13f10f..0000000000 --- a/shared/src/com/vaadin/shared/VaadinUriResolver.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -import com.vaadin.shared.util.SharedUtil; - -/** - * Utility for translating special Vaadin URIs like theme:// and app:// into - * URLs usable by the browser. This is an abstract class performing the main - * logic in {@link #resolveVaadinUri(String)} and using abstract methods in the - * class for accessing information specific to the current environment. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public abstract class VaadinUriResolver implements Serializable { - - /** - * Translates a Vaadin URI to a URL that can be loaded by the browser. The - * following URI schemes are supported: - * <ul> - * <li><code>theme://</code> - resolves to the URL of the currently active - * theme.</li> - * <li><code>published://</code> - resolves to resources on the classpath - * published by {@link com.vaadin.annotations.JavaScript @JavaScript} or - * {@link com.vaadin.annotations.StyleSheet @StyleSheet} annotations on - * connectors.</li> - * <li><code>app://</code> - resolves to a URL that will be routed to the - * currently registered {@link com.vaadin.server.RequestHandler - * RequestHandler} instances.</li> - * <li><code>vaadin://</code> - resolves to the location of static resouces - * in the VAADIN directory</li> - * </ul> - * Any other URI protocols, such as <code>http://</code> or - * <code>https://</code> are passed through this method unmodified. - * - * @since 7.4 - * @param vaadinUri - * the uri to resolve - * @return the resolved uri - */ - public String resolveVaadinUri(String vaadinUri) { - if (vaadinUri == null) { - return null; - } - if (vaadinUri.startsWith(ApplicationConstants.THEME_PROTOCOL_PREFIX)) { - final String themeUri = getThemeUri(); - vaadinUri = themeUri + vaadinUri.substring(7); - } - - if (vaadinUri - .startsWith(ApplicationConstants.PUBLISHED_PROTOCOL_PREFIX)) { - // getAppUri *should* always end with / - // substring *should* always start with / (published:///foo.bar - // without published://) - vaadinUri = ApplicationConstants.APP_PROTOCOL_PREFIX - + ApplicationConstants.PUBLISHED_FILE_PATH - + vaadinUri - .substring(ApplicationConstants.PUBLISHED_PROTOCOL_PREFIX - .length()); - // Let translation of app:// urls take care of the rest - } - if (vaadinUri.startsWith(ApplicationConstants.APP_PROTOCOL_PREFIX)) { - String relativeUrl = vaadinUri - .substring(ApplicationConstants.APP_PROTOCOL_PREFIX - .length()); - String serviceUrl = getServiceUrl(); - String serviceUrlParameterName = getServiceUrlParameterName(); - if (serviceUrlParameterName != null) { - // Should put path in v-resourcePath parameter and append query - // params to base portlet url - String[] parts = relativeUrl.split("\\?", 2); - String path = parts[0]; - - // If there's a "?" followed by something, append it as a query - // string to the base URL - if (parts.length > 1) { - String appUrlParams = parts[1]; - serviceUrl = SharedUtil.addGetParameters(serviceUrl, - appUrlParams); - } - if (!path.startsWith("/")) { - path = '/' + path; - } - String pathParam = serviceUrlParameterName + "=" - + encodeQueryStringParameterValue(path); - serviceUrl = SharedUtil.addGetParameters(serviceUrl, pathParam); - vaadinUri = serviceUrl; - } else { - vaadinUri = serviceUrl + relativeUrl; - } - } - if (vaadinUri.startsWith(ApplicationConstants.VAADIN_PROTOCOL_PREFIX)) { - final String vaadinDirUri = getVaadinDirUrl(); - String relativeUrl = vaadinUri - .substring(ApplicationConstants.VAADIN_PROTOCOL_PREFIX - .length()); - vaadinUri = vaadinDirUri + relativeUrl; - } - - return vaadinUri; - } - - /** - * Gets the URL pointing to the VAADIN directory. - * - * @return the VAADIN directory URL - */ - protected abstract String getVaadinDirUrl(); - - /** - * Gets the name of the request parameter that should be used for sending - * the requested URL to the {@link #getServiceUrl() service URL}. If - * <code>null</code> is returned, the requested URL will instead be appended - * to the base service URL. - * - * @return the parameter name used for passing request URLs, or - * <code>null</code> to send the path as a part of the request path. - */ - protected abstract String getServiceUrlParameterName(); - - /** - * Gets the URL handled by {@link com.vaadin.server.VaadinService - * VaadinService} to handle application requests. - * - * @return the service URL - */ - protected abstract String getServiceUrl(); - - /** - * Gets the URI of the directory of the current theme. - * - * @return the URI of the current theme directory - */ - protected abstract String getThemeUri(); - - /** - * Encodes a value for safe inclusion as a parameter in the query string. - * - * @param parameterValue - * the value to encode - * @return the encoded value - */ - protected abstract String encodeQueryStringParameterValue( - String parameterValue); -} diff --git a/shared/src/com/vaadin/shared/Version.java b/shared/src/com/vaadin/shared/Version.java deleted file mode 100644 index a492229643..0000000000 --- a/shared/src/com/vaadin/shared/Version.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared; - -import java.io.Serializable; - -public class Version implements Serializable { - /** - * The version number of this release. For example "6.2.0". Always in the - * format "major.minor.revision[.build]". The build part is optional. All of - * major, minor, revision must be integers. - */ - private static final String VERSION; - /** - * Major version number. For example 6 in 6.2.0. - */ - private static final int VERSION_MAJOR; - - /** - * Minor version number. For example 2 in 6.2.0. - */ - private static final int VERSION_MINOR; - - /** - * Version revision number. For example 0 in 6.2.0. - */ - private static final int VERSION_REVISION; - - /** - * Build identifier. For example "nightly-20091123-c9963" in - * 6.2.0.nightly-20091123-c9963. - */ - private static final String VERSION_BUILD; - - /* Initialize version numbers from string replaced by build-script. */ - static { - if ("@VERSION@".equals("@" + "VERSION" + "@")) { - VERSION = "9.9.9.INTERNAL-DEBUG-BUILD"; - } else { - VERSION = "@VERSION@"; - } - final String[] digits = VERSION.split("\\.", 4); - VERSION_MAJOR = Integer.parseInt(digits[0]); - VERSION_MINOR = Integer.parseInt(digits[1]); - VERSION_REVISION = Integer.parseInt(digits[2]); - if (digits.length == 4) { - VERSION_BUILD = digits[3]; - } else { - VERSION_BUILD = ""; - } - } - - public static String getFullVersion() { - return VERSION; - } - - public static int getMajorVersion() { - return VERSION_MAJOR; - } - - public static int getMinorVersion() { - return VERSION_MINOR; - } - - public static int getRevision() { - return VERSION_REVISION; - } - - public static String getBuildIdentifier() { - return VERSION_BUILD; - } - -} diff --git a/shared/src/com/vaadin/shared/annotations/Delayed.java b/shared/src/com/vaadin/shared/annotations/Delayed.java deleted file mode 100644 index f7e24de006..0000000000 --- a/shared/src/com/vaadin/shared/annotations/Delayed.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * Invoking a method in a {@link ServerRpc} interface marked with this - * annotation will only add the invocation to a queue of outgoing RPC - * invocations, but it will not cause the queue to be purged and sent to the - * server. The queue will instead be sent when any RPC method not marked as @Delayed - * has been invoked. - * - * @author Vaadin Ltd - * @version @VERSION@ - * @since 7.0.0 - */ -@Target(ElementType.METHOD) -@Documented -public @interface Delayed { - /** - * By setting lastOnly to <code>true</code>, any previous invocations of the - * same method will be removed from the queue when a new invocation is - * added. This can be used in cases where only the last value is of - * interest. - * <p> - * The default value is <code>false</code> which means that invoking the - * method multiple times will cause multiple invocations to be enqueued and - * eventually sent to the server. - * - * @return <code>true</code> if only the last invocation of the annotated - * method should be sent to the server, <code>false</code> if all - * enqueued invocations should be sent. - */ - public boolean lastOnly() default false; -} diff --git a/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java b/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java deleted file mode 100644 index ee5cf78a68..0000000000 --- a/shared/src/com/vaadin/shared/annotations/DelegateToWidget.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.annotations; - -import java.io.Serializable; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -/** - * Signals that the property value from a state class should be forwarded to the - * Widget of the corresponding connector instance. - * <p> - * When this annotation is present on a field or on a setter method, the - * framework will call the corresponding setter in the Connector's Widget - * instance with the current state property value whenever it has been changed. - * This is happens after firing - * {@link com.vaadin.client.ConnectorHierarchyChangeEvent}s but before firing - * any {@link com.vaadin.client.communication.StateChangeEvent}. - * <p> - * Take for example a state class looking like this: - * - * <pre> - * public class MyComponentState extends AbstractComponentState { - * @DelegateToWidget - * public String myProperty; - * } - * </pre> - * - * Whenever <code>myProperty</code> is changed, the framework will call code - * like this: - * - * <pre> - * connector.getWidget().setMyProperty(connector.getState().myProperty); - * </pre> - * - * <p> - * By default, the Widget method to call is derived from the property name, but - * {@link #value()} in the annotation can be used to provide a custom method - * name, e.g. {@code @DelegateToWidget("someSpecialName")}. - * - * @since 7.0.0 - * @author Vaadin Ltd - */ -@Target({ ElementType.METHOD, ElementType.FIELD }) -public @interface DelegateToWidget { - /** - * Defines the name of the Widget method to call when the annotated state - * property has changed. If no value is defined, the method name will be - * derived from the property name, so e.g. a field named - * <code>myProperty</code> will delegate to a method named - * <code>setMyProperty</code>. - * - * @return the name of the method to delegate to, or empty string to use the - * default name - */ - public String value() default ""; - - /** - * Internal helper for handling default values in a uniform way both at - * runtime and during widgetset compilation. - */ - public static class Helper implements Serializable { - /** - * Gets the name of the method to delegate to for a given property name - * and annotation value. - * - * @param propertyName - * the name of the delegated property - * @param annotationValue - * the {@link DelegateToWidget#value()} of the annotation - * @return the name of the method to delegate to - */ - public static String getDelegateTarget(String propertyName, - String annotationValue) { - String name = annotationValue; - if (name.isEmpty()) { - name = "set" + Character.toUpperCase(propertyName.charAt(0)) - + propertyName.substring(1); - } - return name; - } - } -} diff --git a/shared/src/com/vaadin/shared/annotations/NoLayout.java b/shared/src/com/vaadin/shared/annotations/NoLayout.java deleted file mode 100644 index b77729cdcc..0000000000 --- a/shared/src/com/vaadin/shared/annotations/NoLayout.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -/** - * Annotation used to mark client RPC methods, state fields, or state setter - * methods that should not trigger an layout phase after changes have been - * processed. Whenever there's at least one change that is not marked with this - * annotation, the framework will assume some sizes might have changed an will - * therefore start a layout phase after applying the changes. - * <p> - * This annotation can be used for any RPC method or state property that does - * not cause the size of the component or its children to change. Please note - * that almost anything related to CSS (e.g. adding or removing a stylename) has - * the potential of causing sizes to change with appropriate style definitions - * in the application theme. - * - * @since 7.4 - * - * @author Vaadin Ltd - */ -@Documented -@Target({ ElementType.METHOD, ElementType.FIELD }) -public @interface NoLayout { - // Just an empty marker annotation -} diff --git a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java b/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java deleted file mode 100644 index 2e519b69e8..0000000000 --- a/shared/src/com/vaadin/shared/annotations/NoLoadingIndicator.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.annotations; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -/** - * Annotation used to mark server RPC methods for which it isn't necessary to - * show the loading indicator. The framework will show a loading indicator when - * sending requests for RPC methods that are not marked with this annotation. - * The loading indicator is hidden once a response is received. - * - * @since 7.4 - * @author Vaadin Ltd - */ -@Target(ElementType.METHOD) -@Documented -public @interface NoLoadingIndicator { - // Just an empty marker annotation -} diff --git a/shared/src/com/vaadin/shared/communication/ClientRpc.java b/shared/src/com/vaadin/shared/communication/ClientRpc.java deleted file mode 100644 index e400c7de7c..0000000000 --- a/shared/src/com/vaadin/shared/communication/ClientRpc.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; - -/** - * Interface to be extended by all server to client RPC interfaces. - * - * On the server side, proxies of the interface can be obtained from - * AbstractComponent. On the client, RPC implementations can be registered with - * AbstractConnector.registerRpc(). - * - * Note: Currently, each RPC interface may not contain multiple methods with the - * same name, even if their parameter lists would differ. - * - * @since 7.0 - */ -public interface ClientRpc extends Serializable { - -} diff --git a/shared/src/com/vaadin/shared/communication/FieldRpc.java b/shared/src/com/vaadin/shared/communication/FieldRpc.java deleted file mode 100644 index 28ae8d39b6..0000000000 --- a/shared/src/com/vaadin/shared/communication/FieldRpc.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.communication; - -import java.io.Serializable; - -public class FieldRpc implements Serializable { - public interface FocusServerRpc extends ServerRpc { - public void focus(); - } - - public interface BlurServerRpc extends ServerRpc { - public void blur(); - } - - public interface FocusAndBlurServerRpc extends FocusServerRpc, - BlurServerRpc { - - } -} diff --git a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java b/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java deleted file mode 100644 index 4d21b5af7a..0000000000 --- a/shared/src/com/vaadin/shared/communication/LegacyChangeVariablesInvocation.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.communication; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.ApplicationConstants; - -public class LegacyChangeVariablesInvocation extends MethodInvocation { - private Map<String, Object> variableChanges = new HashMap<String, Object>(); - - public LegacyChangeVariablesInvocation(String connectorId, - String variableName, Object value) { - super(connectorId, ApplicationConstants.UPDATE_VARIABLE_INTERFACE, - ApplicationConstants.UPDATE_VARIABLE_METHOD, new Object[] { - variableName, new UidlValue(value) }); - setVariableChange(variableName, value); - } - - public static boolean isLegacyVariableChange(String interfaceName, - String methodName) { - return ApplicationConstants.UPDATE_VARIABLE_METHOD - .equals(interfaceName) - && ApplicationConstants.UPDATE_VARIABLE_METHOD - .equals(methodName); - } - - public void setVariableChange(String name, Object value) { - variableChanges.put(name, value); - } - - public Map<String, Object> getVariableChanges() { - return variableChanges; - } - - @Override - public String getLastOnlyTag() { - assert variableChanges.size() == 1; - return super.getLastOnlyTag() - + variableChanges.keySet().iterator().next(); - } - -} diff --git a/shared/src/com/vaadin/shared/communication/MethodInvocation.java b/shared/src/com/vaadin/shared/communication/MethodInvocation.java deleted file mode 100644 index a4370f37de..0000000000 --- a/shared/src/com/vaadin/shared/communication/MethodInvocation.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; -import java.util.Arrays; - -import com.vaadin.shared.util.SharedUtil; - -/** - * Information needed by the framework to send an RPC method invocation from the - * client to the server or vice versa. - * - * @since 7.0 - */ -public class MethodInvocation implements Serializable { - - private final String connectorId; - private final String interfaceName; - private final String methodName; - private Object[] parameters; - - public MethodInvocation(String connectorId, String interfaceName, - String methodName) { - this.connectorId = connectorId; - this.interfaceName = interfaceName; - this.methodName = methodName; - } - - public MethodInvocation(String connectorId, String interfaceName, - String methodName, Object[] parameters) { - this(connectorId, interfaceName, methodName); - setParameters(parameters); - } - - public String getConnectorId() { - return connectorId; - } - - public String getInterfaceName() { - return interfaceName; - } - - public String getMethodName() { - return methodName; - } - - public Object[] getParameters() { - return parameters; - } - - public void setParameters(Object[] parameters) { - this.parameters = parameters; - } - - @Override - public String toString() { - return connectorId + ":" + interfaceName + "." + methodName + "(" - + Arrays.toString(parameters) + ")"; - } - - /** - * Gets a String tag that is used to uniquely identify previous method - * invocations that should be purged from the queue if - * <code>{@literal @}Delay(lastOnly = true)</code> is used. - * <p> - * The returned string should contain at least one non-number char to ensure - * it doesn't collide with the keys used for invocations without lastOnly. - * - * @return a string identifying this method invocation - */ - public String getLastOnlyTag() { - return connectorId + "-" + getInterfaceName() + "-" + getMethodName(); - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof MethodInvocation)) { - return false; - } - MethodInvocation other = (MethodInvocation) obj; - if (!SharedUtil.equals(getConnectorId(), other.getConnectorId())) { - return false; - } - - if (!SharedUtil.equals(getInterfaceName(), other.getInterfaceName())) { - return false; - } - - if (!SharedUtil.equals(getMethodName(), other.getMethodName())) { - return false; - } - - if (!SharedUtil.equals(getParameters(), other.getParameters())) { - return false; - } - - return true; - - } -} diff --git a/shared/src/com/vaadin/shared/communication/PushConstants.java b/shared/src/com/vaadin/shared/communication/PushConstants.java deleted file mode 100644 index 5b23cd7f6e..0000000000 --- a/shared/src/com/vaadin/shared/communication/PushConstants.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.communication; - -import java.io.Serializable; - -/** - * Shared constants used by push. - * - * @since 7.1 - * @author Vaadin Ltd - */ -public class PushConstants implements Serializable { - - /** - * The size, in <b>bytes</b>, of the receiving buffer used by some servers. - * <p> - * Should not be set to a value equal to or greater than 32768 due to a - * Jetty 9.1 issue (see #13087) - */ - public static final int WEBSOCKET_BUFFER_SIZE = 16384; - - /** - * The maximum size, in <b>characters</b>, of a websocket message fragment. - * This is a conservative maximum chosen so that the size in bytes will not - * exceed {@link PushConstants#WEBSOCKET_BUFFER_SIZE} given a UTF-8 encoded - * message. - */ - public static final int WEBSOCKET_FRAGMENT_SIZE = WEBSOCKET_BUFFER_SIZE / 4 - 1; - - /** - * The character used to mark message boundaries when messages may be split - * into multiple fragments. - */ - public static final char MESSAGE_DELIMITER = '|'; -} diff --git a/shared/src/com/vaadin/shared/communication/PushMode.java b/shared/src/com/vaadin/shared/communication/PushMode.java deleted file mode 100644 index 7b0f968c77..0000000000 --- a/shared/src/com/vaadin/shared/communication/PushMode.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.communication; - -/** - * The mode of bidirectional ("push") communication that is in use. - * - * @see com.vaadin.server.DeploymentConfiguration#getPushMode() - * - * @author Vaadin Ltd - * @since 7.1 - */ -public enum PushMode { - /** - * Push is disabled. Regular AJAX requests are used to communicate between - * the client and the server. Asynchronous messages from the server are not - * possible. {@link com.vaadin.ui.UI#push() ui.push()} throws - * IllegalStateException. - * <p> - * This is the default mode unless - * {@link com.vaadin.server.DeploymentConfiguration#getPushMode() - * configured} otherwise. - */ - DISABLED, - - /** - * Push is enabled. A bidirectional channel is established between the - * client and server and used to communicate state changes and RPC - * invocations. The client is not automatically updated if the server-side - * state is asynchronously changed; {@link com.vaadin.ui.UI#push() - * ui.push()} must be explicitly called. - */ - MANUAL, - - /** - * Push is enabled. Like {@link #MANUAL}, but asynchronous changes to the - * server-side state are automatically pushed to the client once the session - * lock is released. - */ - AUTOMATIC; - - /** - * Checks whether the push mode is using push functionality - * - * @return <code>true</code> if this mode requires push functionality; - * <code>false</code> if no push functionality is used for this - * mode. - */ - public boolean isEnabled() { - return this != DISABLED; - } -} diff --git a/shared/src/com/vaadin/shared/communication/ServerRpc.java b/shared/src/com/vaadin/shared/communication/ServerRpc.java deleted file mode 100644 index e23b3758c6..0000000000 --- a/shared/src/com/vaadin/shared/communication/ServerRpc.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; - -/** - * Interface to be extended by all client to server RPC interfaces. - * - * @since 7.0 - */ -public interface ServerRpc extends Serializable { -} diff --git a/shared/src/com/vaadin/shared/communication/SharedState.java b/shared/src/com/vaadin/shared/communication/SharedState.java deleted file mode 100644 index b21a675a4a..0000000000 --- a/shared/src/com/vaadin/shared/communication/SharedState.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.annotations.NoLayout; - -/** - * Interface to be implemented by all shared state classes used to communicate - * basic information about a {@link Connector} from server to client. - * - * Shared state classes have to be declared in shared package to be accessible - * both for server and client code. - * - * Shared state objects are only sent from the server to the client, and any - * modifications from the client should be performed via an RPC call that - * modifies the authoritative state on the server. - * - * A shared state class should be a bean with getters and setters for each - * field. Supported data types are simple Java types, other beans and maps and - * arrays of these. - * - * On the client side the connector should override - * {@link com.vaadin.client.ui.AbstractConnector#getState()} to return the - * correct state type. This automatically causes a correct state object to be - * created. - * - * Subclasses of a {@link Connector} using shared state should also provide a - * subclass of the shared state class of the parent class to extend the state. A - * single {@link Connector} can only have one shared state object. - * - * @since 7.0 - */ -public class SharedState implements Serializable { - - /** - * The automatically managed resources used by the connector. - * - * @see com.vaadin.server.AbstractClientConnector#setResource(String, - * com.vaadin.server.Resource) - * @see com.vaadin.client.ui.AbstractConnector#getResourceUrl(String) - */ - public Map<String, URLReference> resources = new HashMap<String, URLReference>(); - - public boolean enabled = true; - /** - * A set of event identifiers with registered listeners. - */ - @NoLayout - public Set<String> registeredEventListeners = null; - -} diff --git a/shared/src/com/vaadin/shared/communication/URLReference.java b/shared/src/com/vaadin/shared/communication/URLReference.java deleted file mode 100644 index be767fb25c..0000000000 --- a/shared/src/com/vaadin/shared/communication/URLReference.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.communication; - -import java.io.Serializable; - -public class URLReference implements Serializable { - - private String URL; - - /** - * Returns the URL that this object refers to. - * <p> - * Note that the URL can use special protocols like theme:// - * - * @return The URL for this reference or null if unknown. - */ - public String getURL() { - return URL; - } - - /** - * Sets the URL that this object refers to - * - * @param URL - */ - public void setURL(String URL) { - this.URL = URL; - } -} diff --git a/shared/src/com/vaadin/shared/communication/UidlValue.java b/shared/src/com/vaadin/shared/communication/UidlValue.java deleted file mode 100644 index 04015213f9..0000000000 --- a/shared/src/com/vaadin/shared/communication/UidlValue.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.communication; - -import java.io.Serializable; - -public class UidlValue implements Serializable { - private Object value; - - public UidlValue(Object value) { - this.value = value; - } - - public Object getValue() { - return value; - } - - @Override - public String toString() { - return "" + value; - } - -} diff --git a/shared/src/com/vaadin/shared/data/DataProviderRpc.java b/shared/src/com/vaadin/shared/data/DataProviderRpc.java deleted file mode 100644 index 05965ea56c..0000000000 --- a/shared/src/com/vaadin/shared/data/DataProviderRpc.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.data; - -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.communication.ClientRpc; - -import elemental.json.JsonArray; - -/** - * RPC interface used for pushing container data to the client. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public interface DataProviderRpc extends ClientRpc { - - /** - * Sends updated row data to a client. - * <p> - * rowDataJson represents a JSON array of JSON objects in the following - * format: - * - * <pre> - * [{ - * "d": [COL_1_JSON, COL_2_json, ...], - * "k": "1" - * }, - * ... - * ] - * </pre> - * - * where COL_INDEX is the index of the column (as a string), and COL_n_JSON - * is valid JSON of the column's data. - * - * @param firstRowIndex - * the index of the first updated row - * @param rowDataJson - * the updated row data - * @see com.vaadin.shared.ui.grid.GridState#JSONKEY_DATA - * @see com.vaadin.ui.components.grid.Renderer#encode(Object) - */ - @NoLayout - public void setRowData(int firstRowIndex, JsonArray rowDataJson); - - /** - * Informs the client to remove row data. - * - * @param firstRowIndex - * the index of the first removed row - * @param count - * the number of rows removed from <code>firstRowIndex</code> and - * onwards - */ - @NoLayout - public void removeRowData(int firstRowIndex, int count); - - /** - * Informs the client to insert new row data. - * - * @param firstRowIndex - * the index of the first new row - * @param count - * the number of rows inserted at <code>firstRowIndex</code> - */ - @NoLayout - public void insertRowData(int firstRowIndex, int count); - - /** - * Resets all data and defines a new size for the data. - * <p> - * This should be used in the cases where the data has changed in some - * unverifiable way. I.e. "something happened". This will lead to a - * re-rendering of the current Grid viewport - * - * @param size - * the size of the new data set - */ - public void resetDataAndSize(int size); - - /** - * Informs the client that rows have been updated. The client-side - * DataSource will map the given data to correct index if it should be in - * the cache. - * - * @since 7.6 - * @param rowArray - * array of updated rows - */ - @NoLayout - public void updateRowData(JsonArray rowArray); -} diff --git a/shared/src/com/vaadin/shared/data/DataRequestRpc.java b/shared/src/com/vaadin/shared/data/DataRequestRpc.java deleted file mode 100644 index 4b553dda68..0000000000 --- a/shared/src/com/vaadin/shared/data/DataRequestRpc.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.data; - -import com.vaadin.shared.annotations.Delayed; -import com.vaadin.shared.annotations.NoLoadingIndicator; -import com.vaadin.shared.communication.ServerRpc; - -import elemental.json.JsonArray; - -/** - * RPC interface used for requesting container data to the client. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public interface DataRequestRpc extends ServerRpc { - - /** - * Request rows from the server. - * - * @param firstRowIndex - * the index of the first requested row - * @param numberOfRows - * the number of requested rows - * @param firstCachedRowIndex - * the index of the first cached row - * @param cacheSize - * the number of cached rows - */ - @NoLoadingIndicator - public void requestRows(int firstRowIndex, int numberOfRows, - int firstCachedRowIndex, int cacheSize); - - /** - * Informs the server that items have been dropped from the client cache. - * - * @since 7.6 - * @param rowKeys - * array of dropped keys mapping to items - */ - @Delayed - @NoLoadingIndicator - public void dropRows(JsonArray rowKeys); -} diff --git a/shared/src/com/vaadin/shared/data/sort/SortDirection.java b/shared/src/com/vaadin/shared/data/sort/SortDirection.java deleted file mode 100644 index cd572087d7..0000000000 --- a/shared/src/com/vaadin/shared/data/sort/SortDirection.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.data.sort; - -import java.io.Serializable; - -/** - * Describes sorting direction. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public enum SortDirection implements Serializable { - - /** - * Ascending (e.g. A-Z, 1..9) sort order - */ - ASCENDING { - @Override - public SortDirection getOpposite() { - return DESCENDING; - } - }, - - /** - * Descending (e.g. Z-A, 9..1) sort order - */ - DESCENDING { - @Override - public SortDirection getOpposite() { - return ASCENDING; - } - }; - - /** - * Get the sort direction that is the direct opposite to this one. - * - * @return a sort direction value - */ - public abstract SortDirection getOpposite(); -} diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java b/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java deleted file mode 100644 index 7a75bcbec1..0000000000 --- a/shared/src/com/vaadin/shared/extension/javascriptmanager/ExecuteJavaScriptRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.extension.javascriptmanager; - -import com.vaadin.shared.communication.ClientRpc; - -public interface ExecuteJavaScriptRpc extends ClientRpc { - public void executeJavaScript(String script); -} diff --git a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java b/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java deleted file mode 100644 index e5af6a04f8..0000000000 --- a/shared/src/com/vaadin/shared/extension/javascriptmanager/JavaScriptManagerState.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.extension.javascriptmanager; - -import java.util.HashSet; -import java.util.Set; - -import com.vaadin.shared.communication.SharedState; - -public class JavaScriptManagerState extends SharedState { - public Set<String> names = new HashSet<String>(); -} diff --git a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java b/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java deleted file mode 100644 index 0cb9be8702..0000000000 --- a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.NoLayout; - -public class AbstractEmbeddedState extends AbstractComponentState { - - public static final String SOURCE_RESOURCE = "source"; - - @NoLayout - public String alternateText; -} diff --git a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java b/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java deleted file mode 100644 index 49e5e1c36a..0000000000 --- a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.AbstractComponentState; - -public class AbstractLayoutState extends AbstractComponentState { - -} diff --git a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java deleted file mode 100644 index 3029bedca7..0000000000 --- a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import java.util.ArrayList; -import java.util.List; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.communication.URLReference; - -public class AbstractMediaState extends AbstractComponentState { - public boolean showControls; - - @NoLayout - public String altText; - - public boolean htmlContentAllowed; - - @NoLayout - public boolean autoplay; - - @NoLayout - public boolean muted; - - public List<URLReference> sources = new ArrayList<URLReference>(); - - public List<String> sourceTypes = new ArrayList<String>(); -} diff --git a/shared/src/com/vaadin/shared/ui/AlignmentInfo.java b/shared/src/com/vaadin/shared/ui/AlignmentInfo.java deleted file mode 100644 index 120552a43d..0000000000 --- a/shared/src/com/vaadin/shared/ui/AlignmentInfo.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui; - -import java.io.Serializable; - -public final class AlignmentInfo implements Serializable { - /** Bitmask values for client server communication */ - public static class Bits implements Serializable { - public static final int ALIGNMENT_LEFT = 1; - public static final int ALIGNMENT_RIGHT = 2; - public static final int ALIGNMENT_TOP = 4; - public static final int ALIGNMENT_BOTTOM = 8; - public static final int ALIGNMENT_HORIZONTAL_CENTER = 16; - public static final int ALIGNMENT_VERTICAL_CENTER = 32; - } - - public static final AlignmentInfo LEFT = new AlignmentInfo( - Bits.ALIGNMENT_LEFT); - public static final AlignmentInfo RIGHT = new AlignmentInfo( - Bits.ALIGNMENT_RIGHT); - public static final AlignmentInfo TOP = new AlignmentInfo( - Bits.ALIGNMENT_TOP); - public static final AlignmentInfo BOTTOM = new AlignmentInfo( - Bits.ALIGNMENT_BOTTOM); - public static final AlignmentInfo CENTER = new AlignmentInfo( - Bits.ALIGNMENT_HORIZONTAL_CENTER); - public static final AlignmentInfo MIDDLE = new AlignmentInfo( - Bits.ALIGNMENT_VERTICAL_CENTER); - public static final AlignmentInfo TOP_LEFT = new AlignmentInfo( - Bits.ALIGNMENT_TOP + Bits.ALIGNMENT_LEFT); - - private final int bitMask; - - public AlignmentInfo(int bitMask) { - this.bitMask = bitMask; - } - - public AlignmentInfo(AlignmentInfo horizontal, AlignmentInfo vertical) { - this(horizontal.getBitMask() + vertical.getBitMask()); - } - - public int getBitMask() { - return bitMask; - } - - public boolean isTop() { - return (bitMask & Bits.ALIGNMENT_TOP) == Bits.ALIGNMENT_TOP; - } - - public boolean isBottom() { - return (bitMask & Bits.ALIGNMENT_BOTTOM) == Bits.ALIGNMENT_BOTTOM; - } - - public boolean isLeft() { - return (bitMask & Bits.ALIGNMENT_LEFT) == Bits.ALIGNMENT_LEFT; - } - - public boolean isRight() { - return (bitMask & Bits.ALIGNMENT_RIGHT) == Bits.ALIGNMENT_RIGHT; - } - - public boolean isVerticalCenter() { - return (bitMask & Bits.ALIGNMENT_VERTICAL_CENTER) == Bits.ALIGNMENT_VERTICAL_CENTER; - } - - public boolean isHorizontalCenter() { - return (bitMask & Bits.ALIGNMENT_HORIZONTAL_CENTER) == Bits.ALIGNMENT_HORIZONTAL_CENTER; - } - - public String getVerticalAlignment() { - if (isBottom()) { - return "bottom"; - } else if (isVerticalCenter()) { - return "middle"; - } - return "top"; - } - - public String getHorizontalAlignment() { - if (isRight()) { - return "right"; - } else if (isHorizontalCenter()) { - return "center"; - } - return "left"; - } - -} diff --git a/shared/src/com/vaadin/shared/ui/BorderStyle.java b/shared/src/com/vaadin/shared/ui/BorderStyle.java deleted file mode 100755 index ff5c7c7179..0000000000 --- a/shared/src/com/vaadin/shared/ui/BorderStyle.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -/** - * Constants for border styles used on HTML elements. - * - * @author Vaadin Ltd - * @version @VERSION@ - * @since 7.0 - * - */ -public enum BorderStyle { - /** - * A border style used for using no border. - */ - NONE, - - /** - * A border style used for a minimal border. - */ - MINIMAL, - - /** - * A border style that indicates that the default border style should be - * used. - */ - DEFAULT; -} diff --git a/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java b/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java deleted file mode 100644 index 6196ea09ac..0000000000 --- a/shared/src/com/vaadin/shared/ui/BrowserWindowOpenerState.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.AbstractComponentState; - -public class BrowserWindowOpenerState extends AbstractComponentState { - public static final String locationResource = "url"; - - public String target = "_blank"; - - public String features; - - public String uriFragment; - - public Map<String, String> parameters = new HashMap<String, String>(); - -} diff --git a/shared/src/com/vaadin/shared/ui/ClickRpc.java b/shared/src/com/vaadin/shared/ui/ClickRpc.java deleted file mode 100644 index 388ac14882..0000000000 --- a/shared/src/com/vaadin/shared/ui/ClickRpc.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -public interface ClickRpc extends ServerRpc { - /** - * Called when a click event has occurred and there are server side - * listeners for the event. - * - * @param mouseDetails - * Details about the mouse when the event took place - */ - public void click(MouseEventDetails mouseDetails); -} diff --git a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java deleted file mode 100644 index 894a1bbcbb..0000000000 --- a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import java.io.Serializable; -import java.util.HashSet; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.communication.SharedState; - -public final class ComponentStateUtil implements Serializable { - - private ComponentStateUtil() { - // Util class is not instantiable - } - - public static final boolean isUndefinedWidth(AbstractComponentState state) { - return state.width == null || "".equals(state.width); - } - - public static final boolean isUndefinedHeight(AbstractComponentState state) { - return state.height == null || "".equals(state.height); - } - - public static final boolean hasDescription(AbstractComponentState state) { - return state.description != null && !"".equals(state.description); - } - - public static final boolean hasStyles(AbstractComponentState state) { - return state.styles != null && !state.styles.isEmpty(); - } - - public static final boolean isRelativeWidth(AbstractComponentState state) { - return state.width != null && state.width.endsWith("%"); - } - - public static final boolean isRelativeHeight(AbstractComponentState state) { - return state.height != null && state.height.endsWith("%"); - } - - /** - * Removes an event listener id. - * - * @param eventListenerId - * The event identifier to remove - */ - public static final void removeRegisteredEventListener(SharedState state, - String eventIdentifier) { - if (state.registeredEventListeners == null) { - return; - } - state.registeredEventListeners.remove(eventIdentifier); - if (state.registeredEventListeners.size() == 0) { - state.registeredEventListeners = null; - } - } - - /** - * Adds an event listener id. - * - * @param eventListenerId - * The event identifier to add - */ - public static final void addRegisteredEventListener(SharedState state, - String eventListenerId) { - if (state.registeredEventListeners == null) { - state.registeredEventListeners = new HashSet<String>(); - } - state.registeredEventListeners.add(eventListenerId); - } -} diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java deleted file mode 100644 index b0c20cec31..0000000000 --- a/shared/src/com/vaadin/shared/ui/Connect.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import com.vaadin.shared.Connector; - -/** - * Annotation defining the server side connector that this ClientSideConnector - * should connect to. The value must always by a class extending - * {@link com.vaadin.server.ClientConnector}. - * <p> - * With this annotation client side Vaadin connector is marked to have a server - * side counterpart. The value of the annotation is the class of server side - * implementation. - * - * @since 7.0 - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface Connect { - - /** - * @return the server side counterpart for the annotated component connector - */ - Class<? extends Connector> value(); - - /** - * Depending on the used WidgetMap generator, these optional hints may be - * used to define how the client side components are loaded by the browser. - * The default is to eagerly load all widgets - * {@link com.vaadin.server.widgetsetutils.EagerWidgetMapGenerator}, but if - * the {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} is used - * by the widgetset, these load style hints are respected. - * <p> - * Lazy loading of a widget implementation means the client side component - * is not included in the initial JavaScript application loaded when the - * application starts. Instead the implementation is loaded to the client - * when it is first needed. Lazy loaded widget can be achieved by giving - * {@link LoadStyle#LAZY} value in {@link Connect} annotation. - * <p> - * Lazy loaded widgets don't stress the size and startup time of the client - * side as much as eagerly loaded widgets. On the other hand there is a - * slight latency when lazy loaded widgets are first used as the client side - * needs to visit the server to fetch the client side implementation. - * <p> - * The {@link LoadStyle#DEFERRED} will also not stress the initially loaded - * JavaScript file. If this load style is defined, the widget implementation - * is preemptively loaded to the browser after the application is started - * and the communication to server idles. This load style kind of combines - * the best of both worlds. - * <p> - * Fine tunings to widget loading can also be made by overriding - * {@link com.vaadin.server.widgetsetutils.WidgetMapGenerator} in the GWT - * module. Tunings might be helpful if the end users have slow connections - * and especially if they have high latency in their network. The - * {@link com.vaadin.server.widgetsetutils.CustomWidgetMapGenerator} is an - * abstract generator implementation for easy customization. Vaadin package - * also includes - * {@link com.vaadin.server.widgetsetutils.LazyWidgetMapGenerator} that - * makes as many widgets lazily loaded as possible. - * - * @since 6.4 - * - * @return the hint for the widget set generator how the client side - * implementation should be loaded to the browser - */ - LoadStyle loadStyle() default LoadStyle.EAGER; - - public enum LoadStyle { - /** - * The widget is included in the initial JS sent to the client. - */ - EAGER, - /** - * Not included in the initial set of widgets, but added to queue from - * which it will be loaded when network is not busy or the - * implementation is required. - */ - DEFERRED, - /** - * Loaded to the client only if needed. - */ - LAZY - } -} diff --git a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java deleted file mode 100644 index 3208934146..0000000000 --- a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui; - -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.JavaScriptConnectorState; - -public class JavaScriptComponentState extends AbstractComponentState implements - JavaScriptConnectorState { - - private Set<String> callbackNames = new HashSet<String>(); - private Map<String, Set<String>> rpcInterfaces = new HashMap<String, Set<String>>(); - - @Override - public Set<String> getCallbackNames() { - return callbackNames; - } - - public void setCallbackNames(Set<String> callbackNames) { - this.callbackNames = callbackNames; - } - - @Override - public Map<String, Set<String>> getRpcInterfaces() { - return rpcInterfaces; - } - - public void setRpcInterfaces(Map<String, Set<String>> rpcInterfaces) { - this.rpcInterfaces = rpcInterfaces; - } - -} diff --git a/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java b/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java deleted file mode 100644 index bd46bbda3d..0000000000 --- a/shared/src/com/vaadin/shared/ui/LayoutClickRpc.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -public interface LayoutClickRpc extends ServerRpc { - /** - * Called when a layout click event has occurred and there are server side - * listeners for the event. - * - * @param mouseDetails - * Details about the mouse when the event took place - * @param clickedConnector - * The child component that was the target of the event - */ - public void layoutClick(MouseEventDetails mouseDetails, - Connector clickedConnector); -} diff --git a/shared/src/com/vaadin/shared/ui/MarginInfo.java b/shared/src/com/vaadin/shared/ui/MarginInfo.java deleted file mode 100644 index a8979b36cf..0000000000 --- a/shared/src/com/vaadin/shared/ui/MarginInfo.java +++ /dev/null @@ -1,191 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui; - -import java.io.Serializable; - -/** - * Describes the margin settings for each edge of a Component. - * - * @author Vaadin Ltd - */ -public class MarginInfo implements Serializable { - - private static final int TOP = 1; - private static final int RIGHT = 2; - private static final int BOTTOM = 4; - private static final int LEFT = 8; - private static final int ALL = TOP | RIGHT | BOTTOM | LEFT; - - private int bitMask; - - /** - * Creates a MarginInfo object with all edges set to either enabled or - * disabled. - * - * @param enabled - * the value to set for all edges - */ - public MarginInfo(boolean enabled) { - setMargins(enabled); - } - - /** - * Creates a MarginInfo object from a bit mask. - * - * @param bitMask - * bits to set - */ - public MarginInfo(int bitMask) { - this.bitMask = bitMask; - } - - /** - * Creates a MarginInfo object by having each edge specified in clockwise - * order (analogous to CSS). - * - * @param top - * enable or disable top margin - * @param right - * enable or disable right margin - * @param bottom - * enable or disable bottom margin - * @param left - * enable or disable left margin - */ - public MarginInfo(boolean top, boolean right, boolean bottom, boolean left) { - setMargins(top, right, bottom, left); - } - - /** - * Enables or disables margins on all edges simultaneously. - * - * @param enabled - * if true, enables margins on all edges. If false, disables - * margins on all edges. - */ - public void setMargins(boolean enabled) { - bitMask = enabled ? ALL : 0; - } - - /** - * Sets margins on all edges individually. - * - * @param top - * enable or disable top margin - * @param right - * enable or disable right margin - * @param bottom - * enable or disable bottom margin - * @param left - * enable or disable left margin - */ - public void setMargins(boolean top, boolean right, boolean bottom, - boolean left) { - bitMask = top ? TOP : 0; - bitMask += right ? RIGHT : 0; - bitMask += bottom ? BOTTOM : 0; - bitMask += left ? LEFT : 0; - } - - /** - * Copies margin values from another MarginInfo object. - * - * @param marginInfo - * another marginInfo object - */ - public void setMargins(MarginInfo marginInfo) { - bitMask = marginInfo.bitMask; - } - - /** - * Checks if this MarginInfo object has margins on all edges enabled. - * - * @since 7.5.0 - * - * @return true if all edges have margins enabled - */ - public boolean hasAll() { - return (bitMask & ALL) == ALL; - } - - /** - * Checks if this MarginInfo object has the left edge margin enabled. - * - * @return true if left edge margin is enabled - */ - public boolean hasLeft() { - return (bitMask & LEFT) == LEFT; - } - - /** - * Checks if this MarginInfo object has the right edge margin enabled. - * - * @return true if right edge margin is enabled - */ - public boolean hasRight() { - return (bitMask & RIGHT) == RIGHT; - } - - /** - * Checks if this MarginInfo object has the top edge margin enabled. - * - * @return true if top edge margin is enabled - */ - public boolean hasTop() { - return (bitMask & TOP) == TOP; - } - - /** - * Checks if this MarginInfo object has the bottom edge margin enabled. - * - * @return true if bottom edge margin is enabled - */ - public boolean hasBottom() { - return (bitMask & BOTTOM) == BOTTOM; - } - - /** - * Returns the current bit mask that make up the margin settings. - * - * @return an integer bit mask - */ - public int getBitMask() { - return bitMask; - } - - @Override - public boolean equals(Object obj) { - if (!(obj instanceof MarginInfo)) { - return false; - } - - return ((MarginInfo) obj).bitMask == bitMask; - } - - @Override - public int hashCode() { - return bitMask; - } - - @Override - public String toString() { - return "MarginInfo(" + hasTop() + ", " + hasRight() + ", " - + hasBottom() + ", " + hasLeft() + ")"; - - } -} diff --git a/shared/src/com/vaadin/shared/ui/MediaControl.java b/shared/src/com/vaadin/shared/ui/MediaControl.java deleted file mode 100644 index ab31d6f95f..0000000000 --- a/shared/src/com/vaadin/shared/ui/MediaControl.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui; - -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.communication.ClientRpc; - -/** - * Server to client RPC interface for controlling playback of the media. - * - * @since 7.0 - */ -public interface MediaControl extends ClientRpc { - /** - * Start playing the media. - */ - @NoLayout - public void play(); - - /** - * Pause playback of the media. - */ - @NoLayout - public void pause(); -} diff --git a/shared/src/com/vaadin/shared/ui/MultiSelectMode.java b/shared/src/com/vaadin/shared/ui/MultiSelectMode.java deleted file mode 100644 index b628017a12..0000000000 --- a/shared/src/com/vaadin/shared/ui/MultiSelectMode.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -/** - * Multi select modes that controls how multi select behaves. - */ -public enum MultiSelectMode { - /** - * The default behavior of the multi select mode - */ - DEFAULT, - - /** - * The previous more simple behavior of the multi select - */ - SIMPLE -} diff --git a/shared/src/com/vaadin/shared/ui/Orientation.java b/shared/src/com/vaadin/shared/ui/Orientation.java deleted file mode 100644 index b370ba8109..0000000000 --- a/shared/src/com/vaadin/shared/ui/Orientation.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -public enum Orientation { - HORIZONTAL, VERTICAL; -} diff --git a/shared/src/com/vaadin/shared/ui/ShortCutConstants.java b/shared/src/com/vaadin/shared/ui/ShortCutConstants.java deleted file mode 100644 index d7049c2a74..0000000000 --- a/shared/src/com/vaadin/shared/ui/ShortCutConstants.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import java.io.Serializable; - -public class ShortCutConstants implements Serializable { - public static final String ACTION_TARGET_ATTRIBUTE = "sat"; - public static final String ACTION_TARGET_ACTION_ATTRIBUTE = "sata"; - public static final String ACTION_CAPTION_ATTRIBUTE = "caption"; - public static final String ACTION_KEY_ATTRIBUTE = "key"; - public static final String ACTION_SHORTCUT_KEY_ATTRIBUTE = "kc"; - public static final String ACTION_MODIFIER_KEYS_ATTRIBUTE = "mk"; - public static final String ACTION_TARGET_VARIABLE = "actiontarget"; - public static final String ACTION_TARGET_ACTION_VARIABLE = "action"; - -} diff --git a/shared/src/com/vaadin/shared/ui/TabIndexState.java b/shared/src/com/vaadin/shared/ui/TabIndexState.java deleted file mode 100644 index 1afe982546..0000000000 --- a/shared/src/com/vaadin/shared/ui/TabIndexState.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.NoLayout; - -/** - * Interface implemented by state classes that support tab indexes. - * - * @author Vaadin Ltd - * @since 7.0.0 - * - */ -public class TabIndexState extends AbstractComponentState { - - /** - * The <i>tabulator index</i> of the field. - */ - @NoLayout - public int tabIndex = 0; - -} diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java deleted file mode 100644 index 9ec88db2c2..0000000000 --- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutServerRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.absolutelayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface AbsoluteLayoutServerRpc extends LayoutClickRpc, ServerRpc { - -} diff --git a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java b/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java deleted file mode 100644 index 865d1420d5..0000000000 --- a/shared/src/com/vaadin/shared/ui/absolutelayout/AbsoluteLayoutState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.absolutelayout; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.ui.AbstractLayoutState; - -public class AbsoluteLayoutState extends AbstractLayoutState { - { - primaryStyleName = "v-absolutelayout"; - } - - // Maps each component to a position - public Map<String, String> connectorToCssPosition = new HashMap<String, String>(); -} diff --git a/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java b/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java deleted file mode 100644 index cbb7447a25..0000000000 --- a/shared/src/com/vaadin/shared/ui/accordion/AccordionState.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.accordion; - -import com.vaadin.shared.ui.tabsheet.TabsheetState; - -public class AccordionState extends TabsheetState { - - public static final String PRIMARY_STYLE_NAME = "v-accordion"; - - { - primaryStyleName = PRIMARY_STYLE_NAME; - } - -} diff --git a/shared/src/com/vaadin/shared/ui/audio/AudioState.java b/shared/src/com/vaadin/shared/ui/audio/AudioState.java deleted file mode 100644 index f0b4501e82..0000000000 --- a/shared/src/com/vaadin/shared/ui/audio/AudioState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.audio; - -import com.vaadin.shared.ui.AbstractMediaState; - -/** - * Shared state for the Audio component. - * - * @since 7.6 - */ -public class AudioState extends AbstractMediaState { - - { - primaryStyleName = "v-audio"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java b/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java deleted file mode 100644 index f8a5343cc9..0000000000 --- a/shared/src/com/vaadin/shared/ui/browserframe/BrowserFrameState.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.browserframe; - -import com.vaadin.shared.ui.AbstractEmbeddedState; - -public class BrowserFrameState extends AbstractEmbeddedState { - { - primaryStyleName = "v-browserframe"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java b/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java deleted file mode 100644 index d692fe5a6a..0000000000 --- a/shared/src/com/vaadin/shared/ui/button/ButtonServerRpc.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.button; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -/** - * RPC interface for calls from client to server. - * - * @since 7.0 - */ -public interface ButtonServerRpc extends ServerRpc { - /** - * Button click event. - * - * @param mouseEventDetails - * serialized mouse event details - */ - public void click(MouseEventDetails mouseEventDetails); - - /** - * Indicate to the server that the client has disabled the button as a - * result of a click. - */ - public void disableOnClick(); -} diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java deleted file mode 100644 index 01ef9a038b..0000000000 --- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.button; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.ui.TabIndexState; - -/** - * Shared state for {@link com.vaadin.ui.Button} and - * {@link com.vaadin.ui.NativeButton}. - * - * @see AbstractComponentState - * - * @since 7.0 - */ -public class ButtonState extends TabIndexState { - { - primaryStyleName = "v-button"; - } - @NoLayout - public boolean disableOnClick = false; - @NoLayout - public int clickShortcutKeyCode = 0; - @NoLayout - public String iconAltText = ""; -} diff --git a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java b/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java deleted file mode 100644 index 378b84832d..0000000000 --- a/shared/src/com/vaadin/shared/ui/button/NativeButtonState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.button; - -public class NativeButtonState extends ButtonState { - { - primaryStyleName = "v-nativebutton"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java b/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java deleted file mode 100644 index bffcde11a0..0000000000 --- a/shared/src/com/vaadin/shared/ui/calendar/CalendarClientRpc.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.calendar; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * - * @since 7.1 - * @author Vaadin Ltd. - * - */ -public interface CalendarClientRpc extends ClientRpc { - void scroll(int scrollPosition); -} diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java b/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java deleted file mode 100644 index 67a5fe11e2..0000000000 --- a/shared/src/com/vaadin/shared/ui/calendar/CalendarEventId.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.calendar; - -import java.io.Serializable; - -/** - * CalendarEventId contains static String identifiers for all Calendar events. - * These are used both in the client and server side code. - * - * @since 7.1 - * @author Vaadin Ltd. - */ -public class CalendarEventId implements Serializable { - - public static final String EVENTMOVE = "eventMove"; - public static final String RANGESELECT = "rangeSelect"; - public static final String FORWARD = "forward"; - public static final String BACKWARD = "backward"; - public static final String DATECLICK = "dateClick"; - public static final String WEEKCLICK = "weekClick"; - public static final String EVENTCLICK = "eventClick"; - public static final String EVENTRESIZE = "eventResize"; - public static final String ACTION = "action"; -} diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java b/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java deleted file mode 100644 index 7b7856fee9..0000000000 --- a/shared/src/com/vaadin/shared/ui/calendar/CalendarServerRpc.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.calendar; - -import com.vaadin.shared.annotations.Delayed; -import com.vaadin.shared.communication.ServerRpc; - -/** - * @since 7.1 - * @author Vaadin Ltd. - */ -public interface CalendarServerRpc extends ServerRpc { - void eventMove(int eventIndex, String newDate); - - void rangeSelect(String range); - - void forward(); - - void backward(); - - void dateClick(String date); - - void weekClick(String event); - - void eventClick(int eventIndex); - - void eventResize(int eventIndex, String newStartDate, String newEndDate); - - void actionOnEmptyCell(String actionKey, String startDate, String endDate); - - void actionOnEvent(String actionKey, String startDate, String endDate, - int eventIndex); - - @Delayed(lastOnly = true) - void scroll(int scrollPosition); -} diff --git a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java b/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java deleted file mode 100644 index c26c4ead16..0000000000 --- a/shared/src/com/vaadin/shared/ui/calendar/CalendarState.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.calendar; - -import java.util.List; - -import com.vaadin.shared.AbstractComponentState; - -/** - * @since 7.1.0 - * @author Vaadin Ltd. - */ -public class CalendarState extends AbstractComponentState { - - public boolean format24H; - public String[] dayNames; - public String[] monthNames; - public int firstVisibleDayOfWeek = 1; - public int lastVisibleDayOfWeek = 7; - public int firstHourOfDay = 0; - public int lastHourOfDay = 23; - public int firstDayOfWeek; - public int scroll; - public String now; - public List<CalendarState.Day> days; - public List<CalendarState.Event> events; - public List<CalendarState.Action> actions; - public boolean eventCaptionAsHtml; - - public static class Day implements java.io.Serializable { - public String date; - public String localizedDateFormat; - public int dayOfWeek; - public int week; - public int yearOfWeek; - } - - public static class Action implements java.io.Serializable { - - public String caption; - public String iconKey; - public String actionKey; - public String startDate; - public String endDate; - } - - public static class Event implements java.io.Serializable { - public int index; - public String caption; - public String dateFrom; - public String dateTo; - public String timeFrom; - public String timeTo; - public String styleName; - public String description; - public boolean allDay; - } -} diff --git a/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java b/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java deleted file mode 100644 index 48f42eebbe..0000000000 --- a/shared/src/com/vaadin/shared/ui/calendar/DateConstants.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.calendar; - -import java.io.Serializable; - -/** - * - * @since 7.1 - * - */ -public class DateConstants implements Serializable { - - public static final String ACTION_DATE_FORMAT_PATTERN = "yyyy-MM-dd HH:mm:ss"; - public static final String CLIENT_DATE_FORMAT = "yyyy-MM-dd"; - public static final String CLIENT_TIME_FORMAT = "HH-mm"; - public static final long MINUTEINMILLIS = 60 * 1000; - public static final long HOURINMILLIS = 60 * MINUTEINMILLIS; - public static final long DAYINMILLIS = 24 * HOURINMILLIS; - public static final long WEEKINMILLIS = 7 * DAYINMILLIS; - - public static final int DAYINMINUTES = 24 * 60; - public static final int HOURINMINUTES = 60; - -} diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java deleted file mode 100644 index f4124100e0..0000000000 --- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.checkbox; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.annotations.Delayed; -import com.vaadin.shared.communication.ServerRpc; - -public interface CheckBoxServerRpc extends ServerRpc { - @Delayed - public void setChecked(boolean checked, MouseEventDetails mouseEventDetails); -} diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java deleted file mode 100644 index 10d3b46d93..0000000000 --- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxState.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.checkbox; - -import com.vaadin.shared.AbstractFieldState; - -public class CheckBoxState extends AbstractFieldState { - { - primaryStyleName = "v-checkbox"; - } - - public boolean checked = false; -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/Color.java b/shared/src/com/vaadin/shared/ui/colorpicker/Color.java deleted file mode 100644 index 8624327993..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/Color.java +++ /dev/null @@ -1,453 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import java.io.Serializable; - -/** - * Default implementation for color. - * - * @since 7.0.0 - */ -public class Color implements Serializable { - - public static final Color WHITE = new Color(255, 255, 255); - public static final Color BLACK = new Color(0, 0, 0); - public static final Color RED = new Color(255, 0, 0); - public static final Color GREEN = new Color(0, 255, 0); - public static final Color BLUE = new Color(0, 0, 255); - public static final Color YELLOW = new Color(255, 255, 0); - public static final Color MAGENTA = new Color(255, 0, 255); - public static final Color CYAN = new Color(0, 255, 255); - - private int red; - private int green; - private int blue; - private int alpha; - - private String OUTOFRANGE = "Value must be within the range [0-255]. Was: "; - - /** - * Creates a color that has the specified red, green, blue, and alpha values - * within the range [0 - 255]. - * - * @throws IllegalArgumentException - * if <code>red</code>, <code>green</code>, <code>blue</code> or - * <code>alpha</code> fall outside of the inclusive range from 0 - * to 255 - * @param red - * the red value - * @param green - * the green value - * @param blue - * the blue value - * @param alpha - * the alpha value - */ - public Color(int red, int green, int blue, int alpha) { - checkRange(red, green, blue, alpha); - this.red = red; - this.green = green; - this.blue = blue; - this.alpha = alpha; - } - - /** - * Creates a color that has the specified red, green, and blue values within - * the range [0 - 255]. Alpha gets the default value of 255. - * - * @throws IllegalArgumentException - * if <code>red</code>, <code>green</code> or <code>blue</code> - * fall outside of the inclusive range from 0 to 255 - * @param red - * the red value - * @param green - * the green value - * @param blue - * the blue value - */ - public Color(int red, int green, int blue) { - this(red, green, blue, 255); - } - - /** - * Creates a color based on an RGB value. - * - * @throws IllegalArgumentException - * if converted values of <code>red</code>, <code>green</code>, - * <code>blue</code> or <code>alpha</code> fall outside of the - * inclusive range from 0 to 255 - * - * @param rgb - * the RGB value - */ - public Color(int rgb) { - int value = 0xff000000 | rgb; - int red = (value >> 16) & 0xFF; - int green = (value >> 8) & 0xFF; - int blue = (value >> 0) & 0xFF; - int alpha = (value >> 24) & 0xff; - - checkRange(red, green, blue, alpha); - - this.red = red; - this.green = green; - this.blue = blue; - this.alpha = alpha; - } - - /** - * Checks that all values are within the acceptable range of [0, 255]. - * - * @throws IllegalArgumentException - * if any of the values fall outside of the range - * - * @param red - * @param green - * @param blue - * @param alpha - */ - private void checkRange(int red, int green, int blue, int alpha) { - if (!withinRange(red) || !withinRange(green) || !withinRange(blue) - || !withinRange(alpha)) { - - String errorMessage = "All values must fall within range [0-255]. (red: " - + red - + ", green: " - + green - + ", blue: " - + blue - + ", alpha: " + alpha + ")"; - throw new IllegalArgumentException(errorMessage); - } - } - - /** - * Checks whether the value is within the acceptable range of [0, 255]. - * - * @param value - * @return true if the value falls within the range, false otherwise - */ - private boolean withinRange(int value) { - if (value < 0 || value > 255) { - return false; - } - return true; - } - - /** - * Returns the red value of the color. - * - */ - public int getRed() { - return red; - } - - /** - * Sets the red value of the color. Value must be within the range [0, 255]. - * - * @param red - * new red value - */ - public void setRed(int red) { - if (withinRange(red)) { - this.red = red; - } else { - throw new IllegalArgumentException(OUTOFRANGE + red); - } - } - - /** - * Returns the green value of the color. - * - */ - public int getGreen() { - return green; - } - - /** - * Sets the green value of the color. Value must be within the range [0, - * 255]. - * - * @param green - * new green value - */ - public void setGreen(int green) { - if (withinRange(green)) { - this.green = green; - } else { - throw new IllegalArgumentException(OUTOFRANGE + green); - } - } - - /** - * Returns the blue value of the color. - * - */ - public int getBlue() { - return blue; - } - - /** - * Sets the blue value of the color. Value must be within the range [0, - * 255]. - * - * @param blue - * new blue value - */ - public void setBlue(int blue) { - if (withinRange(blue)) { - this.blue = blue; - } else { - throw new IllegalArgumentException(OUTOFRANGE + blue); - } - } - - /** - * Returns the alpha value of the color. - * - */ - public int getAlpha() { - return alpha; - } - - /** - * Sets the alpha value of the color. Value must be within the range [0, - * 255]. - * - * @param alpha - * new alpha value - */ - public void setAlpha(int alpha) { - if (withinRange(alpha)) { - this.alpha = alpha; - } else { - throw new IllegalArgumentException(OUTOFRANGE + alpha); - } - } - - /** - * Returns CSS representation of the Color, e.g. #000000. - */ - public String getCSS() { - String redString = Integer.toHexString(red); - redString = redString.length() < 2 ? "0" + redString : redString; - - String greenString = Integer.toHexString(green); - greenString = greenString.length() < 2 ? "0" + greenString - : greenString; - - String blueString = Integer.toHexString(blue); - blueString = blueString.length() < 2 ? "0" + blueString : blueString; - - return "#" + redString + greenString + blueString; - } - - /** - * Returns RGB value of the color. - */ - public int getRGB() { - return ((alpha & 0xFF) << 24) | ((red & 0xFF) << 16) - | ((green & 0xFF) << 8) | ((blue & 0xFF) << 0); - } - - /** - * Returns converted HSV components of the color. - * - */ - public float[] getHSV() { - float[] hsv = new float[3]; - - int maxColor = (red > green) ? red : green; - if (blue > maxColor) { - maxColor = blue; - } - int minColor = (red < green) ? red : green; - if (blue < minColor) { - minColor = blue; - } - - float value = maxColor / 255.0f; - - float saturation = 0; - if (maxColor != 0) { - saturation = ((float) (maxColor - minColor)) / ((float) maxColor); - } - - float hue = 0; - if (saturation != 0) { - float redF = ((float) (maxColor - red)) - / ((float) (maxColor - minColor)); - float greenF = ((float) (maxColor - green)) - / ((float) (maxColor - minColor)); - float blueF = ((float) (maxColor - blue)) - / ((float) (maxColor - minColor)); - - if (red == maxColor) { - hue = blueF - greenF; - } else if (green == maxColor) { - hue = 2.0f + redF - blueF; - } else { - hue = 4.0f + greenF - redF; - } - - hue = hue / 6.0f; - if (hue < 0) { - hue = hue + 1.0f; - } - } - - hsv[0] = hue; - hsv[1] = saturation; - hsv[2] = value; - return hsv; - } - - @Override - public int hashCode() { - return getRGB(); - } - - @Override - public boolean equals(Object obj) { - return obj instanceof Color && ((Color) obj).getRGB() == getRGB(); - } - - /** - * <p> - * Converts HSV's hue, saturation and value into an RGB value. - * <p> - * The <code>saturation</code> and <code>value</code> components should be - * floating-point values within the range [0.0-1.0]. - * <p> - * - * @param hue - * the hue of the color - * @param saturation - * the saturation of the color - * @param value - * the value of the color - * @return the RGB value of corresponding color - */ - public static int HSVtoRGB(float hue, float saturation, float value) { - int red = 0; - int green = 0; - int blue = 0; - - if (saturation == 0) { - red = green = blue = (int) (value * 255.0f + 0.5f); - } else { - float h = (hue - (float) Math.floor(hue)) * 6.0f; - float f = h - (float) java.lang.Math.floor(h); - float p = value * (1.0f - saturation); - float q = value * (1.0f - saturation * f); - float t = value * (1.0f - (saturation * (1.0f - f))); - - switch ((int) h) { - case 0: - red = (int) (value * 255.0f + 0.5f); - green = (int) (t * 255.0f + 0.5f); - blue = (int) (p * 255.0f + 0.5f); - break; - case 1: - red = (int) (q * 255.0f + 0.5f); - green = (int) (value * 255.0f + 0.5f); - blue = (int) (p * 255.0f + 0.5f); - break; - case 2: - red = (int) (p * 255.0f + 0.5f); - green = (int) (value * 255.0f + 0.5f); - blue = (int) (t * 255.0f + 0.5f); - break; - case 3: - red = (int) (p * 255.0f + 0.5f); - green = (int) (q * 255.0f + 0.5f); - blue = (int) (value * 255.0f + 0.5f); - break; - case 4: - red = (int) (t * 255.0f + 0.5f); - green = (int) (p * 255.0f + 0.5f); - blue = (int) (value * 255.0f + 0.5f); - break; - case 5: - red = (int) (value * 255.0f + 0.5f); - green = (int) (p * 255.0f + 0.5f); - blue = (int) (q * 255.0f + 0.5f); - break; - } - } - - return 0xff000000 | (red << 16) | (green << 8) | (blue << 0); - } - - /** - * <p> - * Converts HSL's hue, saturation and lightness into an RGB value. - * - * @param hue - * the hue of the color. The unit of the value is degrees and - * should be between 0-360. - * @param saturation - * the saturation of the color. The unit of the value is - * percentages and should be between 0-100; - * @param lightness - * the lightness of the color. The unit of the value is - * percentages and should be between 0-100; - * - * @return the RGB value of corresponding color - */ - public static int HSLtoRGB(int hue, int saturation, int lightness) { - int red = 0; - int green = 0; - int blue = 0; - - float hueRatio = hue / 360f; - float saturationRatio = saturation / 100f; - float lightnessRatio = lightness / 100f; - - if (saturationRatio == 0) { - red = green = blue = (int) (lightnessRatio * 255.0f + 0.5f); - } else { - float p = lightnessRatio < 0.5f ? lightnessRatio - * (1f + saturationRatio) : lightnessRatio + saturationRatio - - lightnessRatio * saturationRatio; - float q = 2 * lightnessRatio - p; - - red = hslComponentToRgbComponent(p, q, hueRatio + (1f / 3f)); - green = hslComponentToRgbComponent(p, q, hueRatio); - blue = hslComponentToRgbComponent(p, q, hueRatio - (1f / 3f)); - } - return 0xff000000 | (red << 16) | (green << 8) | (blue << 0); - } - - private static int hslComponentToRgbComponent(float p, float q, float ratio) { - if (ratio < 0) { - ratio += 1; - } else if (ratio > 1) { - ratio -= 1; - } - - if (6 * ratio < 1f) { - return (int) ((q + (p - q) * 6f * ratio) * 255f + 0.5f); - } else if (2f * ratio < 1f) { - return (int) (p * 255f + 0.5f); - } else if (3f * ratio < 2f) { - return (int) ((q + (p - q) * ((2f / 3f) - ratio) * 6f) * 255f + 0.5f); - } - - return (int) (q * 255f + 0.5f); - } -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java deleted file mode 100644 index 374a41a0fe..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientServerRpc.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * RPC interface for ColorPickerGradient. - * - * @since 7.0.0 - * - */ -public interface ColorPickerGradientServerRpc extends ServerRpc { - - /** - * ColorPickerGradient mouseUp event. - * - * @param cursorX - * @param cursorY - */ - public void select(int cursorX, int cursorY); - -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java deleted file mode 100644 index 8245ffeaac..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGradientState.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import com.vaadin.shared.AbstractComponentState; - -/** - * Default shared state implementation for ColorPickerGradient. - * - * @since 7.0.0 - */ -public class ColorPickerGradientState extends AbstractComponentState { - - public int cursorX; - - public int cursorY; - - public String bgColor; - -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java deleted file mode 100644 index ce5c4317b4..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridServerRpc.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * RPC interface for ColorPickerGrid. - * - * @since 7.0.0 - * - */ -public interface ColorPickerGridServerRpc extends ServerRpc { - - /** - * ColorPickerGrid click event. - * - * @param x - * @param y - */ - public void select(int x, int y); - - /** - * Call to refresh the grid. - */ - public void refresh(); - -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java deleted file mode 100644 index e3e90f5418..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerGridState.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import com.vaadin.shared.AbstractComponentState; - -/** - * Default shared state implementation for ColorPickerGrid. - * - * @since 7.0.0 - */ -public class ColorPickerGridState extends AbstractComponentState { - - public int rowCount; - - public int columnCount; - - public String[] changedX; - - public String[] changedY; - - public String[] changedColor; - -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java deleted file mode 100644 index f556625025..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerServerRpc.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * RPC interface for AbstractColorPicker. - * - * @since 7.0.0 - * - */ -public interface ColorPickerServerRpc extends ServerRpc { - - /** - * ColorPicker click event. - * - * @param openPopup - * - */ - public void openPopup(boolean openPopup); - -} diff --git a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java b/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java deleted file mode 100644 index 3fdce20ce7..0000000000 --- a/shared/src/com/vaadin/shared/ui/colorpicker/ColorPickerState.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.colorpicker; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.DelegateToWidget; - -/** - * Default shared state implementation for AbstractColorPicker. - * - * @since 7.0.0 - */ -public class ColorPickerState extends AbstractComponentState { - { - primaryStyleName = "v-colorpicker"; - } - - @DelegateToWidget("setOpen") - public boolean popupVisible = false; - - @DelegateToWidget("setColor") - public String color = null; - - public boolean showDefaultCaption; - -} diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java deleted file mode 100644 index aeb04ba75f..0000000000 --- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxConstants.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -import java.io.Serializable; - -@Deprecated -public class ComboBoxConstants implements Serializable { - @Deprecated - public static final String ATTR_INPUTPROMPT = "prompt"; - @Deprecated - public static final String ATTR_NO_TEXT_INPUT = "noInput"; - -} diff --git a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java b/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java deleted file mode 100644 index 46e24aa266..0000000000 --- a/shared/src/com/vaadin/shared/ui/combobox/ComboBoxState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -import com.vaadin.shared.ui.select.AbstractSelectState; - -/** - * Shared state for the ComboBox component. - * - * @since 7.0 - */ -public class ComboBoxState extends AbstractSelectState { - { - primaryStyleName = "v-filterselect"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java b/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java deleted file mode 100644 index 1c0b743cc6..0000000000 --- a/shared/src/com/vaadin/shared/ui/combobox/FilteringMode.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.combobox; - -public enum FilteringMode { - OFF, STARTSWITH, CONTAINS; -} diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java deleted file mode 100644 index 1ff2f83d08..0000000000 --- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutServerRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.csslayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface CssLayoutServerRpc extends LayoutClickRpc, ServerRpc { - -} diff --git a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java b/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java deleted file mode 100644 index 5fe61082d5..0000000000 --- a/shared/src/com/vaadin/shared/ui/csslayout/CssLayoutState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.csslayout; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.ui.AbstractLayoutState; - -public class CssLayoutState extends AbstractLayoutState { - { - primaryStyleName = "v-csslayout"; - } - public Map<Connector, String> childCss = new HashMap<Connector, String>(); -} diff --git a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java b/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java deleted file mode 100644 index 04c7eed7e4..0000000000 --- a/shared/src/com/vaadin/shared/ui/customlayout/CustomLayoutState.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.customlayout; - -import java.util.HashMap; -import java.util.Map; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.ui.AbstractLayoutState; - -public class CustomLayoutState extends AbstractLayoutState { - { - primaryStyleName = "v-customlayout"; - } - public Map<Connector, String> childLocations = new HashMap<Connector, String>(); - public String templateContents; - public String templateName; -} diff --git a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java b/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java deleted file mode 100644 index 48bc74c690..0000000000 --- a/shared/src/com/vaadin/shared/ui/datefield/DateFieldConstants.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.datefield; - -import java.io.Serializable; - -@Deprecated -public class DateFieldConstants implements Serializable { - - @Deprecated - public static final String ATTR_WEEK_NUMBERS = "wn"; - -} diff --git a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java deleted file mode 100644 index b15d28f706..0000000000 --- a/shared/src/com/vaadin/shared/ui/datefield/InlineDateFieldState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.datefield; - -public class InlineDateFieldState extends TextualDateFieldState { - { - primaryStyleName = "v-inline-datefield"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java deleted file mode 100644 index 6f10af4314..0000000000 --- a/shared/src/com/vaadin/shared/ui/datefield/PopupDateFieldState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.datefield; - -import com.vaadin.shared.annotations.NoLayout; - -public class PopupDateFieldState extends TextualDateFieldState { - public static final String DESCRIPTION_FOR_ASSISTIVE_DEVICES = "Arrow down key opens calendar element for choosing the date"; - - { - primaryStyleName = "v-datefield"; - } - - public boolean textFieldEnabled = true; - @NoLayout - public String descriptionForAssistiveDevices = DESCRIPTION_FOR_ASSISTIVE_DEVICES; -} diff --git a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java b/shared/src/com/vaadin/shared/ui/datefield/Resolution.java deleted file mode 100644 index 689db11188..0000000000 --- a/shared/src/com/vaadin/shared/ui/datefield/Resolution.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.datefield; - -import java.util.ArrayList; -import java.util.List; - -/** - * Resolutions for DateFields - * - * @author Vaadin Ltd. - * @since 7.0 - */ -public enum Resolution { - // Values from Calendar.SECOND etc. Set as ints to avoid Calendar dependency - // (does not exist on the client side) - SECOND(13), MINUTE(12), HOUR(11), DAY(5), MONTH(2), YEAR(1); - - private int calendarField; - - private Resolution(int calendarField) { - this.calendarField = calendarField; - } - - /** - * Returns the field in java.util.Calendar that corresponds to this - * resolution. - * - * @return one of the field numbers used by Calendar - */ - public int getCalendarField() { - return calendarField; - } - - /** - * Returns the resolutions that are higher or equal to the given resolution, - * starting from the given resolution. In other words passing DAY to this - * methods returns DAY,MONTH,YEAR - * - * @param r - * The resolution to start from - * @return An iterable for the resolutions higher or equal to r - */ - public static Iterable<Resolution> getResolutionsHigherOrEqualTo( - Resolution r) { - List<Resolution> resolutions = new ArrayList<Resolution>(); - Resolution[] values = Resolution.values(); - for (int i = r.ordinal(); i < values.length; i++) { - resolutions.add(values[i]); - } - return resolutions; - } - - /** - * Returns the resolutions that are lower than the given resolution, - * starting from the given resolution. In other words passing DAY to this - * methods returns HOUR,MINUTE,SECOND. - * - * @param r - * The resolution to start from - * @return An iterable for the resolutions lower than r - */ - public static List<Resolution> getResolutionsLowerThan(Resolution r) { - List<Resolution> resolutions = new ArrayList<Resolution>(); - Resolution[] values = Resolution.values(); - for (int i = r.ordinal() - 1; i >= 0; i--) { - resolutions.add(values[i]); - } - return resolutions; - } -} diff --git a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java b/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java deleted file mode 100644 index bf38ee04a9..0000000000 --- a/shared/src/com/vaadin/shared/ui/datefield/TextualDateFieldState.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.datefield; - -import java.util.Date; - -import com.vaadin.shared.AbstractFieldState; -import com.vaadin.shared.annotations.NoLayout; - -public class TextualDateFieldState extends AbstractFieldState { - { - primaryStyleName = "v-datefield"; - } - - /* - * Start range that has been cleared, depending on the resolution of the - * date field - */ - @NoLayout - public Date rangeStart = null; - - /* - * End range that has been cleared, depending on the resolution of the date - * field - */ - @NoLayout - public Date rangeEnd = null; -} diff --git a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java b/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java deleted file mode 100644 index fa3ec107a2..0000000000 --- a/shared/src/com/vaadin/shared/ui/dd/AcceptCriterion.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.dd; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * An annotation type used to point the server side counterpart for client side - * a {@link com.vaadin.client.ui.dd.VAcceptCriterion} class. - * <p> - * Annotations are used at GWT compilation phase, so remember to rebuild your - * widgetset if you do changes for {@link AcceptCriterion} mappings. - * - * Prior to Vaadin 7, the mapping was done with an annotation on server side - * classes. - * - * @since 7.0 - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface AcceptCriterion { - /** - * @return the class of the server side counterpart for the annotated - * criterion - */ - Class<?> value(); - -} diff --git a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java b/shared/src/com/vaadin/shared/ui/dd/DragEventType.java deleted file mode 100644 index f894ed6219..0000000000 --- a/shared/src/com/vaadin/shared/ui/dd/DragEventType.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.dd; - -public enum DragEventType { - ENTER, LEAVE, OVER, DROP -} diff --git a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java b/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java deleted file mode 100644 index 064815695a..0000000000 --- a/shared/src/com/vaadin/shared/ui/dd/HorizontalDropLocation.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.dd; - -public enum HorizontalDropLocation { - LEFT, RIGHT, CENTER -} diff --git a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java b/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java deleted file mode 100644 index d64a48946a..0000000000 --- a/shared/src/com/vaadin/shared/ui/dd/VerticalDropLocation.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.dd; - -public enum VerticalDropLocation { - TOP, BOTTOM, MIDDLE -} diff --git a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java b/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java deleted file mode 100644 index 9dda86ad73..0000000000 --- a/shared/src/com/vaadin/shared/ui/draganddropwrapper/DragAndDropWrapperConstants.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.draganddropwrapper; - -import java.io.Serializable; - -@Deprecated -public class DragAndDropWrapperConstants implements Serializable { - - @Deprecated - public static final String HTML5_DATA_FLAVORS = "html5-data-flavors"; - @Deprecated - public static final String DRAG_START_MODE = "dragStartMode"; - - public static final String DRAG_START_COMPONENT_ATTRIBUTE = "dragStartComponent"; - -} diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java deleted file mode 100644 index 6aadb43b05..0000000000 --- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedConstants.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.embedded; - -import java.io.Serializable; - -@Deprecated -public class EmbeddedConstants implements Serializable { - @Deprecated - public static final String ALTERNATE_TEXT = "alt"; - -} diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java deleted file mode 100644 index 3b293ecdb2..0000000000 --- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedServerRpc.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.embedded; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface EmbeddedServerRpc extends ClickRpc, ServerRpc { -} diff --git a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java b/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java deleted file mode 100644 index 9f12a917e5..0000000000 --- a/shared/src/com/vaadin/shared/ui/embedded/EmbeddedState.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.embedded; - -import com.vaadin.shared.ui.AbstractEmbeddedState; - -public class EmbeddedState extends AbstractEmbeddedState { - { - primaryStyleName = "v-embedded"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/flash/FlashState.java b/shared/src/com/vaadin/shared/ui/flash/FlashState.java deleted file mode 100644 index d974650030..0000000000 --- a/shared/src/com/vaadin/shared/ui/flash/FlashState.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.flash; - -import java.util.Map; - -import com.vaadin.shared.ui.AbstractEmbeddedState; - -public class FlashState extends AbstractEmbeddedState { - { - primaryStyleName = "v-flash"; - } - - public String classId; - - public String codebase; - - public String codetype; - - public String archive; - - public String standby; - - public Map<String, String> embedParams; -} diff --git a/shared/src/com/vaadin/shared/ui/form/FormState.java b/shared/src/com/vaadin/shared/ui/form/FormState.java deleted file mode 100644 index 99ed11f8df..0000000000 --- a/shared/src/com/vaadin/shared/ui/form/FormState.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.form; - -import com.vaadin.shared.AbstractFieldState; -import com.vaadin.shared.Connector; - -public class FormState extends AbstractFieldState { - { - primaryStyleName = "v-form"; - } - public Connector layout; - public Connector footer; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java b/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java deleted file mode 100644 index 79e6c9a89f..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/ColumnGroupState.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.grid; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -/** - * The column group data shared between the server and the client - * - * @since 7.4 - * @author Vaadin Ltd - */ -public class ColumnGroupState implements Serializable { - - /** - * The columns that is included in the group - */ - public List<String> columns = new ArrayList<String>(); - - /** - * The header text of the group - */ - public String header; - - /** - * The footer text of the group - */ - public String footer; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java b/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java deleted file mode 100644 index 8b64d22423..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/DetailsConnectorChange.java +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import java.io.Serializable; -import java.util.Comparator; - -import com.vaadin.shared.Connector; - -/** - * A description of an indexing modification for a connector. This is used by - * Grid for internal bookkeeping updates. - * - * @since 7.5.0 - * @author Vaadin Ltd - */ -public class DetailsConnectorChange implements Serializable { - - public static final Comparator<DetailsConnectorChange> REMOVED_FIRST_COMPARATOR = new Comparator<DetailsConnectorChange>() { - @Override - public int compare(DetailsConnectorChange a, DetailsConnectorChange b) { - boolean deleteA = a.getNewIndex() == null; - boolean deleteB = b.getNewIndex() == null; - if (deleteA && !deleteB) { - return -1; - } else if (!deleteA && deleteB) { - return 1; - } else { - return 0; - } - } - }; - - private Connector connector; - private Integer oldIndex; - private Integer newIndex; - private boolean shouldStillBeVisible; - - /** Create a new connector index change */ - public DetailsConnectorChange() { - } - - /** - * Convenience constructor for setting all the fields in one line. - * <p> - * Calling this constructor will also assert that the state of the pojo is - * consistent by internal assumptions. - * - * @param connector - * the changed connector - * @param oldIndex - * the old index - * @param newIndex - * the new index - * @param shouldStillBeVisible - * details should be visible regardless of {@code connector} - */ - public DetailsConnectorChange(Connector connector, Integer oldIndex, - Integer newIndex, boolean shouldStillBeVisible) { - this.connector = connector; - this.oldIndex = oldIndex; - this.newIndex = newIndex; - this.shouldStillBeVisible = shouldStillBeVisible; - - assert assertStateIsOk(); - } - - private boolean assertStateIsOk() { - boolean connectorAndNewIndexIsNotNull = connector != null - && newIndex != null; - boolean connectorAndNewIndexIsNullThenOldIndexIsSet = connector == null - && newIndex == null && oldIndex != null; - - assert (connectorAndNewIndexIsNotNull || connectorAndNewIndexIsNullThenOldIndexIsSet) : "connector: " - + nullityString(connector) - + ", oldIndex: " - + nullityString(oldIndex) - + ", newIndex: " - + nullityString(newIndex); - return true; - } - - private static String nullityString(Object object) { - return object == null ? "null" : "non-null"; - } - - /** - * Gets the old index for the connector. - * <p> - * If <code>null</code>, the connector is recently added. This means that - * {@link #getConnector()} is expected not to return <code>null</code>. - * - * @return the old index for the connector - */ - public Integer getOldIndex() { - assert assertStateIsOk(); - return oldIndex; - } - - /** - * Gets the new index for the connector. - * <p> - * If <code>null</code>, the connector should be removed. This means that - * {@link #getConnector()} is expected to return <code>null</code> as well. - * - * @return the new index for the connector - */ - public Integer getNewIndex() { - assert assertStateIsOk(); - return newIndex; - } - - /** - * Gets the changed connector. - * - * @return the changed connector. Might be <code>null</code> - */ - public Connector getConnector() { - assert assertStateIsOk(); - return connector; - } - - /** - * Sets the changed connector. - * - * @param connector - * the changed connector. May be <code>null</code> - */ - public void setConnector(Connector connector) { - this.connector = connector; - } - - /** - * Sets the old index - * - * @param oldIndex - * the old index. May be <code>null</code> if a new connector is - * being inserted - */ - public void setOldIndex(Integer oldIndex) { - this.oldIndex = oldIndex; - } - - /** - * Sets the new index - * - * @param newIndex - * the new index. May be <code>null</code> if a connector is - * being removed - */ - public void setNewIndex(Integer newIndex) { - this.newIndex = newIndex; - } - - /** - * Checks whether whether the details should remain open, even if connector - * might be <code>null</code>. - * - * @return <code>true</code> iff the details should remain open, even if - * connector might be <code>null</code> - */ - public boolean isShouldStillBeVisible() { - return shouldStillBeVisible; - } - - /** - * Sets whether the details should remain open, even if connector might be - * <code>null</code>. - * - * @param shouldStillBeVisible - * <code>true</code> iff the details should remain open, even if - * connector might be <code>null</code> - */ - public void setShouldStillBeVisible(boolean shouldStillBeVisible) { - this.shouldStillBeVisible = shouldStillBeVisible; - } -} diff --git a/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java b/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java deleted file mode 100644 index 61066f28c2..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/EditorClientRpc.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import java.util.List; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * An RPC interface for the grid editor server-to-client communications. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public interface EditorClientRpc extends ClientRpc { - - /** - * Tells the client to open the editor and bind data to it. - * - * @param rowIndex - * the index of the edited row - */ - void bind(int rowIndex); - - /** - * Tells the client to cancel editing and hide the editor. - * - * @param rowIndex - * the index of the edited row - */ - void cancel(int rowIndex); - - /** - * Confirms a pending {@link EditorServerRpc#bind(int) bind request} sent by - * the client. - * - * @param bindSucceeded - * <code>true</code> iff the bind action was successful - */ - void confirmBind(boolean bindSucceeded); - - /** - * Confirms a pending {@link EditorServerRpc#save(int) save request} sent by - * the client. - * - * @param saveSucceeded - * <code>true</code> iff the save action was successful - * @param errorMessage - * the error message to show the user - * @param errorColumnsIds - * a list of column keys that should get error markers, or - * <code>null</code> if there should be no error markers - */ - void confirmSave(boolean saveSucceeded, String errorMessage, - List<String> errorColumnsIds); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java deleted file mode 100644 index 34a16ccb38..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/EditorServerRpc.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * An RPC interface for the grid editor client-to-server communications. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public interface EditorServerRpc extends ServerRpc { - - /** - * Asks the server to open the editor and bind data to it. When a bind - * request is sent, it must be acknowledged with a - * {@link EditorClientRpc#confirmBind() confirm call} before the client can - * open the editor. - * - * @param rowIndex - * the index of the edited row - */ - void bind(int rowIndex); - - /** - * Asks the server to save unsaved changes in the editor to the data source. - * When a save request is sent, it must be acknowledged with a - * {@link EditorClientRpc#confirmSave() confirm call}. - * - * @param rowIndex - * the index of the edited row - */ - void save(int rowIndex); - - /** - * Tells the server to cancel editing. When sending a cancel request, the - * client does not need to wait for confirmation by the server before hiding - * the editor. - * - * @param rowIndex - * the index of the edited row - */ - void cancel(int rowIndex); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java b/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java deleted file mode 100644 index ac1b1d5a78..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridClientRpc.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * Server-to-client RPC interface for the Grid component. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public interface GridClientRpc extends ClientRpc { - - /** - * Command client Grid to scroll to a specific data row and its (optional) - * details. - * - * @param row - * zero-based row index. If the row index is below zero or above - * the row count of the client-side data source, a client-side - * exception will be triggered. Since this exception has no - * handling by default, an out-of-bounds value will cause a - * client-side crash. - * @param destination - * desired placement of scrolled-to row. See the documentation - * for {@link ScrollDestination} for more information. - */ - public void scrollToRow(int row, ScrollDestination destination); - - /** - * Command client Grid to scroll to the first row. - */ - public void scrollToStart(); - - /** - * Command client Grid to scroll to the last row. - */ - public void scrollToEnd(); - - /** - * Command client Grid to recalculate column widths. - */ - public void recalculateColumnWidths(); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java b/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java deleted file mode 100644 index 98fa553330..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import java.io.Serializable; - -import com.vaadin.shared.Connector; - -/** - * Column state DTO for transferring column properties from the server to the - * client - * - * @since 7.4 - * @author Vaadin Ltd - */ -public class GridColumnState implements Serializable { - - /** - * Id used by grid connector to map server side column with client side - * column - */ - public String id; - - /** - * Column width in pixels. Default column width is - * {@value GridConstants#DEFAULT_COLUMN_WIDTH_PX}. - */ - public double width = GridConstants.DEFAULT_COLUMN_WIDTH_PX; - - /** - * The connector for the renderer used to render the cells in this column. - */ - public Connector rendererConnector; - - /** - * Whether the values in this column are editable when the editor interface - * is active. - */ - public boolean editable = true; - - /** - * The connector for the field used to edit cells in this column when the - * editor interface is active. - */ - public Connector editorConnector; - - /** - * Whether this column is sortable by the user - */ - public boolean sortable = false; - - /** How much of the remaining space this column will reserve. */ - public int expandRatio = GridConstants.DEFAULT_EXPAND_RATIO; - - /** - * The maximum expansion width of this column. -1 for "no maximum". If - * maxWidth is less than the calculated width, maxWidth is ignored. - */ - public double maxWidth = GridConstants.DEFAULT_MAX_WIDTH; - - /** - * The minimum expansion width of this column. -1 for "no minimum". If - * minWidth is less than the calculated width, minWidth will win. - */ - public double minWidth = GridConstants.DEFAULT_MIN_WIDTH; - - /** Whether this column is currently hidden. */ - public boolean hidden = false; - - /** Whether the column can be hidden by the user. */ - public boolean hidable = false; - - /** The caption for the column hiding toggle. */ - public String hidingToggleCaption; - - /** Column header caption */ - public String headerCaption; - - /** Whether this column is resizable by the user. */ - public boolean resizable = true; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java b/shared/src/com/vaadin/shared/ui/grid/GridConstants.java deleted file mode 100644 index 0f1af94456..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridConstants.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import java.io.Serializable; - -/** - * Container class for common constants and default values used by the Grid - * component. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public final class GridConstants implements Serializable { - - /** - * Enum describing different sections of Grid. - * - * @since 7.6 - */ - public enum Section { - HEADER, BODY, FOOTER - } - - /** - * Default padding in pixels when scrolling programmatically, without an - * explicitly defined padding value. - */ - public static final int DEFAULT_PADDING = 0; - - /** - * Delay before a long tap action is triggered. Number in milliseconds. - */ - public static final int LONG_TAP_DELAY = 500; - - /** - * The threshold in pixels a finger can move while long tapping. - */ - public static final int LONG_TAP_THRESHOLD = 3; - - /* Column constants */ - - /** - * Default maximum width for columns. - */ - public static final double DEFAULT_MAX_WIDTH = -1; - - /** - * Default minimum width for columns. - */ - public static final double DEFAULT_MIN_WIDTH = 10.0d; - - /** - * Default expand ratio for columns. - */ - public static final int DEFAULT_EXPAND_RATIO = -1; - - /** - * Default width for columns. - */ - public static final double DEFAULT_COLUMN_WIDTH_PX = -1; - - /** - * Event ID for item click events - */ - public static final String ITEM_CLICK_EVENT_ID = "itemClick"; - - /** The default save button caption in the editor */ - public static final String DEFAULT_SAVE_CAPTION = "Save"; - - /** The default cancel button caption in the editor */ - public static final String DEFAULT_CANCEL_CAPTION = "Cancel"; - - /** - * Event ID constant for editor open event - */ - public static final String EDITOR_OPEN_EVENT_ID = "editorOpen"; - - /** - * Event ID constant for editor move event - */ - public static final String EDITOR_MOVE_EVENT_ID = "editorMove"; - - /** - * Event ID constant for editor close event - */ - public static final String EDITOR_CLOSE_EVENT_ID = "editorClose"; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java deleted file mode 100644 index 336e8097c0..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridServerRpc.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import java.util.List; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.data.sort.SortDirection; -import com.vaadin.shared.ui.grid.GridConstants.Section; - -/** - * Client-to-server RPC interface for the Grid component - * - * @since 7.4 - * @author Vaadin Ltd - */ -public interface GridServerRpc extends ServerRpc { - - void sort(String[] columnIds, SortDirection[] directions, - boolean userOriginated); - - /** - * Informs the server that an item has been clicked in Grid. - * - * @param rowKey - * a key identifying the clicked item - * @param columnId - * column id identifying the clicked property - * @param details - * mouse event details - */ - void itemClick(String rowKey, String columnId, MouseEventDetails details); - - /** - * Informs the server that a context click has happened inside of Grid. - * - * @since 7.6 - * @param rowIndex - * index of clicked row in Grid section - * @param rowKey - * a key identifying the clicked item - * @param columnId - * column id identifying the clicked property - * @param section - * grid section (header, footer, body) - * @param details - * mouse event details - */ - void contextClick(int rowIndex, String rowKey, String columnId, - Section section, MouseEventDetails details); - - /** - * Informs the server that the columns of the Grid have been reordered. - * - * @since 7.5.0 - * @param newColumnOrder - * a list of column ids in the new order - * @param oldColumnOrder - * a list of column ids in order before the change - */ - void columnsReordered(List<String> newColumnOrder, - List<String> oldColumnOrder); - - /** - * Informs the server that a column's visibility has been changed. - * - * @since 7.5.0 - * @param id - * the id of the column - * @param hidden - * <code>true</code> if hidden, <code>false</code> if unhidden - * @param userOriginated - * <code>true</code> if triggered by user, <code>false</code> if - * by code - */ - void columnVisibilityChanged(String id, boolean hidden, - boolean userOriginated); - - /** - * Informs the server that a column has been resized by the user. - * - * @since 7.6 - * @param id - * the id of the column - * @param pixels - * the new width of the column in pixels - */ - void columnResized(String id, double pixels); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridState.java b/shared/src/com/vaadin/shared/ui/grid/GridState.java deleted file mode 100644 index 54ccc78daa..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridState.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.grid; - -import java.util.ArrayList; -import java.util.List; - -import com.vaadin.shared.annotations.DelegateToWidget; -import com.vaadin.shared.data.sort.SortDirection; -import com.vaadin.shared.ui.TabIndexState; - -/** - * The shared state for the {@link com.vaadin.ui.components.grid.Grid} component - * - * @since 7.4 - * @author Vaadin Ltd - */ -public class GridState extends TabIndexState { - - /** - * A description of which of the three bundled SelectionModels is currently - * in use. - * <p> - * Used as a data transfer object instead of the client/server ones, because - * they don't know about each others classes. - * - * @see com.vaadin.ui.components.grid.Grid.SelectionMode - * @see com.vaadin.client.ui.grid.Grid.SelectionMode - */ - public enum SharedSelectionMode { - /** - * Representation of a single selection mode - * - * @see com.vaadin.ui.components.grid.Grid.SelectionMode#SINGLE - * @see com.vaadin.client.ui.grid.Grid.SelectionMode#SINGLE - */ - SINGLE, - - /** - * Representation of a multiselection mode - * - * @see com.vaadin.ui.components.grid.Grid.SelectionMode#MULTI - * @see com.vaadin.client.ui.grid.Grid.SelectionMode#MULTI - */ - MULTI, - - /** - * Representation of a no-selection mode - * - * @see com.vaadin.ui.components.grid.Grid.SelectionMode#NONE - * @see com.vaadin.client.ui.grid.Grid.SelectionMode#NONE - */ - NONE; - } - - /** - * The default value for height-by-rows for both GWT widgets - * {@link com.vaadin.ui.components.grid Grid} and - * {@link com.vaadin.client.ui.grid.Escalator Escalator} - */ - public static final double DEFAULT_HEIGHT_BY_ROWS = 10.0d; - - /** - * The key in which a row's data can be found - * - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, String) - */ - public static final String JSONKEY_DATA = "d"; - - /** - * The key in which a row's own key can be found - * - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, String) - */ - public static final String JSONKEY_ROWKEY = "k"; - - /** - * The key in which a row's generated style can be found - * - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, String) - */ - public static final String JSONKEY_ROWSTYLE = "rs"; - - /** - * The key in which a generated styles for a row's cells can be found - * - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, String) - */ - public static final String JSONKEY_CELLSTYLES = "cs"; - - /** - * The key in which a row's description can be found - * - * @since 7.6 - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, String) - */ - public static final String JSONKEY_ROWDESCRIPTION = "rd"; - - /** - * The key in which a cell's description can be found - * - * @since 7.6 - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, String) - */ - public static final String JSONKEY_CELLDESCRIPTION = "cd"; - - /** - * The key that tells whether details are visible for the row. - * - * @since 7.5.0 - * - * @see com.vaadin.ui.Grid#setDetailsGenerator(com.vaadin.ui.Grid.DetailsGenerator) - * @see com.vaadin.ui.Grid#setDetailsVisible(Object, boolean) - * @see com.vaadin.shared.data.DataProviderRpc#setRowData(int, - * elemental.json.JsonArray) - * */ - public static final String JSONKEY_DETAILS_VISIBLE = "dv"; - - /** - * The key that tells whether row is selected. - * - * @since 7.6 - */ - public static final String JSONKEY_SELECTED = "s"; - - { - primaryStyleName = "v-grid"; - } - - /** - * Columns in grid. - */ - public List<GridColumnState> columns = new ArrayList<GridColumnState>(); - - /** - * Column order in grid. - */ - public List<String> columnOrder = new ArrayList<String>(); - - public GridStaticSectionState header = new GridStaticSectionState(); - - public GridStaticSectionState footer = new GridStaticSectionState(); - - /** The number of frozen columns */ - public int frozenColumnCount = 0; - - /** The height of the Grid in terms of body rows. */ - @DelegateToWidget - public double heightByRows = DEFAULT_HEIGHT_BY_ROWS; - - /** The mode by which Grid defines its height. */ - @DelegateToWidget - public HeightMode heightMode = HeightMode.CSS; - - /** Keys of the currently sorted columns */ - public String[] sortColumns = new String[0]; - - /** Directions for each sorted column */ - public SortDirection[] sortDirs = new SortDirection[0]; - - /** The enabled state of the editor interface */ - public boolean editorEnabled = false; - - /** - * Buffered editor mode - * - * @since 7.6 - */ - @DelegateToWidget - public boolean editorBuffered = true; - - /** - * Whether rows and/or cells have generated descriptions (tooltips) - * - * @since 7.6 - */ - public boolean hasDescriptions; - - /** The caption for the save button in the editor */ - @DelegateToWidget - public String editorSaveCaption = GridConstants.DEFAULT_SAVE_CAPTION; - - /** The caption for the cancel button in the editor */ - @DelegateToWidget - public String editorCancelCaption = GridConstants.DEFAULT_CANCEL_CAPTION; - - /** Whether the columns can be reordered */ - @DelegateToWidget - public boolean columnReorderingAllowed; - -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java b/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java deleted file mode 100644 index c646717d2c..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridStaticCellType.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -/** - * Enumeration, specifying the content type of a Cell in a GridStaticSection. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public enum GridStaticCellType { - /** - * Text content - */ - TEXT, - - /** - * HTML content - */ - HTML, - - /** - * Widget content - */ - WIDGET; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java b/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java deleted file mode 100644 index a3c485af08..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/GridStaticSectionState.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import com.vaadin.shared.Connector; - -/** - * Shared state for Grid headers and footers. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public class GridStaticSectionState implements Serializable { - - public static class CellState implements Serializable { - public String text = ""; - - public String html = ""; - - public Connector connector = null; - - public GridStaticCellType type = GridStaticCellType.TEXT; - - public String columnId; - - public String styleName = null; - } - - public static class RowState implements Serializable { - public List<CellState> cells = new ArrayList<CellState>(); - - public boolean defaultRow = false; - - /** - * Map from column id set to cell state for merged state. - */ - public Map<Set<String>, CellState> cellGroups = new HashMap<Set<String>, CellState>(); - - /** - * The style name for the row. Null if none. - */ - public String styleName = null; - } - - public List<RowState> rows = new ArrayList<RowState>(); - - public boolean visible = true; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/HeightMode.java b/shared/src/com/vaadin/shared/ui/grid/HeightMode.java deleted file mode 100644 index 4cd19a01b1..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/HeightMode.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -/** - * The modes for height calculation that are supported by Grid ( - * {@link com.vaadin.client.ui.grid.Grid client} and - * {@link com.vaadin.ui.components.grid.Grid server}) / - * {@link com.vaadin.client.ui.grid.Escalator Escalator}. - * - * @since 7.4 - * @author Vaadin Ltd - * @see com.vaadin.client.ui.grid.Grid#setHeightMode(HeightMode) - * @see com.vaadin.ui.components.grid.Grid#setHeightMode(HeightMode) - * @see com.vaadin.client.ui.grid.Escalator#setHeightMode(HeightMode) - */ -public enum HeightMode { - /** - * The height of the Component or Widget is defined by a CSS-like value. - * (e.g. "100px", "50em" or "25%") - */ - CSS, - - /** - * The height of the Component or Widget in question is defined by a number - * of rows. - */ - ROW; -} diff --git a/shared/src/com/vaadin/shared/ui/grid/Range.java b/shared/src/com/vaadin/shared/ui/grid/Range.java deleted file mode 100644 index 21e70d3dbf..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/Range.java +++ /dev/null @@ -1,439 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.grid; - -import java.io.Serializable; - -/** - * An immutable representation of a range, marked by start and end points. - * <p> - * The range is treated as inclusive at the start, and exclusive at the end. - * I.e. the range [0..1[ has the length 1, and represents one integer: 0. - * <p> - * The range is considered {@link #isEmpty() empty} if the start is the same as - * the end. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public final class Range implements Serializable { - private final int start; - private final int end; - - /** - * Creates a range object representing a single integer. - * - * @param integer - * the number to represent as a range - * @return the range represented by <code>integer</code> - */ - public static Range withOnly(final int integer) { - return new Range(integer, integer + 1); - } - - /** - * Creates a range between two integers. - * <p> - * The range start is <em>inclusive</em> and the end is <em>exclusive</em>. - * So, a range "between" 0 and 5 represents the numbers 0, 1, 2, 3 and 4, - * but not 5. - * - * @param start - * the start of the the range, inclusive - * @param end - * the end of the range, exclusive - * @return a range representing <code>[start..end[</code> - * @throws IllegalArgumentException - * if <code>start > end</code> - */ - public static Range between(final int start, final int end) - throws IllegalArgumentException { - return new Range(start, end); - } - - /** - * Creates a range from a start point, with a given length. - * - * @param start - * the first integer to include in the range - * @param length - * the length of the resulting range - * @return a range starting from <code>start</code>, with - * <code>length</code> number of integers following - * @throws IllegalArgumentException - * if length < 0 - */ - public static Range withLength(final int start, final int length) - throws IllegalArgumentException { - if (length < 0) { - /* - * The constructor of Range will throw an exception if start > - * start+length (i.e. if length is negative). We're throwing the - * same exception type, just with a more descriptive message. - */ - throw new IllegalArgumentException("length must not be negative"); - } - return new Range(start, start + length); - } - - /** - * Creates a new range between two numbers: <code>[start..end[</code>. - * - * @param start - * the start integer, inclusive - * @param end - * the end integer, exclusive - * @throws IllegalArgumentException - * if <code>start > end</code> - */ - private Range(final int start, final int end) - throws IllegalArgumentException { - if (start > end) { - throw new IllegalArgumentException( - "start must not be greater than end"); - } - - this.start = start; - this.end = end; - } - - /** - * Returns the <em>inclusive</em> start point of this range. - * - * @return the start point of this range - */ - public int getStart() { - return start; - } - - /** - * Returns the <em>exclusive</em> end point of this range. - * - * @return the end point of this range - */ - public int getEnd() { - return end; - } - - /** - * The number of integers contained in the range. - * - * @return the number of integers contained in the range - */ - public int length() { - return getEnd() - getStart(); - } - - /** - * Checks whether the range has no elements between the start and end. - * - * @return <code>true</code> iff the range contains no elements. - */ - public boolean isEmpty() { - return getStart() >= getEnd(); - } - - /** - * Checks whether this range and another range are at least partially - * covering the same values. - * - * @param other - * the other range to check against - * @return <code>true</code> if this and <code>other</code> intersect - */ - public boolean intersects(final Range other) { - return getStart() < other.getEnd() && other.getStart() < getEnd(); - } - - /** - * Checks whether an integer is found within this range. - * - * @param integer - * an integer to test for presence in this range - * @return <code>true</code> iff <code>integer</code> is in this range - */ - public boolean contains(final int integer) { - return getStart() <= integer && integer < getEnd(); - } - - /** - * Checks whether this range is a subset of another range. - * - * @return <code>true</code> iff <code>other</code> completely wraps this - * range - */ - public boolean isSubsetOf(final Range other) { - if (isEmpty() && other.isEmpty()) { - return true; - } - - return other.getStart() <= getStart() && getEnd() <= other.getEnd(); - } - - /** - * Overlay this range with another one, and partition the ranges according - * to how they position relative to each other. - * <p> - * The three partitions are returned as a three-element Range array: - * <ul> - * <li>Elements in this range that occur before elements in - * <code>other</code>. - * <li>Elements that are shared between the two ranges. - * <li>Elements in this range that occur after elements in - * <code>other</code>. - * </ul> - * - * @param other - * the other range to act as delimiters. - * @return a three-element Range array of partitions depicting the elements - * before (index 0), shared/inside (index 1) and after (index 2). - */ - public Range[] partitionWith(final Range other) { - final Range[] splitBefore = splitAt(other.getStart()); - final Range rangeBefore = splitBefore[0]; - final Range[] splitAfter = splitBefore[1].splitAt(other.getEnd()); - final Range rangeInside = splitAfter[0]; - final Range rangeAfter = splitAfter[1]; - return new Range[] { rangeBefore, rangeInside, rangeAfter }; - } - - /** - * Get a range that is based on this one, but offset by a number. - * - * @param offset - * the number to offset by - * @return a copy of this range, offset by <code>offset</code> - */ - public Range offsetBy(final int offset) { - if (offset == 0) { - return this; - } else { - return new Range(start + offset, end + offset); - } - } - - @Override - public String toString() { - return getClass().getSimpleName() + " [" + getStart() + ".." + getEnd() - + "[" + (isEmpty() ? " (empty)" : ""); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + end; - result = prime * result + start; - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - final Range other = (Range) obj; - if (end != other.end) { - return false; - } - if (start != other.start) { - return false; - } - return true; - } - - /** - * Checks whether this range starts before the start of another range. - * - * @param other - * the other range to compare against - * @return <code>true</code> iff this range starts before the - * <code>other</code> - */ - public boolean startsBefore(final Range other) { - return getStart() < other.getStart(); - } - - /** - * Checks whether this range ends before the start of another range. - * - * @param other - * the other range to compare against - * @return <code>true</code> iff this range ends before the - * <code>other</code> - */ - public boolean endsBefore(final Range other) { - return getEnd() <= other.getStart(); - } - - /** - * Checks whether this range ends after the end of another range. - * - * @param other - * the other range to compare against - * @return <code>true</code> iff this range ends after the - * <code>other</code> - */ - public boolean endsAfter(final Range other) { - return getEnd() > other.getEnd(); - } - - /** - * Checks whether this range starts after the end of another range. - * - * @param other - * the other range to compare against - * @return <code>true</code> iff this range starts after the - * <code>other</code> - */ - public boolean startsAfter(final Range other) { - return getStart() >= other.getEnd(); - } - - /** - * Split the range into two at a certain integer. - * <p> - * <em>Example:</em> <code>[5..10[.splitAt(7) == [5..7[, [7..10[</code> - * - * @param integer - * the integer at which to split the range into two - * @return an array of two ranges, with <code>[start..integer[</code> in the - * first element, and <code>[integer..end[</code> in the second - * element. - * <p> - * If {@code integer} is less than {@code start}, [empty, - * {@code this} ] is returned. if <code>integer</code> is equal to - * or greater than {@code end}, [{@code this}, empty] is returned - * instead. - */ - public Range[] splitAt(final int integer) { - if (integer < start) { - return new Range[] { Range.withLength(start, 0), this }; - } else if (integer >= end) { - return new Range[] { this, Range.withLength(end, 0) }; - } else { - return new Range[] { new Range(start, integer), - new Range(integer, end) }; - } - } - - /** - * Split the range into two after a certain number of integers into the - * range. - * <p> - * Calling this method is equivalent to calling - * <code>{@link #splitAt(int) splitAt}({@link #getStart()}+length);</code> - * <p> - * <em>Example:</em> - * <code>[5..10[.splitAtFromStart(2) == [5..7[, [7..10[</code> - * - * @param length - * the length at which to split this range into two - * @return an array of two ranges, having the <code>length</code>-first - * elements of this range, and the second range having the rest. If - * <code>length</code> ≤ 0, the first element will be empty, and - * the second element will be this range. If <code>length</code> - * ≥ {@link #length()}, the first element will be this range, - * and the second element will be empty. - */ - public Range[] splitAtFromStart(final int length) { - return splitAt(getStart() + length); - } - - /** - * Combines two ranges to create a range containing all values in both - * ranges, provided there are no gaps between the ranges. - * - * @param other - * the range to combine with this range - * - * @return the combined range - * - * @throws IllegalArgumentException - * if the two ranges aren't connected - */ - public Range combineWith(Range other) throws IllegalArgumentException { - if (getStart() > other.getEnd() || other.getStart() > getEnd()) { - throw new IllegalArgumentException("There is a gap between " + this - + " and " + other); - } - - return Range.between(Math.min(getStart(), other.getStart()), - Math.max(getEnd(), other.getEnd())); - } - - /** - * Creates a range that is expanded the given amounts in both ends. - * - * @param startDelta - * the amount to expand by in the beginning of the range - * @param endDelta - * the amount to expand by in the end of the range - * - * @return an expanded range - * - * @throws IllegalArgumentException - * if the new range would have <code>start > end</code> - */ - public Range expand(int startDelta, int endDelta) - throws IllegalArgumentException { - return Range.between(getStart() - startDelta, getEnd() + endDelta); - } - - /** - * Limits this range to be within the bounds of the provided range. - * <p> - * This is basically an optimized way of calculating - * <code>{@link #partitionWith(Range)}[1]</code> without the overhead of - * defining the parts that do not overlap. - * <p> - * If the two ranges do not intersect, an empty range is returned. There are - * no guarantees about the position of that range. - * - * @param bounds - * the bounds that the returned range should be limited to - * @return a bounded range - */ - public Range restrictTo(Range bounds) { - boolean startWithin = bounds.contains(getStart()); - boolean endWithin = bounds.contains(getEnd()); - boolean boundsWithin = getStart() < bounds.getStart() - && getEnd() >= bounds.getEnd(); - - if (startWithin) { - if (endWithin) { - return this; - } else { - return Range.between(getStart(), bounds.getEnd()); - } - } else { - if (endWithin) { - return Range.between(bounds.getStart(), getEnd()); - } else if (boundsWithin) { - return bounds; - } else { - return Range.withLength(getStart(), 0); - } - } - } -} diff --git a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java b/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java deleted file mode 100644 index 64cf070e46..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/ScrollDestination.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid; - -/** - * Enumeration, specifying the destinations that are supported when scrolling - * rows or columns into view. - * - * @since 7.4 - * @author Vaadin Ltd - */ -public enum ScrollDestination { - - /** - * Scroll as little as possible to show the target element. If the element - * fits into view, this works as START or END depending on the current - * scroll position. If the element does not fit into view, this works as - * START. - */ - ANY, - - /** - * Scrolls so that the element is shown at the start of the viewport. The - * viewport will, however, not scroll beyond its contents. - */ - START, - - /** - * Scrolls so that the element is shown in the middle of the viewport. The - * viewport will, however, not scroll beyond its contents, given more - * elements than what the viewport is able to show at once. Under no - * circumstances will the viewport scroll before its first element. - */ - MIDDLE, - - /** - * Scrolls so that the element is shown at the end of the viewport. The - * viewport will, however, not scroll before its first element. - */ - END - -} diff --git a/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java b/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java deleted file mode 100644 index 658caef050..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/renderers/RendererClickRpc.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid.renderers; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -public interface RendererClickRpc extends ServerRpc { - /** - * Called when a click event has occurred and there are server side - * listeners for the event. - * - * @param mouseDetails - * Details about the mouse when the event took place - */ - public void click(String rowKey, String columnId, - MouseEventDetails mouseDetails); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java deleted file mode 100644 index 1ddecb31e4..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelServerRpc.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid.selection; - -import java.util.List; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * ServerRpc for MultiSelectionModel. - * - * @since 7.6 - * @author Vaadin Ltd - */ -public interface MultiSelectionModelServerRpc extends ServerRpc { - - /** - * Select a list of rows based on their row keys on the server-side. - * - * @param rowKeys - * list of row keys to select - */ - public void select(List<String> rowKeys); - - /** - * Deselect a list of rows based on their row keys on the server-side. - * - * @param rowKeys - * list of row keys to deselect - */ - public void deselect(List<String> rowKeys); - - /** - * Selects all rows on the server-side. - */ - public void selectAll(); - - /** - * Deselects all rows on the server-side. - */ - public void deselectAll(); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java b/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java deleted file mode 100644 index 3d56b65793..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/selection/MultiSelectionModelState.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid.selection; - -import com.vaadin.shared.communication.SharedState; - -/** - * SharedState object for MultiSelectionModel. - * - * @since 7.6 - * @author Vaadin Ltd - */ -public class MultiSelectionModelState extends SharedState { - - /* Select All -checkbox status */ - public boolean allSelected; - -} diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java b/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java deleted file mode 100644 index ff8e7c424b..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelServerRpc.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid.selection; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * ServerRpc for SingleSelectionModel. - * - * @since 7.6 - * @author Vaadin Ltd - */ -public interface SingleSelectionModelServerRpc extends ServerRpc { - - /** - * Selects a row on server-side. - * - * @param rowKey - * row key of selected row; {@code null} if deselect - */ - public void select(String rowKey); -} diff --git a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java b/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java deleted file mode 100644 index be8770a94e..0000000000 --- a/shared/src/com/vaadin/shared/ui/grid/selection/SingleSelectionModelState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.grid.selection; - -import com.vaadin.shared.communication.SharedState; - -/** - * SharedState object for SingleSelectionModel. - * - * @since 7.6 - * @author Vaadin Ltd - */ -public class SingleSelectionModelState extends SharedState { - - /* Allow deselecting rows */ - public boolean deselectAllowed = true; -} diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java deleted file mode 100644 index 70b49154ee..0000000000 --- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutServerRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.gridlayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface GridLayoutServerRpc extends LayoutClickRpc, ServerRpc { - -} diff --git a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java b/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java deleted file mode 100644 index b84c2673f4..0000000000 --- a/shared/src/com/vaadin/shared/ui/gridlayout/GridLayoutState.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.gridlayout; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.ui.AbstractLayoutState; -import com.vaadin.shared.ui.AlignmentInfo; - -public class GridLayoutState extends AbstractLayoutState { - public static AlignmentInfo ALIGNMENT_DEFAULT = AlignmentInfo.TOP_LEFT; - - { - primaryStyleName = "v-gridlayout"; - } - public boolean spacing = false; - public int rows = 0; - public int columns = 0; - public int marginsBitmask = 0; - // Set of indexes of implicitly Ratios rows and columns - public Set<Integer> explicitRowRatios = new HashSet<Integer>();; - public Set<Integer> explicitColRatios = new HashSet<Integer>(); - public Map<Connector, ChildComponentData> childData = new HashMap<Connector, GridLayoutState.ChildComponentData>(); - public boolean hideEmptyRowsAndColumns = false; - - public static class ChildComponentData implements Serializable { - public int column1; - public int row1; - public int column2; - public int row2; - public int alignment = ALIGNMENT_DEFAULT.getBitMask(); - - } -} diff --git a/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java b/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java deleted file mode 100644 index ec03c7fe47..0000000000 --- a/shared/src/com/vaadin/shared/ui/image/ImageServerRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.image; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface ImageServerRpc extends ClickRpc, ServerRpc { - -} diff --git a/shared/src/com/vaadin/shared/ui/image/ImageState.java b/shared/src/com/vaadin/shared/ui/image/ImageState.java deleted file mode 100644 index b51913d168..0000000000 --- a/shared/src/com/vaadin/shared/ui/image/ImageState.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.image; - -import com.vaadin.shared.ui.AbstractEmbeddedState; - -public class ImageState extends AbstractEmbeddedState { - { - primaryStyleName = "v-image"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/label/ContentMode.java b/shared/src/com/vaadin/shared/ui/label/ContentMode.java deleted file mode 100644 index 37e821536d..0000000000 --- a/shared/src/com/vaadin/shared/ui/label/ContentMode.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.label; - -/** - * Content modes defining how the client should interpret a Label's value. - * - * @since 7.0.0 - */ -public enum ContentMode { - /** - * Content mode, where the label contains only plain text. - */ - TEXT, - - /** - * Content mode, where the label contains preformatted text. In this mode - * newlines are preserved when rendered on the screen. - */ - PREFORMATTED, - - /** - * Content mode, where the label contains HTML. - */ - HTML, - - /** - * Content mode, where the label contains well-formed or well-balanced XML. - * This is handled in the same way as {@link #HTML}. - * - * @deprecated Use {@link #HTML} instead - */ - @Deprecated - XML, - - /** - * Legacy content mode, where the label contains RAW output. This is handled - * in exactly the same way as {@link #HTML}. - * - * @deprecated Use {@link #HTML} instead - */ - @Deprecated - RAW; -} diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java deleted file mode 100644 index 8fd1d7c798..0000000000 --- a/shared/src/com/vaadin/shared/ui/label/LabelState.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.label; - -import com.vaadin.shared.AbstractComponentState; - -public class LabelState extends AbstractComponentState { - { - primaryStyleName = "v-label"; - } - public ContentMode contentMode = ContentMode.TEXT; - public String text = ""; -} diff --git a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java b/shared/src/com/vaadin/shared/ui/link/LinkConstants.java deleted file mode 100644 index 399e6b6148..0000000000 --- a/shared/src/com/vaadin/shared/ui/link/LinkConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.link; - -import java.io.Serializable; - -public class LinkConstants implements Serializable { - public static String HREF_RESOURCE = "href"; -} diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/com/vaadin/shared/ui/link/LinkState.java deleted file mode 100644 index 2b1f73b90a..0000000000 --- a/shared/src/com/vaadin/shared/ui/link/LinkState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.link; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.ui.BorderStyle; - -public class LinkState extends AbstractComponentState { - { - primaryStyleName = "v-link"; - } - public String name = ""; - public String target = null; - public BorderStyle targetBorder = BorderStyle.DEFAULT; - public int targetWidth = -1; - public int targetHeight = -1; -} diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java deleted file mode 100644 index b34bc13a23..0000000000 --- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarConstants.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.menubar; - -import java.io.Serializable; - -@Deprecated -public class MenuBarConstants implements Serializable { - @Deprecated - public static final String ATTRIBUTE_CHECKED = "checked"; - @Deprecated - public static final String ATTRIBUTE_ITEM_DESCRIPTION = "description"; - @Deprecated - public static final String ATTRIBUTE_ITEM_ICON = "icon"; - @Deprecated - public static final String ATTRIBUTE_ITEM_DISABLED = "disabled"; - @Deprecated - public static final String ATTRIBUTE_ITEM_STYLE = "style"; - @Deprecated - public static final String HTML_CONTENT_ALLOWED = "usehtml"; - @Deprecated - public static final String OPEN_ROOT_MENU_ON_HOWER = "ormoh"; - -} diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java deleted file mode 100644 index 6d6acebe18..0000000000 --- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.menubar; - -import com.vaadin.shared.ui.TabIndexState; - -public class MenuBarState extends TabIndexState { - { - primaryStyleName = "v-menubar"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java deleted file mode 100644 index 5670b64b38..0000000000 --- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupConstants.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.optiongroup; - -import java.io.Serializable; - -public class OptionGroupConstants implements Serializable { - public static final String HTML_CONTENT_ALLOWED = "usehtml"; - public static final String ATTRIBUTE_OPTION_DISABLED = "disabled"; - -} diff --git a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java b/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java deleted file mode 100644 index f1676e0dd8..0000000000 --- a/shared/src/com/vaadin/shared/ui/optiongroup/OptionGroupState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.optiongroup; - -import com.vaadin.shared.ui.select.AbstractSelectState; - -/** - * Shared state for the OptionGroup component. - * - * @since 7.0 - */ -public class OptionGroupState extends AbstractSelectState { - { - primaryStyleName = "v-select-optiongroup"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java deleted file mode 100644 index 76e5267bb8..0000000000 --- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutServerRpc.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.orderedlayout; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.LayoutClickRpc; - -public interface AbstractOrderedLayoutServerRpc extends LayoutClickRpc, - ServerRpc { - -} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java deleted file mode 100644 index c06b945ada..0000000000 --- a/shared/src/com/vaadin/shared/ui/orderedlayout/AbstractOrderedLayoutState.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.orderedlayout; - -import java.io.Serializable; -import java.util.HashMap; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.ui.AbstractLayoutState; -import com.vaadin.shared.ui.AlignmentInfo; - -public class AbstractOrderedLayoutState extends AbstractLayoutState { - public boolean spacing = false; - - public HashMap<Connector, ChildComponentData> childData = new HashMap<Connector, ChildComponentData>(); - - public int marginsBitmask = 0; - - public static class ChildComponentData implements Serializable { - - public int alignmentBitmask = AlignmentInfo.TOP_LEFT.getBitMask(); - - public float expandRatio = 0.0f; - } -} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java deleted file mode 100644 index b8134d2cee..0000000000 --- a/shared/src/com/vaadin/shared/ui/orderedlayout/FormLayoutState.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.orderedlayout; - -/** - * Shared state for the FormLayout component. - * - * @since 7.6 - */ -public class FormLayoutState extends AbstractOrderedLayoutState { - - { - primaryStyleName = "v-formlayout"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java deleted file mode 100644 index 167e89f624..0000000000 --- a/shared/src/com/vaadin/shared/ui/orderedlayout/HorizontalLayoutState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.orderedlayout; - -public class HorizontalLayoutState extends AbstractOrderedLayoutState { - { - primaryStyleName = "v-horizontallayout"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java b/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java deleted file mode 100644 index 4c83a8b1dd..0000000000 --- a/shared/src/com/vaadin/shared/ui/orderedlayout/VerticalLayoutState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.orderedlayout; - -public class VerticalLayoutState extends AbstractOrderedLayoutState { - { - primaryStyleName = "v-verticallayout"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java b/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java deleted file mode 100644 index 8bb98e8e5d..0000000000 --- a/shared/src/com/vaadin/shared/ui/panel/PanelServerRpc.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.panel; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface PanelServerRpc extends ClickRpc, ServerRpc { - -} diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java deleted file mode 100644 index 8f48fad921..0000000000 --- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.panel; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.NoLayout; - -public class PanelState extends AbstractComponentState { - { - primaryStyleName = "v-panel"; - } - @NoLayout - public int tabIndex; - @NoLayout - public int scrollLeft, scrollTop; -} diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java b/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java deleted file mode 100644 index af712b9e31..0000000000 --- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewServerRpc.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.popupview; - -import com.vaadin.shared.communication.ServerRpc; - -public interface PopupViewServerRpc extends ServerRpc { - - public void setPopupVisibility(boolean visible); - -} diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java b/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java deleted file mode 100644 index 86fda428a1..0000000000 --- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.popupview; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.NoLayout; - -public class PopupViewState extends AbstractComponentState { - - public String html; - @NoLayout - public boolean hideOnMouseOut; - -} diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java b/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java deleted file mode 100644 index 6f557489dd..0000000000 --- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressBarState.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.progressindicator; - -import com.vaadin.shared.AbstractFieldState; -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.communication.SharedState; - -/** - * {@link SharedState} for {@link com.vaadin.ui.ProgressBar} - * - * @since 7.1 - * @author Vaadin Ltd - */ -public class ProgressBarState extends AbstractFieldState { - public static final String PRIMARY_STYLE_NAME = "v-progressbar"; - - { - primaryStyleName = PRIMARY_STYLE_NAME; - } - public boolean indeterminate = false; - @NoLayout - public Float state = 0.0f; - -} diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java b/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java deleted file mode 100644 index f541395cef..0000000000 --- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorServerRpc.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.progressindicator; - -import com.vaadin.shared.annotations.NoLoadingIndicator; -import com.vaadin.shared.communication.ServerRpc; - -public interface ProgressIndicatorServerRpc extends ServerRpc { - @NoLoadingIndicator - public void poll(); -} diff --git a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java b/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java deleted file mode 100644 index 9b3cf94d4a..0000000000 --- a/shared/src/com/vaadin/shared/ui/progressindicator/ProgressIndicatorState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.progressindicator; - -import com.vaadin.shared.annotations.NoLayout; - -@Deprecated -public class ProgressIndicatorState extends ProgressBarState { - public static final String PRIMARY_STYLE_NAME = "v-progressindicator"; - - { - primaryStyleName = PRIMARY_STYLE_NAME; - } - - @NoLayout - public int pollingInterval = 1000; -} diff --git a/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java b/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java deleted file mode 100644 index 8ea306daf6..0000000000 --- a/shared/src/com/vaadin/shared/ui/select/AbstractSelectState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.select; - -import com.vaadin.shared.AbstractFieldState; - -/** - * Shared state for the AbstractSelect component. - * - * @since 7.6 - */ -public class AbstractSelectState extends AbstractFieldState { - - { - primaryStyleName = "v-select"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java b/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java deleted file mode 100644 index 74ccaa4e15..0000000000 --- a/shared/src/com/vaadin/shared/ui/slider/SliderOrientation.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.slider; - -public enum SliderOrientation { - HORIZONTAL, VERTICAL; -} diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java b/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java deleted file mode 100644 index 1938dc1de2..0000000000 --- a/shared/src/com/vaadin/shared/ui/slider/SliderServerRpc.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.slider; - -import com.vaadin.shared.communication.ServerRpc; - -public interface SliderServerRpc extends ServerRpc { - - /** - * Invoked when the value of a variable has changed. Slider listeners are - * notified if the slider value has changed. - * - * @param value - */ - public void valueChanged(double value); -} diff --git a/shared/src/com/vaadin/shared/ui/slider/SliderState.java b/shared/src/com/vaadin/shared/ui/slider/SliderState.java deleted file mode 100644 index a96d35bc13..0000000000 --- a/shared/src/com/vaadin/shared/ui/slider/SliderState.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.slider; - -import com.vaadin.shared.AbstractFieldState; -import com.vaadin.shared.annotations.NoLayout; - -public class SliderState extends AbstractFieldState { - { - primaryStyleName = "v-slider"; - } - - @NoLayout - public double value; - - @NoLayout - public double maxValue = 100; - @NoLayout - public double minValue = 0; - - /** - * The number of fractional digits that are considered significant. Must be - * non-negative. - */ - @NoLayout - public int resolution = 0; - - public SliderOrientation orientation = SliderOrientation.HORIZONTAL; - -} diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java deleted file mode 100644 index 7f1e9555d5..0000000000 --- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelRpc.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.splitpanel; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -public interface AbstractSplitPanelRpc extends ServerRpc { - - /** - * Called when the position has been updated by the user. - * - * @param position - * The new position in % if the current unit is %, in px - * otherwise - */ - public void setSplitterPosition(float position); - - /** - * Called when a click event has occurred on the splitter. - * - * @param mouseDetails - * Details about the mouse when the event took place - */ - public void splitterClick(MouseEventDetails mouseDetails); - -} diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java deleted file mode 100644 index 2db292d71d..0000000000 --- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.splitpanel; - -import java.io.Serializable; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.Connector; - -public class AbstractSplitPanelState extends AbstractComponentState { - public Connector firstChild = null; - public Connector secondChild = null; - public SplitterState splitterState = new SplitterState(); - - public static class SplitterState implements Serializable { - public float position; - public String positionUnit; - public float minPosition; - public String minPositionUnit; - public float maxPosition; - public String maxPositionUnit; - public boolean positionReversed = false; - public boolean locked = false; - } -} diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java deleted file mode 100644 index 849cd89651..0000000000 --- a/shared/src/com/vaadin/shared/ui/splitpanel/HorizontalSplitPanelState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.splitpanel; - -public class HorizontalSplitPanelState extends AbstractSplitPanelState { - { - primaryStyleName = "v-splitpanel-horizontal"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java deleted file mode 100644 index cb06a2a076..0000000000 --- a/shared/src/com/vaadin/shared/ui/splitpanel/VerticalSplitPanelState.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.splitpanel; - -public class VerticalSplitPanelState extends AbstractSplitPanelState { - { - primaryStyleName = "v-splitpanel-vertical"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java b/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java deleted file mode 100644 index afeb7fb35a..0000000000 --- a/shared/src/com/vaadin/shared/ui/table/CollapseMenuContent.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.table; - -/** - * Defines whether only collapsible columns should be shown to the user in the - * column collapse menu. - * - * @see com.vaadin.ui.Table#setCollapseMenuContent(CollapseMenuContent) - * - * @since 7.6 - * @author Vaadin Ltd - */ -public enum CollapseMenuContent { - /** - * All columns are shown in the collapse menu. Columns that are not - * collapsible are shown as disabled in the menu. This is the default - * setting. - */ - ALL_COLUMNS, - - /** - * Only collapsible columns are shown in the collapse menu. - */ - COLLAPSIBLE_COLUMNS; -} diff --git a/shared/src/com/vaadin/shared/ui/table/TableConstants.java b/shared/src/com/vaadin/shared/ui/table/TableConstants.java deleted file mode 100644 index 2bdb711153..0000000000 --- a/shared/src/com/vaadin/shared/ui/table/TableConstants.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.table; - -import java.io.Serializable; - -public class TableConstants implements Serializable { - /** - * Enum describing different sections of Table. - * - * @since 7.6 - */ - public enum Section { - HEADER, BODY, FOOTER - } - - 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"; - public static final String COLUMN_COLLAPSE_EVENT_ID = "columnCollapse"; - - @Deprecated - public static final String ATTRIBUTE_PAGEBUFFER_FIRST = "pb-ft"; - @Deprecated - public static final String ATTRIBUTE_PAGEBUFFER_LAST = "pb-l"; - /** - * Tell the client that old keys are no longer valid because the server has - * cleared its key map. - */ - @Deprecated - public static final String ATTRIBUTE_KEY_MAPPER_RESET = "clearKeyMap"; - - /** - * Default value for {@link TableState#collapseMenuContent}. - * - * @since 7.6 - */ - public static final CollapseMenuContent DEFAULT_COLLAPSE_MENU_CONTENT = CollapseMenuContent.ALL_COLUMNS; - -} diff --git a/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java b/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java deleted file mode 100644 index 13d494afb7..0000000000 --- a/shared/src/com/vaadin/shared/ui/table/TableServerRpc.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.table; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.table.TableConstants.Section; - -/** - * Client-to-server RPC interface for the Table component - * - * @since 7.6 - * @author Vaadin Ltd - */ -public interface TableServerRpc extends ServerRpc { - - /** - * Informs the server that a context click happened inside of Table - */ - public void contextClick(String rowKey, String colKey, Section section, - MouseEventDetails details); - -} diff --git a/shared/src/com/vaadin/shared/ui/table/TableState.java b/shared/src/com/vaadin/shared/ui/table/TableState.java deleted file mode 100644 index 9e225846b8..0000000000 --- a/shared/src/com/vaadin/shared/ui/table/TableState.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.table; - -import com.vaadin.shared.ui.select.AbstractSelectState; - -/** - * Shared state for the Table component. - * - * @since 7.0 - */ -public class TableState extends AbstractSelectState { - { - primaryStyleName = "v-table"; - } - - public CollapseMenuContent collapseMenuContent = TableConstants.DEFAULT_COLLAPSE_MENU_CONTENT; -} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java deleted file mode 100644 index 3c8c1d76d0..0000000000 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabState.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tabsheet; - -import java.io.Serializable; - -/** - * Shared state of a single tab in a Tabsheet or an Accordion. - * - * @since 7.2 - * @author Vaadin Ltd - */ -public class TabState implements Serializable { - - public String caption = ""; - public boolean enabled = true; - public boolean visible = true; - public boolean closable = false; - public String description = null; - public String styleName; - public String key; - public String componentError; - public String id; - public String iconAltText; - -} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java deleted file mode 100644 index 62cfd5cb81..0000000000 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetBaseConstants.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tabsheet; - -import java.io.Serializable; - -@Deprecated -public class TabsheetBaseConstants implements Serializable { - @Deprecated - public static final String ATTRIBUTE_TAB_DISABLED = "disabled"; - @Deprecated - public static final String ATTRIBUTE_TAB_DESCRIPTION = "description"; - @Deprecated - public static final String ATTRIBUTE_TAB_ERROR_MESSAGE = "error"; - @Deprecated - public static final String ATTRIBUTE_TAB_CAPTION = "caption"; - @Deprecated - public static final String ATTRIBUTE_TAB_ICON = "icon"; - @Deprecated - public static final String ATTRIBUTE_TAB_ICON_ALT = "iconalt"; - -} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java deleted file mode 100644 index 5b1497dd3b..0000000000 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetClientRpc.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tabsheet; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * Server to client RPC methods for the TabSheet. - * - * @since 7.2 - * @author Vaadin Ltd - */ -public interface TabsheetClientRpc extends ClientRpc { - - /** - * Forces the client to switch to the tab that is selected by the server. - * - * This is required e.g. for reverting tab selection change on the server - * side (shared state does not change). - */ - public void revertToSharedStateSelection(); -} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java deleted file mode 100644 index c99bf2eeb2..0000000000 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetConstants.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tabsheet; - -import java.io.Serializable; - -@Deprecated -public class TabsheetConstants implements Serializable { - @Deprecated - public static final String TAB_STYLE_NAME = "tabstyle"; - -} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java deleted file mode 100644 index a96c616ec6..0000000000 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetServerRpc.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tabsheet; - -import com.vaadin.shared.communication.ServerRpc; - -/** - * Client to server RPC methods for the TabSheet. - * - * @since 7.2 - * @author Vaadin Ltd - */ -public interface TabsheetServerRpc extends ServerRpc { - - /** - * Tell server that a tab has been selected by the user. - * - * @param key - * internal key of the tab - */ - void setSelected(String key); - - /** - * Tell server that a tab has been closed by the user. - * - * @param key - * internal key of the tab - */ - void closeTab(String key); - -} diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java deleted file mode 100644 index 6059379dc5..0000000000 --- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tabsheet; - -import java.util.ArrayList; -import java.util.List; - -import com.vaadin.shared.AbstractComponentState; -import com.vaadin.shared.annotations.DelegateToWidget; -import com.vaadin.shared.annotations.NoLayout; - -public class TabsheetState extends AbstractComponentState { - public static final String PRIMARY_STYLE_NAME = "v-tabsheet"; - - { - primaryStyleName = PRIMARY_STYLE_NAME; - } - - /** - * Index of the component when switching focus - not related to Tabsheet - * tabs. - */ - @NoLayout - public int tabIndex; - - public List<TabState> tabs = new ArrayList<TabState>(); - - /** true to show the tab bar, false to only show the contained component */ - public boolean tabsVisible = true; - - /** the key of the currently selected tab */ - public String selected; - - @DelegateToWidget - public boolean tabCaptionsAsHtml = false; - -} diff --git a/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java deleted file mode 100644 index 51c386ddfc..0000000000 --- a/shared/src/com/vaadin/shared/ui/textarea/RichTextAreaState.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.textarea; - -import com.vaadin.shared.ui.textfield.AbstractTextFieldState; - -/** - * - * Shared state for the RichTextArea component. - * - * @since 7.6 - */ -public class RichTextAreaState extends AbstractTextFieldState { - - { - primaryStyleName = "v-richtextarea"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java b/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java deleted file mode 100644 index c1f9536278..0000000000 --- a/shared/src/com/vaadin/shared/ui/textarea/TextAreaState.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.textarea; - -import com.vaadin.shared.annotations.DelegateToWidget; -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.ui.textfield.AbstractTextFieldState; - -public class TextAreaState extends AbstractTextFieldState { - { - primaryStyleName = "v-textarea"; - } - - /** - * Number of visible rows in the text area. The default is 5. - */ - @DelegateToWidget - public int rows = 5; - - /** - * Tells if word-wrapping should be used in the text area. - */ - @DelegateToWidget - @NoLayout - public boolean wordwrap = true; - -} diff --git a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java b/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java deleted file mode 100644 index 9d4272c22f..0000000000 --- a/shared/src/com/vaadin/shared/ui/textfield/AbstractTextFieldState.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.textfield; - -import com.vaadin.shared.AbstractFieldState; -import com.vaadin.shared.annotations.NoLayout; - -public class AbstractTextFieldState extends AbstractFieldState { - { - primaryStyleName = "v-textfield"; - } - - /** - * Maximum character count in text field. - */ - @NoLayout - public int maxLength = -1; - - /** - * Number of visible columns in the TextField. - */ - public int columns = 0; - - /** - * The prompt to display in an empty field. Null when disabled. - */ - @NoLayout - public String inputPrompt = null; - - /** - * The text in the field - */ - @NoLayout - public String text = null; -} diff --git a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java b/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java deleted file mode 100644 index 242e53682b..0000000000 --- a/shared/src/com/vaadin/shared/ui/textfield/TextFieldConstants.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.textfield; - -import java.io.Serializable; - -public class TextFieldConstants implements Serializable { - public static final String VAR_CUR_TEXT = "curText"; - public static final String ATTR_NO_VALUE_CHANGE_BETWEEN_PAINTS = "nvc"; - public static final String ATTR_TEXTCHANGE_TIMEOUT = "iet"; - public static final String VAR_CURSOR = "c"; - public static final String ATTR_TEXTCHANGE_EVENTMODE = "iem"; - public static final String TEXTCHANGE_MODE_EAGER = "EAGER"; - -} diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java b/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java deleted file mode 100644 index 33560dec53..0000000000 --- a/shared/src/com/vaadin/shared/ui/tree/TreeConstants.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tree; - -import java.io.Serializable; - -@Deprecated -public class TreeConstants implements Serializable { - - @Deprecated - public static final String ATTRIBUTE_NODE_STYLE = "style"; - @Deprecated - public static final String ATTRIBUTE_NODE_CAPTION = "caption"; - @Deprecated - public static final String ATTRIBUTE_NODE_ICON = "icon"; - @Deprecated - public static final String ATTRIBUTE_NODE_ICON_ALT = "iconalt"; - - @Deprecated - public static final String ATTRIBUTE_ACTION_CAPTION = "caption"; - @Deprecated - public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON; - @Deprecated - public static final String ATTRIBUTE_HTML_ALLOWED = "htmlAllowed"; - - public static final String ITEM_CLICK_EVENT_ID = "itemClick"; - -} diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java b/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java deleted file mode 100644 index 76b33aa8c3..0000000000 --- a/shared/src/com/vaadin/shared/ui/tree/TreeServerRpc.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tree; - -import com.vaadin.shared.MouseEventDetails; -import com.vaadin.shared.communication.ServerRpc; - -/** - * Client-to-server RPC interface for the Tree component - * - * @since 7.6 - * @author Vaadin Ltd - */ -public interface TreeServerRpc extends ServerRpc { - - /** - * Informs the server that a context click happened inside of Tree - */ - public void contextClick(String rowKey, MouseEventDetails details); - -}
\ No newline at end of file diff --git a/shared/src/com/vaadin/shared/ui/tree/TreeState.java b/shared/src/com/vaadin/shared/ui/tree/TreeState.java deleted file mode 100644 index 19a70e89f2..0000000000 --- a/shared/src/com/vaadin/shared/ui/tree/TreeState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.tree; - -import com.vaadin.shared.ui.select.AbstractSelectState; - -/** - * Shared state for the Table component. - * - * @since 7.0 - */ -public class TreeState extends AbstractSelectState { - { - primaryStyleName = "v-tree"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java deleted file mode 100644 index 510c18d245..0000000000 --- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableConstants.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.treetable; - -import java.io.Serializable; - -@Deprecated -public class TreeTableConstants implements Serializable { - @Deprecated - public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci"; - -} diff --git a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java b/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java deleted file mode 100644 index ecc7d0f4c4..0000000000 --- a/shared/src/com/vaadin/shared/ui/treetable/TreeTableState.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.treetable; - -import com.vaadin.shared.ui.table.TableState; - -public class TreeTableState extends TableState { - { - primaryStyleName = "v-table"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java deleted file mode 100644 index 32422a38e5..0000000000 --- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectConstants.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.twincolselect; - -import java.io.Serializable; - -@Deprecated -public class TwinColSelectConstants implements Serializable { - @Deprecated - public static final String ATTRIBUTE_LEFT_CAPTION = "lc"; - @Deprecated - public static final String ATTRIBUTE_RIGHT_CAPTION = "rc"; - -} diff --git a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java deleted file mode 100644 index 12505c4231..0000000000 --- a/shared/src/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.twincolselect; - -import com.vaadin.shared.ui.select.AbstractSelectState; - -/** - * Shared state for the TwinColSelect component. - * - * @since 7.0 - */ -public class TwinColSelectState extends AbstractSelectState { - { - primaryStyleName = "v-select-twincol"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java b/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java deleted file mode 100644 index 9a5d269a87..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowClientRpc.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.ui; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * Client RPC methods for the Debug Window. - * - * @since 7.1 - * @author Vaadin Ltd - */ -public interface DebugWindowClientRpc extends ClientRpc { - - /** - * Send results from {@link DebugWindowServerRpc#analyzeLayouts()} back to - * the client. - * - * @since 7.1 - * @param json - * JSON containing list of found problems - */ - public void reportLayoutProblems(String json); - -} diff --git a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java b/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java deleted file mode 100644 index b6f17661d0..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/DebugWindowServerRpc.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -/** - * - */ -package com.vaadin.shared.ui.ui; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.communication.ServerRpc; - -/** - * Server RPC methods for the Debug Window. - * - * @since 7.1 - * @author Vaadin Ltd - */ -public interface DebugWindowServerRpc extends ServerRpc { - /** - * Sends a request to the server to print details to console that will help - * the developer to locate the corresponding server-side connector in the - * source code. - * - * @since 7.1 - * @param connector - * the connector to locate - **/ - public void showServerDebugInfo(Connector connector); - - /** - * Invokes the layout analyzer on the server - * - * @since 7.1 - */ - public void analyzeLayouts(); - - /** - * Sends a request to the server to print a design to the console for the - * given component. - * - * @since 7.5 - * @param connector - * the component connector to output a declarative design for - */ - public void showServerDesign(Connector connector); - -} diff --git a/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java b/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java deleted file mode 100644 index b6f6c6bb83..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/NotificationRole.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.ui; - -/** - * Available WAI-ARIA roles for a notification. - * - * @since 7.2 - */ -public enum NotificationRole { - ALERT, STATUS -} diff --git a/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java b/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java deleted file mode 100644 index a4c7d33ad1..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/PageClientRpc.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.ui; - -import com.vaadin.shared.communication.ClientRpc; - -public interface PageClientRpc extends ClientRpc { - - public void reload(); - -} diff --git a/shared/src/com/vaadin/shared/ui/ui/PageState.java b/shared/src/com/vaadin/shared/ui/ui/PageState.java deleted file mode 100644 index b6dd5abb89..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/PageState.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.ui; - -import java.io.Serializable; - -/** - * The shared state of a {@link com.vaadin.server.Page Page}. - * - * Note that at the moment this is not a stand-alone state class but embedded in - * {@link UIState}. This might change in the future. - * - * @since 7.1 - */ -public class PageState implements Serializable { - /** - * True if the page has browser window resize listeners. - */ - public boolean hasResizeListeners = false; - - /** - * Non-null if the title is set. Null means Vaadin does not touch the title. - */ - public String title = null; -} diff --git a/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java b/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java deleted file mode 100644 index fb052a25e9..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/ScrollClientRpc.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.ui; - -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.communication.ClientRpc; - -public interface ScrollClientRpc extends ClientRpc { - - @NoLayout - public void setScrollTop(int scrollTop); - - @NoLayout - public void setScrollLeft(int scrollLeft); -} diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java deleted file mode 100644 index 6263f3039d..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/Transport.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.ui; - -/** - * Transport modes for Push - * - * @since 7.1 - * @author Vaadin Ltd - */ -public enum Transport { - /** - * Websockets - */ - WEBSOCKET("websocket"), - /** - * Websockets for server to client, XHR for client to server - * - * @since 7.6 - */ - WEBSOCKET_XHR("websocket-xhr"), - /** - * HTTP streaming - * - * @deprecated Use the more reliable {@link Transport#LONG_POLLING} instead. - */ - @Deprecated - STREAMING("streaming"), - /** - * HTTP long polling - */ - LONG_POLLING("long-polling"); - - private String identifier; - - private Transport(String identifier) { - this.identifier = identifier; - } - - public String getIdentifier() { - return identifier; - } - - /** - * Returns a Transport by its identifier. Returns null if no value is found - * for the given identifier. - * - * @since 7.3.10 - */ - public static Transport getByIdentifier(String identifier) { - for (Transport t : values()) { - if (t.getIdentifier().equals(identifier)) { - return t; - } - } - return null; - } -} diff --git a/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java b/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java deleted file mode 100644 index 5026189d71..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/UIClientRpc.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.ui; - -import com.vaadin.shared.communication.ClientRpc; - -/** - * Server to Client RPC methods for UI - * - * @since 7.1 - * @author Vaadin Ltd - */ -public interface UIClientRpc extends ClientRpc { - - /** - * Informs the client that the UI has been closed - * - * @param sessionExpired - * true if the ui was closed because the session expired, false - * otherwise - */ - void uiClosed(boolean sessionExpired); - -} diff --git a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java b/shared/src/com/vaadin/shared/ui/ui/UIConstants.java deleted file mode 100644 index 429360e05d..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/UIConstants.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.ui; - -import java.io.Serializable; - -public class UIConstants implements Serializable { - /** - * Attribute name for the lazy resize setting . - */ - @Deprecated - public static final String RESIZE_LAZY = "rL"; - - @Deprecated - public static final String NOTIFICATION_HTML_CONTENT_NOT_ALLOWED = "useplain"; - - @Deprecated - public static final String LOCATION_VARIABLE = "location"; - - @Deprecated - public static final String ATTRIBUTE_NOTIFICATION_STYLE = "style"; - @Deprecated - public static final String ATTRIBUTE_NOTIFICATION_CAPTION = "caption"; - @Deprecated - public static final String ATTRIBUTE_NOTIFICATION_MESSAGE = "message"; - @Deprecated - public static final String ATTRIBUTE_NOTIFICATION_ICON = "icon"; - @Deprecated - public static final String ATTRIBUTE_NOTIFICATION_POSITION = "position"; - @Deprecated - public static final String ATTRIBUTE_NOTIFICATION_DELAY = "delay"; - - /** - * Name of the parameter used to transmit UI ids back and forth - */ - public static final String UI_ID_PARAMETER = "v-uiId"; - -} diff --git a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java b/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java deleted file mode 100644 index 887ea760b3..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/UIServerRpc.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.ui; - -import com.vaadin.shared.annotations.NoLoadingIndicator; -import com.vaadin.shared.annotations.Delayed; -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface UIServerRpc extends ClickRpc, ServerRpc { - @Delayed(lastOnly = true) - public void resize(int viewWidth, int viewHeight, int windowWidth, - int windowHeight); - - @Delayed(lastOnly = true) - public void scroll(int scrollTop, int scrollLeft); - - @NoLoadingIndicator - @Delayed(lastOnly = true) - /* - * @Delayed just to get lastOnly semantics, sendPendingVariableChanges() - * should always be called to ensure the message is flushed right away. - */ - public void poll(); -} diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java deleted file mode 100644 index 48ff9cdaaf..0000000000 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.ui; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.vaadin.shared.communication.PushMode; -import com.vaadin.shared.ui.TabIndexState; - -public class UIState extends TabIndexState { - public TooltipConfigurationState tooltipConfiguration = new TooltipConfigurationState(); - public LoadingIndicatorConfigurationState loadingIndicatorConfiguration = new LoadingIndicatorConfigurationState(); - public int pollInterval = -1; - - // Informing users of assistive devices, that the content of this container - // is announced automatically and does not need to be navigated into - public String overlayContainerLabel = "This content is announced automatically and does not need to be navigated into."; - public Map<String, NotificationTypeConfiguration> notificationConfigurations = new HashMap<String, NotificationTypeConfiguration>(); - { - notificationConfigurations.put("error", - new NotificationTypeConfiguration("Error: ", - " - close with ESC-key", NotificationRole.ALERT)); - notificationConfigurations.put("warning", - new NotificationTypeConfiguration("Warning: ", null, - NotificationRole.ALERT)); - notificationConfigurations.put("humanized", - new NotificationTypeConfiguration("Info: ", null, - NotificationRole.ALERT)); - - // We use alert instead of status for all notifications because - // (at least) Jaws 16 and earlier fail to announce any role=status - // message in Chrome/Firefox - notificationConfigurations.put("tray", - new NotificationTypeConfiguration("Status: ", null, - NotificationRole.ALERT)); - notificationConfigurations.put("assistive", - new NotificationTypeConfiguration("Note: ", null, - NotificationRole.ALERT)); - } - /** - * State related to the Page class. - */ - public PageState pageState = new PageState(); - /** - * State related to the LocaleService class. - */ - public LocaleServiceState localeServiceState = new LocaleServiceState(); - /** - * Configuration for the push channel - */ - public PushConfigurationState pushConfiguration = new PushConfigurationState(); - /** - * Currently used theme. - * - * @since 7.3 - */ - public String theme; - public ReconnectDialogConfigurationState reconnectDialogConfiguration = new ReconnectDialogConfigurationState(); - { - primaryStyleName = "v-ui"; - // Default is 1 for legacy reasons - tabIndex = 1; - } - - public static class LoadingIndicatorConfigurationState implements - Serializable { - public int firstDelay = 300; - public int secondDelay = 1500; - public int thirdDelay = 5000; - } - - public static class TooltipConfigurationState implements Serializable { - public int openDelay = 750; - public int quickOpenDelay = 100; - public int quickOpenTimeout = 1000; - public int closeTimeout = 300; - public int maxWidth = 500; - } - - public static class NotificationTypeConfiguration implements Serializable { - public String prefix; - public String postfix; - public NotificationRole notificationRole = NotificationRole.ALERT; - - public NotificationTypeConfiguration() { - } - - public NotificationTypeConfiguration(String prefix, String postfix, - NotificationRole role) { - this.prefix = prefix; - this.postfix = postfix; - notificationRole = role; - } - } - - public static class PushConfigurationState implements Serializable { - public static final String TRANSPORT_PARAM = "transport"; - public static final String FALLBACK_TRANSPORT_PARAM = "fallbackTransport"; - - public boolean alwaysUseXhrForServerRequests = false; - public PushMode mode = PushMode.DISABLED; - public String pushUrl = null; - public Map<String, String> parameters = new HashMap<String, String>(); - { - parameters - .put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier()); - parameters.put(FALLBACK_TRANSPORT_PARAM, - Transport.LONG_POLLING.getIdentifier()); - } - } - - public static class ReconnectDialogConfigurationState implements - Serializable { - public String dialogText = "Server connection lost, trying to reconnect..."; - public String dialogTextGaveUp = "Server connection lost."; - public int reconnectAttempts = 10000; - public int reconnectInterval = 5000; - public int dialogGracePeriod = 400; - public boolean dialogModal = false; - } - - public static class LocaleServiceState implements Serializable { - public List<LocaleData> localeData = new ArrayList<LocaleData>(); - } - - public static class LocaleData implements Serializable { - public String name; - public String[] monthNames; - public String[] shortMonthNames; - public String[] shortDayNames; - public String[] dayNames; - public int firstDayOfWeek; - public String dateFormat; - public boolean twelveHourClock; - public String hourMinuteDelimiter; - public String am; - public String pm; - - } - -} diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java b/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java deleted file mode 100644 index a5147147bc..0000000000 --- a/shared/src/com/vaadin/shared/ui/upload/UploadClientRpc.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.upload; - -import com.vaadin.shared.communication.ClientRpc; - -public interface UploadClientRpc extends ClientRpc { - - /** - * Forces the upload the send selected file to the server. - */ - void submitUpload(); -} diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java b/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java deleted file mode 100644 index 5a5a1378d1..0000000000 --- a/shared/src/com/vaadin/shared/ui/upload/UploadServerRpc.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.upload; - -import com.vaadin.shared.communication.ServerRpc; - -public interface UploadServerRpc extends ServerRpc { - - /** - * Event sent when the file name of the upload component is changed. - * - * @param filename - * The filename - */ - void change(String filename); - - /** - * Called to poll the server to see if any changes have been made e.g. when - * starting upload - * - * @since 7.6 - */ - void poll(); - -} diff --git a/shared/src/com/vaadin/shared/ui/upload/UploadState.java b/shared/src/com/vaadin/shared/ui/upload/UploadState.java deleted file mode 100644 index f91d67631c..0000000000 --- a/shared/src/com/vaadin/shared/ui/upload/UploadState.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.upload; - -import com.vaadin.shared.AbstractComponentState; - -/** - * Shared state for the Upload component. - * - * @since 7.6 - */ -public class UploadState extends AbstractComponentState { - - { - primaryStyleName = "v-upload"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java b/shared/src/com/vaadin/shared/ui/video/VideoConstants.java deleted file mode 100644 index 0a61b88afc..0000000000 --- a/shared/src/com/vaadin/shared/ui/video/VideoConstants.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.vaadin.shared.ui.video; - -import java.io.Serializable; - -public class VideoConstants implements Serializable { - public static final String POSTER_RESOURCE = "poster"; -} diff --git a/shared/src/com/vaadin/shared/ui/video/VideoState.java b/shared/src/com/vaadin/shared/ui/video/VideoState.java deleted file mode 100644 index 91006f0f6a..0000000000 --- a/shared/src/com/vaadin/shared/ui/video/VideoState.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.video; - -import com.vaadin.shared.ui.AbstractMediaState; - -public class VideoState extends AbstractMediaState { - { - primaryStyleName = "v-video"; - } -} diff --git a/shared/src/com/vaadin/shared/ui/window/WindowMode.java b/shared/src/com/vaadin/shared/ui/window/WindowMode.java deleted file mode 100644 index e3438fe6a9..0000000000 --- a/shared/src/com/vaadin/shared/ui/window/WindowMode.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.window; - -/** - * Determines the mode of the Window. - * <p> - * A window mode decides the size and position of the Window. It can be set to - * {@link #NORMAL} or {@link #MAXIMIZED}. - * - * - * @author Vaadin Ltd - * @since 7.1 - */ -public enum WindowMode { - /** - * Normal mode. The window size and position is determined by the window - * state. - */ - NORMAL, - /** - * Maximized mode. The window is positioned in the top left corner and fills - * the whole screen. - */ - MAXIMIZED; -} diff --git a/shared/src/com/vaadin/shared/ui/window/WindowRole.java b/shared/src/com/vaadin/shared/ui/window/WindowRole.java deleted file mode 100644 index 5114c04bc2..0000000000 --- a/shared/src/com/vaadin/shared/ui/window/WindowRole.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.window; - -/** - * Available WAI-ARIA roles for a window. - * - * @since 7.2 - */ -public enum WindowRole { - ALERTDIALOG, DIALOG -} diff --git a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java b/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java deleted file mode 100644 index 6c7191c54d..0000000000 --- a/shared/src/com/vaadin/shared/ui/window/WindowServerRpc.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.window; - -import com.vaadin.shared.communication.ServerRpc; -import com.vaadin.shared.ui.ClickRpc; - -public interface WindowServerRpc extends ClickRpc, ServerRpc { - - public void windowModeChanged(WindowMode newState); - - public void windowMoved(int x, int y); - -} diff --git a/shared/src/com/vaadin/shared/ui/window/WindowState.java b/shared/src/com/vaadin/shared/ui/window/WindowState.java deleted file mode 100644 index 7dafba57ff..0000000000 --- a/shared/src/com/vaadin/shared/ui/window/WindowState.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.ui.window; - -import com.vaadin.shared.Connector; -import com.vaadin.shared.annotations.NoLayout; -import com.vaadin.shared.ui.panel.PanelState; - -public class WindowState extends PanelState { - { - primaryStyleName = "v-window"; - } - - @NoLayout - public boolean modal = false; - @NoLayout - public boolean resizable = true; - @NoLayout - public boolean resizeLazy = false; - @NoLayout - public boolean draggable = true; - @NoLayout - public boolean centered = false; - @NoLayout - public int positionX = -1; - @NoLayout - public int positionY = -1; - public WindowMode windowMode = WindowMode.NORMAL; - - @NoLayout - public String assistivePrefix = ""; - @NoLayout - public String assistivePostfix = ""; - @NoLayout - public Connector[] contentDescription = new Connector[0]; - @NoLayout - public WindowRole role = WindowRole.DIALOG; - @NoLayout - public boolean assistiveTabStop = false; - @NoLayout - public String assistiveTabStopTopText = "Top of dialog"; - @NoLayout - public String assistiveTabStopBottomText = "Bottom of Dialog"; -} diff --git a/shared/src/com/vaadin/shared/util/SharedUtil.java b/shared/src/com/vaadin/shared/util/SharedUtil.java deleted file mode 100644 index 28c1ea3734..0000000000 --- a/shared/src/com/vaadin/shared/util/SharedUtil.java +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright 2000-2014 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.shared.util; - -import java.io.Serializable; -import java.util.Locale; - -/** - * Misc internal utility methods used by both the server and the client package. - * - * @author Vaadin Ltd - * @since 7.1 - * - */ -public class SharedUtil implements Serializable { - /** - * Checks if a and b are equals using {@link #equals(Object)}. Handles null - * values as well. Does not ensure that objects are of the same type. - * Assumes that the first object's equals method handle equals properly. - * - * @param o1 - * The first value to compare - * @param o2 - * The second value to compare - * @return true if the objects are equal, false otherwise - */ - public static boolean equals(Object o1, Object o2) { - if (o1 == null) { - return o2 == null; - } - - return o1.equals(o2); - } - - /** - * Trims trailing slashes (if any) from a string. - * - * @param value - * The string value to be trimmed. Cannot be null. - * @return String value without trailing slashes. - */ - public static String trimTrailingSlashes(String value) { - return value.replaceAll("/*$", ""); - } - - /** - * RegEx pattern to extract the width/height values. - */ - public static final String SIZE_PATTERN = "^(-?\\d*(?:\\.\\d+)?)(%|px|em|rem|ex|in|cm|mm|pt|pc)?$"; - - /** - * Splits a camelCaseString into an array of words with the casing - * preserved. - * - * @since 7.4 - * @param camelCaseString - * The input string in camelCase format - * @return An array with one entry per word in the input string - */ - public static String[] splitCamelCase(String camelCaseString) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < camelCaseString.length(); i++) { - char c = camelCaseString.charAt(i); - if (Character.isUpperCase(c) && isWordComplete(camelCaseString, i)) { - sb.append(' '); - } - sb.append(c); - } - return sb.toString().split(" "); - } - - private static boolean isWordComplete(String camelCaseString, int i) { - if (i == 0) { - // Word can't end at the beginning - return false; - } else if (!Character.isUpperCase(camelCaseString.charAt(i - 1))) { - // Word ends if previous char wasn't upper case - return true; - } else if (i + 1 < camelCaseString.length() - && !Character.isUpperCase(camelCaseString.charAt(i + 1))) { - // Word ends if next char isn't upper case - return true; - } else { - return false; - } - } - - /** - * Converts a camelCaseString to a human friendly format (Camel case - * string). - * <p> - * In general splits words when the casing changes but also handles special - * cases such as consecutive upper case characters. Examples: - * <p> - * {@literal MyBeanContainer} becomes {@literal My Bean Container} - * {@literal AwesomeURLFactory} becomes {@literal Awesome URL Factory} - * {@literal SomeUriAction} becomes {@literal Some Uri Action} - * - * @since 7.4 - * @param camelCaseString - * The input string in camelCase format - * @return A human friendly version of the input - */ - public static String camelCaseToHumanFriendly(String camelCaseString) { - String[] parts = splitCamelCase(camelCaseString); - for (int i = 0; i < parts.length; i++) { - parts[i] = capitalize(parts[i]); - } - return join(parts, " "); - } - - private static boolean isAllUpperCase(String string) { - for (int i = 0; i < string.length(); i++) { - char c = string.charAt(i); - if (!Character.isUpperCase(c) && !Character.isDigit(c)) { - return false; - } - } - return true; - } - - /** - * Joins the words in the input array together into a single string by - * inserting the separator string between each word. - * - * @since 7.4 - * @param parts - * The array of words - * @param separator - * The separator string to use between words - * @return The constructed string of words and separators - */ - public static String join(String[] parts, String separator) { - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < parts.length; i++) { - sb.append(parts[i]); - sb.append(separator); - } - return sb.substring(0, sb.length() - separator.length()); - } - - /** - * Capitalizes the first character in the given string in a way suitable for - * use in code (methods, properties etc) - * - * @since 7.4 - * @param string - * The string to capitalize - * @return The capitalized string - */ - public static String capitalize(String string) { - if (string == null) { - return null; - } - - if (string.length() <= 1) { - return string.toUpperCase(); - } - - return string.substring(0, 1).toUpperCase(Locale.ENGLISH) - + string.substring(1); - } - - /** - * Converts a property id to a human friendly format. Handles nested - * properties by only considering the last part, e.g. "address.streetName" - * is equal to "streetName" for this method. - * - * @since 7.4 - * @param propertyId - * The propertyId to format - * @return A human friendly version of the property id - */ - public static String propertyIdToHumanFriendly(Object propertyId) { - String string = propertyId.toString(); - if (string.isEmpty()) { - return ""; - } - - // For nested properties, only use the last part - int dotLocation = string.lastIndexOf('.'); - if (dotLocation > 0 && dotLocation < string.length() - 1) { - string = string.substring(dotLocation + 1); - } - - return camelCaseToHumanFriendly(string); - } - - /** - * Adds the get parameters to the uri and returns the new uri that contains - * the parameters. - * - * @param uri - * The uri to which the parameters should be added. - * @param extraParams - * One or more parameters in the format "a=b" or "c=d&e=f". An - * empty string is allowed but will not modify the url. - * @return The modified URI with the get parameters in extraParams added. - */ - public static String addGetParameters(String uri, String extraParams) { - if (extraParams == null || extraParams.length() == 0) { - return uri; - } - // RFC 3986: The query component is indicated by the first question - // mark ("?") character and terminated by a number sign ("#") character - // or by the end of the URI. - String fragment = null; - int hashPosition = uri.indexOf('#'); - if (hashPosition != -1) { - // Fragment including "#" - fragment = uri.substring(hashPosition); - // The full uri before the fragment - uri = uri.substring(0, hashPosition); - } - - if (uri.contains("?")) { - uri += "&"; - } else { - uri += "?"; - } - uri += extraParams; - - if (fragment != null) { - uri += fragment; - } - - return uri; - } - - /** - * Converts a dash ("-") separated string into camelCase. - * <p> - * Examples: - * <p> - * {@literal foo} becomes {@literal foo} {@literal foo-bar} becomes - * {@literal fooBar} {@literal foo--bar} becomes {@literal fooBar} - * - * @since 7.5 - * @param dashSeparated - * The dash separated string to convert - * @return a camelCase version of the input string - */ - public static String dashSeparatedToCamelCase(String dashSeparated) { - if (dashSeparated == null) { - return null; - } - String[] parts = dashSeparated.split("-"); - for (int i = 1; i < parts.length; i++) { - parts[i] = capitalize(parts[i]); - } - - return join(parts, ""); - } - -} |