final String pid = uidl.getId();
if (!paintableMap.hasPaintable(pid)) {
// Create and register a new paintable if no old was found
- VPaintableWidget p = widgetSet.createWidget(uidl, configuration);
+ VPaintableWidget p = widgetSet.createWidget(uidl.getTag(),
+ configuration);
p.setConnection(this);
p.setId(pid);
p.init();
import com.google.gwt.core.client.GWT;
import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.VFilterSelectPaintable;
-import com.vaadin.terminal.gwt.client.ui.VListSelectPaintable;
import com.vaadin.terminal.gwt.client.ui.VUnknownComponentPaintable;
public class WidgetSet {
* component must be a {@link Widget} that implements
* {@link VPaintableWidget}.
*
- * @param uidl
- * UIDL to be painted with returned component.
+ * @param tag
+ * component type tag for the component to create
* @param client
* the application connection that whishes to instantiate widget
*
* @return New uninitialized and unregistered component that can paint given
* UIDL.
*/
- public VPaintableWidget createWidget(UIDL uidl,
+ public VPaintableWidget createWidget(String tag,
ApplicationConfiguration conf) {
/*
* Yes, this (including the generated code in WidgetMap) may look very
* Luckily this is mostly written by WidgetSetGenerator, here are just
* some hacks. Extra instantiation code is needed if client side widget
* has no "native" counterpart on client side.
- *
- * TODO should try to get rid of these exceptions here
*/
- final Class<? extends VPaintableWidget> classType = resolveWidgetType(
- uidl, conf);
+ Class<? extends VPaintableWidget> classType = resolveWidgetType(tag,
+ conf);
+
if (classType == null || classType == VUnknownComponentPaintable.class) {
String serverSideName = conf
- .getUnknownServerClassNameByEncodedTagName(uidl.getTag());
+ .getUnknownServerClassNameByEncodedTagName(tag);
VUnknownComponentPaintable c = GWT
.create(VUnknownComponentPaintable.class);
c.setServerSideClassName(serverSideName);
}
- protected Class<? extends VPaintableWidget> resolveWidgetType(UIDL uidl,
+ protected Class<? extends VPaintableWidget> resolveWidgetType(String tag,
ApplicationConfiguration conf) {
- final String tag = uidl.getTag();
-
Class<? extends VPaintableWidget> widgetClass = conf
.getWidgetClassByEncodedTag(tag);
- // add our historical quirks
-
- if (widgetClass == VFilterSelectPaintable.class) {
- if (uidl.hasAttribute("type")) {
- final String type = uidl.getStringAttribute("type").intern();
- if ("legacy-multi" == type) {
- return VListSelectPaintable.class;
- }
- }
- }
return widgetClass;
}
- /**
- * Test if the given component implementation conforms to UIDL.
- *
- * @param currentWidget
- * Current implementation of the component
- * @param uidl
- * UIDL to test against
- * @return true iff createWidget would return a new component of the same
- * class than currentWidget
- */
- public boolean isCorrectImplementation(Widget currentWidget, UIDL uidl,
- ApplicationConfiguration conf) {
- return currentWidget.getClass() == resolveWidgetType(uidl, conf);
- }
-
/**
* Due its nature, GWT does not support dynamic classloading. To bypass this
* limitation, widgetset must have function that returns Class by its fully
Class<? extends VPaintableWidget> implementationByServerSideClassName = widgetMap
.getImplementationByServerSideClassName(fullyqualifiedName);
- /*
- * Also ensure that our historical quirks have their instantiators
- * loaded. Without these, legacy code will throw NPEs when e.g. a Select
- * is in multiselect mode, causing the clientside implementation to
- * *actually* be VListSelect, when the annotation says VFilterSelect
- */
- if (fullyqualifiedName.equals("com.vaadin.ui.Select")) {
- loadImplementation(VListSelectPaintable.class);
- }
-
return implementationByServerSideClassName;
}
}
/**
- * Sets the multiselect mode. Setting multiselect mode false may loose
+ * Sets the multiselect mode. Setting multiselect mode false may lose
* selection information: if selected items set contains one or more
* selected items, only one of the selected items is kept as selected.
*
+ * Subclasses of AbstractSelect can choose not to support changing the
+ * multiselect mode, and may throw {@link UnsupportedOperationException}.
+ *
* @param multiSelect
* the New value of property multiSelect.
*/
private boolean textInputAllowed = true;
public ComboBox() {
- setMultiSelect(false);
setNewItemsAllowed(false);
}
public ComboBox(String caption, Collection<?> options) {
super(caption, options);
- setMultiSelect(false);
setNewItemsAllowed(false);
}
public ComboBox(String caption, Container dataSource) {
super(caption, dataSource);
- setMultiSelect(false);
setNewItemsAllowed(false);
}
public ComboBox(String caption) {
super(caption);
- setMultiSelect(false);
setNewItemsAllowed(false);
}
- @Override
- public void setMultiSelect(boolean multiSelect) {
- if (multiSelect && !isMultiSelect()) {
- throw new UnsupportedOperationException("Multiselect not supported");
- }
- super.setMultiSelect(multiSelect);
- }
-
/**
* Gets the current input prompt.
*
* match. Null values are not supported.
* </p>
*
+ * Note: since Vaadin 7.0, returns an {@link AbstractSelect} instead of a
+ * {@link Select}.
+ *
* @param propertyId
* the id of the property.
* @param values
* @param descriptions
* @return the select property generated
*/
- public Select replaceWithSelect(Object propertyId, Object[] values,
+ public AbstractSelect replaceWithSelect(Object propertyId, Object[] values,
Object[] descriptions) {
// Checks the parameters
}
// Creates the new field matching to old field parameters
- final Select newField = new Select();
- if (isMultiselect) {
- newField.setMultiSelect(true);
- }
+ final AbstractSelect newField = isMultiselect ? new ListSelect()
+ : new Select();
newField.setCaption(oldField.getCaption());
newField.setReadOnly(oldField.isReadOnly());
newField.setReadThrough(oldField.isReadThrough());
* @deprecated use {@link ListSelect}, {@link OptionGroup} or
* {@link TwinColSelect} instead
* @see com.vaadin.ui.AbstractSelect#setMultiSelect(boolean)
+ * @throws UnsupportedOperationException
+ * if trying to activate multiselect mode
*/
@Deprecated
@Override
public void setMultiSelect(boolean multiSelect) {
- super.setMultiSelect(multiSelect);
+ if (multiSelect) {
+ throw new UnsupportedOperationException("Multiselect not supported");
+ }
}
/**
+++ /dev/null
-package com.vaadin.tests.components.select;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Select;
-
-public class MultiSelect extends TestBase {
-
- @SuppressWarnings("deprecation")
- @Override
- protected void setup() {
- Select selectComponent = new Select();
- selectComponent.setMultiSelect(true);
-
- String[] selection = { "One", "Hund", "Three" };
- for (String word : selection) {
- selectComponent.addItem(word);
- }
-
- addComponent(selectComponent);
- }
-
- @Override
- protected String getDescription() {
- return "The select is in multi select mode and should be rendered as such";
- }
-
- @Override
- protected Integer getTicketNumber() {
- return 4553;
- }
-
-}
import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
+import com.vaadin.ui.ListSelect;
import com.vaadin.ui.Panel;
-import com.vaadin.ui.Select;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
ol.addComponent(tf);
ol.setComponentAlignment(tf, Alignment.BOTTOM_LEFT);
- Select s = new Select("100% high select");
+ ListSelect s = new ListSelect("100% high select");
s.setMultiSelect(true);
s.setHeight("100%");
s.setWidth("");
ol.addComponent(s);
- s = new Select("200 px high select");
+ s = new ListSelect("200 px high select");
s.setMultiSelect(true);
s.setHeight("200px");
s.setWidth("");
ol.addComponent(l);
ol.setComponentAlignment(l, Alignment.BOTTOM_LEFT);
- Select s = new Select("100% high select, should fit into layout");
+ ListSelect s = new ListSelect(
+ "100% high select, should fit into layout");
s.setMultiSelect(true);
s.setHeight("100%");
s.setWidth("");
ol.addComponent(s);
- s = new Select("200 px high select, should be partly outside");
+ s = new ListSelect("200 px high select, should be partly outside");
s.setMultiSelect(true);
s.setHeight("200px");
s.setWidth("");
ol.addComponent(l);
ol.setComponentAlignment(l, Alignment.BOTTOM_LEFT);
- Select s = new Select("100% high select, should fit into layout");
+ ListSelect s = new ListSelect(
+ "100% high select, should fit into layout");
s.setMultiSelect(true);
s.setHeight("100%");
s.setWidth("100%");
ol.addComponent(s);
- s = new Select("200 px high select, should make the layout 200px high");
+ s = new ListSelect(
+ "200 px high select, should make the layout 200px high");
s.setMultiSelect(true);
s.setHeight("200px");
s.setWidth("100%");
ol.addComponent(l);
ol.setComponentAlignment(l, Alignment.BOTTOM_LEFT);
- Select s = new Select("100% high select, should fit into layout");
+ ListSelect s = new ListSelect(
+ "100% high select, should fit into layout");
s.setMultiSelect(true);
s.setHeight("100%");
s.setWidth("100%");
ol.addComponent(s);
- s = new Select("200 px high select, should make the layout 200px high");
+ s = new ListSelect(
+ "200 px high select, should make the layout 200px high");
s.setMultiSelect(true);
s.setHeight("200px");
s.setWidth("100%");
@SuppressWarnings("deprecation")
private Select createSelect() {
Select select = new Select();
- select.setMultiSelect(false);
select.addContainerProperty(PROPERTY_ID, String.class, "");
select.setItemCaptionPropertyId(PROPERTY_ID);
projects / vaadin-framework.git / commitdiff