[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models BaseModel.java,1.11,1.12 ConceptualModel.java,1.6,1.7 PhysicalModel.java,1.6,1.7

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

Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models
In directory sc8-pr-cvs1:/tmp/cvs-serv28289/src/org/devaki/nextobjects/workspace/models

Modified Files:
	BaseModel.java ConceptualModel.java PhysicalModel.java 
Log Message:
First step in adding ability to have mabels and model's titles + checkstyle


Index: BaseModel.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/BaseModel.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BaseModel.java	4 Jun 2003 19:29:41 -0000	1.11
--- BaseModel.java	8 Jun 2003 09:28:26 -0000	1.12
***************
*** 29,32 ****
--- 29,33 ----
  import org.devaki.nextobjects.workspace.models.objects.InheritanceLink;
  import org.devaki.nextobjects.workspace.models.objects.BaseObject;
+ import org.devaki.nextobjects.workspace.models.graphics.BaseModelView;
  
  /**
***************
*** 81,85 ****
  	 */
  	private Vector inheritanceLinks = new Vector();
! 
  	/**
  	 *  Torqu's DB type
--- 82,90 ----
  	 */
  	private Vector inheritanceLinks = new Vector();
! 	/**
! 	 * labels
! 	 */
! 	private Vector labels=new Vector();
! 	
  	/**
  	 *  Torqu's DB type
***************
*** 210,214 ****
  	 */
  	public abstract BaseObject[] getModelObjects();
! 
  
  	/**
--- 215,224 ----
  	 */
  	public abstract BaseObject[] getModelObjects();
! 	
! 	/**
! 	 * Get the model view
! 	 * @return model view
! 	 */
! 	public abstract BaseModelView getModelView();
  
  	/**
***************
*** 752,755 ****
--- 762,766 ----
  		}
  	}
+ 	
  	/**
  	 * Return the inheritance links, constraints, halfAssociations of the model
***************
*** 770,774 ****
  	}
  
! 
  	/**
  	 * The model is saved
--- 781,792 ----
  	}
  
! 	/**
! 	 * Return the labels of the model
! 	 * @return the classes
! 	 */
! 	public Vector getLabels()
! 	{
! 			return labels;
! 	}
  	/**
  	 * The model is saved

Index: ConceptualModel.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/ConceptualModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ConceptualModel.java	4 Jun 2003 19:29:41 -0000	1.6
--- ConceptualModel.java	8 Jun 2003 09:28:26 -0000	1.7
***************
*** 24,27 ****
--- 24,28 ----
  import java.util.Vector;
  import org.devaki.nextobjects.workspace.models.graphics.ConceptualView;
+ import org.devaki.nextobjects.workspace.models.graphics.BaseModelView;
  import org.devaki.nextobjects.workspace.models.graphics.LineView;
  import org.devaki.nextobjects.workspace.models.objects.Association;
***************
*** 131,135 ****
  	* in this models.
  	* @return the base objects 
! 	*/
  	public BaseObject[] getModelObjects()
  	{
--- 132,137 ----
  	* in this models.
  	* @return the base objects 
! 	* */
! 
  	public BaseObject[] getModelObjects()
  	{
***************
*** 163,172 ****
  		return baseObjects;
  	}
! 
  	/**
  	 * Return the graphics view of the model
  	 * @return the graphic view
  	 */
! 	public ConceptualView getConceptualView()
  	{
  		return this.myConceptualView;
--- 165,175 ----
  		return baseObjects;
  	}
! 	
! 	
  	/**
  	 * Return the graphics view of the model
  	 * @return the graphic view
  	 */
! 	public BaseModelView getModelView()
  	{
  		return this.myConceptualView;

Index: PhysicalModel.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/PhysicalModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PhysicalModel.java	4 Jun 2003 19:29:41 -0000	1.6
--- PhysicalModel.java	8 Jun 2003 09:28:26 -0000	1.7
***************
*** 23,26 ****
--- 23,27 ----
  import java.util.Vector;
  import org.devaki.nextobjects.workspace.models.graphics.PhysicalView;
+ import org.devaki.nextobjects.workspace.models.graphics.BaseModelView;
  import org.devaki.nextobjects.workspace.models.objects.BaseObject;
  import org.devaki.nextobjects.workspace.models.objects.Constraint;
***************
*** 86,90 ****
  	 * @return model view
  	 */
! 	public PhysicalView getPhysicalView()
  	{
  		return this.myPhysicalView;
--- 87,91 ----
  	 * @return model view
  	 */
! 	public BaseModelView getModelView()
  	{
  		return this.myPhysicalView;