Global code cleanup

Change-Id: I14f46e6aa4f9cbdd9037f1c4ad1ac38fe7cbda86

2 files changed, 15 insertions, 11 deletions

diff --git a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEvent.java b/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEvent.java
index c9788b8540..ce8ca8e083 100644
--- a/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEvent.java
+++ b/uitest/src/com/vaadin/tests/components/ui/InitialFragmentEvent.java
@@ -15,19 +15,23 @@ public class InitialFragmentEvent extends AbstractTestUI {
 
     @Override
     protected void setup(VaadinRequest request) {
-        getPage().addUriFragmentChangedListener(new UriFragmentChangedListener() {
-
-            public void uriFragmentChanged(UriFragmentChangedEvent source) {
-                String newFragment = source.getUriFragment();
-                log.log("Fragment changed from " + lastKnownFragment + " to "
-                        + newFragment);
-                lastKnownFragment = newFragment;
-            }
-        });
+        getPage().addUriFragmentChangedListener(
+                new UriFragmentChangedListener() {
+
+                    @Override
+                    public void uriFragmentChanged(
+                            UriFragmentChangedEvent source) {
+                        String newFragment = source.getUriFragment();
+                        log.log("Fragment changed from " + lastKnownFragment
+                                + " to " + newFragment);
+                        lastKnownFragment = newFragment;
+                    }
+                });
         addComponent(log);
         addComponent(new Button("Set fragment to 'foo'",
                 new Button.ClickListener() {
 
+                    @Override
                     public void buttonClick(ClickEvent event) {
                         setFragment("foo");
                     }
@@ -35,6 +39,7 @@ public class InitialFragmentEvent extends AbstractTestUI {
         addComponent(new Button("Set fragment to 'bar'",
                 new Button.ClickListener() {
 
+                    @Override
                     public void buttonClick(ClickEvent event) {
                         setFragment("bar");
                     }
diff --git a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
index 49b8472a7a..25bf40edde 100644
--- a/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
+++ b/uitest/src/com/vaadin/tests/components/ui/UIsInMultipleTabs.java
@@ -18,8 +18,7 @@ public class UIsInMultipleTabs extends AbstractTestUIProvider {
     public static class TabUI extends UI {
         @Override
         protected void init(VaadinRequest request) {
-            VaadinSession application = VaadinSession
-                    .getCurrent();
+            VaadinSession application = VaadinSession.getCurrent();
             AtomicInteger count = numberOfUIsOpened.get(application);
             if (count == null) {
                 numberOfUIsOpened.putIfAbsent(application, new AtomicInteger());