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/04/01 05:33:24 UTC

svn commit: r1087570 - /myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java

Author: lu4242
Date: Fri Apr  1 03:33:23 2011
New Revision: 1087570

URL: http://svn.apache.org/viewvc?rev=1087570&view=rev
Log:
MYFACES-3102 FaceletViewDeclarationLanguage.getRenderedViewId is not necessary anymore since JSF 2.0

Modified:
    myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java

Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=1087570&r1=1087569&r2=1087570&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java Fri Apr  1 03:33:23 2011
@@ -1743,6 +1743,10 @@ public class FaceletViewDeclarationLangu
         return writer;
     }
 
+    /**
+     * @deprecated this code is not used anymore
+     */
+    @Deprecated
     protected String getDefaultSuffix(FacesContext context) throws FacesException
     {
         if (_defaultSuffix == null)
@@ -1757,25 +1761,13 @@ public class FaceletViewDeclarationLangu
         return _defaultSuffix;
     }
 
+    /**
+     * @deprecated 
+     */
+    @Deprecated
     protected String getRenderedViewId(FacesContext context, String actionId)
     {
-        ExternalContext eContext = context.getExternalContext();
-        String viewId = actionId;
-        if (eContext.getRequestPathInfo() == null)
-        {
-            String viewSuffix = getDefaultSuffix(context);
-
-            StringBuilder builder = new StringBuilder(viewId);
-
-            viewId = builder.replace(viewId.lastIndexOf('.'), viewId.length(), viewSuffix).toString();
-        }
-
-        if (log.isLoggable(Level.FINEST))
-        {
-            log.finest("ActionId -> ViewId: " + actionId + " -> " + viewId);
-        }
-
-        return viewId;
+        return actionId;
     }
 
     /**