Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping
In directory sc8-pr-cvs1:/tmp/cvs-serv7052/sf/hibernate/mapping
Modified Files:
Collection.java Column.java Constraint.java Index.java
PersistentClass.java Property.java Table.java Value.java
Log Message:
added stringability
fixed some naming conventions
Index: Collection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Collection.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Collection.java 27 Jan 2003 12:12:41 -0000 1.11
--- Collection.java 27 Jan 2003 12:51:50 -0000 1.12
***************
*** 7,12 ****
import net.sf.hibernate.cache.CacheConcurrencyStrategy;
import net.sf.hibernate.type.PersistentCollectionType;
! public abstract class Collection {
public static final String DEFAULT_ELEMENT_COLUMN_NAME = "elt";
--- 7,13 ----
import net.sf.hibernate.cache.CacheConcurrencyStrategy;
import net.sf.hibernate.type.PersistentCollectionType;
+ import net.sf.hibernate.util.Stringable;
! public abstract class Collection extends Stringable {
public static final String DEFAULT_ELEMENT_COLUMN_NAME = "elt";
Index: Column.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Column.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Column.java 27 Jan 2003 07:12:03 -0000 1.5
--- Column.java 27 Jan 2003 12:51:50 -0000 1.6
***************
*** 7,12 ****
import net.sf.hibernate.engine.Mapping;
import net.sf.hibernate.type.Type;
! public class Column {
private static final int DEFAULT_PROPERTY_LENGTH = 255;
--- 7,13 ----
import net.sf.hibernate.engine.Mapping;
import net.sf.hibernate.type.Type;
+ import net.sf.hibernate.util.Stringable;
! public class Column extends Stringable {
private static final int DEFAULT_PROPERTY_LENGTH = 255;
Index: Constraint.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Constraint.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Constraint.java 5 Jan 2003 02:11:22 -0000 1.3
--- Constraint.java 27 Jan 2003 12:51:50 -0000 1.4
***************
*** 2,10 ****
package net.sf.hibernate.mapping;
! import java.util.*;
import net.sf.hibernate.dialect.Dialect;
import net.sf.hibernate.engine.Mapping;
! public abstract class Constraint implements RelationalModel {
private String name;
private final ArrayList columns = new ArrayList();
--- 2,14 ----
package net.sf.hibernate.mapping;
! import java.util.ArrayList;
! import java.util.Iterator;
!
import net.sf.hibernate.dialect.Dialect;
import net.sf.hibernate.engine.Mapping;
+ import net.sf.hibernate.util.Stringable;
! public abstract class Constraint extends Stringable implements RelationalModel {
!
private String name;
private final ArrayList columns = new ArrayList();
Index: Index.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Index.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Index.java 27 Jan 2003 07:12:03 -0000 1.5
--- Index.java 27 Jan 2003 12:51:50 -0000 1.6
***************
*** 8,14 ****
import net.sf.hibernate.engine.Mapping;
import net.sf.hibernate.util.StringHelper;
import net.sf.hibernate.dialect.Dialect;
! public class Index implements RelationalModel {
private Table table;
--- 8,15 ----
import net.sf.hibernate.engine.Mapping;
import net.sf.hibernate.util.StringHelper;
+ import net.sf.hibernate.util.Stringable;
import net.sf.hibernate.dialect.Dialect;
! public class Index extends Stringable implements RelationalModel {
private Table table;
Index: PersistentClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/PersistentClass.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PersistentClass.java 27 Jan 2003 12:12:41 -0000 1.9
--- PersistentClass.java 27 Jan 2003 12:51:50 -0000 1.10
***************
*** 8,13 ****
import net.sf.hibernate.util.JoinedIterator;
import net.sf.hibernate.util.StringHelper;
! public abstract class PersistentClass {
private Class persistentClass;
--- 8,14 ----
import net.sf.hibernate.util.JoinedIterator;
import net.sf.hibernate.util.StringHelper;
+ import net.sf.hibernate.util.Stringable;
! public abstract class PersistentClass extends Stringable {
private Class persistentClass;
Index: Property.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Property.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Property.java 27 Jan 2003 07:12:03 -0000 1.6
--- Property.java 27 Jan 2003 12:51:50 -0000 1.7
***************
*** 8,16 ****
import net.sf.hibernate.type.AbstractComponentType;
import net.sf.hibernate.type.Type;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
! public class Property {
private String name;
--- 8,17 ----
import net.sf.hibernate.type.AbstractComponentType;
import net.sf.hibernate.type.Type;
+ import net.sf.hibernate.util.Stringable;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
! public class Property extends Stringable {
private String name;
Index: Table.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Table.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Table.java 20 Jan 2003 12:48:13 -0000 1.5
--- Table.java 27 Jan 2003 12:51:50 -0000 1.6
***************
*** 15,22 ****
import net.sf.hibernate.tool.hbm2ddl.JdbcTableInfo;
import net.sf.hibernate.util.StringHelper;
import org.apache.commons.collections.SequencedHashMap;
! public class Table implements RelationalModel {
private String name;
private String schema;
--- 15,24 ----
import net.sf.hibernate.tool.hbm2ddl.JdbcTableInfo;
import net.sf.hibernate.util.StringHelper;
+ import net.sf.hibernate.util.Stringable;
import org.apache.commons.collections.SequencedHashMap;
! public class Table extends Stringable implements RelationalModel {
!
private String name;
private String schema;
***************
*** 62,75 ****
return columns.size();
}
! public Iterator columnIterator() {
return columns.values().iterator();
}
! public Iterator indexIterator() {
return indexes.values().iterator();
}
! public Iterator foreignKeyIterator() {
return foreignKeys.values().iterator();
}
! public Iterator uniqueKeyIterator() {
return uniqueKeys.values().iterator();
}
--- 64,77 ----
return columns.size();
}
! public Iterator getColumnIterator() {
return columns.values().iterator();
}
! public Iterator getIndexIterator() {
return indexes.values().iterator();
}
! public Iterator getForeignKeyIterator() {
return foreignKeys.values().iterator();
}
! public Iterator getUniqueKeyIterator() {
return uniqueKeys.values().iterator();
}
***************
*** 77,81 ****
public String sqlAlterString(Dialect dialect,Mapping p,JdbcTableInfo tableInfo) throws HibernateException {
! Iterator iter=columnIterator();
StringBuffer buf=new StringBuffer(50);
while (iter.hasNext()) {
--- 79,83 ----
public String sqlAlterString(Dialect dialect,Mapping p,JdbcTableInfo tableInfo) throws HibernateException {
! Iterator iter=getColumnIterator();
StringBuffer buf=new StringBuffer(50);
while (iter.hasNext()) {
***************
*** 116,120 ****
}
! Iterator iter = columnIterator();
while ( iter.hasNext() ) {
Column col = (Column) iter.next();
--- 118,122 ----
}
! Iterator iter = getColumnIterator();
while ( iter.hasNext() ) {
Column col = (Column) iter.next();
***************
*** 153,157 ****
}
if ( dialect.supportsUnique() ) {
! Iterator ukiter = uniqueKeyIterator();
while ( ukiter.hasNext() ) {
UniqueKey uk = (UniqueKey) ukiter.next();
--- 155,159 ----
}
if ( dialect.supportsUnique() ) {
! Iterator ukiter = getUniqueKeyIterator();
while ( ukiter.hasNext() ) {
UniqueKey uk = (UniqueKey) ukiter.next();
Index: Value.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/mapping/Value.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Value.java 27 Jan 2003 12:12:41 -0000 1.8
--- Value.java 27 Jan 2003 12:51:50 -0000 1.9
***************
*** 14,17 ****
--- 14,18 ----
import net.sf.hibernate.type.Type;
import net.sf.hibernate.util.ReflectHelper;
+ import net.sf.hibernate.util.Stringable;
/**
***************
*** 21,25 ****
* to instances of this class.
*/
! public class Value {
//TODO: split this class into two - one that handles collections, and a second that handles basic types
//actually make "Value" be an interface
--- 22,26 ----
* to instances of this class.
*/
! public class Value extends Stringable {
//TODO: split this class into two - one that handles collections, and a second that handles basic types
//actually make "Value" be an interface
|