[Hibernate-commits] Hibernate2/src/net/sf/hibernate/cfg Binder.java,1.3,1.4 Configuration.java,1.9,1.10

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

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

Modified Files:
	Binder.java Configuration.java 
Log Message:
renamed 'mutable' to 'update'
added 'insert' attribute
removed old dtds

Index: Binder.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Binder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Binder.java	27 Jan 2003 12:39:34 -0000	1.3
--- Binder.java	28 Jan 2003 10:22:19 -0000	1.4
***************
*** 205,210 ****
  					bindValue(subnode, id, false, propertyName);
  					id.setTypeByReflection( model.getPersistentClass(), propertyName );
! 					Property prop = new Property();
! 					bindProperty(subnode, prop, id, mappings);
  					model.setIdentifierProperty(prop);
  				}
--- 205,210 ----
  					bindValue(subnode, id, false, propertyName);
  					id.setTypeByReflection( model.getPersistentClass(), propertyName );
! 					Property prop = new Property(id);
! 					bindProperty(subnode, prop, mappings);
  					model.setIdentifierProperty(prop);
  				}
***************
*** 225,230 ****
  					Class reflectedClass = ReflectHelper.getGetter( model.getPersistentClass(), propertyName ).getReturnType();
  					bindComponent(subnode, id, reflectedClass, null, false, mappings);
! 					Property prop = new Property();
! 					bindProperty(subnode, prop, id, mappings);
  					model.setIdentifierProperty(prop);
  				}
--- 225,230 ----
  					Class reflectedClass = ReflectHelper.getGetter( model.getPersistentClass(), propertyName ).getReturnType();
  					bindComponent(subnode, id, reflectedClass, null, false, mappings);
! 					Property prop = new Property(id);
! 					bindProperty(subnode, prop, mappings);
  					model.setIdentifierProperty(prop);
  				}
***************
*** 236,241 ****
  				bindValue(subnode, val, false, propertyName);
  				if ( val.getType()==null ) val.setType( "version".equals(name) ? Hibernate.INTEGER : Hibernate.TIMESTAMP );
! 				Property prop = new Property();
! 				bindProperty(subnode, prop, val, mappings);
  				model.setVersion(prop);
  				model.addProperty(prop);
--- 236,241 ----
  				bindValue(subnode, val, false, propertyName);
  				if ( val.getType()==null ) val.setType( "version".equals(name) ? Hibernate.INTEGER : Hibernate.TIMESTAMP );
! 				Property prop = new Property(val);
! 				bindProperty(subnode, prop, mappings);
  				model.setVersion(prop);
  				model.addProperty(prop);
***************
*** 333,340 ****
  	}
  
! 	public static void bindProperty(Node node, Property model, Value value, Mappings mappings) throws MappingException {
  		model.setName( Property.getPropertyName(node) );
! 		model.setValue(value);
! 		Type type = value.getType();
  		if (type==null) throw new MappingException( "Could not determine a property type for: " + model.getName() );
  		Node cascadeNode = node.getAttributes().getNamedItem("cascade");
--- 333,339 ----
  	}
  
! 	public static void bindProperty(Node node, Property model, Mappings mappings) throws MappingException {
  		model.setName( Property.getPropertyName(node) );
! 		Type type = model.getValue().getType();
  		if (type==null) throw new MappingException( "Could not determine a property type for: " + model.getName() );
  		Node cascadeNode = node.getAttributes().getNamedItem("cascade");
***************
*** 343,351 ****
  			cascadeNode.getNodeValue()
  		);
! 		Node mutableNode = node.getAttributes().getNamedItem("mutable");
! 		model.setMutable( (mutableNode==null) ? 
  			true : 
! 			"true".equals( mutableNode.getNodeValue() ) 
  		);
  	}
  	
--- 342,355 ----
  			cascadeNode.getNodeValue()
  		);
! 		Node updateNode = node.getAttributes().getNamedItem("update");
! 		model.setUpdateable( (updateNode==null) ? 
  			true : 
! 			"true".equals( updateNode.getNodeValue() ) 
  		);
+ 		Node insertNode = node.getAttributes().getNamedItem("insert");
+ 		model.setInsertable( (insertNode==null) ? 
+ 			true : 
+ 			"true".equals( insertNode.getNodeValue() ) 
+ 		);
  	}
  	
***************
*** 358,367 ****
  		//ROLENAME
  		Node roleAtt = atts.getNamedItem("name");
- 		if (roleAtt==null) roleAtt = atts.getNamedItem("role");
  		String barerole = roleAtt.getNodeValue();
  		model.setRole( prefix + Mappings.ROLE_SEPERATOR + barerole );
  		
  		Node inverseNode = atts.getNamedItem("inverse");
- 		if ( inverseNode==null) inverseNode = atts.getNamedItem("readonly");
  		if ( inverseNode!=null) model.setInverse( StringHelper.booleanValue( inverseNode.getNodeValue() ) );
  		
--- 362,369 ----
***************
*** 645,650 ****
  				if (componentClass!=null) value.setTypeByReflection(componentClass, propertyName);
  				value.createForeignKey();
! 				Property prop = new Property();
! 				bindProperty(subnode, prop, value, mappings);
  				model.addProperty(prop);					
  			}
--- 647,652 ----
  				if (componentClass!=null) value.setTypeByReflection(componentClass, propertyName);
  				value.createForeignKey();
! 				Property prop = new Property(value);
! 				bindProperty(subnode, prop, mappings);
  				model.addProperty(prop);					
  			}
***************
*** 797,802 ****
  				value.setTypeByReflection( model.getPersistentClass(), propertyName );
  				value.createForeignKey();
! 				Property prop = new Property();
! 				bindProperty(subnode, prop, value, mappings);
  				model.addProperty(prop);
  			}
--- 799,804 ----
  				value.setTypeByReflection( model.getPersistentClass(), propertyName );
  				value.createForeignKey();
! 				Property prop = new Property(value);
! 				bindProperty(subnode, prop, mappings);
  				model.addProperty(prop);
  			}

Index: Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Configuration.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Configuration.java	27 Jan 2003 12:51:49 -0000	1.9
--- Configuration.java	28 Jan 2003 10:22:19 -0000	1.10
***************
*** 501,504 ****
--- 501,524 ----
  		}
  
+ 		/**
+ 		 * @see net.sf.hibernate.Interceptor#instantiate(java.lang.Class, java.io.Serializable)
+ 		 */
+ 		public Object instantiate(Class clazz, Serializable id) {
+ 			return null;
+ 		}
+ 
+ 		/**
+ 		 * @see net.sf.hibernate.Interceptor#findDirty(java.lang.Object, java.io.Serializable, java.lang.Object, java.lang.Object, java.lang.String, net.sf.hibernate.type.Type)
+ 		 */
+ 		public int[] findDirty(
+ 			Object entity,
+ 			Serializable id,
+ 			Object[] currentState,
+ 			Object[] previousState,
+ 			String[] propertyNames,
+ 			Type[] types) {
+ 			return null;
+ 		}
+ 
  	}