From 227a937af1d844f7372a5a3071c1e204e25a49c0 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 19 Mar 2014 16:30:23 +0200
Subject: Format project files according to conventions

Change-Id: I2522698237eb2a21c0896605bed8e73a82795c97
---
 .../data/util/AbstractInMemoryContainer.java       | 22 ++++++++++------------
 .../vaadin/server/communication/UidlWriter.java    |  4 ++--
 2 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'server/src/com')

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\" : ");
 
-- 
cgit v1.2.3