[richfaces-svn-commits] JBoss Rich Faces SVN: r2823 - trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle.
richfaces-svn-commits at lists.jboss.org
richfaces-svn-commits at lists.jboss.org
Sun Sep 9 11:42:43 EDT 2007
Author: nbelaevski
Date: 2007-09-09 11:42:43 -0400 (Sun, 09 Sep 2007)
New Revision: 2823
Modified:
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
Log:
extensions/portlet made compileable - Java 5 elements removed
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ApplyValuesPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -27,7 +27,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
nextPhase.execute(context, listeners);
@@ -36,7 +35,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
context.getViewRoot().processDecodes(context);
}
@@ -44,7 +42,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
// TODO Auto-generated method stub
return PhaseId.APPLY_REQUEST_VALUES;
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/InvokeApplicationPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -24,7 +24,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
// do nothing.
@@ -34,7 +33,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
context.getViewRoot().processApplication(context);
}
@@ -42,7 +40,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
return PhaseId.INVOKE_APPLICATION;
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycle.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -17,7 +17,8 @@
*/
public class PortletLifecycle extends Lifecycle {
- private final List<PhaseListener> _phaseListeners = new ArrayList<PhaseListener>();
+ //List<PhaseListener>
+ private final List _phaseListeners = new ArrayList();
private final LifecyclePhase executePhase = new RestoreViewPhase(this);
@@ -65,7 +66,7 @@
if (_phaseListenersArray == null) {
// Lazy creation of a working copy listeners Array.
synchronized (_phaseListeners) {
- _phaseListenersArray = _phaseListeners.toArray(new PhaseListener[_phaseListeners.size()]);
+ _phaseListenersArray = (PhaseListener[]) _phaseListeners.toArray(new PhaseListener[_phaseListeners.size()]);
}
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/PortletLifecycleFactory.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -37,7 +37,8 @@
private LifecycleFactory _defaultFactory;
- private final Map<String, Lifecycle> _lifecycles = new HashMap<String, Lifecycle>(1);
+ //Map<String, Lifecycle>
+ private final Map _lifecycles = new HashMap(1);
// private Map _lifecycles = new HashMap();
@@ -68,7 +69,7 @@
if(null == lifecycleId ){
throw new NullPointerException("argument for a removeLifecycle method can't be null");
}
- return _lifecycles.get(lifecycleId);
+ return (Lifecycle) _lifecycles.get(lifecycleId);
}
/* (non-Javadoc)
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/ProcessValidatorsPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -27,7 +27,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
nextPhase.execute(context, listeners);
@@ -37,7 +36,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
context.getViewRoot().processValidators(context);
@@ -46,7 +44,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
return PhaseId.PROCESS_VALIDATIONS;
}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RenderResponsePhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -27,7 +27,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
*/
- @Override
protected void executeNextPhase(FacesContext context,
PhaseListener[] listeners) {
// do nothing.
@@ -37,7 +36,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
*/
- @Override
protected void executePhase(FacesContext context) {
try {
context.getApplication().getViewHandler().
@@ -52,7 +50,6 @@
/* (non-Javadoc)
* @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
*/
- @Override
protected PhaseId getPhaseId() {
// TODO Auto-generated method stub
return PhaseId.RENDER_RESPONSE;
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/RestoreViewPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -1,53 +1,50 @@
-/**
- *
- */
-package org.ajax4jsf.portlet.lifecycle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-
-/**
- * @author asmirnov
- *
- */
-public class RestoreViewPhase extends LifecyclePhase {
-
- private final LifecyclePhase nextPhase;
-
- /**
- * @param lifecycle
- */
- public RestoreViewPhase(Lifecycle lifecycle) {
- super(lifecycle);
- nextPhase = new ApplyValuesPhase(lifecycle);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
- */
- @Override
- protected void executeNextPhase(FacesContext context,
- PhaseListener[] listeners) {
- nextPhase.execute(context, listeners);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
- */
- @Override
- protected void executePhase(FacesContext context) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
- */
- @Override
- protected PhaseId getPhaseId() {
- return PhaseId.RESTORE_VIEW;
- }
-
-}
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class RestoreViewPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+
+ /**
+ * @param lifecycle
+ */
+ public RestoreViewPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new ApplyValuesPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ protected void executePhase(FacesContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ protected PhaseId getPhaseId() {
+ return PhaseId.RESTORE_VIEW;
+ }
+
+}
Modified: trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java
===================================================================
--- trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java 2007-09-08 13:24:14 UTC (rev 2822)
+++ trunk/extensions/portlet/src/main/java/org/ajax4jsf/portlet/lifecycle/UpdateModelPhase.java 2007-09-09 15:42:43 UTC (rev 2823)
@@ -1,53 +1,50 @@
-/**
- *
- */
-package org.ajax4jsf.portlet.lifecycle;
-
-import javax.faces.context.FacesContext;
-import javax.faces.event.PhaseId;
-import javax.faces.event.PhaseListener;
-import javax.faces.lifecycle.Lifecycle;
-
-/**
- * @author asmirnov
- *
- */
-public class UpdateModelPhase extends LifecyclePhase {
-
- private final LifecyclePhase nextPhase;
- /**
- * @param lifecycle
- */
- public UpdateModelPhase(Lifecycle lifecycle) {
- super(lifecycle);
- nextPhase = new InvokeApplicationPhase(lifecycle);
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
- */
- @Override
- protected void executeNextPhase(FacesContext context,
- PhaseListener[] listeners) {
- nextPhase.execute(context, listeners);
-
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
- */
- @Override
- protected void executePhase(FacesContext context) {
- // TODO Auto-generated method stub
-
- }
-
- /* (non-Javadoc)
- * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
- */
- @Override
- protected PhaseId getPhaseId() {
- return PhaseId.UPDATE_MODEL_VALUES;
- }
-
-}
+/**
+ *
+ */
+package org.ajax4jsf.portlet.lifecycle;
+
+import javax.faces.context.FacesContext;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+import javax.faces.lifecycle.Lifecycle;
+
+/**
+ * @author asmirnov
+ *
+ */
+public class UpdateModelPhase extends LifecyclePhase {
+
+ private final LifecyclePhase nextPhase;
+ /**
+ * @param lifecycle
+ */
+ public UpdateModelPhase(Lifecycle lifecycle) {
+ super(lifecycle);
+ nextPhase = new InvokeApplicationPhase(lifecycle);
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executeNextPhase(javax.faces.context.FacesContext, javax.faces.event.PhaseListener[])
+ */
+ protected void executeNextPhase(FacesContext context,
+ PhaseListener[] listeners) {
+ nextPhase.execute(context, listeners);
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#executePhase(javax.faces.context.FacesContext)
+ */
+ protected void executePhase(FacesContext context) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.portlet.lifecycle.LifecyclePhase#getPhaseId()
+ */
+ protected PhaseId getPhaseId() {
+ return PhaseId.UPDATE_MODEL_VALUES;
+ }
+
+}
More information about the richfaces-svn-commits
mailing list