From 5887181f9ea636f2536b9fc0d5679fccb6b76693 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Thu, 4 Nov 2010 15:04:30 +0000 Subject: [PATCH] #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 --- .../vaadin/terminal/gwt/client/WidgetSet.java | 38 +------------------ .../gwt/client/ui/VDateFieldCalendar.java | 3 ++ 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 ++++++++++ 8 files changed, 30 insertions(+), 65 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/WidgetSet.java b/src/com/vaadin/terminal/gwt/client/WidgetSet.java index 146e3b8949..38984e75c3 100644 --- a/src/com/vaadin/terminal/gwt/client/WidgetSet.java +++ b/src/com/vaadin/terminal/gwt/client/WidgetSet.java @@ -8,18 +8,13 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.ui.Widget; import com.vaadin.terminal.gwt.client.ui.VButton; import com.vaadin.terminal.gwt.client.ui.VCheckBox; -import com.vaadin.terminal.gwt.client.ui.VDateFieldCalendar; import com.vaadin.terminal.gwt.client.ui.VFilterSelect; import com.vaadin.terminal.gwt.client.ui.VListSelect; -import com.vaadin.terminal.gwt.client.ui.VNativeSelect; -import com.vaadin.terminal.gwt.client.ui.VOptionGroup; import com.vaadin.terminal.gwt.client.ui.VPasswordField; -import com.vaadin.terminal.gwt.client.ui.VPopupCalendar; import com.vaadin.terminal.gwt.client.ui.VSplitPanelHorizontal; import com.vaadin.terminal.gwt.client.ui.VSplitPanelVertical; import com.vaadin.terminal.gwt.client.ui.VTextArea; import com.vaadin.terminal.gwt.client.ui.VTextField; -import com.vaadin.terminal.gwt.client.ui.VTwinColSelect; import com.vaadin.terminal.gwt.client.ui.VUnknownComponent; import com.vaadin.terminal.gwt.client.ui.VView; import com.vaadin.terminal.gwt.client.ui.VWindow; @@ -64,14 +59,6 @@ public class WidgetSet { VUnknownComponent c = GWT.create(VUnknownComponent.class); c.setServerSideClassName(serverSideName); return c; - } else if (VSplitPanelVertical.class == classType) { - return GWT.create(VSplitPanelVertical.class); - } else if (VTextArea.class == classType) { - return GWT.create(VTextArea.class); - } else if (VDateFieldCalendar.class == classType) { - return GWT.create(VDateFieldCalendar.class); - } else if (VPasswordField.class == classType) { - return GWT.create(VPasswordField.class); } else if (VWindow.class == classType) { return GWT.create(VWindow.class); } else { @@ -98,21 +85,8 @@ public class WidgetSet { return VWindow.class; } else if (widgetClass == VFilterSelect.class) { if (uidl.hasAttribute("type")) { - // TODO check if all type checks are really needed final String type = uidl.getStringAttribute("type").intern(); - if ("twincol".equals(type)) { - return VTwinColSelect.class; - } else if ("optiongroup".equals(type)) { - return VOptionGroup.class; - } else if ("native".equals(type)) { - return VNativeSelect.class; - } else if ("list".equals(type)) { - return VListSelect.class; - } else if ("legacy-multi".equals(type)) { - return VListSelect.class; - } else if (uidl.hasAttribute("selectmode") - && uidl.getStringAttribute("selectmode") - .equals("multi")) { + if ("legacy-multi" == type) { return VListSelect.class; } } @@ -122,11 +96,6 @@ public class WidgetSet { } else if (uidl.hasAttribute("secret")) { return VPasswordField.class; } - } else if (widgetClass == VPopupCalendar.class) { - if (uidl.hasAttribute("type") - && uidl.getStringAttribute("type").equals("inline")) { - return VDateFieldCalendar.class; - } } else if (widgetClass == VSplitPanelHorizontal.class && uidl.hasAttribute("vertical")) { return VSplitPanelVertical.class; @@ -177,15 +146,10 @@ public class WidgetSet { if (fullyqualifiedName.equals("com.vaadin.ui.Button")) { loadImplementation(VCheckBox.class); } else if (fullyqualifiedName.equals("com.vaadin.ui.Select")) { - loadImplementation(VTwinColSelect.class); - loadImplementation(VOptionGroup.class); - loadImplementation(VNativeSelect.class); loadImplementation(VListSelect.class); } else if (fullyqualifiedName.equals("com.vaadin.ui.TextField")) { loadImplementation(VTextArea.class); loadImplementation(VPasswordField.class); - } else if (fullyqualifiedName.equals("com.vaadin.ui.DateField")) { - loadImplementation(VDateFieldCalendar.class); } else if (fullyqualifiedName.equals("com.vaadin.ui.SplitPanel")) { loadImplementation(VSplitPanelVertical.class); } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java index 26f2949870..454ea5e3ce 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VDateFieldCalendar.java @@ -15,6 +15,9 @@ import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.FocusOutListener; import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.SubmitListener; import com.vaadin.terminal.gwt.client.ui.VCalendarPanel.TimeChangeListener; +/** + * A client side implementation for InlineDateField + */ public class VDateFieldCalendar extends VDateField { private final VCalendarPanel calendarPanel; 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; /** *

@@ -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(); + } + } -- 2.39.5