[Hibernate-commits] Hibernate2/src/net/sf/hibernate/cfg Binder.java,1.10,1.11 Mappings.java,1.5,1.6

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg
In directory sc8-pr-cvs1:/tmp/cvs-serv3374/hibernate/cfg

Modified Files:
	Binder.java Mappings.java 
Log Message:
re-reworked import functionality

Index: Binder.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Binder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Binder.java	29 Mar 2003 04:08:46 -0000	1.10
--- Binder.java	29 Mar 2003 07:36:22 -0000	1.11
***************
*** 92,98 ****
  		);
  		//IMPORT
! 		Attribute importNode = node.attribute("import");
! 		if (importNode!=null) {
! 			mapping.addImport( className, importNode.getValue() );
  		}
  	}
--- 92,97 ----
  		);
  		//IMPORT
! 		if ( mapping.isAutoImport() ) {
! 			mapping.addImport( className, StringHelper.unqualify(className) );
  		}
  	}
***************
*** 936,940 ****
  		model.setSchemaName( (schemaNode==null) ? null : schemaNode.getValue() );
  		Attribute dcNode = hmNode.attribute("default-cascade");
! 		model.setDefaultCascade( (dcNode==null) ? "none" : dcNode.getValue() );
  		
  		Iterator nodes = hmNode.elementIterator("class");
--- 935,940 ----
  		model.setSchemaName( (schemaNode==null) ? null : schemaNode.getValue() );
  		Attribute dcNode = hmNode.attribute("default-cascade");
! 		model.setDefaultCascade( (dcNode==null) ? "none" : dcNode.getValue() );
! 		model.setAutoImport( "true".equals( hmNode.attributeValue("auto-import") ) );
  		
  		Iterator nodes = hmNode.elementIterator("class");

Index: Mappings.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Mappings.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Mappings.java	29 Mar 2003 04:08:46 -0000	1.5
--- Mappings.java	29 Mar 2003 07:36:22 -0000	1.6
***************
*** 30,33 ****
--- 30,34 ----
  	private String schemaName;
  	private String defaultCascade;
+ 	private boolean autoImport;
  	
  	Mappings(Map classes, Map collections, Map tables, Map queries, Map imports, List secondPasses) {
***************
*** 114,117 ****
--- 115,134 ----
  	void addSecondPass(Binder.SecondPass sp) {
  		secondPasses.add(sp);
+ 	}
+ 
+ 	/**
+ 	 * Returns the autoImport.
+ 	 * @return boolean
+ 	 */
+ 	public boolean isAutoImport() {
+ 		return autoImport;
+ 	}
+ 
+ 	/**
+ 	 * Sets the autoImport.
+ 	 * @param autoImport The autoImport to set
+ 	 */
+ 	public void setAutoImport(boolean autoImport) {
+ 		this.autoImport = autoImport;
  	}