You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/05/08 06:42:08 UTC
svn commit: r404928 [2/2] - in /webservices/axis2/trunk/c:
include/xml_schema/ modules/xml/xml_schema/
Modified: webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c?rev=404928&r1=404927&r2=404928&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/xml_schema/xml_schema_simple_content_restriction.c Sun May 7 21:42:06 2006
@@ -29,8 +29,6 @@
axis2_xml_schema_annotated_t *annotated;
- axis2_hash_t *methods;
-
axis2_xml_schema_obj_collection_t *attributes;
axis2_xml_schema_obj_collection_t *facets;
@@ -46,50 +44,63 @@
((axis2_xml_schema_simple_content_restriction_impl_t *) sim_content_res)
axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_free(void *sim_content_res,
- axis2_env_t **env);
+axis2_xml_schema_simple_content_restriction_free(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_base_impl(void *sim_content_res,
- axis2_env_t **env);
+axis2_xml_schema_simple_content_restriction_get_base_impl(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
axis2_xml_schema_any_attribute_t* AXIS2_CALL
axis2_xml_schema_simple_content_restriction_get_any_attribute(
- void *sim_content_res,
- axis2_env_t **env);
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
+
axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_set_any_attribute(void *sim_content_res,
- axis2_env_t **env,
- axis2_xml_schema_any_attribute_t *any_attr);
+axis2_xml_schema_simple_content_restriction_set_any_attribute(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env,
+ axis2_xml_schema_any_attribute_t *any_attr);
+
axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_attributes(void *sim_content_res,
- axis2_env_t **env);
+axis2_xml_schema_simple_content_restriction_get_attributes(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_restriction_set_base_type_name(
- void *sim_content_res,
- axis2_env_t **env,
- axis2_qname_t *base_type_name);
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env,
+ axis2_qname_t *base_type_name);
+
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_simple_content_restriction_get_base_type_name(
- void *sim_content_res,
- axis2_env_t **env);
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_set_base_type(void *sim_content_res,
- axis2_env_t **env,
- axis2_xml_schema_simple_type_t *base_type);
+axis2_xml_schema_simple_content_restriction_set_base_type(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env,
+ axis2_xml_schema_simple_type_t *base_type);
+
axis2_xml_schema_simple_type_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_base_type(void *sim_content_res,
- axis2_env_t **env);
+axis2_xml_schema_simple_content_restriction_get_base_type(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
+
axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_facets(void *sim_content_res,
- axis2_env_t **env);
+axis2_xml_schema_simple_content_restriction_get_facets(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env);
+
/*****************************************************************************/
@@ -109,8 +120,6 @@
}
sim_content_res_impl->annotated = NULL;
- sim_content_res_impl->methods = NULL;
- sim_content_res_impl->sim_content_res.base.ops = NULL;
sim_content_res_impl->sim_content_res.ops = NULL;
sim_content_res_impl->attributes = NULL;
sim_content_res_impl->base_type_name = NULL;
@@ -160,30 +169,6 @@
sim_content_res_impl->sim_content_res.ops->get_facets =
axis2_xml_schema_simple_content_restriction_get_facets;
-
- sim_content_res_impl->methods = axis2_hash_make(env);
-
- if(!sim_content_res_impl->methods)
- {
- axis2_xml_schema_simple_content_restriction_free(
- &(sim_content_res_impl->sim_content_res), env);
- AXIS2_ERROR_SET((*env)->error,
- AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
- return NULL;
- }
- axis2_hash_set(sim_content_res_impl->methods, "free",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_free);
- axis2_hash_set(sim_content_res_impl->methods, "get_any_attribute",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_get_any_attribute);
- axis2_hash_set(sim_content_res_impl->methods, "set_any_attribute",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_set_any_attribute);
- axis2_hash_set(sim_content_res_impl->methods, "get_attributes",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_get_attributes);
- axis2_hash_set(sim_content_res_impl->methods, "get_base_type_name",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_get_base_type_name);
- axis2_hash_set(sim_content_res_impl->methods, "set_base_type_name",
- AXIS2_HASH_KEY_STRING, axis2_xml_schema_simple_content_restriction_set_base_type_name);
-
sim_content_res_impl->annotated = axis2_xml_schema_annotated_create(env);
if(!sim_content_res_impl->annotated)
{
@@ -200,16 +185,13 @@
return NULL;
}
- status = axis2_xml_schema_annotated_resolve_methods(
- &(sim_content_res_impl->sim_content_res.base), env, sim_content_res_impl->annotated,
- sim_content_res_impl->methods);
-
return &(sim_content_res_impl->sim_content_res);
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_free(void *sim_content_res,
- axis2_env_t **env)
+axis2_xml_schema_simple_content_restriction_free(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env)
{
axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL;
@@ -233,21 +215,11 @@
AXIS2_QNAME_FREE(content_res_impl->base_type_name, env);
content_res_impl->base_type_name = NULL;
}
- if(NULL != content_res_impl->methods)
- {
- axis2_hash_free(content_res_impl->methods, env);
- content_res_impl->methods = NULL;
- }
if(NULL != content_res_impl->annotated)
{
AXIS2_XML_SCHEMA_ANNOTATED_FREE(content_res_impl->annotated, env);
content_res_impl->annotated = NULL;
}
- if(NULL != content_res_impl->sim_content_res.base.ops)
- {
- AXIS2_FREE((*env)->allocator, content_res_impl->sim_content_res.base.ops);
- content_res_impl->sim_content_res.base.ops = NULL;
- }
if(NULL != content_res_impl->sim_content_res.ops)
{
AXIS2_FREE((*env)->allocator, content_res_impl->sim_content_res.ops);
@@ -260,8 +232,9 @@
}
axis2_xml_schema_annotated_t *AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_base_impl(void *sim_content_res,
- axis2_env_t **env)
+axis2_xml_schema_simple_content_restriction_get_base_impl(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env)
{
axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -272,8 +245,9 @@
axis2_xml_schema_any_attribute_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_any_attribute(void *sim_content_res,
- axis2_env_t **env)
+axis2_xml_schema_simple_content_restriction_get_any_attribute(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env)
{
axis2_xml_schema_simple_content_restriction_impl_t *cnt_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -282,9 +256,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_set_any_attribute(void *sim_content_res,
- axis2_env_t **env,
- axis2_xml_schema_any_attribute_t *any_attr)
+axis2_xml_schema_simple_content_restriction_set_any_attribute(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env,
+ axis2_xml_schema_any_attribute_t *any_attr)
{
axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL;
@@ -295,13 +270,14 @@
AXIS2_XML_SCHEMA_ANY_ATTRIBUTE_FREE(content_res_impl->any_attribute, env);
content_res_impl->any_attribute = NULL;
}
- content_res_impl->any_attribute = any_attr;
+ content_res_impl->any_attribute = any_attr;
return AXIS2_SUCCESS;
}
axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_attributes(void *sim_content,
- axis2_env_t **env)
+axis2_xml_schema_simple_content_restriction_get_attributes(
+ axis2_xml_schema_simple_content_restriction_t *sim_content,
+ axis2_env_t **env)
{
axis2_xml_schema_simple_content_restriction_impl_t *cnt_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -311,8 +287,8 @@
axis2_qname_t* AXIS2_CALL
axis2_xml_schema_simple_content_restriction_get_base_type_name(
- void *sim_content,
- axis2_env_t **env)
+ axis2_xml_schema_simple_content_restriction_t *sim_content,
+ axis2_env_t **env)
{
axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL;
AXIS2_ENV_CHECK(env, NULL);
@@ -322,9 +298,9 @@
axis2_status_t AXIS2_CALL
axis2_xml_schema_simple_content_restriction_set_base_type_name(
- void *sim_content,
- axis2_env_t **env,
- axis2_qname_t *base_type_name)
+ axis2_xml_schema_simple_content_restriction_t *sim_content,
+ axis2_env_t **env,
+ axis2_qname_t *base_type_name)
{
axis2_xml_schema_simple_content_restriction_impl_t *content_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -339,9 +315,10 @@
}
axis2_status_t AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_set_base_type(void *sim_content_res,
- axis2_env_t **env,
- axis2_xml_schema_simple_type_t *base_type)
+axis2_xml_schema_simple_content_restriction_set_base_type(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env,
+ axis2_xml_schema_simple_type_t *base_type)
{
axis2_xml_schema_simple_content_restriction_impl_t *sim_cnt_res_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -358,16 +335,18 @@
axis2_xml_schema_simple_type_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_base_type(void *sim_content_res,
- axis2_env_t **env)
+axis2_xml_schema_simple_content_restriction_get_base_type(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env)
{
return AXIS2_INTF_TO_IMPL(sim_content_res)->base_type;
}
axis2_xml_schema_obj_collection_t* AXIS2_CALL
-axis2_xml_schema_simple_content_restriction_get_facets(void *sim_content_res,
- axis2_env_t **env)
+axis2_xml_schema_simple_content_restriction_get_facets(
+ axis2_xml_schema_simple_content_restriction_t *sim_content_res,
+ axis2_env_t **env)
{
return AXIS2_INTF_TO_IMPL(sim_content_res)->facets;
}