Menu
▾
▴
[Hibernate-commits] Hibernate/cirrus/hibernate/map Array.java,1.12,1.13 Collection.java,1.48,1.49 Column.java,1.19,1.20 Component.java,1.34,1.35 Constraint.java,1.8,1.9 ForeignKey.java,1.11,1.12 Index.java,1.4,1.5 IndexedCollection.java,1.9,1.10 IntegerValue.java,1.7,1.8 List.java,1.13,1.14 Map.java,1.21,1.22 OneToMany.java,1.12,1.13 PrimaryKey.java,1.8,1.9 PrimitiveArray.java,1.5,1.6 Property.java,1.21,1.22 RelationalModel.java,1.4,1.5 Set.java,1.14,1.15
Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/map
In directory sc8-pr-cvs1:/tmp/cvs-serv20166/cirrus/hibernate/map
Modified Files:
Array.java Collection.java Column.java Component.java
Constraint.java ForeignKey.java Index.java
IndexedCollection.java IntegerValue.java List.java Map.java
OneToMany.java PrimaryKey.java PrimitiveArray.java
Property.java RelationalModel.java Set.java
Log Message:
fixed broken line-endings and added a test
Index: Array.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Array.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Array.java 5 Oct 2002 07:52:10 -0000 1.12
--- Array.java 26 Nov 2002 03:35:42 -0000 1.13
***************
*** 9,13 ****
import cirrus.hibernate.*;
import org.w3c.dom.Node;
! import org.w3c.dom.NodeList;
public class Array extends List {
--- 9,13 ----
import cirrus.hibernate.*;
import org.w3c.dom.Node;
! import org.w3c.dom.NodeList;
public class Array extends List {
***************
*** 67,69 ****
}
!
--- 67,69 ----
}
!
Index: Collection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Collection.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** Collection.java 24 Nov 2002 11:48:11 -0000 1.48
--- Collection.java 26 Nov 2002 03:35:42 -0000 1.49
***************
*** 71,75 ****
String barerole = atts.getNamedItem("role").getNodeValue();
role = prefix + Root.ROLE_SEPERATOR + barerole;
!
toplevel = owner==null;
--- 71,75 ----
String barerole = atts.getNamedItem("role").getNodeValue();
role = prefix + Root.ROLE_SEPERATOR + barerole;
!
toplevel = owner==null;
***************
*** 176,180 ****
doneSecondPass=true;
}
!
public boolean isLazy() {
return lazy;
--- 176,180 ----
doneSecondPass=true;
}
!
public boolean isLazy() {
return lazy;
***************
*** 183,187 ****
this.lazy = lazy;
}
!
public String getRole() {
return role;
--- 183,187 ----
this.lazy = lazy;
}
!
public String getRole() {
return role;
***************
*** 198,202 ****
return false;
}
!
public boolean isOneToMany() {
return isOneToMany;
--- 198,202 ----
return false;
}
!
public boolean isOneToMany() {
return isOneToMany;
***************
*** 206,210 ****
return toplevel;
}
!
public OneToMany getOneToMany() {
return oneToMany;
--- 206,210 ----
return toplevel;
}
!
public OneToMany getOneToMany() {
return oneToMany;
***************
*** 227,235 ****
return cache;
}
!
public boolean isReadOnly() {
return readonly;
}
!
}
!
--- 227,235 ----
return cache;
}
!
public boolean isReadOnly() {
return readonly;
}
!
}
!
Index: Column.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Column.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Column.java 27 Oct 2002 03:11:33 -0000 1.19
--- Column.java 26 Nov 2002 03:35:43 -0000 1.20
***************
*** 40,44 ****
this.name = name;
}
!
public boolean isNullable() {
return nullable;
--- 40,44 ----
this.name = name;
}
!
public boolean isNullable() {
return nullable;
***************
*** 65,69 ****
sqlType = (typeNode==null) ? null : typeNode.getNodeValue();
}
!
public int getTypeIndex() {
return typeIndex;
--- 65,69 ----
sqlType = (typeNode==null) ? null : typeNode.getNodeValue();
}
!
public int getTypeIndex() {
return typeIndex;
***************
*** 92,94 ****
}
!
--- 92,94 ----
}
!
Index: Component.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Component.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Component.java 22 Nov 2002 00:27:08 -0000 1.34
--- Component.java 26 Nov 2002 03:35:43 -0000 1.35
***************
*** 81,85 ****
//component path
path += Root.ROLE_SEPERATOR + StringHelper.unqualify(className);
!
NodeList list = node.getChildNodes();
for ( int i=0; i<list.getLength(); i++ ) {
--- 81,85 ----
//component path
path += Root.ROLE_SEPERATOR + StringHelper.unqualify(className);
!
NodeList list = node.getChildNodes();
for ( int i=0; i<list.getLength(); i++ ) {
***************
*** 156,158 ****
}
!
--- 156,158 ----
}
!
Index: Constraint.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Constraint.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Constraint.java 1 Oct 2002 01:25:30 -0000 1.8
--- Constraint.java 26 Nov 2002 03:35:43 -0000 1.9
***************
*** 16,20 ****
public void setName(String name) {
this.name = name;
! }
public Iterator getColumnIterator() {
return columns.iterator();
--- 16,20 ----
public void setName(String name) {
this.name = name;
! }
public Iterator getColumnIterator() {
return columns.iterator();
***************
*** 48,50 ****
public abstract String sqlConstraintString(Dialect d, String constraintName);
}
!
--- 48,50 ----
public abstract String sqlConstraintString(Dialect d, String constraintName);
}
!
Index: ForeignKey.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/ForeignKey.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ForeignKey.java 11 Oct 2002 04:37:43 -0000 1.11
--- ForeignKey.java 26 Nov 2002 03:35:43 -0000 1.12
***************
*** 12,16 ****
private Table referencedTable;
private Class referencedClass;
!
public String sqlConstraintString(Dialect d, String constraintName) {
String[] cols = new String[ getColumnSpan() ];
--- 12,16 ----
private Table referencedTable;
private Class referencedClass;
!
public String sqlConstraintString(Dialect d, String constraintName) {
String[] cols = new String[ getColumnSpan() ];
***************
*** 51,55 ****
public ForeignKey() {
}
!
}
!
--- 51,55 ----
public ForeignKey() {
}
!
}
!
Index: Index.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Index.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Index.java 1 Oct 2002 01:25:30 -0000 1.4
--- Index.java 26 Nov 2002 03:35:43 -0000 1.5
***************
*** 1,24 ****
! //$Id$
! package cirrus.hibernate.map;
!
! import java.util.ArrayList;
! import java.util.Iterator;
!
! import cirrus.hibernate.HibernateException;
! import cirrus.hibernate.engine.Mapping;
! import cirrus.hibernate.helpers.StringHelper;
! import cirrus.hibernate.sql.Dialect;
!
! public class Index implements RelationalModel {
private Table table;
private ArrayList columns = new ArrayList();
! private String name;
public String sqlCreateString(Dialect dialect, Mapping p)
! throws HibernateException {
StringBuffer buf = new StringBuffer("create index ")
.append( dialect.qualifyIndexName() ? name : StringHelper.unqualify(name) )
.append(" on ")
.append( table.getQualifiedName() )
! .append(" (");
Iterator iter = getColumnIterator();
while ( iter.hasNext() ) {
--- 1,24 ----
! //$Id$
! package cirrus.hibernate.map;
!
! import java.util.ArrayList;
! import java.util.Iterator;
!
! import cirrus.hibernate.HibernateException;
! import cirrus.hibernate.engine.Mapping;
! import cirrus.hibernate.helpers.StringHelper;
! import cirrus.hibernate.sql.Dialect;
!
! public class Index implements RelationalModel {
private Table table;
private ArrayList columns = new ArrayList();
! private String name;
public String sqlCreateString(Dialect dialect, Mapping p)
! throws HibernateException {
StringBuffer buf = new StringBuffer("create index ")
.append( dialect.qualifyIndexName() ? name : StringHelper.unqualify(name) )
.append(" on ")
.append( table.getQualifiedName() )
! .append(" (");
Iterator iter = getColumnIterator();
while ( iter.hasNext() ) {
***************
*** 27,52 ****
}
buf.append(")");
! return buf.toString();
! }
public String sqlDropString(Dialect dialect) {
return "drop index " + table.getQualifiedName() + '.' + name;
! }
public Table getTable() {
return table;
! }
public void setTable(Table table) {
this.table = table;
! }
public Iterator getColumnIterator() {
return columns.iterator();
! }
public void addColumn(Column column) {
this.columns.add(column);
! }
public String getName() {
return name;
! }
public void setName(String name) {
this.name = name;
! }
! }
--- 27,52 ----
}
buf.append(")");
! return buf.toString();
! }
public String sqlDropString(Dialect dialect) {
return "drop index " + table.getQualifiedName() + '.' + name;
! }
public Table getTable() {
return table;
! }
public void setTable(Table table) {
this.table = table;
! }
public Iterator getColumnIterator() {
return columns.iterator();
! }
public void addColumn(Column column) {
this.columns.add(column);
! }
public String getName() {
return name;
! }
public void setName(String name) {
this.name = name;
! }
! }
Index: IndexedCollection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/IndexedCollection.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** IndexedCollection.java 24 Nov 2002 11:48:11 -0000 1.9
--- IndexedCollection.java 26 Nov 2002 03:35:43 -0000 1.10
***************
*** 39,43 ****
}
!
}
!
--- 39,43 ----
}
!
}
!
Index: IntegerValue.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/IntegerValue.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IntegerValue.java 10 Feb 2002 10:03:21 -0000 1.7
--- IntegerValue.java 26 Nov 2002 03:35:43 -0000 1.8
***************
*** 19,23 ****
col.setTypeIndex(0);
}
!
}
!
--- 19,23 ----
col.setTypeIndex(0);
}
!
}
!
Index: List.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/List.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** List.java 5 Oct 2002 07:52:10 -0000 1.13
--- List.java 26 Nov 2002 03:35:43 -0000 1.14
***************
*** 10,14 ****
private boolean doneSecondPass;
!
public List(Node node, String prefix, PersistentClass owner, Root root) throws MappingException {
super(node, prefix, owner, root);
--- 10,14 ----
private boolean doneSecondPass;
!
public List(Node node, String prefix, PersistentClass owner, Root root) throws MappingException {
super(node, prefix, owner, root);
***************
*** 39,43 ****
return cirrus.hibernate.collections.List.class;
}
!
}
!
--- 39,43 ----
return cirrus.hibernate.collections.List.class;
}
!
}
!
Index: Map.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Map.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Map.java 9 Oct 2002 03:52:10 -0000 1.21
--- Map.java 26 Nov 2002 03:35:43 -0000 1.22
***************
*** 15,19 ****
private Comparator comparator;
private boolean doneSecondPass;
!
public Map(Node node, String prefix, PersistentClass owner, Root root) throws MappingException {
super(node, prefix, owner, root);
--- 15,19 ----
private Comparator comparator;
private boolean doneSecondPass;
!
public Map(Node node, String prefix, PersistentClass owner, Root root) throws MappingException {
super(node, prefix, owner, root);
***************
*** 70,78 ****
return sorted ? TypeFactory.sortedMap( getRole(), !isToplevel(), comparator ): TypeFactory.map( getRole(), !isToplevel() );
}
!
public Class wrapperClass() {
return sorted ? cirrus.hibernate.collections.SortedMap.class : cirrus.hibernate.collections.Map.class;
}
!
}
!
--- 70,78 ----
return sorted ? TypeFactory.sortedMap( getRole(), !isToplevel(), comparator ): TypeFactory.map( getRole(), !isToplevel() );
}
!
public Class wrapperClass() {
return sorted ? cirrus.hibernate.collections.SortedMap.class : cirrus.hibernate.collections.Map.class;
}
!
}
!
Index: OneToMany.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/OneToMany.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** OneToMany.java 27 Oct 2002 03:11:33 -0000 1.12
--- OneToMany.java 26 Nov 2002 03:35:43 -0000 1.13
***************
*** 6,10 ****
import cirrus.hibernate.Hibernate;
import cirrus.hibernate.MappingException;
!
public class OneToMany {
--- 6,10 ----
import cirrus.hibernate.Hibernate;
import cirrus.hibernate.MappingException;
!
public class OneToMany {
***************
*** 32,36 ****
public Table getReferencingTable() {
return referencingTable;
! }
}
!
--- 32,36 ----
public Table getReferencingTable() {
return referencingTable;
! }
}
!
Index: PrimaryKey.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/PrimaryKey.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PrimaryKey.java 1 Jul 2002 13:45:32 -0000 1.8
--- PrimaryKey.java 26 Nov 2002 03:35:43 -0000 1.9
***************
*** 28,32 ****
}
return buf.append(")").toString();
! }
}
!
--- 28,32 ----
}
return buf.append(")").toString();
! }
}
!
Index: PrimitiveArray.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/PrimitiveArray.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PrimitiveArray.java 5 Oct 2002 07:52:10 -0000 1.5
--- PrimitiveArray.java 26 Nov 2002 03:35:43 -0000 1.6
***************
*** 6,10 ****
import org.w3c.dom.Node;
! public class PrimitiveArray extends Array {
public PrimitiveArray(Node node, String prefix, PersistentClass owner, Root root) throws MappingException {
super(node, prefix, owner, root);
--- 6,10 ----
import org.w3c.dom.Node;
! public class PrimitiveArray extends Array {
public PrimitiveArray(Node node, String prefix, PersistentClass owner, Root root) throws MappingException {
super(node, prefix, owner, root);
***************
*** 16,18 ****
}
!
--- 16,18 ----
}
!
Index: Property.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Property.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Property.java 10 Oct 2002 05:17:27 -0000 1.21
--- Property.java 26 Nov 2002 03:35:43 -0000 1.22
***************
*** 26,30 ****
public Iterator getColumnIterator() {
return value.getColumnIterator();
! }
public String getName() {
return name;
--- 26,30 ----
public Iterator getColumnIterator() {
return value.getColumnIterator();
! }
public String getName() {
return name;
***************
*** 53,57 ****
return (propertyName==null) ? null : propertyName.getNodeValue();
}
!
public Cascades.CascadeStyle cascade() throws MappingException {
if ( value.getType().isComponentType() ) {
--- 53,57 ----
return (propertyName==null) ? null : propertyName.getNodeValue();
}
!
public Cascades.CascadeStyle cascade() throws MappingException {
if ( value.getType().isComponentType() ) {
***************
*** 84,86 ****
}
!
--- 84,86 ----
}
!
Index: RelationalModel.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/RelationalModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RelationalModel.java 1 Oct 2002 01:25:30 -0000 1.4
--- RelationalModel.java 26 Nov 2002 03:35:43 -0000 1.5
***************
*** 10,12 ****
public String sqlDropString(Dialect dialect);
}
!
--- 10,12 ----
public String sqlDropString(Dialect dialect);
}
!
Index: Set.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/map/Set.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Set.java 24 Nov 2002 11:48:11 -0000 1.14
--- Set.java 26 Nov 2002 03:35:43 -0000 1.15
***************
*** 85,87 ****
}
!
--- 85,87 ----
}
!
|
