From: Leif Åstrand <leif@vaadin.com>
Date: Fri, 4 Nov 2011 07:42:53 +0000 (+0200)
Subject: Merge branch 'master' into windowing
X-Git-Tag: 7.0.0.alpha1~342
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=df4c883f511b2dd5d75aea32cd9e9622eb0cff96;p=vaadin-framework.git

Merge branch 'master' into windowing
---

df4c883f511b2dd5d75aea32cd9e9622eb0cff96
diff --cc src/com/vaadin/Application.java
index 57ecd03e70,f751431e63..9fbd9a2fee
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@@ -1929,30 -1906,4 +1929,30 @@@ public abstract class Application imple
          }
  
      }
 -}
 +
 +    public abstract Root getRoot(WrappedRequest request);
 +
 +    public boolean handleRequest(WrappedRequest request,
 +            WrappedResponse response) {
 +        for (RequestHandler handler : new ArrayList<RequestHandler>(
 +                requestHandlers)) {
 +            if (handler.handleRequest(request, response)) {
 +                return true;
 +            }
 +        }
 +        // If not handled
 +        return false;
 +    }
 +
 +    public void addRequestHandler(RequestHandler handler) {
 +        requestHandlers.add(handler);
 +    }
 +
 +    public void removeRequestHandler(RequestHandler handler) {
 +        requestHandlers.remove(handler);
 +    }
 +
 +    public Collection<RequestHandler> getRequestHandlers() {
 +        return Collections.unmodifiableCollection(requestHandlers);
 +    }
- }
++}