[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects Asso
Status: Alpha
Brought to you by:
eflorent
Menu
▾
▴
[Nextobjects-devel] nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects Association.java,1.3,1.4 AssociationLink.java,1.2,1.3 BaseClass.java,1.10,1.11 BaseLine.java,1.2,1.3 BaseObject.java,1.2,1.3 Entity.java,1.3,1.4 InheritanceLink.java,1.4,1.5 Table.java,1.5,1.6
|
From: <efl...@us...> - 2003-05-31 12:07:36
|
Update of /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects
In directory sc8-pr-cvs1:/tmp/cvs-serv10548/src/org/devaki/nextobjects/workspace/models/objects
Modified Files:
Association.java AssociationLink.java BaseClass.java
BaseLine.java BaseObject.java Entity.java InheritanceLink.java
Table.java
Log Message:
Buffered graphics
Index: Association.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/Association.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Association.java 11 Feb 2003 12:04:41 -0000 1.3
--- Association.java 31 May 2003 11:48:35 -0000 1.4
***************
*** 29,33 ****
{
/** Variables **/
- static int countInstance = 0;
/**
--- 29,32 ----
***************
*** 42,46 ****
{
super(pModel);
- countInstance++;
// Create the link between the associations and the table
AssociationLink associationLink = new AssociationLink(this,
--- 41,44 ----
***************
*** 56,63 ****
// Set name and code
this.name = new StringBuffer().append("Association ")
! .append(countInstance)
.toString();
! this.code = new StringBuffer().append("ASSOCIATION_")
! .append(countInstance)
.toString();
// Set the object view
--- 54,61 ----
// Set name and code
this.name = new StringBuffer().append("Association ")
! .append(pModel.countAssociation())
.toString();
! this.code = new StringBuffer().append("Association")
! .append(pModel.countAssociation())
.toString();
// Set the object view
***************
*** 72,76 ****
{
super(pObject);
- countInstance++;
this.objectView = new AssociationView(this);
}
--- 70,73 ----
***************
*** 83,90 ****
{
super(pModel);
! countInstance++;
// Set name and code
! this.name = "Association " + countInstance;
! this.code = "ASSOCIATION_"+ countInstance;
// Set the object view
this.objectView = new AssociationView(this);
--- 80,87 ----
{
super(pModel);
!
// Set name and code
! this.name = "Association " + pModel.countAssociation();
! this.code = "Association"+pModel.countAssociation();
// Set the object view
this.objectView = new AssociationView(this);
Index: AssociationLink.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/AssociationLink.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AssociationLink.java 11 Feb 2003 12:04:41 -0000 1.2
--- AssociationLink.java 31 May 2003 11:48:35 -0000 1.3
***************
*** 27,33 ****
{
/** Variables **/
! // Number of association links created
! private static int countAssociationLinks = 0;
! // ?? (It seems to be trhe default cardinality)
private int card = ConceptualModel._0N_;
--- 27,31 ----
{
/** Variables **/
!
private int card = ConceptualModel._0N_;
***************
*** 46,50 ****
this.setName(new StringBuffer()
.append("Association Link ")
! .append(++countAssociationLinks).toString());
// Set the object view
this.objectView = new AssociationLinkView(this);
--- 44,48 ----
this.setName(new StringBuffer()
.append("Association Link ")
! .append(((ConceptualModel)pEntity.getMyModel()).countAssociationLinks()).toString());
// Set the object view
this.objectView = new AssociationLinkView(this);
Index: BaseClass.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/BaseClass.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BaseClass.java 5 Apr 2003 14:14:23 -0000 1.10
--- BaseClass.java 31 May 2003 11:48:35 -0000 1.11
***************
*** 25,35 ****
import org.devaki.nextobjects.workspace.models.columns.Column;
! /**
*
- * <p>Title: </p>
- * <p>Description: </p>
- * <p>Copyright: GNU Public License</p>
- * <p>Company: devaki.org</p>
*/
public class BaseClass extends BaseObject implements Serializable
{
--- 25,35 ----
import org.devaki.nextobjects.workspace.models.columns.Column;
! /*
! * Object of type "class"
! *
! * @author eflorent
*
*/
+
public class BaseClass extends BaseObject implements Serializable
{
***************
*** 57,61 ****
/**
! * Construct a standard nextGraphicsObject
*/
public BaseClass()
--- 57,61 ----
/**
! * Construct a standard BaseClass
*/
public BaseClass()
Index: BaseLine.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/BaseLine.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseLine.java 11 Feb 2003 12:04:41 -0000 1.2
--- BaseLine.java 31 May 2003 11:48:35 -0000 1.3
***************
*** 23,33 ****
import org.devaki.nextobjects.workspace.models.BaseModel;
- /**
- *
- * <p>Title: </p>
- * <p>Description: </p>
- * <p>Copyright: GNU Public License</p>
- * <p>Company: devaki.org</p>
- */
public class BaseLine extends BaseObject implements Serializable
{
--- 23,26 ----
Index: BaseObject.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/BaseObject.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseObject.java 11 Feb 2003 12:04:41 -0000 1.2
--- BaseObject.java 31 May 2003 11:48:35 -0000 1.3
***************
*** 26,56 ****
import org.devaki.nextobjects.workspace.models.graphics.ObjectView;
! /**
*
- * <p>Title: </p>
- * <p>Description: </p>
- * <p>Copyright: GNU Public License</p>
- * <p>Company: devaki.org</p>
*/
public class BaseObject implements Serializable
{
! /** Variables **/
! // General
protected String name = "";
protected String code = "";
private String description = "";
private String notes = "";
!
! // Number of nextGraphicsObject created
! private static int countBaseObjects = 0;
! // Fields
! protected Vector data = new Vector(1);
! // Model associated
protected BaseModel myModel;
! // Node associated
private transient CustomTreeNode customTreeNode;
! // Graphics representation
protected ObjectView objectView;
! // Has the data of the object been modified
private boolean dataChanged = false;
--- 26,80 ----
import org.devaki.nextobjects.workspace.models.graphics.ObjectView;
! /*
! * Objects of the models.
! *
! * @author eflorent
*
*/
+
public class BaseObject implements Serializable
{
! /*
! * The name
! */
protected String name = "";
+ /*
+ * The code
+ */
protected String code = "";
+ /*
+ * The description
+ */
private String description = "";
+
+ /*
+ * Notes
+ */
private String notes = "";
!
! /*
! * Coumns associated
! */
! protected Vector columns = new Vector(1);
!
! /*
! * Model associated
! */
protected BaseModel myModel;
!
! /*
! *Nodel associated
! */
private transient CustomTreeNode customTreeNode;
!
! /*
! * Graphics representation
! */
protected ObjectView objectView;
!
! /*
! * Has the data of the object been modified
! */
!
private boolean dataChanged = false;
***************
*** 58,65 ****
* Construct a standard nextGraphicsObject
*/
! public BaseObject()
! {
! countBaseObjects++;
! }
/**
--- 82,86 ----
* Construct a standard nextGraphicsObject
*/
! public BaseObject() { }
/**
***************
*** 70,74 ****
{
this.myModel = pModel;
- countBaseObjects++;
}
--- 91,94 ----
***************
*** 82,87 ****
this.setCode(pObject.getCode());
this.setDescription(pObject.getDescription());
! this.setNotes(pObject.getNotes());
! countBaseObjects++;
}
--- 102,106 ----
this.setCode(pObject.getCode());
this.setDescription(pObject.getDescription());
! this.setNotes(pObject.getNotes());;
}
***************
*** 105,109 ****
/**
! * Returns a String representation of the nextGraphicsObject
* @return
*/
--- 124,130 ----
/**
! * Returns a String representation of the object
! * Really usefull in the treeview ow/ would avoid.
! *
* @return
*/
***************
*** 231,235 ****
public Vector getData()
{
! return this.data;
}
--- 252,256 ----
public Vector getData()
{
! return this.columns;
}
Index: Entity.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/Entity.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Entity.java 11 Feb 2003 12:04:41 -0000 1.3
--- Entity.java 31 May 2003 11:48:35 -0000 1.4
***************
*** 27,33 ****
public class Entity extends BaseClass implements Serializable
{
! /** Variables **/
! // Number of 'Entity' objects created
! private static int countEntities = 0;
//Subsequent Table
transient private Table subSequentTable;
--- 27,31 ----
public class Entity extends BaseClass implements Serializable
{
!
//Subsequent Table
transient private Table subSequentTable;
***************
*** 41,45 ****
{
super(pObject);
- countEntities++;
this.objectView = new EntityView(this);
}
--- 39,42 ----
***************
*** 52,61 ****
{
super(pModel);
- countEntities++;
this.name = new StringBuffer().append("Entity ")
! .append(countEntities)
.toString();
! this.code = new StringBuffer().append("ENTITY_")
! .append(countEntities)
.toString();
this.objectView = new EntityView(this);
--- 49,57 ----
{
super(pModel);
this.name = new StringBuffer().append("Entity ")
! .append(pModel.countEntities())
.toString();
! this.code = new StringBuffer().append("Entity")
! .append(pModel.countEntities())
.toString();
this.objectView = new EntityView(this);
Index: InheritanceLink.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/InheritanceLink.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InheritanceLink.java 6 Apr 2003 14:19:29 -0000 1.4
--- InheritanceLink.java 31 May 2003 11:48:35 -0000 1.5
***************
*** 30,47 ****
- /**
- * <p>Titre : </p>
- * <p>Description : </p>
- * <p>Copyright: GNU Public License</p>
- * <p>Company: devaki.org</p>
- * @author non attribu\uFFFD
- * @version 1.0
- */
-
public class InheritanceLink extends BaseLine implements Serializable
{
/** Variables **/
- private static int countInstance=0;
private static String key=null;
--- 30,37 ----
***************
*** 58,62 ****
objectView = new InheritanceLinkView(this);
this.setName(new StringBuffer().append("Inheritance Link ")
! .append(countInstance++)
.toString());
}
--- 48,53 ----
objectView = new InheritanceLinkView(this);
this.setName(new StringBuffer().append("Inheritance Link ")
!
! .append(pChildClass.toString())
.toString());
}
***************
*** 68,72 ****
{
super(pObject);
- countInstance++;
objectView= new InheritanceLinkView(this);
this.parentClass=pObject.getParentClass();
--- 59,62 ----
***************
*** 77,81 ****
}
this.objectView = new InheritanceLinkView(this);
-
}
--- 67,70 ----
***************
*** 88,95 ****
objectView= new InheritanceLinkView(this);
this.setName(new StringBuffer().append("Inheritance Link ")
! .append(countInstance++)
.toString());
-
}
/*
* get the primary Key of the Child Class
--- 77,84 ----
objectView= new InheritanceLinkView(this);
this.setName(new StringBuffer().append("Inheritance Link ")
! .append(childClass.toString())
.toString());
}
+
/*
* get the primary Key of the Child Class
Index: Table.java
===================================================================
RCS file: /cvsroot/nextobjects/nextobjects/nextobjects/src/org/devaki/nextobjects/workspace/models/objects/Table.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Table.java 28 May 2003 21:48:29 -0000 1.5
--- Table.java 31 May 2003 11:48:35 -0000 1.6
***************
*** 26,41 ****
import org.devaki.nextobjects.workspace.models.graphics.TableView;
! /**
! *
! * <p>Title: Table</p>
! * <p>Description: </p>
! * <p>Copyright: GNU Public License</p>
! * <p>Company: devaki.org</p>
! */
public class Table extends BaseClass implements Serializable
{
! /** Variables **/
! // Number of tables created
! private static int countTables = 0;
public Vector constraints=new Vector(1);
--- 26,37 ----
import org.devaki.nextobjects.workspace.models.graphics.TableView;
!
public class Table extends BaseClass implements Serializable
{
! /*
! * Linked constraints.
! *
! * */
!
public Vector constraints=new Vector(1);
***************
*** 47,51 ****
{
super(pObject);
- countTables++;
objectView = new TableView(this);
}
--- 43,46 ----
***************
*** 58,64 ****
{
super(pModel);
! countTables++;
! setName(new StringBuffer().append("table ").append(countTables).toString());
! setCode(new StringBuffer().append("table_").append(countTables).toString());
objectView = new TableView(this);
}
--- 53,58 ----
{
super(pModel);
! setName(new StringBuffer().append("table ").append(pModel.countTable()).toString());
! setCode(new StringBuffer().append("table_").append(pModel.countTable()).toString());
objectView = new TableView(this);
}
***************
*** 67,70 ****
--- 61,65 ----
/**
* Get the foreign keys
+ * @task use "to be created" Column.isFk() instead of constraints child test.
* @return
*/
|
