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/12/02 12:34:28 UTC
svn commit: r1041333 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation:
ClientInformationImpl.java ClientSideWindowHandler.java
ServerSideWindowHandler.java
Author: gpetracek
Date: Thu Dec 2 11:34:27 2010
New Revision: 1041333
URL: http://svn.apache.org/viewvc?rev=1041333&view=rev
Log:
minor cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientInformationImpl.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientSideWindowHandler.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientInformationImpl.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/ClientInformationImpl.java?rev=1041333&r1=1041332&r2=1041333&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientInformationImpl.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientInformationImpl.java Thu Dec 2 11:34:27 2010
@@ -45,7 +45,8 @@ public class ClientInformationImpl imple
protected String windowHandlerHtml;
- private @Inject ProjectStage projectStage;
+ @Inject
+ private ProjectStage projectStage;
public boolean isJavaScriptEnabled()
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientSideWindowHandler.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/ClientSideWindowHandler.java?rev=1041333&r1=1041332&r2=1041333&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ClientSideWindowHandler.java Thu Dec 2 11:34:27 2010
@@ -102,7 +102,7 @@ public class ClientSideWindowHandler ext
public void beforeLifecycleExecute(FacesContext facesContext)
{
- if (!shouldHandleRequest(facesContext))
+ if (!isClientSideWindowHandlerRequest(facesContext))
{
return;
}
@@ -137,7 +137,7 @@ public class ClientSideWindowHandler ext
}
}
- private boolean shouldHandleRequest(FacesContext facesContext)
+ private boolean isClientSideWindowHandlerRequest(FacesContext facesContext)
{
// no POST request and javascript enabled
// NOTE that for POST-requests the windowId is saved in the state (see WindowContextIdHolderComponent)
@@ -253,5 +253,4 @@ public class ClientSideWindowHandler ext
return false;
}
-
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.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/ServerSideWindowHandler.java?rev=1041333&r1=1041332&r2=1041333&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/ServerSideWindowHandler.java Thu Dec 2 11:34:27 2010
@@ -39,7 +39,7 @@ import java.io.IOException;
*/
@SuppressWarnings({"UnusedDeclaration"})
@Alternative
-public abstract class ServerSideWindowHandler extends DefaultWindowHandler
+public class ServerSideWindowHandler extends DefaultWindowHandler
{
private static final long serialVersionUID = 4040116087475343221L;