From ac74d37b185837149c1ef8d5bfe6fc921c7e1ac4 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 23 Aug 2016 15:18:41 +0300 Subject: [PATCH] Move Vaadin 7 CustomField to compatibility package Change-Id: Ie1d37fd2d249bf35e953f095fa80a6905a135793 --- .../legacy/ui/LegacyCustomFieldConnector.java | 25 ---- .../ui/customfield/CustomFieldConnector.java | 124 ++++++++++++++++++ .../java/com/vaadin/v7/ui/CustomField.java | 0 3 files changed, 124 insertions(+), 25 deletions(-) delete mode 100644 client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java create mode 100644 compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java rename {server => compatibility-server}/src/main/java/com/vaadin/v7/ui/CustomField.java (100%) diff --git a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java b/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java deleted file mode 100644 index 19b13f53d6..0000000000 --- a/client/src/main/java/com/vaadin/client/legacy/ui/LegacyCustomFieldConnector.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2000-2016 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.client.legacy.ui; - -import com.vaadin.client.ui.customfield.CustomFieldConnector; -import com.vaadin.shared.ui.Connect; -import com.vaadin.v7.ui.CustomField; - -@Connect(value = CustomField.class) -public class LegacyCustomFieldConnector extends CustomFieldConnector { - -} diff --git a/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java new file mode 100644 index 0000000000..33495a399d --- /dev/null +++ b/compatibility-client/src/main/java/com/vaadin/v7/client/ui/customfield/CustomFieldConnector.java @@ -0,0 +1,124 @@ +/* + * Copyright 2000-2016 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.v7.client.ui.customfield; + +import java.util.Collections; +import java.util.List; + +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.user.client.ui.Widget; +import com.vaadin.client.ComponentConnector; +import com.vaadin.client.ConnectorHierarchyChangeEvent; +import com.vaadin.client.ConnectorHierarchyChangeEvent.ConnectorHierarchyChangeHandler; +import com.vaadin.client.HasComponentsConnector; +import com.vaadin.client.ui.AbstractFieldConnector; +import com.vaadin.client.ui.VCustomComponent; +import com.vaadin.shared.ui.Connect; +import com.vaadin.v7.ui.CustomField; + +@Connect(value = CustomField.class) +public class CustomFieldConnector extends AbstractFieldConnector + implements HasComponentsConnector, ConnectorHierarchyChangeHandler { + + List childComponents; + + /** + * Default constructor + */ + public CustomFieldConnector() { + addConnectorHierarchyChangeHandler(this); + } + + @Override + public VCustomComponent getWidget() { + return (VCustomComponent) super.getWidget(); + } + + @Override + public void updateCaption(ComponentConnector connector) { + // NOP, custom field does not render the caption of its content + } + + @Override + public void onConnectorHierarchyChange( + ConnectorHierarchyChangeEvent event) { + // We always have 1 child, unless the child is hidden + getWidget().setWidget(getContentWidget()); + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.client.HasComponentsConnector#getChildren() + */ + @Override + public List getChildComponents() { + if (childComponents == null) { + return Collections.emptyList(); + } + + return childComponents; + } + + /* + * (non-Javadoc) + * + * @see com.vaadin.client.HasComponentsConnector#setChildren + * (java.util.Collection) + */ + @Override + public void setChildComponents(List childComponents) { + this.childComponents = childComponents; + } + + @Override + public HandlerRegistration addConnectorHierarchyChangeHandler( + ConnectorHierarchyChangeHandler handler) { + return ensureHandlerManager() + .addHandler(ConnectorHierarchyChangeEvent.TYPE, handler); + } + + /** + * Returns the content (only/first child) of the container. + * + * @return child connector or null if none (e.g. invisible or not set on + * server) + */ + protected ComponentConnector getContent() { + List children = getChildComponents(); + if (children.isEmpty()) { + return null; + } else { + return children.get(0); + } + } + + /** + * Returns the widget (if any) of the content of the container. + * + * @return widget of the only/first connector of the container, null if no + * content or if there is no widget for the connector + */ + protected Widget getContentWidget() { + ComponentConnector content = getContent(); + if (null != content) { + return content.getWidget(); + } else { + return null; + } + } + +} diff --git a/server/src/main/java/com/vaadin/v7/ui/CustomField.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/CustomField.java similarity index 100% rename from server/src/main/java/com/vaadin/v7/ui/CustomField.java rename to compatibility-server/src/main/java/com/vaadin/v7/ui/CustomField.java -- 2.39.5