From a26f6d702c2eeb72d3045d5b95712f58bc08d116 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Thu, 26 Jul 2012 17:08:10 +0300
Subject: Revert root cleanup changes - this commit was not supposed to go to
 master

This reverts commit 25f664f993a1eb936cb516f1b748773b9b4d5239.
---
 src/com/vaadin/ui/Root.java | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'src/com/vaadin/ui/Root.java')

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 23f491949f..9271097a46 100644
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -419,16 +419,9 @@ public abstract class Root extends AbstractComponentContainer implements
     private Page page = new Page(this);
 
     private RootServerRpc rpc = new RootServerRpc() {
-        @Override
         public void click(MouseEventDetails mouseDetails) {
             fireEvent(new ClickEvent(Root.this, mouseDetails));
         }
-
-        @Override
-        public void close() {
-            System.out.println(" --- ROOT CLOSE RPC " + rootId);
-            getApplication().removeRoot(rootId);
-        }
     };
 
     /**
@@ -509,7 +502,6 @@ public abstract class Root extends AbstractComponentContainer implements
         return this;
     }
 
-    @Override
     public void replaceComponent(Component oldComponent, Component newComponent) {
         throw new UnsupportedOperationException();
     }
@@ -519,7 +511,6 @@ public abstract class Root extends AbstractComponentContainer implements
         return application;
     }
 
-    @Override
     public void paintContent(PaintTarget target) throws PaintException {
         page.paintContent(target);
 
@@ -559,7 +550,6 @@ public abstract class Root extends AbstractComponentContainer implements
         fireEvent(new ClickEvent(this, mouseDetails));
     }
 
-    @Override
     @SuppressWarnings("unchecked")
     public void changeVariables(Object source, Map<String, Object> variables) {
         if (variables.containsKey(CLICK_EVENT_ID)) {
@@ -588,7 +578,6 @@ public abstract class Root extends AbstractComponentContainer implements
      * 
      * @see com.vaadin.ui.ComponentContainer#getComponentIterator()
      */
-    @Override
     public Iterator<Component> getComponentIterator() {
         // TODO could directly create some kind of combined iterator instead of
         // creating a new ArrayList
@@ -608,7 +597,6 @@ public abstract class Root extends AbstractComponentContainer implements
      * 
      * @see com.vaadin.ui.ComponentContainer#getComponentCount()
      */
-    @Override
     public int getComponentCount() {
         return windows.size() + (getContent() == null ? 0 : 1);
     }
@@ -968,13 +956,11 @@ public abstract class Root extends AbstractComponentContainer implements
         return actionManager;
     }
 
-    @Override
     public <T extends Action & com.vaadin.event.Action.Listener> void addAction(
             T action) {
         getActionManager().addAction(action);
     }
 
-    @Override
     public <T extends Action & com.vaadin.event.Action.Listener> void removeAction(
             T action) {
         if (actionManager != null) {
@@ -982,12 +968,10 @@ public abstract class Root extends AbstractComponentContainer implements
         }
     }
 
-    @Override
     public void addActionHandler(Handler actionHandler) {
         getActionManager().addActionHandler(actionHandler);
     }
 
-    @Override
     public void removeActionHandler(Handler actionHandler) {
         if (actionManager != null) {
             actionManager.removeActionHandler(actionHandler);
-- 
cgit v1.2.3