Removed unneeded files and corrected ViewActionUtils

impl/src/main/java/org/jboss/seam/faces/view/action/ViewActionUtils.java

@@ -19,11 +19,12 @@ public class ViewActionUtils {
     private ViewActionUtils() {
     }
 
-    public static PhaseInstant getPhaseInstantOrDefault(List<Annotation> annotations, Object parentElement, PhaseInstant defaultInstant) {
+    public static PhaseInstant getPhaseInstantOrDefault(List<Annotation> annotations, Object parentElement,
+            PhaseInstant defaultInstant) {
         PhaseInstant phaseInstant = getPhaseInstant(annotations, parentElement);
-        return phaseInstant!=null ? phaseInstant : defaultInstant;
+        return phaseInstant != null ? phaseInstant : defaultInstant;
     }
-    
+
     public static PhaseInstant getPhaseInstant(List<Annotation> annotations, Object parentElement) {
         Boolean before = null;
         PhaseId phaseId = null;
@@ -44,55 +45,55 @@ public static PhaseInstant getPhaseInstant(List<Annotation> annotations, Object
             } else if (annotationType == ApplyRequestValues.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 phaseId = PhaseId.APPLY_REQUEST_VALUES;
             } else if (annotationType == ProcessValidations.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 phaseId = PhaseId.PROCESS_VALIDATIONS;
             } else if (annotationType == UpdateModelValues.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 phaseId = PhaseId.UPDATE_MODEL_VALUES;
             } else if (annotationType == InvokeApplication.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 phaseId = PhaseId.INVOKE_APPLICATION;
             } else if (annotationType == RenderResponse.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 phaseId = PhaseId.RENDER_RESPONSE;
             } else if (annotationType == BeforeRenderReponse.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 if (before != null) {
                     throw new IllegalStateException("invalid " + parentElement
                             + ". Cannot be annotated simultaneously with multiples @Before/@After and " + annotationType);
                 }
                 phaseId = PhaseId.RENDER_RESPONSE;
                 before = true;
-            } else if (annotationType == AfterRenderView.class) {
+            } else if (annotationType == AfterRenderResponse.class) {
                 if (phaseId != null) {
                     throw new IllegalStateException("invalid " + parentElement
-                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations (" + annotationType
-                            + " and " + phaseId + ")");
+                            + ". Cannot be annotated simultaneously with multiples JSF lifecycle annotations ("
+                            + annotationType + " and " + phaseId + ")");
                 }
                 if (before != null) {
                     throw new IllegalStateException("invalid " + parentElement
@@ -102,13 +103,13 @@ public static PhaseInstant getPhaseInstant(List<Annotation> annotations, Object
                 before = false;
             }
         }
-        if (before==null && phaseId==null) {
+        if (before == null && phaseId == null) {
             return null;
-        } else if (before!=null && phaseId!=null) {
+        } else if (before != null && phaseId != null) {
             return new PhaseInstant(phaseId, before);
         } else {
             throw new IllegalStateException("invalid " + parentElement
-                    + ". both phaseId and @Before/@After must be specified {phaseId: " + phaseId+", before: "+before+"}");
+                    + ". both phaseId and @Before/@After must be specified {phaseId: " + phaseId + ", before: " + before + "}");
         }
     }
 }