@Override
public void bind(int rowIndex) {
- boolean success = false;
+ Exception exception = null;
try {
Object id = getContainerDataSource().getIdByIndex(rowIndex);
if (editedItemId == null) {
}
if (editedItemId.equals(id)) {
- success = true;
doEditItem();
}
} catch (Exception e) {
- handleError(e);
+ exception = e;
+ }
+
+ if (exception != null) {
+ handleError(exception);
+ doCancelEditor();
+ getEditorRpc().confirmBind(false);
+ } else {
+ doEditItem();
+ getEditorRpc().confirmBind(true);
}
- getEditorRpc().confirmBind(success);
}
@Override
}
Field<?> editor = editorFieldGroup.getField(propertyId);
- if (editor == null) {
- editor = editorFieldGroup.buildAndBind(propertyId);
- }
- if (editor.getParent() != Grid.this) {
- assert editor.getParent() == null;
- editor.setParent(this);
+ try {
+ if (editor == null) {
+ editor = editorFieldGroup.buildAndBind(propertyId);
+ }
+ } finally {
+ if (editor == null) {
+ editor = editorFieldGroup.getField(propertyId);
+ }
+
+ if (editor != null && editor.getParent() != Grid.this) {
+ assert editor.getParent() == null;
+ editor.setParent(this);
+ }
}
return editor;
}
protected void doCancelEditor() {
editedItemId = null;
editorFieldGroup.discard();
+ editorFieldGroup.setItemDataSource(null);
}
void resetEditor() {
.getEditorField();
field.setValue("New Name");
+ Property<?> datasource = field.getPropertyDataSource();
+
grid.cancelEditor();
assertFalse(grid.isEditorActive());
assertNull(grid.getEditedItemId());
assertFalse(field.isModified());
- assertEquals(DEFAULT_NAME, field.getValue());
- assertEquals(DEFAULT_NAME, field.getPropertyDataSource().getValue());
+ assertEquals("", field.getValue());
+ assertEquals(DEFAULT_NAME, datasource.getValue());
+ assertNull(field.getPropertyDataSource());
+ assertNull(grid.getEditorFieldGroup().getItemDataSource());
}
@Test(expected = IllegalArgumentException.class)
--- /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.components.grid;
+
+import com.vaadin.server.ErrorHandler;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Grid;
+
+public class GridEditorConverterNotFound extends AbstractTestUIWithLog {
+
+ class Foo {
+ }
+
+ @Override
+ protected void setup(VaadinRequest request) {
+
+ Grid grid = new Grid();
+
+ grid.addColumn("foo", Foo.class);
+ grid.addRow(new Foo());
+ grid.setEditorEnabled(true);
+ grid.setErrorHandler(new ErrorHandler() {
+
+ @Override
+ public void error(com.vaadin.server.ErrorEvent event) {
+ log(event.getThrowable().toString());
+ }
+ });
+
+ addComponent(grid);
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 17935;
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Grid should gracefully handle bind failures when opening editor";
+ }
+}
--- /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.components.grid;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+
+public class GridEditorConverterNotFoundTest extends GridBasicFeaturesTest {
+
+ @Override
+ protected Class<?> getUIClass() {
+ // Use the correct UI with helpers from GridBasicFeatures
+ return GridEditorConverterNotFound.class;
+ }
+
+ @Test
+ public void testConverterNotFound() {
+ openTestURL();
+
+ $(GridElement.class).first().getCell(0, 0).doubleClick();
+
+ assertEquals("1. com.vaadin.data.Buffered$SourceException",
+ getLogRow(0));
+ }
+}