You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sl...@apache.org on 2008/11/13 00:06:58 UTC

svn commit: r713548 - in /myfaces/core/branches/2_0_0: api/src/main/java/javax/faces/context/ExternalContext.java impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

Author: slessard
Date: Wed Nov 12 15:06:57 2008
New Revision: 713548

URL: http://svn.apache.org/viewvc?rev=713548&view=rev
Log:
MYFACES-1936 - Implement ExternalContext.getRequestScheme

Modified:
    myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java
    myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java

Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java?rev=713548&r1=713547&r2=713548&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/context/ExternalContext.java Wed Nov 12 15:06:57 2008
@@ -147,9 +147,7 @@
      */
     public String getRequestScheme()
     {
-        // TODO: JSF 2.0 #26
-        // VALIDATE: Should this be asbtract or throws UnsupportedOperationException? Check with the EG
-        return null;
+        throw new UnsupportedOperationException();
     }
 
     /**

Modified: myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=713548&r1=713547&r2=713548&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/branches/2_0_0/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Wed Nov 12 15:06:57 2008
@@ -300,6 +300,12 @@
     }
 
     @Override
+    public String getRequestScheme()
+    {
+        return _servletRequest.getScheme();
+    }
+
+    @Override
     @SuppressWarnings("unchecked")
     public Set<String> getResourcePaths(final String path)
     {