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 2009/07/11 04:19:26 UTC

svn commit: r793165 - in /myfaces/core/trunk/api/src/main/java/javax/faces: application/Application.java context/ExternalContext.java

Author: lu4242
Date: Sat Jul 11 02:19:26 2009
New Revision: 793165

URL: http://svn.apache.org/viewvc?rev=793165&view=rev
Log:
remove abstract from methods to allow myfaces-test compile

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java
    myfaces/core/trunk/api/src/main/java/javax/faces/context/ExternalContext.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java?rev=793165&r1=793164&r2=793165&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/Application.java Sat Jul 11 02:19:26 2009
@@ -19,6 +19,7 @@
 package javax.faces.application;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
@@ -570,7 +571,18 @@
      * 
      * FIXME: Notify EG, this should not be abstract and throw UnsupportedOperationException
      */
-    public abstract Iterator<String> getBehaviorIds();
+    public Iterator<String> getBehaviorIds()
+    {
+        Application application = getMyfacesApplicationInstance();
+        if (application != null)
+        {
+            return application.getBehaviorIds();
+        }
+        // It is better to return an empty iterator,
+        // to keep compatiblity with previous jsf 2.0 Application
+        // instances
+        return Collections.EMPTY_LIST.iterator();
+    }
 
     /**
      * Return an <code>Iterator</code> over the set of currently defined component types for this

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/ExternalContext.java?rev=793165&r1=793164&r2=793165&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/ExternalContext.java Sat Jul 11 02:19:26 2009
@@ -87,7 +87,11 @@
     /**
      * @since 2.0
      */
-    public abstract String encodePartialActionURL(String url);     // TODO: IMPLEMENT IMPL
+    public String encodePartialActionURL(String url)
+    {
+        // TODO: IMPLEMENT IMPL
+        throw new UnsupportedOperationException();
+    }
 
     /**
      *