[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/util MeriseTransform.java,1.16,1.17

[<efl...@us...>]

Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util
In directory sc8-pr-cvs1:/tmp/cvs-serv24048/src/org/devaki/nextobjects/util

Modified Files:
	MeriseTransform.java 
Log Message:
Fixed major bug - preparing a beta release.


Index: MeriseTransform.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/MeriseTransform.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** MeriseTransform.java	25 May 2003 20:21:10 -0000	1.16
--- MeriseTransform.java	26 May 2003 17:15:53 -0000	1.17
***************
*** 369,379 ****
  	pAsso.getEntityAt(0).getSubsequentTable().setIdMethod("none");
  
! 	if (pAsso.getCardAt(1)==ConceptualModel._0N_
! 	  | pAsso.getCardAt(0)==ConceptualModel._01_) {
! 		newField.setRequired(false);
  	} else {
  		//force cause we have a 1 in 1N.
  		// (even if it'salways already set, the value is forced)
! 		newField.setRequired(true);
  	}
  	// to do implement isPk for 11 !!!
--- 369,378 ----
  	pAsso.getEntityAt(0).getSubsequentTable().setIdMethod("none");
  
! 	if (pAsso.getCardAt(0)==ConceptualModel._11_) {
! 		newField.setRequired(true);
  	} else {
  		//force cause we have a 1 in 1N.
  		// (even if it'salways already set, the value is forced)
! 		newField.setRequired(false);
  	}
  	// to do implement isPk for 11 !!!
***************
*** 404,414 ****
  	pAsso.getEntityAt(1).getSubsequentTable().setIdMethod("none");
  	
! 	if (pAsso.getCardAt(0)==ConceptualModel._0N_
! 	| pAsso.getCardAt(1)==ConceptualModel._01_) {
! 		newField.setRequired(false);
  	} else {
  		//force cause we have a 1 in 1N.
  		// (even if it'salways already set, the value is forced)
! 		newField.setRequired(true);
  	}
  	// to do implement isPk for 11 !!!
--- 403,412 ----
  	pAsso.getEntityAt(1).getSubsequentTable().setIdMethod("none");
  	
! 	if (pAsso.getCardAt(1)==ConceptualModel._11_) {
! 		newField.setRequired(true);
  	} else {
  		//force cause we have a 1 in 1N.
  		// (even if it'salways already set, the value is forced)
! 		newField.setRequired(false);
  	}
  	// to do implement isPk for 11 !!!