You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/05/02 15:50:19 UTC

svn commit: r1098565 - in /myfaces/core/branches/2.1.x/api/src/main/java/javax/faces: FactoryFinder.java component/TransientStateHelper.java component/UIComponent.java component/UIData.java event/PostAddToViewNonPDLEvent.java

Author: lu4242
Date: Mon May  2 13:50:18 2011
New Revision: 1098565

URL: http://svn.apache.org/viewvc?rev=1098565&view=rev
Log:
fix API signature for binary compatibility

Removed:
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/event/PostAddToViewNonPDLEvent.java
Modified:
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/FactoryFinder.java
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/TransientStateHelper.java
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIComponent.java
    myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIData.java

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/FactoryFinder.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/FactoryFinder.java?rev=1098565&r1=1098564&r2=1098565&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/FactoryFinder.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/FactoryFinder.java Mon May  2 13:50:18 2011
@@ -187,6 +187,11 @@ public final class FactoryFinder
      */
     public static Object getFactory(String factoryName) throws FacesException
     {
+        if (factoryName == null)
+        {
+            throw new NullPointerException("factoryName may not be null");
+        }
+        
         initializeFactoryFinderProviderFactory();
         
         if (_factoryFinderProviderFactoryInstance == null)
@@ -215,11 +220,6 @@ public final class FactoryFinder
 
     private static Object _getFactory(String factoryName) throws FacesException
     {
-        if (factoryName == null)
-        {
-            throw new NullPointerException("factoryName may not be null");
-        }
-
         ClassLoader classLoader = getClassLoader();
 
         // This code must be synchronized because this could cause a problem when
@@ -367,6 +367,11 @@ public final class FactoryFinder
 
     public static void setFactory(String factoryName, String implName)
     {
+        if (factoryName == null)
+        {
+            throw new NullPointerException("factoryName may not be null");
+        }
+        
         initializeFactoryFinderProviderFactory();
         
         if (_factoryFinderProviderFactoryInstance == null)

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/TransientStateHelper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/TransientStateHelper.java?rev=1098565&r1=1098564&r2=1098565&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/TransientStateHelper.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/TransientStateHelper.java Mon May  2 13:50:18 2011
@@ -35,7 +35,7 @@ package javax.faces.component;
  * @author Leonardo Uribe (latest modification by $Author: slessard $)
  * @version $Revision: 696523 $ $Date: 2009-03-21 10:05:08 -0400 (mer., 17 sept. 2008) $
  */
-public interface TransientStateHelper extends StateHelper, TransientStateHolder
+public interface TransientStateHelper extends TransientStateHolder
 {
     /**
      * <p>Return the value currently

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIComponent.java?rev=1098565&r1=1098564&r2=1098565&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIComponent.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIComponent.java Mon May  2 13:50:18 2011
@@ -163,7 +163,7 @@ public abstract class UIComponent implem
      */
     private transient Map<String, String> _resourceBundleMap = null;
     private boolean _inView = false;
-    private TransientStateHelper _stateHelper = null;
+    private _DeltaStateHelper _stateHelper = null;
     
     /**
      * In JSF 2.0 bindings map was deprecated, and replaced with a map
@@ -896,7 +896,7 @@ public abstract class UIComponent implem
         return _stateHelper;
     }
     
-    public TransientStateHelper getTransientStateHelper()
+    public final TransientStateHelper getTransientStateHelper()
     {
         return getTransientStateHelper(true);
     }

Modified: myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIData.java?rev=1098565&r1=1098564&r2=1098565&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/branches/2.1.x/api/src/main/java/javax/faces/component/UIData.java Mon May  2 13:50:18 2011
@@ -1944,7 +1944,7 @@ public class UIData extends UIComponentB
      * 
      * @return
      */
-    @JSFProperty(literalOnly=true)
+    @JSFProperty(literalOnly=true, faceletsOnly=true)
     public boolean isRowStatePreserved()
     {
         Boolean b = (Boolean) getStateHelper().get(PropertyKeys.rowStatePreserved);