[webbeans-commits] Webbeans SVN: r92 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet.

Author: pete.muir(a)jboss.org Date: 2008-08-10 11:22:21 -0400 (Sun, 10 Aug 2008) New Revision: 92 Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java Log: minor Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-08-10 15:12:42 UTC (rev 91) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2008-08-10 15:22:21 UTC (rev 92) @@ -26,5 +26,6 @@ public static ServletContext getServletContext() { return servletContext; - } + } + } Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java 2008-08-10 15:12:42 UTC (rev 91) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/ServletRequestSessionMap.java 2008-08-10 15:22:21 UTC (rev 92) @@ -1,115 +0,0 @@ -package org.jboss.webbeans.servlet; - -import java.util.Collection; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -/** - * - * @author Shane Bryzak - * - */ -public class ServletRequestSessionMap -{ - private HttpServletRequest request; - - public ServletRequestSessionMap(HttpServletRequest request) - { - this.request = request; - } - - public void clear() - { - throw new UnsupportedOperationException(); - } - - public boolean containsKey(Object key) - { - HttpSession session = request.getSession(false); - return session==null ? false : session.getAttribute( (String) key )!=null; - } - - public boolean containsValue(Object value) - { - throw new UnsupportedOperationException(); - } - - public Set<java.util.Map.Entry<String, Object>> entrySet() - { - throw new UnsupportedOperationException(); - } - - public Object get(Object key) - { - HttpSession session = request.getSession(false); - return session==null ? null : session.getAttribute( (String) key ); - } - - public boolean isEmpty() - { - throw new UnsupportedOperationException(); - } - - public Set<String> keySet() - { - HttpSession session = request.getSession(false); - if (session==null) - { - return Collections.EMPTY_SET; - } - else - { - Set<String> keys = new HashSet<String>(); - Enumeration<String> names = session.getAttributeNames(); - while ( names.hasMoreElements() ) - { - keys.add( names.nextElement() ); - } - return keys; - } - } - - public Object put(String key, Object value) - { - HttpSession session = request.getSession(true); - Object result = session.getAttribute(key); - session.setAttribute(key, value); - return result; - } - - public void putAll(Map<? extends String, ? extends Object> t) - { - throw new UnsupportedOperationException(); - } - - public Object remove(Object key) - { - HttpSession session = request.getSession(false); - if (session==null) - { - return null; - } - else - { - Object result = session.getAttribute( (String) key ); - session.removeAttribute( (String) key ); - return result; - } - } - - public int size() - { - throw new UnsupportedOperationException(); - } - - public Collection<Object> values() - { - throw new UnsupportedOperationException(); - } -} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-08-10 15:12:42 UTC (rev 91) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-08-10 15:22:21 UTC (rev 92) @@ -9,7 +9,6 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.webbeans.Container; -import javax.webbeans.Context; import javax.webbeans.RequestScoped; import org.jboss.webbeans.BasicContext;