[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/util MeriseTransform.java,1.22,1.23 ModelMan.java,1.27,1.28 NOXMLFactory.java,1.11,1.12

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

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

Modified Files:
	MeriseTransform.java ModelMan.java NOXMLFactory.java 
Log Message:
Add serialize labels.


Index: MeriseTransform.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/MeriseTransform.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** MeriseTransform.java	8 Jun 2003 09:28:26 -0000	1.22
--- MeriseTransform.java	30 Jun 2003 18:56:23 -0000	1.23
***************
*** 590,594 ****
  		Association pAsso)
  	{
! 		/*
  		 *  The table to be created.
  		 */
--- 590,594 ----
  		Association pAsso)
  	{
! 		/**
  		 *  The table to be created.
  		 */
***************
*** 622,631 ****
  		}
  
! 		/*
  		 * Column we create
  		 */
  		Column newField;
  
! 		/*
  		 *  Constraint to be created(s)
  		 */
--- 622,631 ----
  		}
  
! 		/**
  		 * Column we create
  		 */
  		Column newField;
  
! 		/**
  		 *  Constraint to be created(s)
  		 */

Index: ModelMan.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/ModelMan.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** ModelMan.java	9 Jun 2003 19:06:05 -0000	1.27
--- ModelMan.java	30 Jun 2003 18:56:24 -0000	1.28
***************
*** 516,520 ****
  
  	/**
! 	 * Conveniency method for the <code>NOClipboard</code> to add a label
  	 * @param pModel the model
  	 * @param lbl the label
--- 516,520 ----
  
  	/**
! 	 * Method to add a label
  	 * @param pModel the model
  	 * @param lbl the label
***************
*** 523,528 ****
  	{
  		pModel.getLabels().addElement(lbl.getObjectView());
! 		setCurrentObject(lbl);
! 		NOToolBar2.setCurrentTool(NOToolBar2.TOOL_SELECTION);		
  	}
  
--- 523,535 ----
  	{
  		pModel.getLabels().addElement(lbl.getObjectView());
! 		addCurrentObject(lbl);
! 		NOToolBar2.setCurrentTool(NOToolBar2.TOOL_SELECTION);	
! 		lbl.setMyModel(pModel);		
! 		//((EntityView)pEntity.getObjectView()).setOldLocation(pEntity.getEntityView().getLocation());				
! 		currentModel.redoLog.log(
! 			NORedoLog.ACTION_CREATE,
! 			lbl,
! 			(int) lbl.getObjectView().getLocation().getX(),
! 			(int) lbl.getObjectView().getLocation().getY());	
  	}
  

Index: NOXMLFactory.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/util/NOXMLFactory.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** NOXMLFactory.java	31 May 2003 11:48:34 -0000	1.11
--- NOXMLFactory.java	30 Jun 2003 18:56:24 -0000	1.12
***************
*** 41,44 ****
--- 41,45 ----
  import org.devaki.nextobjects.workspace.models.columns.ColumnType;
  import org.devaki.nextobjects.workspace.models.graphics.AssociationLinkView;
+ import org.devaki.nextobjects.workspace.models.graphics.LabelView;
  import org.devaki.nextobjects.workspace.models.graphics.LineView;
  import org.devaki.nextobjects.workspace.models.objects.Association;
***************
*** 49,818 ****
  import org.devaki.nextobjects.workspace.models.objects.InheritanceLink;
  import org.devaki.nextobjects.workspace.models.objects.Table;
[...1894 lines suppressed...]
! 	 * @param pConstraint the constraint to write
! 	 * @return the tree node
! 	 */
! 	private static Element writeForeignKey(Constraint pConstraint)
! 	{
! 		Element tmpElementForeignKey = new Element("foreign-key");
! 		tmpElementForeignKey.setAttribute(
! 			"foreignTable",
! 			pConstraint.getParentClass().getCode());
! 		Element tmpElementReference = new Element("reference");
! 		tmpElementReference.setAttribute(
! 			"local",
! 			pConstraint.getAnyField().getCode());
! 		tmpElementReference.setAttribute(
! 			"foreign",
! 			pConstraint.getUniqueField().getCode());
! 		tmpElementForeignKey.addContent(tmpElementReference);
! 		return tmpElementForeignKey;
! 	}
  }