committingValueToDataSource = false;
}
} else {
- /*
- * An invalid value and we don't allow them, throw the exception
- */
+ /* An invalid value and we don't allow them, throw the exception */
validate();
}
}
* @param repaintIsNotNeeded
* True iff caller is sure that repaint is not needed.
* @throws Property.ReadOnlyException
- * @throws Converter.ConversionException
- * @throws InvalidValueException
- */
- protected void setValue(T newFieldValue, boolean repaintIsNotNeeded) {
- setValue(newFieldValue, repaintIsNotNeeded, false);
- }
-
- /**
- * Sets the value of the field.
- *
- * @since
- * @param newFieldValue
- * the New value of the field.
- * @param repaintIsNotNeeded
- * True iff caller is sure that repaint is not needed.
- * @param ignoreReadOnly
- * True iff if the read-only check should be ignored
- * @throws Property.ReadOnlyException
- * @throws Converter.ConversionException
- * @throws InvalidValueException
*/
- protected void setValue(T newFieldValue, boolean repaintIsNotNeeded,
- boolean ignoreReadOnly) throws Property.ReadOnlyException,
- Converter.ConversionException, InvalidValueException {
+ protected void setValue(T newFieldValue, boolean repaintIsNotNeeded)
+ throws Property.ReadOnlyException, Converter.ConversionException,
+ InvalidValueException {
if (!SharedUtil.equals(newFieldValue, getInternalValue())) {
// Read only fields can not be changed
- if (!ignoreReadOnly && isReadOnly()) {
+ if (isReadOnly()) {
throw new Property.ReadOnlyException();
}
try {
import com.vaadin.data.Container;
import com.vaadin.data.Item;
import com.vaadin.data.Property;
-import com.vaadin.data.Validator.InvalidValueException;
import com.vaadin.data.util.IndexedContainer;
import com.vaadin.data.util.converter.Converter;
-import com.vaadin.data.util.converter.Converter.ConversionException;
import com.vaadin.data.util.converter.ConverterUtil;
import com.vaadin.event.DataBoundTransferable;
import com.vaadin.event.Transferable;
* the New selected item or collection of selected items.
* @param repaintIsNotNeeded
* True if caller is sure that repaint is not needed.
- * @param ignoreReadOnly
- * True if read-only check should be omitted.
* @see com.vaadin.ui.AbstractField#setValue(java.lang.Object,
* java.lang.Boolean)
*/
@Override
- protected void setValue(Object newFieldValue, boolean repaintIsNotNeeded,
- boolean ignoreReadOnly)
- throws com.vaadin.data.Property.ReadOnlyException,
- ConversionException, InvalidValueException {
+ protected void setValue(Object newValue, boolean repaintIsNotNeeded)
+ throws Property.ReadOnlyException {
+
if (isMultiSelect()) {
- if (newFieldValue == null) {
- super.setValue(new LinkedHashSet<Object>(), repaintIsNotNeeded,
- ignoreReadOnly);
- } else if (Collection.class.isAssignableFrom(newFieldValue
- .getClass())) {
+ if (newValue == null) {
+ super.setValue(new LinkedHashSet<Object>(), repaintIsNotNeeded);
+ } else if (Collection.class.isAssignableFrom(newValue.getClass())) {
super.setValue(new LinkedHashSet<Object>(
- (Collection<?>) newFieldValue), repaintIsNotNeeded,
- ignoreReadOnly);
+ (Collection<?>) newValue), repaintIsNotNeeded);
}
- } else if (newFieldValue == null || items.containsId(newFieldValue)) {
- super.setValue(newFieldValue, repaintIsNotNeeded, ignoreReadOnly);
+ } else if (newValue == null || items.containsId(newValue)) {
+ super.setValue(newValue, repaintIsNotNeeded);
}
}
}
if (!selected.isEmpty()) {
if (isMultiSelect()) {
- setValue(selected, false, true);
+ setValue(selected);
} else if (selected.size() == 1) {
- setValue(selected.iterator().next(), false, true);
+ setValue(selected.iterator().next());
} else {
throw new DesignException(
"Multiple values selected for a single select component");
public void readDesign(Element design, DesignContext designContext) {
super.readDesign(design, designContext);
if (design.hasAttr("checked")) {
- this.setValue(
- DesignAttributeHandler.readAttribute("checked",
- design.attributes(), Boolean.class), false, true);
+ this.setValue(DesignAttributeHandler.readAttribute("checked",
+ design.attributes(), Boolean.class));
}
}
Logger.getLogger(DateField.class.getName()).info(
"cannot parse " + design.attr("value") + " as date");
}
- this.setValue(date, false, true);
+ this.setValue(date);
}
}
Attributes attr = design.attributes();
if (attr.hasKey("value")) {
setValue(DesignAttributeHandler.readAttribute("value", attr,
- String.class), false, true);
+ String.class));
}
}
public void readDesign(Element design, DesignContext designContext) {
super.readDesign(design, designContext);
if (design.hasAttr("value") && !design.attr("value").isEmpty()) {
- setValue(
- DesignAttributeHandler.readAttribute("value",
- design.attributes(), Float.class), false, true);
+ setValue(DesignAttributeHandler.readAttribute("value",
+ design.attributes(), Float.class));
}
}
@Override
public void readDesign(Element design, DesignContext designContext) {
super.readDesign(design, designContext);
- setValue(design.html(), false, true);
+ setValue(design.html());
}
@Override
if (attr.hasKey("vertical")) {
setOrientation(SliderOrientation.VERTICAL);
}
- if (attr.hasKey("value")) {
- Double newFieldValue = DesignAttributeHandler.readAttribute(
- "value", attr, Double.class);
- setValue(newFieldValue, false, true);
+ if (!attr.get("value").isEmpty()) {
+ setValue(DesignAttributeHandler.readAttribute("value", attr,
+ Double.class));
}
}
@Override
public void readDesign(Element design, DesignContext designContext) {
super.readDesign(design, designContext);
- setValue(DesignFormatter.unencodeFromTextNode(design.html()), false,
- true);
+ setValue(DesignFormatter.unencodeFromTextNode(design.html()));
}
/*
super.readDesign(design, designContext);
Attributes attr = design.attributes();
if (attr.hasKey("value")) {
- String newFieldValue = DesignAttributeHandler.readAttribute(
- "value", attr, String.class);
- setValue(newFieldValue, false, true);
+ setValue(DesignAttributeHandler.readAttribute("value", attr,
+ String.class));
}
}
testRead(design, checkBox);
testWrite(design, checkBox);
}
-
- @Test
- public void testReadOnlyValue() {
- String design = "<v-check-box readonly checked='' />";
- CheckBox checkBox = new CheckBox();
- checkBox.setValue(true);
- checkBox.setReadOnly(true);
- testRead(design, checkBox);
- testWrite(design, checkBox);
- }
}
testWrite(getBasicDesign(), getBasicExpected());
}
- @Test
- public void testReadOnlyValue() {
- String design = "<v-combo-box readonly value='foo'><option selected>foo</option></v-combo-box>";
-
- ComboBox comboBox = new ComboBox();
- comboBox.addItems("foo", "bar");
- comboBox.setValue("foo");
- comboBox.setReadOnly(true);
-
- testRead(design, comboBox);
-
- // Selects items are not written out by default
- String design2 = "<v-combo-box readonly></v-combo-box>";
- testWrite(design2, comboBox);
- }
-
private String getBasicDesign() {
return "<v-combo-box input-prompt=\"Select something\" filtering-mode=\"off\" scroll-to-selected-item='false'>";
}
"2020-01-01 00:00:00+0200"),
getYearResolutionExpected());
}
-
- @Test
- public void testReadOnlyValue() {
- String design = "<v-date-field readonly resolution='year' value='2020-01-01 00:00:00+0200'/>";
- DateField df = new DateField();
- df.setResolution(Resolution.YEAR);
- df.setValue(new Date(2020 - 1900, 1 - 1, 1));
- df.setReadOnly(true);
-
- testRead(design, df);
- testWrite(design, df);
- }
}
testWrite(stripOptionTags(getBasicDesign()), getBasicExpected());
}
- @Test
- public void testReadOnlyValue() {
- String design = "<v-native-select readonly><option selected>foo</option><option>bar</option></v-native-select>";
-
- NativeSelect ns = new NativeSelect();
- ns.addItems("foo", "bar");
- ns.setValue("foo");
- ns.setReadOnly(true);
-
- testRead(design, ns);
-
- // Selects items are not written out by default
- String design2 = "<v-native-select readonly></v-native-select>";
- testWrite(design2, ns);
- }
-
}
\ No newline at end of file
+++ /dev/null
-/*
- * Copyright 2000-2014 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.tests.server.component.passwordfield;
-
-import org.junit.Test;
-
-import com.vaadin.tests.design.DeclarativeTestBase;
-import com.vaadin.ui.PasswordField;
-
-/**
- *
- * @since
- * @author Vaadin Ltd
- */
-public class PasswordFieldDeclarativeTest extends
- DeclarativeTestBase<PasswordField> {
-
- @Test
- public void testReadOnlyValue() {
- String design = "<v-password-field readonly=\"\" value=\"test value\"/>";
- PasswordField tf = new PasswordField();
- tf.setValue("test value");
- tf.setReadOnly(true);
- testRead(design, tf);
- testWrite(design, tf);
- }
-}
testWrite("<v-progress-bar>", new ProgressBar());
}
- @Test
- public void testReadOnlyValue() {
- String design = "<v-progress-bar readonly value=0.5 indeterminate=''>";
- ProgressBar progressBar = new ProgressBar();
- progressBar.setIndeterminate(true);
- progressBar.setValue(0.5f);
- progressBar.setReadOnly(true);
-
- testRead(design, progressBar);
- testWrite(design, progressBar);
- }
-
}
\ No newline at end of file
public void testWriteEmpty() {
testWrite("<v-rich-text-area />", new RichTextArea());
}
-
- @Test
- public void testReadOnlyValue() {
- String design = "<v-rich-text-area readonly style-name='v-richtextarea-readonly'>Hello World!</v-text-area>";
- RichTextArea ta = new RichTextArea();
- ta.setValue("Hello World!");
- ta.setReadOnly(true);
-
- testRead(design, ta);
- testWrite(design, ta);
- }
}
testRead(design, expected);
testWrite(design, expected);
}
-
- @Test
- public void testReadOnlyValue() {
- String design = "<v-slider readonly min=10 max=20 resolution=1 value=12.3>";
-
- Slider expected = new Slider();
- expected.setMin(10.0);
- expected.setMax(20.0);
- expected.setResolution(1);
- expected.setValue(12.3);
- expected.setReadOnly(true);
-
- testRead(design, expected);
- testWrite(design, expected);
- }
}
read.writeDesign(root, dc);
Assert.assertEquals("&amp; Test", root.html());
- }
- @Test
- public void testReadOnlyValue() {
- String design = "<v-text-area readonly rows=6 wordwrap=false>Hello World!</v-text-area>";
- TextArea ta = new TextArea();
- ta.setRows(6);
- ta.setWordwrap(false);
- ta.setValue("Hello World!");
- ta.setReadOnly(true);
- testRead(design, ta);
- testWrite(design, ta);
}
}
testRead(design, tf);
testWrite(design, tf);
}
-
- @Test
- public void testReadOnlyValue() {
- String design = "<v-text-field readonly=\"\" value=\"test value\"/>";
- TextField tf = new TextField();
- tf.setValue("test value");
- tf.setReadOnly(true);
- testRead(design, tf);
- testWrite(design, tf);
- }
}
projects / vaadin-framework.git / commitdiff