You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ca...@apache.org on 2007/02/06 14:19:50 UTC
svn commit: r504128 - in
/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation:
common/CVUtils.java validationscript/ValidationScriptRenderer.java
Author: cagatay
Date: Tue Feb 6 05:19:49 2007
New Revision: 504128
URL: http://svn.apache.org/viewvc?view=rev&rev=504128
Log:
Moved javascript includes to CVUtils for reuse later(Extended Form)
Modified:
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/common/CVUtils.java
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/validationscript/ValidationScriptRenderer.java
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/common/CVUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/common/CVUtils.java?view=diff&rev=504128&r1=504127&r2=504128
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/common/CVUtils.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/common/CVUtils.java Tue Feb 6 05:19:49 2007
@@ -31,7 +31,10 @@
import javax.faces.convert.Converter;
import javax.faces.validator.Validator;
+import org.apache.myfaces.custom.clientvalidation.validationscript.ValidationScript;
import org.apache.myfaces.custom.util.ComponentUtils;
+import org.apache.myfaces.renderkit.html.util.AddResource;
+import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
/**
@@ -171,14 +174,19 @@
writer.write("\t\t }\n");
}
- public static ClassLoader getCurrentLoader(Object defaultObject)
- {
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- if(loader == null)
- {
- loader = defaultObject.getClass().getClassLoader();
- }
- return loader;
- }
+ //renders included resources
+ public static void encodeJavascript(FacesContext context)throws IOException {
+ AddResource addResource = AddResourceFactory.getInstance(context);
+
+ //Common
+ addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, "common.js");
+
+ //MessageBundle
+ addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, CVUtils.getJSMessageBundle(context));
+
+ //Converters and Validators
+ addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, "converters.js");
+ addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, "validators.js");
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/validationscript/ValidationScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/validationscript/ValidationScriptRenderer.java?view=diff&rev=504128&r1=504127&r2=504128
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/validationscript/ValidationScriptRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/clientvalidation/validationscript/ValidationScriptRenderer.java Tue Feb 6 05:19:49 2007
@@ -25,8 +25,6 @@
import javax.faces.render.Renderer;
import org.apache.myfaces.custom.clientvalidation.common.CVUtils;
-import org.apache.myfaces.renderkit.html.util.AddResource;
-import org.apache.myfaces.renderkit.html.util.AddResourceFactory;
import org.apache.myfaces.shared_tomahawk.renderkit.RendererUtils;
/**
@@ -39,24 +37,10 @@
RendererUtils.checkParamValidity(context, component,ValidationScript.class);
if (CVUtils.isCVEnabled()) {
- encodeJavascript(context, component);
+ CVUtils.encodeJavascript(context);
CVUtils.queueCVCalls(context.getViewRoot());
CVUtils.encodeValidationScript(context);
}
- }
-
- private void encodeJavascript(FacesContext context, UIComponent component)throws IOException {
- AddResource addResource = AddResourceFactory.getInstance(context);
-
- //Common
- addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, "common.js");
-
- //MessageBundle
- addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, CVUtils.getJSMessageBundle(context));
-
- //Converters and Validators
- addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, "converters.js");
- addResource.addJavaScriptAtPosition(context, AddResource.HEADER_BEGIN,ValidationScript.class, "validators.js");
}
}