You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/11/19 04:23:24 UTC
svn commit: r1036726 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl:
config/ scope/conversation/ scope/conversation/spi/ windowhandler/
Author: gpetracek
Date: Fri Nov 19 03:23:24 2010
New Revision: 1036726
URL: http://svn.apache.org/viewvc?rev=1036726&view=rev
Log:
minor changes
Added:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/ClientInformation.java
- copied, changed from r1036721, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/WindowUser.java
Removed:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/WindowUser.java
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/spi/Jsf2ModuleConfig.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/Jsf2WindowHandlerServlet.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java?rev=1036726&r1=1036725&r2=1036726&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/config/DefaultWindowContextConfig.java Fri Nov 19 03:23:24 2010
@@ -31,7 +31,7 @@ public class DefaultWindowContextConfig
{
private static final long serialVersionUID = 5184658265260290647L;
- public boolean isClientSideWindowHandler()
+ public boolean isClientSideWindowHandlerEnabled()
{
return true;
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java?rev=1036726&r1=1036725&r2=1036726&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/Jsf2WindowHandler.java Fri Nov 19 03:23:24 2010
@@ -37,7 +37,9 @@ import java.io.IOException;
@Specializes
public class Jsf2WindowHandler extends DefaultWindowHandler
{
- boolean isClientSideWindowHandler;
+ private static final long serialVersionUID = 5293942986187078113L;
+
+ private boolean isClientSideWindowHandler;
protected Jsf2WindowHandler()
{
@@ -48,25 +50,26 @@ public class Jsf2WindowHandler extends D
protected Jsf2WindowHandler(Jsf2ModuleConfig config)
{
super(config);
- this.isClientSideWindowHandler = config.isClientSideWindowHandler();
+ this.isClientSideWindowHandler = config.isClientSideWindowHandlerEnabled();
}
@Override
public void sendRedirect(ExternalContext externalContext, String url, boolean addRequestParameter)
- throws IOException
+ throws IOException
{
- PartialViewContext pvc = FacesContext.getCurrentInstance().getPartialViewContext();
- if (pvc != null && pvc.isPartialRequest())
+ PartialViewContext partialViewContext = FacesContext.getCurrentInstance().getPartialViewContext();
+
+ if (partialViewContext != null && partialViewContext.isPartialRequest())
{
super.sendRedirect(externalContext, url, addRequestParameter);
return;
}
- if (url != null && url.startsWith(Jsf2WindowHandlerServlet.WINDOWHANDLER_URL))
- {
- externalContext.redirect(url);
- return;
- }
+ if (url != null && url.startsWith(Jsf2WindowHandlerServlet.WINDOWHANDLER_URL))
+ {
+ externalContext.redirect(url);
+ return;
+ }
super.sendRedirect(externalContext, url, addRequestParameter);
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/spi/Jsf2ModuleConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/spi/Jsf2ModuleConfig.java?rev=1036726&r1=1036725&r2=1036726&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/spi/Jsf2ModuleConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/spi/Jsf2ModuleConfig.java Fri Nov 19 03:23:24 2010
@@ -25,5 +25,5 @@ import org.apache.myfaces.extensions.cdi
*/
public interface Jsf2ModuleConfig extends JsfModuleConfig
{
- boolean isClientSideWindowHandler();
+ boolean isClientSideWindowHandlerEnabled();
}
Copied: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/ClientInformation.java (from r1036721, myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/WindowUser.java)
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/ClientInformation.java?p2=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/ClientInformation.java&p1=myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/WindowUser.java&r1=1036721&r2=1036726&rev=1036726&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/WindowUser.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/ClientInformation.java Fri Nov 19 03:23:24 2010
@@ -26,15 +26,16 @@ import java.io.Serializable;
* JavaScript enabled on his client, etc.
*/
@SessionScoped
-public class WindowUser implements Serializable
+public class ClientInformation implements Serializable
{
+ private static final long serialVersionUID = -3264016646002116064L;
- boolean javaScriptEnabled = true;
+ private boolean javaScriptEnabled = true;
public boolean isJavaScriptEnabled()
{
- return javaScriptEnabled;
+ return this.javaScriptEnabled;
}
public void setJavaScriptEnabled(boolean javaScriptEnabled)
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/Jsf2WindowHandlerServlet.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/Jsf2WindowHandlerServlet.java?rev=1036726&r1=1036725&r2=1036726&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/Jsf2WindowHandlerServlet.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/windowhandler/Jsf2WindowHandlerServlet.java Fri Nov 19 03:23:24 2010
@@ -38,17 +38,19 @@ import java.util.Set;
/**
* Serves the windowhandler.html from the resource path
*/
-@WebServlet(urlPatterns={Jsf2WindowHandlerServlet.WINDOWHANDLER_URL})
+@WebServlet(urlPatterns = {Jsf2WindowHandlerServlet.WINDOWHANDLER_URL})
public class Jsf2WindowHandlerServlet extends HttpServlet
{
+ private static final long serialVersionUID = 6109043260242858474L;
+
public final static String URL_PARAM = "url";
public final static String WINDOWHANDLER_URL = "windowhandler";
- private WindowUser windowUser;
+ private ClientInformation clientInformation;
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException
+ throws ServletException, IOException
{
if (!isJavaScriptEnabled())
{
@@ -66,7 +68,7 @@ public class Jsf2WindowHandlerServlet ex
}
private void sendWindowHandler(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException
+ throws ServletException, IOException
{
resp.setStatus(HttpServletResponse.SC_OK);
resp.setContentType("text/html");
@@ -75,14 +77,14 @@ public class Jsf2WindowHandlerServlet ex
OutputStream os = resp.getOutputStream();
try
{
- byte[] buf = new byte[16*4096];
+ byte[] buf = new byte[16 * 4096];
int bytesRead;
while ((bytesRead = is.read(buf)) != -1)
{
os.write(buf, 0, bytesRead);
}
}
- finally
+ finally
{
is.close();
os.close();
@@ -91,15 +93,17 @@ public class Jsf2WindowHandlerServlet ex
private boolean isJavaScriptEnabled()
{
- if (windowUser == null)
+ if (clientInformation == null)
{
- BeanManager bm = BeanManagerProvider.getInstance().getBeanManager();
- Set<Bean<?>> beans = bm.getBeans(WindowUser.class);
- Bean<?> wuBean = bm.resolve(beans);
- CreationalContext<?> cc = bm.createCreationalContext(wuBean);
- windowUser = (WindowUser) bm.getReference(wuBean, WindowUser.class, cc);
+ //TODO use CodiUtils
+ BeanManager beanManager = BeanManagerProvider.getInstance().getBeanManager();
+ Set<Bean<?>> beans = beanManager.getBeans(ClientInformation.class);
+ Bean<?> clientInformationBean = beanManager.resolve(beans);
+ CreationalContext<?> cc = beanManager.createCreationalContext(clientInformationBean);
+ clientInformation = (ClientInformation) beanManager
+ .getReference(clientInformationBean, ClientInformation.class, cc);
}
- return windowUser.isJavaScriptEnabled();
+ return clientInformation.isJavaScriptEnabled();
}
}