myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r691240 - in /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController: ViewControllerFactory.java ViewControllerManagerFactory.java jsf/ViewControllerPhaseListener.java jsf/ViewControllerVariableResolver.java
Date Tue, 02 Sep 2008 13:27:46 GMT
Author: skitching
Date: Tue Sep  2 06:27:42 2008
New Revision: 691240

URL: http://svn.apache.org/viewvc?rev=691240&view=rev
Log:
Rename class after discussion with Mario.

Added:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
  (contents, props changed)
      - copied, changed from r691228, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerFactory.java
Removed:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerFactory.java
Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java

Copied: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
(from r691228, myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerFactory.java)
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java?p2=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java&p1=myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerFactory.java&r1=691228&r2=691240&rev=691240&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerFactory.java
(original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
Tue Sep  2 06:27:42 2008
@@ -21,14 +21,23 @@
 import org.apache.myfaces.orchestra.frameworkAdapter.FrameworkAdapter;
 
 /**
- * Lookup the viewController. <br />
- * If a bean with name "org.apache.myfaces.orchestra.viewController.ViewControllerManager"
exists this view controller
- * will be used, else the {@link DefaultViewControllerManager} will be used.
+ * Provides facility to look up the ViewControllerManager instance that is used by
+ * Orchestra to invoke lifecycle methods on "controller beans" associated with the
+ * current view.
+ * <p>
  */
-public class ViewControllerFactory
+public class ViewControllerManagerFactory
 {
     private final static ViewControllerManager DEFAULT_VCM = new DefaultViewControllerManager();
 
+    /**
+     * Returns the singleton ViewControllerManager object.
+     * <p>
+     * If a bean with name "org.apache.myfaces.orchestra.viewController.ViewControllerManager"
exists
+     * then this is returned. This bean is expected to be a singleton.
+     * <p>
+     * Otherwise a singleton instance of {@link DefaultViewControllerManager} will be returned.
+     */
     public static ViewControllerManager getInstance()
     {
         ViewControllerManager manager = (ViewControllerManager)

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/ViewControllerManagerFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java?rev=691240&r1=691239&r2=691240&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
(original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerPhaseListener.java
Tue Sep  2 06:27:42 2008
@@ -19,7 +19,7 @@
 
 package org.apache.myfaces.orchestra.viewController.jsf;
 
-import org.apache.myfaces.orchestra.viewController.ViewControllerFactory;
+import org.apache.myfaces.orchestra.viewController.ViewControllerManagerFactory;
 import org.apache.myfaces.orchestra.viewController.ViewControllerManager;
 
 import javax.faces.component.UIViewRoot;
@@ -130,7 +130,7 @@
      */
     protected void assertConversationState(FacesContext facesContext)
     {
-        ViewControllerManager manager = ViewControllerFactory.getInstance();
+        ViewControllerManager manager = ViewControllerManagerFactory.getInstance();
         if (manager == null)
         {
             return;
@@ -150,7 +150,7 @@
      */
     protected void preRenderResponse(FacesContext facesContext)
     {
-        ViewControllerManager manager = ViewControllerFactory.getInstance();
+        ViewControllerManager manager = ViewControllerManagerFactory.getInstance();
         if (manager == null)
         {
             return;
@@ -179,7 +179,7 @@
      */
     protected void postRestoreView(FacesContext facesContext)
     {
-        ViewControllerManager manager = ViewControllerFactory.getInstance();
+        ViewControllerManager manager = ViewControllerManagerFactory.getInstance();
         if (manager == null)
         {
             return;
@@ -222,7 +222,7 @@
      */
     protected void preInvokeApplication(FacesContext facesContext)
     {
-        ViewControllerManager manager = ViewControllerFactory.getInstance();
+        ViewControllerManager manager = ViewControllerManagerFactory.getInstance();
         if (manager == null)
         {
             return;

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java?rev=691240&r1=691239&r2=691240&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java
(original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/viewController/jsf/ViewControllerVariableResolver.java
Tue Sep  2 06:27:42 2008
@@ -18,13 +18,13 @@
  */
 package org.apache.myfaces.orchestra.viewController.jsf;
 
-import org.apache.myfaces.orchestra.viewController.ViewControllerFactory;
-import org.apache.myfaces.orchestra.viewController.ViewControllerManager;
-
 import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.apache.myfaces.orchestra.viewController.ViewControllerManager;
+import org.apache.myfaces.orchestra.viewController.ViewControllerManagerFactory;
+
 /**
  * Provides a way to access the viewController through the JSF expression language (EL)
  * using the special variable name <code>oxViewController</code>.
@@ -44,7 +44,7 @@
     {
         if (VIEW_CONTROLLER_VARIABLE.equals(variableName))
         {
-            ViewControllerManager manager = ViewControllerFactory.getInstance();
+            ViewControllerManager manager = ViewControllerManagerFactory.getInstance();
             return manager.getViewController(facesContext.getViewRoot().getViewId());
         }
 



Mime
View raw message