[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/util MeriseTransform.java,1.13,1.14

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

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

Modified Files:
	MeriseTransform.java 
Log Message:
Well sorry as you can see I did it ...
cvs -j 1.13 -j 1.12 MeriseTransform.java
Sorry, committing in .
Modified Files:
 	MeriseTransform.java 


Index: MeriseTransform.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/MeriseTransform.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MeriseTransform.java	3 May 2003 20:46:28 -0000	1.13
--- MeriseTransform.java	6 May 2003 20:19:52 -0000	1.14
***************
*** 342,352 ****
   /* Rule 3 */
    Column newField;
!   Constraint newCst=new Constraint(theDatabase,
!                                    pAsso.getEntityAt(0).getSubsequentTable(),
!                                    pAsso.getEntityAt(1).getSubsequentTable());
!   if (pAsso.getCardAt(0)==ConceptualModel._0N_
!       && pAsso.getCardAt(0)==ConceptualModel._1N_)
    {
      // ...
      newField=new Column(pAsso.getEntityAt(1).getIdentifier());
      newField.setAutoIncrement(false); // always in that case!
--- 342,353 ----
   /* Rule 3 */
    Column newField;
!   Constraint newCst=null;
!   if (pAsso.getCardAt(1)==ConceptualModel._0N_
!       || pAsso.getCardAt(1)==ConceptualModel._1N_)
    {
      // ...
+     newCst=new Constraint(theDatabase,
+                                    pAsso.getEntityAt(1).getSubsequentTable(),
+                                    pAsso.getEntityAt(0).getSubsequentTable());
      newField=new Column(pAsso.getEntityAt(1).getIdentifier());
      newField.setAutoIncrement(false); // always in that case!
***************
*** 367,370 ****
--- 368,374 ----
    } else {
      // ...
+     newCst=new Constraint(theDatabase,
+                                    pAsso.getEntityAt(0).getSubsequentTable(),
+                                    pAsso.getEntityAt(1).getSubsequentTable());
      newField=new Column(pAsso.getEntityAt(0).getIdentifier());
      newField.setAutoIncrement(false);
***************
*** 439,441 ****
    ModelMan.addTable(theDatabase,newTable);
  }
! }
\ No newline at end of file
--- 443,445 ----
    ModelMan.addTable(theDatabase,newTable);
  }
! }