From 5887181f9ea636f2536b9fc0d5679fccb6b76693 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 4 Nov 2010 15:04:30 +0000
Subject: #5865. Removed some non-needed code from widgetset, prepared
 datefields and button and select for one-to-one mapping

svn changeset:15867/svn branch:6.5
---
 src/com/vaadin/ui/Button.java          |  2 ++
 src/com/vaadin/ui/CheckBox.java        |  1 +
 src/com/vaadin/ui/DateField.java       | 16 ----------------
 src/com/vaadin/ui/InlineDateField.java |  8 ++------
 src/com/vaadin/ui/PopupDateField.java  |  6 ------
 src/com/vaadin/ui/Select.java          | 21 +++++++++++++++++++++
 6 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'src/com/vaadin/ui')

diff --git a/src/com/vaadin/ui/Button.java b/src/com/vaadin/ui/Button.java
index 35843365f2..0d193168e6 100644
--- a/src/com/vaadin/ui/Button.java
+++ b/src/com/vaadin/ui/Button.java
@@ -211,6 +211,8 @@ public class Button extends AbstractField implements FieldEvents.BlurNotifier,
      * 
      * @param switchMode
      *            The switchMode to set.
+     * @deprecated the {@link CheckBox} component should be used instead of
+     *             Button in switch mode
      */
     public void setSwitchMode(boolean switchMode) {
         this.switchMode = switchMode;
diff --git a/src/com/vaadin/ui/CheckBox.java b/src/com/vaadin/ui/CheckBox.java
index 0ffafe3d02..e8b46c1d83 100644
--- a/src/com/vaadin/ui/CheckBox.java
+++ b/src/com/vaadin/ui/CheckBox.java
@@ -91,6 +91,7 @@ public class CheckBox extends Button {
         super(caption, false);
     }
 
+    @Deprecated
     @Override
     public void setSwitchMode(boolean switchMode)
             throws UnsupportedOperationException {
diff --git a/src/com/vaadin/ui/DateField.java b/src/com/vaadin/ui/DateField.java
index 5e8e004a0e..0300315dd7 100644
--- a/src/com/vaadin/ui/DateField.java
+++ b/src/com/vaadin/ui/DateField.java
@@ -84,21 +84,6 @@ public class DateField extends AbstractField implements
      */
     public static final int RESOLUTION_YEAR = 6;
 
-    /**
-     * Popup date selector (calendar).
-     */
-    protected static final String TYPE_POPUP = "popup";
-
-    /**
-     * Inline date selector (calendar).
-     */
-    protected static final String TYPE_INLINE = "inline";
-
-    /**
-     * Specified widget type.
-     */
-    protected String type = TYPE_POPUP;
-
     /**
      * Specified smallest modifiable unit.
      */
@@ -227,7 +212,6 @@ public class DateField extends AbstractField implements
             target.addAttribute("strict", true);
         }
 
-        target.addAttribute("type", type);
         target.addAttribute(VDateField.WEEK_NUMBERS, isShowISOWeekNumbers());
         target.addAttribute("parsable", parsingSucceeded);
 
diff --git a/src/com/vaadin/ui/InlineDateField.java b/src/com/vaadin/ui/InlineDateField.java
index 88f0c3e0b4..d1066dc28a 100644
--- a/src/com/vaadin/ui/InlineDateField.java
+++ b/src/com/vaadin/ui/InlineDateField.java
@@ -7,6 +7,7 @@ package com.vaadin.ui;
 import java.util.Date;
 
 import com.vaadin.data.Property;
+import com.vaadin.terminal.gwt.client.ui.VDateFieldCalendar;
 
 /**
  * <p>
@@ -21,32 +22,27 @@ import com.vaadin.data.Property;
  * @VERSION@
  * @since 5.0
  */
-@SuppressWarnings("serial")
+@ClientWidget(VDateFieldCalendar.class)
 public class InlineDateField extends DateField {
 
     public InlineDateField() {
         super();
-        type = TYPE_INLINE;
     }
 
     public InlineDateField(Property dataSource) throws IllegalArgumentException {
         super(dataSource);
-        type = TYPE_INLINE;
     }
 
     public InlineDateField(String caption, Date value) {
         super(caption, value);
-        type = TYPE_INLINE;
     }
 
     public InlineDateField(String caption, Property dataSource) {
         super(caption, dataSource);
-        type = TYPE_INLINE;
     }
 
     public InlineDateField(String caption) {
         super(caption);
-        type = TYPE_INLINE;
     }
 
 }
diff --git a/src/com/vaadin/ui/PopupDateField.java b/src/com/vaadin/ui/PopupDateField.java
index e975cb23d2..7501c9fe15 100644
--- a/src/com/vaadin/ui/PopupDateField.java
+++ b/src/com/vaadin/ui/PopupDateField.java
@@ -23,34 +23,28 @@ import com.vaadin.terminal.PaintTarget;
  * @VERSION@
  * @since 5.0
  */
-@SuppressWarnings("serial")
 public class PopupDateField extends DateField {
 
     private String inputPrompt = null;
 
     public PopupDateField() {
         super();
-        type = TYPE_POPUP;
     }
 
     public PopupDateField(Property dataSource) throws IllegalArgumentException {
         super(dataSource);
-        type = TYPE_POPUP;
     }
 
     public PopupDateField(String caption, Date value) {
         super(caption, value);
-        type = TYPE_POPUP;
     }
 
     public PopupDateField(String caption, Property dataSource) {
         super(caption, dataSource);
-        type = TYPE_POPUP;
     }
 
     public PopupDateField(String caption) {
         super(caption);
-        type = TYPE_POPUP;
     }
 
     @Override
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index e5c19ccdd3..0eefdeacb4 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -518,4 +518,25 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
 
     }
 
+    /**
+     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
+     *             {@link TwinColSelect} instead
+     * @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
+     */
+    @Override
+    public void setMultiSelect(boolean multiSelect) {
+        super.setMultiSelect(multiSelect);
+    }
+
+    /**
+     * @deprecated use {@link ListSelect}, {@link OptionGroup} or
+     *             {@link TwinColSelect} instead
+     * 
+     * @see com.vaadin.ui.AbstractSelect#isMultiSelect()
+     */
+    @Override
+    public boolean isMultiSelect() {
+        return super.isMultiSelect();
+    }
+
 }
-- 
cgit v1.2.3