Move selects to compatibility package

Change-Id: I7ee02d34b230e8752174a7f19824f81cbb616c33

4 files changed, 0 insertions, 501 deletions

diff --git a/server/src/main/java/com/vaadin/ui/ListSelect.java b/server/src/main/java/com/vaadin/ui/ListSelect.java
deleted file mode 100644
index 9a720d1895..0000000000
--- a/server/src/main/java/com/vaadin/ui/ListSelect.java
+++ /dev/null
@@ -1,80 +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.ui;
-
-import java.util.Collection;
-
-import com.vaadin.data.Container;
-import com.vaadin.server.PaintException;
-import com.vaadin.server.PaintTarget;
-
-/**
- * This is a simple list select without, for instance, support for new items,
- * lazyloading, and other advanced features.
- */
-@SuppressWarnings("serial")
-public class ListSelect extends AbstractSelect {
-
-    private int rows = 0;
-
-    public ListSelect() {
-        super();
-    }
-
-    public ListSelect(String caption, Collection<?> options) {
-        super(caption, options);
-    }
-
-    public ListSelect(String caption, Container dataSource) {
-        super(caption, dataSource);
-    }
-
-    public ListSelect(String caption) {
-        super(caption);
-    }
-
-    public int getRows() {
-        return rows;
-    }
-
-    /**
-     * Sets the number of rows in the editor. If the number of rows is set 0,
-     * the actual number of displayed rows is determined implicitly by the
-     * adapter.
-     *
-     * @param rows
-     *            the number of rows to set.
-     */
-    public void setRows(int rows) {
-        if (rows < 0) {
-            rows = 0;
-        }
-        if (this.rows != rows) {
-            this.rows = rows;
-            markAsDirty();
-        }
-    }
-
-    @Override
-    public void paintContent(PaintTarget target) throws PaintException {
-        // Adds the number of rows
-        if (rows != 0) {
-            target.addAttribute("rows", rows);
-        }
-        super.paintContent(target);
-    }
-}
diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java
deleted file mode 100644
index 13556a0387..0000000000
--- a/server/src/main/java/com/vaadin/ui/NativeSelect.java
+++ /dev/null
@@ -1,108 +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.ui;
-
-import java.util.Collection;
-
-import com.vaadin.data.Container;
-import com.vaadin.event.FieldEvents;
-import com.vaadin.event.FieldEvents.BlurEvent;
-import com.vaadin.event.FieldEvents.BlurListener;
-import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl;
-import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.event.FieldEvents.FocusListener;
-
-/**
- * This is a simple drop-down select without, for instance, support for
- * multiselect, new items, lazyloading, and other advanced features. Sometimes
- * "native" select without all the bells-and-whistles of the ComboBox is a
- * better choice.
- */
-@SuppressWarnings("serial")
-public class NativeSelect extends AbstractSelect
-        implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
-
-    FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(
-            this) {
-
-        @Override
-        protected void fireEvent(Event event) {
-            NativeSelect.this.fireEvent(event);
-        }
-    };
-
-    public NativeSelect() {
-        super();
-        registerRpc(focusBlurRpc);
-    }
-
-    public NativeSelect(String caption, Collection<?> options) {
-        super(caption, options);
-        registerRpc(focusBlurRpc);
-    }
-
-    public NativeSelect(String caption, Container dataSource) {
-        super(caption, dataSource);
-        registerRpc(focusBlurRpc);
-    }
-
-    public NativeSelect(String caption) {
-        super(caption);
-        registerRpc(focusBlurRpc);
-    }
-
-    @Override
-    public void setMultiSelect(boolean multiSelect)
-            throws UnsupportedOperationException {
-        if (multiSelect == true) {
-            throw new UnsupportedOperationException(
-                    "Multiselect not supported");
-        }
-    }
-
-    @Override
-    public void setNewItemsAllowed(boolean allowNewOptions)
-            throws UnsupportedOperationException {
-        if (allowNewOptions == true) {
-            throw new UnsupportedOperationException(
-                    "newItemsAllowed not supported");
-        }
-    }
-
-    @Override
-    public void addFocusListener(FocusListener listener) {
-        addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
-                FocusListener.focusMethod);
-    }
-
-    @Override
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-    }
-
-    @Override
-    public void addBlurListener(BlurListener listener) {
-        addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
-                BlurListener.blurMethod);
-    }
-
-    @Override
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
-}
diff --git a/server/src/main/java/com/vaadin/ui/OptionGroup.java b/server/src/main/java/com/vaadin/ui/OptionGroup.java
deleted file mode 100644
index 3e491906d5..0000000000
--- a/server/src/main/java/com/vaadin/ui/OptionGroup.java
+++ /dev/null
@@ -1,253 +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.ui;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.jsoup.nodes.Element;
-
-import com.vaadin.data.Container;
-import com.vaadin.event.FieldEvents;
-import com.vaadin.event.FieldEvents.BlurEvent;
-import com.vaadin.event.FieldEvents.BlurListener;
-import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.server.PaintException;
-import com.vaadin.server.PaintTarget;
-import com.vaadin.shared.ui.optiongroup.OptionGroupConstants;
-import com.vaadin.shared.ui.optiongroup.OptionGroupState;
-import com.vaadin.ui.declarative.DesignContext;
-import com.vaadin.ui.declarative.DesignFormatter;
-
-/**
- * Configures select to be used as an option group.
- */
-@SuppressWarnings("serial")
-public class OptionGroup extends AbstractSelect
-        implements FieldEvents.BlurNotifier, FieldEvents.FocusNotifier {
-
-    private Set<Object> disabledItemIds = new HashSet<Object>();
-
-    public OptionGroup() {
-        super();
-    }
-
-    public OptionGroup(String caption, Collection<?> options) {
-        super(caption, options);
-    }
-
-    public OptionGroup(String caption, Container dataSource) {
-        super(caption, dataSource);
-    }
-
-    public OptionGroup(String caption) {
-        super(caption);
-    }
-
-    @Override
-    protected void paintItem(PaintTarget target, Object itemId)
-            throws PaintException {
-        super.paintItem(target, itemId);
-        if (!isItemEnabled(itemId)) {
-            target.addAttribute(OptionGroupConstants.ATTRIBUTE_OPTION_DISABLED,
-                    true);
-        }
-    }
-
-    @Override
-    public void changeVariables(Object source, Map<String, Object> variables) {
-        super.changeVariables(source, variables);
-
-        if (variables.containsKey(FocusEvent.EVENT_ID)) {
-            fireEvent(new FocusEvent(this));
-        }
-        if (variables.containsKey(BlurEvent.EVENT_ID)) {
-            fireEvent(new BlurEvent(this));
-        }
-    }
-
-    @Override
-    public void addBlurListener(BlurListener listener) {
-        addListener(BlurEvent.EVENT_ID, BlurEvent.class, listener,
-                BlurListener.blurMethod);
-    }
-
-    @Override
-    public void removeBlurListener(BlurListener listener) {
-        removeListener(BlurEvent.EVENT_ID, BlurEvent.class, listener);
-    }
-
-    @Override
-    public void addFocusListener(FocusListener listener) {
-        addListener(FocusEvent.EVENT_ID, FocusEvent.class, listener,
-                FocusListener.focusMethod);
-    }
-
-    @Override
-    public void removeFocusListener(FocusListener listener) {
-        removeListener(FocusEvent.EVENT_ID, FocusEvent.class, listener);
-
-    }
-
-    @Override
-    protected void setValue(Object newValue, boolean repaintIsNotNeeded) {
-        if (repaintIsNotNeeded) {
-            /*
-             * Check that value from changeVariables() doesn't contain unallowed
-             * selections: In the multi select mode, the user has selected or
-             * deselected a disabled item. In the single select mode, the user
-             * has selected a disabled item.
-             */
-            if (isMultiSelect()) {
-                Set<?> currentValueSet = (Set<?>) getValue();
-                Set<?> newValueSet = (Set<?>) newValue;
-                for (Object itemId : currentValueSet) {
-                    if (!isItemEnabled(itemId)
-                            && !newValueSet.contains(itemId)) {
-                        markAsDirty();
-                        return;
-                    }
-                }
-                for (Object itemId : newValueSet) {
-                    if (!isItemEnabled(itemId)
-                            && !currentValueSet.contains(itemId)) {
-                        markAsDirty();
-                        return;
-                    }
-                }
-            } else {
-                if (newValue == null) {
-                    newValue = getNullSelectionItemId();
-                }
-                if (!isItemEnabled(newValue)) {
-                    markAsDirty();
-                    return;
-                }
-            }
-        }
-        super.setValue(newValue, repaintIsNotNeeded);
-    }
-
-    /**
-     * Sets an item disabled or enabled. In the multiselect mode, a disabled
-     * item cannot be selected or deselected by the user. In the single
-     * selection mode, a disable item cannot be selected.
-     *
-     * However, programmatical selection or deselection of an disable item is
-     * possible. By default, items are enabled.
-     *
-     * @param itemId
-     *            the id of the item to be disabled or enabled
-     * @param enabled
-     *            if true the item is enabled, otherwise the item is disabled
-     */
-    public void setItemEnabled(Object itemId, boolean enabled) {
-        if (itemId != null) {
-            if (enabled) {
-                disabledItemIds.remove(itemId);
-            } else {
-                disabledItemIds.add(itemId);
-            }
-            markAsDirty();
-        }
-    }
-
-    /**
-     * Returns true if the item is enabled.
-     *
-     * @param itemId
-     *            the id of the item to be checked
-     * @return true if the item is enabled, false otherwise
-     * @see #setItemEnabled(Object, boolean)
-     */
-    public boolean isItemEnabled(Object itemId) {
-        if (itemId != null) {
-            return !disabledItemIds.contains(itemId);
-        }
-        return true;
-    }
-
-    /**
-     * Sets whether html is allowed in the item captions. If set to true, the
-     * captions are passed to the browser as html and the developer is
-     * responsible for ensuring no harmful html is used. If set to false, the
-     * content is passed to the browser as plain text.
-     *
-     * @param htmlContentAllowed
-     *            true if the captions are used as html, false if used as plain
-     *            text
-     */
-    public void setHtmlContentAllowed(boolean htmlContentAllowed) {
-        getState().htmlContentAllowed = htmlContentAllowed;
-    }
-
-    /**
-     * Checks whether captions are interpreted as html or plain text.
-     *
-     * @return true if the captions are used as html, false if used as plain
-     *         text
-     * @see #setHtmlContentAllowed(boolean)
-     */
-    public boolean isHtmlContentAllowed() {
-        return getState(false).htmlContentAllowed;
-    }
-
-    @Override
-    protected Object readItem(Element child, Set<String> selected,
-            DesignContext context) {
-        Object itemId = super.readItem(child, selected, context);
-
-        if (child.hasAttr("disabled")) {
-            setItemEnabled(itemId, false);
-        }
-
-        return itemId;
-    }
-
-    @Override
-    protected Element writeItem(Element design, Object itemId,
-            DesignContext context) {
-        Element elem = super.writeItem(design, itemId, context);
-
-        if (!isItemEnabled(itemId)) {
-            elem.attr("disabled", "");
-        }
-        if (isHtmlContentAllowed()) {
-            // need to unencode HTML entities. AbstractSelect.writeDesign can't
-            // check if HTML content is allowed, so it always encodes entities
-            // like '>', '<' and '&'; in case HTML content is allowed this is
-            // undesirable so we need to unencode entities. Entities other than
-            // '<' and '>' will be taken care by Jsoup.
-            elem.html(DesignFormatter.decodeFromTextNode(elem.html()));
-        }
-
-        return elem;
-    }
-
-    @Override
-    protected OptionGroupState getState() {
-        return (OptionGroupState) super.getState();
-    }
-
-    @Override
-    protected OptionGroupState getState(boolean markAsDirty) {
-        return (OptionGroupState) super.getState(markAsDirty);
-    }
-}
diff --git a/server/src/main/java/com/vaadin/ui/Select.java b/server/src/main/java/com/vaadin/ui/Select.java
deleted file mode 100644
index 66b36f8ac2..0000000000
--- a/server/src/main/java/com/vaadin/ui/Select.java
+++ /dev/null
@@ -1,60 +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.ui;
-
-import java.util.Collection;
-
-import com.vaadin.data.Container;
-
-/**
- * <p>
- * A class representing a selection of items the user has selected in a UI. The
- * set of choices is presented as a set of {@link com.vaadin.data.Item}s in a
- * {@link com.vaadin.data.Container}.
- * </p>
- *
- * <p>
- * A <code>Select</code> component may be in single- or multiselect mode.
- * Multiselect mode means that more than one item can be selected
- * simultaneously.
- * </p>
- *
- * @author Vaadin Ltd.
- * @since 3.0
- * @deprecated As of 7.0. Use {@link ComboBox} instead.
- */
-@Deprecated
-public class Select extends ComboBox {
-    /* Component methods */
-
-    public Select() {
-        super();
-    }
-
-    public Select(String caption, Collection<?> options) {
-        super(caption, options);
-    }
-
-    public Select(String caption, Container dataSource) {
-        super(caption, dataSource);
-    }
-
-    public Select(String caption) {
-        super(caption);
-    }
-
-}