diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-10-06 14:02:29 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2009-10-06 14:02:29 +0000 |
| commit | 243f126a127cc999eeffa3ae659a704fd5920a0e (patch) | |
| tree | ba30af6f09bbf9f08bc906f192d290b309a0ab8f | |
| parent | 7158b92cd4ff9ffa983920b697b1446051f805b4 (diff) | |
| download | vaadin-framework-243f126a127cc999eeffa3ae659a704fd5920a0e.tar.gz vaadin-framework-243f126a127cc999eeffa3ae659a704fd5920a0e.zip | |
added missing ClientWidget annotation
svn changeset:9114/svn branch:6.2
| -rw-r--r-- | src/com/vaadin/ui/ComboBox.java | 108 |
1 files changed, 55 insertions, 53 deletions
diff --git a/src/com/vaadin/ui/ComboBox.java b/src/com/vaadin/ui/ComboBox.java index 68400986da..f8c65d5573 100644 --- a/src/com/vaadin/ui/ComboBox.java +++ b/src/com/vaadin/ui/ComboBox.java @@ -9,6 +9,7 @@ import java.util.Collection; import com.vaadin.data.Container;
import com.vaadin.terminal.PaintException;
import com.vaadin.terminal.PaintTarget;
+import com.vaadin.terminal.gwt.client.ui.VFilterSelect;
/**
* A filtering dropdown single-select. Suitable for newItemsAllowed, but it's
@@ -19,68 +20,69 @@ import com.vaadin.terminal.PaintTarget; *
*/
@SuppressWarnings("serial")
+@ClientWidget(VFilterSelect.class)
public class ComboBox extends Select {
- private String inputPrompt = null;
+ private String inputPrompt = null;
- public ComboBox() {
- setMultiSelect(false);
- setNewItemsAllowed(false);
- }
+ public ComboBox() {
+ setMultiSelect(false);
+ setNewItemsAllowed(false);
+ }
- public ComboBox(String caption, Collection options) {
- super(caption, options);
- 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, Container dataSource) {
+ super(caption, dataSource);
+ setMultiSelect(false);
+ setNewItemsAllowed(false);
+ }
- public ComboBox(String caption) {
- super(caption);
- 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);
- }
+ @Override
+ public void setMultiSelect(boolean multiSelect) {
+ if (multiSelect && !isMultiSelect()) {
+ throw new UnsupportedOperationException("Multiselect not supported");
+ }
+ super.setMultiSelect(multiSelect);
+ }
- /**
- * Gets the current input prompt.
- *
- * @see #setInputPrompt(String)
- * @return the current input prompt, or null if not enabled
- */
- public String getInputPrompt() {
- return inputPrompt;
- }
+ /**
+ * Gets the current input prompt.
+ *
+ * @see #setInputPrompt(String)
+ * @return the current input prompt, or null if not enabled
+ */
+ public String getInputPrompt() {
+ return inputPrompt;
+ }
- /**
- * Sets the input prompt - a textual prompt that is displayed when the
- * select would otherwise be empty, to prompt the user for input.
- *
- * @param inputPrompt
- * the desired input prompt, or null to disable
- */
- public void setInputPrompt(String inputPrompt) {
- this.inputPrompt = inputPrompt;
- }
+ /**
+ * Sets the input prompt - a textual prompt that is displayed when the
+ * select would otherwise be empty, to prompt the user for input.
+ *
+ * @param inputPrompt
+ * the desired input prompt, or null to disable
+ */
+ public void setInputPrompt(String inputPrompt) {
+ this.inputPrompt = inputPrompt;
+ }
- @Override
- public void paintContent(PaintTarget target) throws PaintException {
- if (inputPrompt != null) {
- target.addAttribute("prompt", inputPrompt);
- }
- super.paintContent(target);
- }
+ @Override
+ public void paintContent(PaintTarget target) throws PaintException {
+ if (inputPrompt != null) {
+ target.addAttribute("prompt", inputPrompt);
+ }
+ super.paintContent(target);
+ }
}
|