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 2011/11/01 17:18:11 UTC
svn commit: r1196091 - in /myfaces/extensions/cdi/trunk/jee-modules:
jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/
jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversa...
Author: gpetracek
Date: Tue Nov 1 16:18:10 2011
New Revision: 1196091
URL: http://svn.apache.org/viewvc?rev=1196091&view=rev
Log:
EXTCDI-232 minor refactoring
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RestParameters.java
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/JsfRestParameters.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RestParameters.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RestParameters.java?rev=1196091&r1=1196090&r2=1196091&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RestParameters.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/scope/conversation/RestParameters.java Tue Nov 1 16:18:10 2011
@@ -18,19 +18,12 @@
*/
package org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation;
-import javax.enterprise.context.RequestScoped;
-import java.io.Serializable;
-
-
/**
* This class holds information about the last used RestParameters for a given window.
*/
// this could be @WindowScoped, but due to a bug in OpenWebBeans 1.1.1 and below, we get passivation errors
-@RequestScoped
-public class RestParameters implements Serializable
+public abstract class RestParameters
{
- private static final long serialVersionUID = 3066621432740911704L;
-
/**
* Check and update the view parameters of the given viewId.
*
@@ -38,17 +31,10 @@ public class RestParameters implements S
* @return <code>true</code> if the viewParameters are now different than at the last invocation.
* In this default implementation it always returns false!
*/
- public boolean checkForNewViewParameters()
- {
- return false;
- }
+ public abstract boolean checkForNewViewParameters();
/**
* This method will get called to reset the stored viewParameters
*/
- public void reset()
- {
- // do nothing by default
- }
-
+ public abstract void reset();
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/JsfRestParameters.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/JsfRestParameters.java?rev=1196091&r1=1196090&r2=1196091&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/JsfRestParameters.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/scope/conversation/JsfRestParameters.java Tue Nov 1 16:18:10 2011
@@ -24,7 +24,6 @@ import org.apache.myfaces.extensions.cdi
import org.apache.myfaces.extensions.cdi.jsf.impl.scope.conversation.RestParameters;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.Specializes;
import javax.faces.component.UIViewParameter;
import javax.faces.context.FacesContext;
import javax.faces.event.PhaseEvent;
@@ -37,7 +36,6 @@ import java.util.HashMap;
* This class holds information about the last used RestParameters for a given JSF view.
*/
@WindowScoped
-@Specializes
public class JsfRestParameters extends RestParameters implements Serializable
{
private static final long serialVersionUID = 1349109309042072780L;