vgritsenko 02/04/05 22:27:40
Modified: src/java/org/apache/cocoon/components/language/markup/xsp
XSPFormValidatorHelper.java
Log:
1. Use source resolver to resolve sources
2. Compare last modification time on !=
3. Cache descriptors using system ID
Revision Changes Path
1.8 +303 -408
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
Index: XSPFormValidatorHelper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSPFormValidatorHelper.java 22 Feb 2002 07:00:08 -0000 1.7
+++ XSPFormValidatorHelper.java 6 Apr 2002 06:27:39 -0000 1.8
@@ -50,18 +50,18 @@
*/
package org.apache.cocoon.components.language.markup.xsp;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
+
import org.apache.cocoon.Constants;
import org.apache.cocoon.acting.ConfigurationHelper;
import org.apache.cocoon.acting.ValidatorActionResult;
-import org.apache.cocoon.components.source.SourceHandler;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.Source;
+import org.apache.cocoon.environment.SourceResolver;
+
import org.apache.log.Logger;
import java.util.HashMap;
@@ -71,14 +71,10 @@
* The <code>ValidatorActionResult</code> object helper
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christian Haul</a>
- * @version CVS $Id: XSPFormValidatorHelper.java,v 1.7 2002/02/22 07:00:08
cziegeler Exp $
+ * @version CVS $Id: XSPFormValidatorHelper.java,v 1.8 2002/04/06 06:27:39
vgritsenko Exp $
*/
public class XSPFormValidatorHelper {
- /**
- * Assign values to the object's namespace uri and prefix
- */
- private static final String URI = Constants.XSP_FORMVALIDATOR_URI;
- private static final String PREFIX = Constants.XSP_FORMVALIDATOR_PREFIX;
+
private static Map configurations = new HashMap();
/**
@@ -90,244 +86,187 @@
Logger current_logger = null;
String current_constraint_set = null;
String current_parameter = null;
- ComponentManager current_manager = null;
+ SourceResolver current_resolver = null;
- public XSPFormValidatorHelper ( String descriptor,
- boolean reloadable,
- Logger logger,
- ComponentManager manager
- ) {
- current_descriptor = descriptor;
- current_reloadable = reloadable;
- current_logger = logger;
- current_manager = manager;
- }
-
- public XSPFormValidatorHelper ( String descriptor,
- boolean reloadable,
- Logger logger,
- ComponentManager manager,
- String constraintset
- ) {
- current_descriptor = descriptor;
- current_reloadable = reloadable;
- current_logger = logger;
- current_manager = manager;
- current_constraint_set = constraintset;
+ public XSPFormValidatorHelper(String descriptor, boolean reloadable,
+ Logger logger, SourceResolver resolver) {
+ current_descriptor = descriptor;
+ current_reloadable = reloadable;
+ current_logger = logger;
+ current_resolver = resolver;
+ }
+
+ public XSPFormValidatorHelper(String descriptor, boolean reloadable,
+ Logger logger, SourceResolver resolver,
+ String constraintset) {
+ current_descriptor = descriptor;
+ current_reloadable = reloadable;
+ current_logger = logger;
+ current_resolver = resolver;
+ current_constraint_set = constraintset;
}
/**
* keep track of current parameter context
*/
- public void setParameter ( String parameter ) {
- current_parameter = parameter;
+ public void setParameter(String parameter) {
+ current_parameter = parameter;
}
/**
* keep track of current constraint-set context
* (probably this is not needed?)
*/
- public void setConstraintSet ( String constraintset ) {
- current_constraint_set = constraintset;
+ public void setConstraintSet(String constraintset) {
+ current_constraint_set = constraintset;
+ }
+
+ /**
+ * Get the specified attribute
+ *
+ * @param objectModel The Map objectModel
+ * @param name The parameter name
+ */
+ public static Object getAttribute(Map objectModel, String name) {
+ Request request = ObjectModelHelper.getRequest(objectModel);
+ return request.getAttribute(name);
+ }
+
+ /**
+ * Extracts the validation results from the request attribute
+ *
+ * @param objectModel The Map objectModel
+ * @return Map with ValidatorActionResults
+ * @see org.apache.cocoon.acting.ValidatorActionResult
+ */
+ public static Map getResults(Map objectModel) {
+ Request request = ObjectModelHelper.getRequest(objectModel);
+ return (Map) request.getAttribute(Constants.XSP_FORMVALIDATOR_PATH);
+ }
+
+
+ /**
+ * Extracts the validation results from the request attribute
+ * for a specific request parameter
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @see org.apache.cocoon.acting.ValidatorActionResult
+ */
+ public static ValidatorActionResult getParamResult(Map objectModel,
+ String name) {
+ ValidatorActionResult result = ValidatorActionResult.NOTPRESENT;
+ Map param_result = (Map) getResults(objectModel);
+ if (param_result != null) {
+ result = (ValidatorActionResult) param_result.get(name);
+ }
+ return result;
+ }
+
+ /**
+ * Extracts the validation results from the request attribute
+ * for the context's current request parameter
+ *
+ * @param objectModel The Map objectModel
+ * @see org.apache.cocoon.acting.ValidatorActionResult
+ */
+ public ValidatorActionResult getParamResult(Map objectModel) {
+ ValidatorActionResult result = ValidatorActionResult.NOTPRESENT;
+ Map param_result = (Map) getResults(objectModel);
+ if (param_result != null) {
+ result = (ValidatorActionResult) param_result.get(current_parameter);
+ }
+ return result;
}
- /**
- * Get the specified attribute
- *
- * @param objectModel The Map objectModel
- * @param name The parameter name
- */
- public static Object getAttribute(
- Map objectModel,
- String name) {
-
- Request request = ObjectModelHelper.getRequest(objectModel);
- return request.getAttribute(name);
- }
-
- /**
- * Extracts the validation results from the request attribute
- *
- * @param objectModel The Map objectModel
- * @return Map with ValidatorActionResults
- * @see org.apache.cocoon.acting.ValidatorActionResult
- */
- public static
- Map getResults (
- Map objectModel
- )
- {
- Request request = ObjectModelHelper.getRequest(objectModel);
- return (Map) request.getAttribute(Constants.XSP_FORMVALIDATOR_PATH);
- }
-
-
-
- /**
- * Extracts the validation results from the request attribute
- * for a specific request parameter
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @see org.apache.cocoon.acting.ValidatorActionResult
- */
- public static
- ValidatorActionResult getParamResult (
- Map objectModel,
- String name
- )
- {
- ValidatorActionResult result = ValidatorActionResult.NOTPRESENT;
- Map param_result = (Map) getResults(objectModel);
- if (param_result != null ) {
- result = (ValidatorActionResult) param_result.get(name);
- }
- return result;
- }
-
- /**
- * Extracts the validation results from the request attribute
- * for the context's current request parameter
- *
- * @param objectModel The Map objectModel
- * @see org.apache.cocoon.acting.ValidatorActionResult
- */
- public
- ValidatorActionResult getParamResult (
- Map objectModel
- )
- {
- ValidatorActionResult result = ValidatorActionResult.NOTPRESENT;
- Map param_result = (Map) getResults(objectModel);
- if (param_result != null ) {
- result = (ValidatorActionResult) param_result.get(current_parameter);
- }
- return result;
- }
-
-
- /**
- * Test whether the validation returned no error for this
- * parameter.
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true only if the parameter was validated and the validation
- * did not return an error.
- */
- public static
- boolean isOK(
- Map objectModel,
- String name
- )
- {
- boolean ok = false;
- return getParamResult(objectModel, name).equals(ValidatorActionResult.OK);
- }
-
- /**
- * Test whether the validation returned no error for the
- * context's current parameter.
- *
- * @param objectModel The Map objectModel
- * @return true only if the parameter was validated and the validation
- * did not return an error.
- */
- public
- boolean isOK(
- Map objectModel
- )
- {
+
+ /**
+ * Test whether the validation returned no error for this
+ * parameter.
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true only if the parameter was validated and the validation
+ * did not return an error.
+ */
+ public static boolean isOK(Map objectModel, String name) {
+ return getParamResult(objectModel, name).equals(ValidatorActionResult.OK);
+ }
+
+ /**
+ * Test whether the validation returned no error for the
+ * context's current parameter.
+ *
+ * @param objectModel The Map objectModel
+ * @return true only if the parameter was validated and the validation
+ * did not return an error.
+ */
+ public boolean isOK(Map objectModel) {
return isOK(objectModel, current_parameter);
}
- /**
- * Test whether the validation returned an error for this
- * parameter.
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true if the parameter was either not validated or the validation
- * returned an error.
- */
- public static
- boolean isError(
- Map objectModel,
- String name
- )
- {
- boolean ok = false;
+ /**
+ * Test whether the validation returned an error for this
+ * parameter.
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true if the parameter was either not validated or the validation
+ * returned an error.
+ */
+ public static boolean isError(Map objectModel, String name) {
return getParamResult(objectModel, name).ge(ValidatorActionResult.ERROR);
}
- /**
- * Test whether the validation returned an error for the
- * context's current parameter.
- *
- * @param objectModel The Map objectModel
- * @return true if the parameter was either not validated or the validation
- * returned an error.
- */
- public
- boolean isError(
- Map objectModel
- )
- {
+ /**
+ * Test whether the validation returned an error for the
+ * context's current parameter.
+ *
+ * @param objectModel The Map objectModel
+ * @return true if the parameter was either not validated or the validation
+ * returned an error.
+ */
+ public boolean isError(Map objectModel) {
return isError(objectModel, current_parameter);
}
- /**
- * Test whether the validated parameter was null but wasn't allowed to.
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true if the parameter was validated and the validation
- * returned an error because the parameter was null but wasn't allowd to.
- */
- public static
- boolean isNull(
- Map objectModel,
- String name
- )
- {
- boolean ok = false;
- return getParamResult(objectModel, name).equals(ValidatorActionResult.ISNULL);
- }
-
- /**
- * Test whether the context's current parameter as validated was null but
- * wasn't allowed to.
- *
- * @param objectModel The Map objectModel
- * @return true if the parameter was validated and the validation
- * returned an error because the parameter was null but wasn't allowd to.
- */
- public
- boolean isNull(
- Map objectModel
- )
- {
+ /**
+ * Test whether the validated parameter was null but wasn't allowed to.
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true if the parameter was validated and the validation
+ * returned an error because the parameter was null but wasn't allowd to.
+ */
+ public static boolean isNull(Map objectModel, String name) {
+ return getParamResult(objectModel,
name).equals(ValidatorActionResult.ISNULL);
+ }
+
+ /**
+ * Test whether the context's current parameter as validated was null but
+ * wasn't allowed to.
+ *
+ * @param objectModel The Map objectModel
+ * @return true if the parameter was validated and the validation
+ * returned an error because the parameter was null but wasn't allowd to.
+ */
+ public boolean isNull(Map objectModel) {
return isNull(objectModel, current_parameter);
}
- /**
- * Test whether the validated parameter was too small.
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true if the parameter was validated and the validation
- * returned an error because either its value or its length was
- * too small.
- */
- public static
- boolean isTooSmall(
- Map objectModel,
- String name
- )
- {
+ /**
+ * Test whether the validated parameter was too small.
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true if the parameter was validated and the validation
+ * returned an error because either its value or its length was
+ * too small.
+ */
+ public static boolean isTooSmall(Map objectModel, String name) {
boolean ok = getParamResult(objectModel,
name).equals(ValidatorActionResult.TOOSMALL);
if (!ok) {
@@ -337,125 +276,91 @@
return ok;
}
- /**
- * Test whether the context's current parameter was too small.
- *
- * @param objectModel The Map objectModel
- * @return true if the parameter was validated and the validation
- * returned an error because either its value or its length was
- * too small.
- */
- public
- boolean isTooSmall(
- Map objectModel
- )
- {
+ /**
+ * Test whether the context's current parameter was too small.
+ *
+ * @param objectModel The Map objectModel
+ * @return true if the parameter was validated and the validation
+ * returned an error because either its value or its length was
+ * too small.
+ */
+ public boolean isTooSmall(Map objectModel) {
return isTooSmall(objectModel, current_parameter);
}
- /**
- * Test whether the validated parameter was too large.
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true if the parameter was validated and the validation
- * returned an error because either its value or its length was
- * too large.
- */
- public static
- boolean isTooLarge(
- Map objectModel,
- String name
- )
- {
- boolean ok = false;
- return (getParamResult(objectModel, name) == ValidatorActionResult.TOOLARGE);
- }
-
- /**
- * Test whether the context's current parameter was too large.
- *
- * @param objectModel The Map objectModel
- * @return true if the parameter was validated and the validation
- * returned an error because either its value or its length was
- * too large.
- */
- public
- boolean isTooLarge(
- Map objectModel
- )
- {
+ /**
+ * Test whether the validated parameter was too large.
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true if the parameter was validated and the validation
+ * returned an error because either its value or its length was
+ * too large.
+ */
+ public static boolean isTooLarge(Map objectModel, String name) {
+ return (getParamResult(objectModel, name) ==
ValidatorActionResult.TOOLARGE);
+ }
+
+ /**
+ * Test whether the context's current parameter was too large.
+ *
+ * @param objectModel The Map objectModel
+ * @return true if the parameter was validated and the validation
+ * returned an error because either its value or its length was
+ * too large.
+ */
+ public boolean isTooLarge(Map objectModel) {
return isTooLarge(objectModel, current_parameter);
}
- /**
- * Test whether the validated parameter wasn't matched by the requested
- * regular expression.
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true if the parameter was validated and the validation
- * returned an error because its value wasn't matched by the requested
- * regular expression.
- */
- public static
- boolean isNoMatch(
- Map objectModel,
- String name
- )
- {
- boolean ok = false;
+ /**
+ * Test whether the validated parameter wasn't matched by the requested
+ * regular expression.
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true if the parameter was validated and the validation
+ * returned an error because its value wasn't matched by the requested
+ * regular expression.
+ */
+ public static boolean isNoMatch(Map objectModel, String name) {
return getParamResult(objectModel,
name).equals(ValidatorActionResult.NOMATCH);
}
- /**
- * Test whether the context's current parameter wasn't matched by the requested
- * regular expression.
- *
- * @param objectModel The Map objectModel
- * @return true if the parameter was validated and the validation
- * returned an error because its value wasn't matched by the requested
- * regular expression.
- */
- public
- boolean isNoMatch(
- Map objectModel
- )
- {
- return isNoMatch(objectModel, current_parameter);
+ /**
+ * Test whether the context's current parameter wasn't matched by the requested
+ * regular expression.
+ *
+ * @param objectModel The Map objectModel
+ * @return true if the parameter was validated and the validation
+ * returned an error because its value wasn't matched by the requested
+ * regular expression.
+ */
+ public boolean isNoMatch(Map objectModel) {
+ return isNoMatch(objectModel, current_parameter);
}
- /**
- * Test whether the validated parameter wasn't validated
- *
- * @param objectModel The Map objectModel
- * @param name Request parameter's name
- * @return true if the parameter was not validated.
- */
- public static
- boolean isNotPresent(
- Map objectModel,
- String name
- )
- {
- boolean ok = false;
- return getParamResult(objectModel,
name).equals(ValidatorActionResult.NOTPRESENT);
- }
-
- /**
- * Test whether the context's current parameter wasn't validated
- *
- * @param objectModel The Map objectModel
- * @return true if the parameter was not validated.
- */
- public
- boolean isNotPresent(
- Map objectModel
- )
- {
+ /**
+ * Test whether the validated parameter wasn't validated
+ *
+ * @param objectModel The Map objectModel
+ * @param name Request parameter's name
+ * @return true if the parameter was not validated.
+ */
+ public static boolean isNotPresent(Map objectModel, String name) {
+ return getParamResult(objectModel,
name).equals(ValidatorActionResult.NOTPRESENT);
+ }
+
+ /**
+ * Test whether the context's current parameter wasn't validated
+ *
+ * @param objectModel The Map objectModel
+ * @return true if the parameter was not validated.
+ */
+ public boolean isNotPresent(Map objectModel) {
return isNotPresent(objectModel, current_parameter);
}
@@ -472,7 +377,7 @@
* flagg, manager, and logger parameter.
*
* @param descriptor URL of descriptor.xml file @see
org.apache.cocoon.acting.AbstractComplimentaryConfigurableAction
- * @param manager
+ * @param resolver
* @param reloadable set to <code>true</code> if changes of
* <code>descriptor</code> should trigger a reload. Note that this
* only works if <code>Source</code> is able to determine the
@@ -481,31 +386,26 @@
* @return up-to-date configuration, either (re)loaded or cached.
*/
- protected static Configuration getConfiguration(
- String descriptor,
- ComponentManager manager,
- boolean reloadable,
- Logger logger
- ) throws ConfigurationException {
- ConfigurationHelper conf = null;
+ protected static Configuration getConfiguration(String descriptor,
SourceResolver resolver,
+ boolean reloadable, Logger
logger)
+ throws ConfigurationException {
if (descriptor == null) {
throw new ConfigurationException("The form descriptor is not set!");
}
+ ConfigurationHelper conf = null;
synchronized (XSPFormValidatorHelper.configurations) {
- conf = (ConfigurationHelper)
XSPFormValidatorHelper.configurations.get(descriptor);
Source source = null;
- SourceHandler sourceHandler = null;
try {
- sourceHandler = (SourceHandler) manager.lookup(SourceHandler.ROLE);
- source = sourceHandler.getSource(null, descriptor);
-
- if (conf == null || ( reloadable && conf.lastModified <
source.getLastModified())) {
- logger.debug("XSPFormValidatorHelper.getConfiguration:
(Re)Loading " + descriptor);
-
- if (conf == null)
- conf = new ConfigurationHelper();
+ source = resolver.resolve(descriptor);
+ conf = (ConfigurationHelper)
XSPFormValidatorHelper.configurations.get(source.getSystemId());
+ if (conf == null || (reloadable && conf.lastModified !=
source.getLastModified())) {
+ logger.debug("(Re)Loading " + descriptor);
+
+ if (conf == null) {
+ conf = new ConfigurationHelper();
+ }
SAXConfigurationHandler builder = new SAXConfigurationHandler();
source.toSAX(builder);
@@ -513,16 +413,15 @@
conf.lastModified = source.getLastModified();
conf.configuration = builder.getConfiguration();
- XSPFormValidatorHelper.cacheConfiguration(descriptor, conf);
+ XSPFormValidatorHelper.cacheConfiguration(source.getSystemId(),
conf);
} else {
- logger.debug("XSPFormValidatorHelper.getConfiguration: Using
cached configuration for " + descriptor);
+ logger.debug("Using cached configuration for " + descriptor);
}
} catch (Exception e) {
- logger.error("XSPFormValidatorHelper.getConfiguration: Could not
configure Database mapping environment", e);
+ logger.error("Could not configure Database mapping environment", e);
throw new ConfigurationException("Error trying to load
configurations for resource: " + source.getSystemId());
} finally {
if (source != null) source.recycle();
- manager.release(sourceHandler);
}
}
@@ -547,26 +446,25 @@
* @param logger
* @return specified configuration or <code>null</code> if not found.
*/
- protected static Configuration getConfigurationByName ( Configuration[] conf,
- String name ,
- Logger logger
- )
- {
- int j = 0;
- boolean found = false;
- String setname = null;
- for (j = 0; j < conf.length; j ++) {
- setname = conf[j].getAttribute ("name", "");
- if (name.trim().equals (setname.trim ())) {
- found = true;
- break;
+ protected static Configuration getConfigurationByName(Configuration[] conf,
+ String name,
+ Logger logger
+ ) {
+ int j = 0;
+ boolean found = false;
+ String setname = null;
+ for (j = 0; j < conf.length; j++) {
+ setname = conf[j].getAttribute("name", "");
+ if (name.trim().equals(setname.trim())) {
+ found = true;
+ break;
+ }
}
- }
- if (!found) {
- logger.debug("XSPFormValidatorHelper.getConfigurationByName: configuration
" + name + " not found.");
- return null;
- }
- return conf[j];
+ if (!found) {
+ logger.debug("XSPFormValidatorHelper.getConfigurationByName:
configuration " + name + " not found.");
+ return null;
+ }
+ return conf[j];
}
/**
@@ -574,7 +472,7 @@
* descriptor.xml.
*
* @param descriptor URL of descriptor.xml file @see
org.apache.cocoon.acting.AbstractComplimentaryConfigurableAction
- * @param manager
+ * @param resolver
* @param reloadable set to <code>true</code> if changes of
* <code>descriptor</code> should trigger a reload. Note that this
* only works if <code>Source</code> is able to determine the
@@ -583,30 +481,30 @@
* @param attribute attribute name
* @return attribute value or <code>null</code>
*/
- public static String getParameterAttributes ( String descriptor,
- ComponentManager manager,
- boolean reloadable,
- String constraintset,
- String parameter,
- String attribute,
- Logger logger
- )
- {
- try {
- Configuration conf = getConfiguration(descriptor, manager, reloadable,
logger);
- Configuration[] desc = conf.getChildren ("parameter");
- Configuration[] csets = conf.getChildren ("constraint-set");
-
- Configuration cset = getConfigurationByName ( csets, constraintset, logger
);
-
- Configuration[] set = cset.getChildren ("validate");
- Configuration constraints = getConfigurationByName(set,parameter, logger);
- Configuration descr = getConfigurationByName(desc,parameter, logger);
- return constraints.getAttribute(attribute,descr.getAttribute(attribute,""));
- } catch (Exception e ) {
- logger.debug("XSPFormValidatorHelper.getParameterAttributes Exception " +e);
- };
- return "";
+ public static String getParameterAttributes(String descriptor,
+ SourceResolver resolver,
+ boolean reloadable,
+ String constraintset,
+ String parameter,
+ String attribute,
+ Logger logger
+ ) {
+ try {
+ Configuration conf = getConfiguration(descriptor, resolver, reloadable,
logger);
+ Configuration[] desc = conf.getChildren("parameter");
+ Configuration[] csets = conf.getChildren("constraint-set");
+
+ Configuration cset = getConfigurationByName(csets, constraintset,
logger);
+
+ Configuration[] set = cset.getChildren("validate");
+ Configuration constraints = getConfigurationByName(set, parameter,
logger);
+ Configuration descr = getConfigurationByName(desc, parameter, logger);
+ return constraints.getAttribute(attribute,
descr.getAttribute(attribute, ""));
+ } catch (Exception e) {
+ logger.debug("XSPFormValidatorHelper.getParameterAttributes Exception "
+ e);
+ }
+ ;
+ return "";
}
@@ -617,15 +515,14 @@
* @param attribute attribute name
* @return attribute value or <code>null</code>
*/
- public String getParameterAttribute ( String attribute )
- {
- return XSPFormValidatorHelper.getParameterAttributes ( current_descriptor,
- current_manager,
- current_reloadable,
- current_constraint_set,
- current_parameter,
- attribute,
- current_logger );
+ public String getParameterAttribute(String attribute) {
+ return XSPFormValidatorHelper.getParameterAttributes(current_descriptor,
+ current_resolver,
+ current_reloadable,
+ current_constraint_set,
+ current_parameter,
+ attribute,
+ current_logger);
}
/**
@@ -635,15 +532,13 @@
* @param attribute attribute name
* @return attribute value or <code>null</code>
*/
- public String getParameterAttribute ( String parameter, String attribute )
- {
- return XSPFormValidatorHelper.getParameterAttributes ( current_descriptor,
- current_manager,
- current_reloadable,
- current_constraint_set,
- parameter,
- attribute,
- current_logger );
+ public String getParameterAttribute(String parameter, String attribute) {
+ return XSPFormValidatorHelper.getParameterAttributes(current_descriptor,
+ current_resolver,
+ current_reloadable,
+ current_constraint_set,
+ parameter,
+ attribute,
+ current_logger);
}
-
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
