diff options
Diffstat (limited to 'server')
4 files changed, 15 insertions, 16 deletions
diff --git a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java index 9a7922b928..cae9f30fc9 100644 --- a/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java +++ b/server/src/com/vaadin/data/util/AbstractInMemoryContainer.java @@ -148,8 +148,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE } } - private static abstract class BaseItemAddOrRemoveEvent extends - EventObject implements Serializable { + private static abstract class BaseItemAddOrRemoveEvent extends EventObject + implements Serializable { protected Object itemId; protected int index; protected int count; @@ -188,9 +188,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * of added items. * </p> */ - protected static class BaseItemAddEvent extends - BaseItemAddOrRemoveEvent implements - Container.Indexed.ItemAddEvent { + protected static class BaseItemAddEvent extends BaseItemAddOrRemoveEvent + implements Container.Indexed.ItemAddEvent { public BaseItemAddEvent(Container source, Object itemId, int index, int count) { @@ -212,12 +211,11 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE * number of removed items. * </p> */ - protected static class BaseItemRemoveEvent extends - BaseItemAddOrRemoveEvent implements - Container.Indexed.ItemRemoveEvent { + protected static class BaseItemRemoveEvent extends BaseItemAddOrRemoveEvent + implements Container.Indexed.ItemRemoveEvent { - public BaseItemRemoveEvent(Container source, Object itemId, - int index, int count) { + public BaseItemRemoveEvent(Container source, Object itemId, int index, + int count) { super(source, itemId, index, count); } @@ -1003,8 +1001,8 @@ public abstract class AbstractInMemoryContainer<ITEMIDTYPE, PROPERTYIDCLASS, ITE */ protected void fireItemsAdded(int firstPosition, ITEMIDTYPE firstItemId, int numberOfItems) { - BaseItemAddEvent addEvent = new BaseItemAddEvent(this, - firstItemId, firstPosition, numberOfItems); + BaseItemAddEvent addEvent = new BaseItemAddEvent(this, firstItemId, + firstPosition, numberOfItems); fireItemSetChange(addEvent); } diff --git a/server/src/com/vaadin/server/communication/UidlWriter.java b/server/src/com/vaadin/server/communication/UidlWriter.java index b46fbbf58a..6c23da629e 100644 --- a/server/src/com/vaadin/server/communication/UidlWriter.java +++ b/server/src/com/vaadin/server/communication/UidlWriter.java @@ -99,8 +99,8 @@ public class UidlWriter implements Serializable { uiConnectorTracker.setWritingResponse(true); try { - writer.write("\"" + ApplicationConstants.SERVER_SYNC_ID - + "\": " + uiConnectorTracker.getCurrentSyncId() + ", "); + writer.write("\"" + ApplicationConstants.SERVER_SYNC_ID + "\": " + + uiConnectorTracker.getCurrentSyncId() + ", "); writer.write("\"changes\" : "); diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java index 685404ded6..d591d10e18 100644 --- a/server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java +++ b/server/tests/src/com/vaadin/tests/data/converter/TestDateToSqlDateConverter.java @@ -19,7 +19,7 @@ public class TestDateToSqlDateConverter extends TestCase { public void testValueConversion() { Date testDate = new Date(100, 0, 1); long time = testDate.getTime(); - assertEquals(testDate, converter.convertToModel(new java.sql.Date(time), - java.sql.Date.class, Locale.ENGLISH)); + assertEquals(testDate, converter.convertToModel( + new java.sql.Date(time), java.sql.Date.class, Locale.ENGLISH)); } } diff --git a/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java b/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java index 1d1a3c297e..832ae14950 100644 --- a/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java +++ b/server/tests/src/com/vaadin/tests/server/validation/TestBeanValidation.java @@ -84,6 +84,7 @@ public class TestBeanValidation { Assert.assertEquals(2, causes.length); } + public void testBeanValidationNotAddedTwice() { // See ticket #11045 BeanFieldGroup<BeanToValidate> fieldGroup = new BeanFieldGroup<BeanToValidate>( |