You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2007/03/25 01:07:30 UTC

svn commit: r522131 - /myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Author: dennisbyrne
Date: Sat Mar 24 17:07:30 2007
New Revision: 522131

URL: http://svn.apache.org/viewvc?view=rev&rev=522131
Log:
refactored

Modified:
    myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?view=diff&rev=522131&r1=522130&r2=522131
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Sat Mar 24 17:07:30 2007
@@ -865,9 +865,11 @@
         writer.startElement(HTML.SCRIPT_ELEM, null);
         writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
 
-        boolean autoScroll = MyfacesConfig.getCurrentInstance(facesContext.getExternalContext()).isAutoScroll();
+        final ExternalContext externalContext = facesContext.getExternalContext();
+		final MyfacesConfig currentInstance = MyfacesConfig.getCurrentInstance(externalContext);
+		boolean autoScroll = currentInstance.isAutoScroll();
 
-        ScriptContext context = new ScriptContext(MyfacesConfig.getCurrentInstance(facesContext.getExternalContext())
+        ScriptContext context = new ScriptContext(currentInstance
             .isPrettyHtml());
         context.prettyLine();
         context.increaseIndent();
@@ -1275,13 +1277,11 @@
             return "'" +CLEAR_HIDDEN_FIELD_FN_NAME
                 + "_'+formName.replace(/-/g, '\\$"+NamingContainer.SEPARATOR_CHAR+"').replace(/"+NamingContainer.SEPARATOR_CHAR+"/g,'_')";
         }
-         else
-        {
-            return JavascriptUtils.getValidJavascriptNameAsInRI(CLEAR_HIDDEN_FIELD_FN_NAME
+        
+        return JavascriptUtils.getValidJavascriptNameAsInRI(CLEAR_HIDDEN_FIELD_FN_NAME
                 + "_"
                 + formName
                 .replace(NamingContainer.SEPARATOR_CHAR, '_'));
-        }
     }
 
     public static String getClearHiddenCommandFormParamsFunctionNameMyfacesLegacy(