[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jibx-cvs
Subject:    [Jibx-cvs] core/build/src/org/jibx/schema/generator SchemaGen.java,
From:       Dennis Sosnoski <dsosnoski () users ! sourceforge ! net>
Date:       2010-01-26 10:39:33
Message-ID: E1NZipZ-0000Wf-Od () sfp-cvsdas-3 ! v30 ! ch3 ! sourceforge ! com
[Download RAW message or body]

Update of /cvsroot/jibx/core/build/src/org/jibx/schema/generator
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv2018/build/src/org/jibx/schema/generator


Modified Files:
	SchemaGen.java 
Log Message:
Pass Collection to finishSchemas(), rather than List, and always use the name as the \
identifier for the schema (avoids need for the caller to change the resolvers for \
relocated schemas).

Index: SchemaGen.java
===================================================================
RCS file: /cvsroot/jibx/core/build/src/org/jibx/schema/generator/SchemaGen.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SchemaGen.java	23 Jan 2010 11:27:08 -0000	1.13
--- SchemaGen.java	26 Jan 2010 10:39:31 -0000	1.14
***************
*** 62,66 ****
  import org.jibx.schema.SchemaHolder;
  import org.jibx.schema.SchemaUtils;
- import org.jibx.schema.TreeWalker;
  import org.jibx.schema.elements.AllElement;
  import org.jibx.schema.elements.AnnotatedBase;
--- 62,65 ----
***************
*** 87,95 ****
  import org.jibx.schema.elements.FacetElement.Enumeration;
  import org.jibx.schema.types.Count;
- import org.jibx.schema.validation.NameMergeVisitor;
- import org.jibx.schema.validation.PrevalidationVisitor;
- import org.jibx.schema.validation.NameRegistrationVisitor;
  import org.jibx.schema.validation.ValidationUtils;
- import org.jibx.schema.validation.ValidationVisitor;
  import org.jibx.util.IClass;
  import org.jibx.util.IClassItem;
--- 86,90 ----
***************
*** 1087,1094 ****
       * Finish the construction of schemas, setting links between the schemas and \
                validating the schemas.
       * 
!      * @param exists existing schemas potentially referrenced from constructed \
                schemas
       * @return list of {@link SchemaHolder}
       */
!     public ArrayList finishSchemas(List exists) {
          
          // fix all references between schemas
--- 1082,1089 ----
       * Finish the construction of schemas, setting links between the schemas and \
                validating the schemas.
       * 
!      * @param exists existing schemas potentially referenced (by name, rather than \
                id) from constructed schemas
       * @return list of {@link SchemaHolder}
       */
!     public ArrayList finishSchemas(Collection exists) {
          
          // fix all references between schemas
***************
*** 1112,1116 ****
          for (Iterator iter = exists.iterator(); iter.hasNext();) {
              SchemaElement schema = (SchemaElement)iter.next();
!             vctx.setSchema(schema.getResolver().getId(), schema);
          }
          
--- 1107,1111 ----
          for (Iterator iter = exists.iterator(); iter.hasNext();) {
              SchemaElement schema = (SchemaElement)iter.next();
!             vctx.setSchema(schema.getResolver().getName(), schema);
          }
          


------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Jibx-cvs mailing list
Jibx-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jibx-cvs


[prev in list] [next in list] [prev in thread] [next in thread]