Menu
▾
▴
[Hibernate-commits] Hibernate/cirrus/hibernate/collections ArrayHolder.java,1.49,1.50 List.java,1.43,1.44 Map.java,1.45,1.46 PersistentCollection.java,1.74,1.75 Set.java,1.49,1.50 SortedMap.java,1.21,1.22
Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections
In directory sc8-pr-cvs1:/tmp/cvs-serv20166/cirrus/hibernate/collections
Modified Files:
ArrayHolder.java List.java Map.java PersistentCollection.java
Set.java SortedMap.java
Log Message:
fixed broken line-endings and added a test
Index: ArrayHolder.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/ArrayHolder.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** ArrayHolder.java 27 Oct 2002 03:11:33 -0000 1.49
--- ArrayHolder.java 26 Nov 2002 03:35:41 -0000 1.50
***************
*** 58,65 ****
super(session);
elementClass = persister.getElementClass();
! }
public Object getArray() {
return array;
! }
public boolean equalsSnapshot(Type elementType) throws HibernateException {
Serializable snapshot = getSnapshot();
--- 58,65 ----
super(session);
elementClass = persister.getElementClass();
! }
public Object getArray() {
return array;
! }
public boolean equalsSnapshot(Type elementType) throws HibernateException {
Serializable snapshot = getSnapshot();
***************
*** 84,88 ****
}
}
!
/**
* @see PersistentCollection#elements()
--- 84,88 ----
}
}
!
/**
* @see PersistentCollection#elements()
***************
*** 100,104 ****
return false;
}
!
/**
* @see PersistentCollection#writeTo(PreparedStatement, CollectionPersister, Object, int)
--- 100,104 ----
return false;
}
!
/**
* @see PersistentCollection#writeTo(PreparedStatement, CollectionPersister, Object, int)
***************
*** 110,114 ****
persister.writeIndex(st, new Integer(i), writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
--- 110,114 ----
persister.writeIndex(st, new Integer(i), writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
***************
*** 127,131 ****
return element;
}
!
/**
* @see PersistentCollection#entries()
--- 127,131 ----
return element;
}
!
/**
* @see PersistentCollection#entries()
***************
*** 227,229 ****
}
!
--- 227,229 ----
}
!
Index: List.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/List.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** List.java 1 Oct 2002 01:25:29 -0000 1.43
--- List.java 26 Nov 2002 03:35:41 -0000 1.44
***************
*** 23,27 ****
/**
* A persistent wrapper for a java.util.List
! */
public class List extends ODMGCollection implements java.util.List, DList, DArray {
--- 23,27 ----
/**
* A persistent wrapper for a java.util.List
! */
public class List extends ODMGCollection implements java.util.List, DList, DArray {
***************
*** 56,60 ****
this.list = list;
initialized = true;
! }
public void beforeInitialize(CollectionPersister persister) {
this.list = new ArrayList();
--- 56,60 ----
this.list = list;
initialized = true;
! }
public void beforeInitialize(CollectionPersister persister) {
this.list = new ArrayList();
***************
*** 68,72 ****
return list.size();
}
!
/**
* @see List#isEmpty()
--- 68,72 ----
return list.size();
}
!
/**
* @see List#isEmpty()
***************
*** 76,80 ****
return list.isEmpty();
}
!
/**
* @see List#contains(Object)
--- 76,80 ----
return list.isEmpty();
}
!
/**
* @see List#contains(Object)
***************
*** 84,88 ****
return list.contains(object);
}
!
/**
* @see List#iterator()
--- 84,88 ----
return list.contains(object);
}
!
/**
* @see List#iterator()
***************
*** 92,96 ****
return new IteratorProxy( list.iterator() );
}
!
/**
* @see List#toArray()
--- 92,96 ----
return new IteratorProxy( list.iterator() );
}
!
/**
* @see List#toArray()
***************
*** 100,104 ****
return list.toArray();
}
!
/**
* @see List#toArray(Object[])
--- 100,104 ----
return list.toArray();
}
!
/**
* @see List#toArray(Object[])
***************
*** 108,112 ****
return list.toArray(array);
}
!
/**
* @see List#add(Object)
--- 108,112 ----
return list.toArray(array);
}
!
/**
* @see List#add(Object)
***************
*** 116,120 ****
return list.add(object);
}
!
/**
* @see List#remove(Object)
--- 116,120 ----
return list.add(object);
}
!
/**
* @see List#remove(Object)
***************
*** 124,128 ****
return list.remove(arg0);
}
!
/**
* @see List#containsAll(Collection)
--- 124,128 ----
return list.remove(arg0);
}
!
/**
* @see List#containsAll(Collection)
***************
*** 132,136 ****
return list.containsAll( arg0);
}
!
/**
* @see List#addAll(Collection)
--- 132,136 ----
return list.containsAll( arg0);
}
!
/**
* @see List#addAll(Collection)
***************
*** 140,144 ****
return list.addAll( arg0);
}
!
/**
* @see List#addAll(int, Collection)
--- 140,144 ----
return list.addAll( arg0);
}
!
/**
* @see List#addAll(int, Collection)
***************
*** 148,152 ****
return list.addAll( arg0, arg1);
}
!
/**
* @see List#removeAll(Collection)
--- 148,152 ----
return list.addAll( arg0, arg1);
}
!
/**
* @see List#removeAll(Collection)
***************
*** 156,160 ****
return list.removeAll( arg0);
}
!
/**
* @see List#retainAll(Collection)
--- 156,160 ----
return list.removeAll( arg0);
}
!
/**
* @see List#retainAll(Collection)
***************
*** 164,168 ****
return list.retainAll( arg0);
}
!
/**
* @see List#clear()
--- 164,168 ----
return list.retainAll( arg0);
}
!
/**
* @see List#clear()
***************
*** 172,176 ****
list.clear();
}
!
/**
* @see List#get(int)
--- 172,176 ----
list.clear();
}
!
/**
* @see List#get(int)
***************
*** 180,184 ****
return list.get( arg0);
}
!
/**
* @see List#set(int, Object)
--- 180,184 ----
return list.get( arg0);
}
!
/**
* @see List#set(int, Object)
***************
*** 188,192 ****
return list.set( arg0, arg1);
}
!
/**
* @see List#add(int, Object)
--- 188,192 ----
return list.set( arg0, arg1);
}
!
/**
* @see List#add(int, Object)
***************
*** 196,200 ****
list.add(arg0, arg1);
}
!
/**
* @see List#remove(int)
--- 196,200 ----
list.add(arg0, arg1);
}
!
/**
* @see List#remove(int)
***************
*** 204,208 ****
return list.remove( arg0);
}
!
/**
* @see List#indexOf(Object)
--- 204,208 ----
return list.remove( arg0);
}
!
/**
* @see List#indexOf(Object)
***************
*** 212,216 ****
return list.indexOf( arg0);
}
!
/**
* @see List#lastIndexOf(Object)
--- 212,216 ----
return list.indexOf( arg0);
}
!
/**
* @see List#lastIndexOf(Object)
***************
*** 220,224 ****
return list.lastIndexOf( arg0);
}
!
/**
* @see List#listIterator()
--- 220,224 ----
return list.lastIndexOf( arg0);
}
!
/**
* @see List#listIterator()
***************
*** 228,232 ****
return new ListIteratorProxy( list.listIterator() );
}
!
/**
* @see List#listIterator(int)
--- 228,232 ----
return new ListIteratorProxy( list.listIterator() );
}
!
/**
* @see List#listIterator(int)
***************
*** 236,240 ****
return new ListIteratorProxy( list.listIterator(arg0) );
}
!
/**
* @see List#subList(int, int)
--- 236,240 ----
return new ListIteratorProxy( list.listIterator(arg0) );
}
!
/**
* @see List#subList(int, int)
***************
*** 244,248 ****
return new ListProxy( list.subList(arg0, arg1) );
}
!
/**
* @see PersistentCollection#replaceElements(Map)
--- 244,248 ----
return new ListProxy( list.subList(arg0, arg1) );
}
!
/**
* @see PersistentCollection#replaceElements(Map)
***************
*** 255,259 ****
}
}
!
/**
* @see PersistentCollection#elements()
--- 255,259 ----
}
}
!
/**
* @see PersistentCollection#elements()
***************
*** 269,273 ****
return list.toString();
}
!
/**
* @see PersistentCollection#writeTo(PreparedStatement, CollectionPersister, Object, int)
--- 269,273 ----
return list.toString();
}
!
/**
* @see PersistentCollection#writeTo(PreparedStatement, CollectionPersister, Object, int)
***************
*** 279,283 ****
persister.writeIndex(st, new Integer(i), writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
--- 279,283 ----
persister.writeIndex(st, new Integer(i), writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
***************
*** 292,296 ****
return element;
}
!
/**
* @see PersistentCollection#entries()
--- 292,296 ----
return element;
}
!
/**
* @see PersistentCollection#entries()
***************
*** 304,308 ****
list.add( entries.next() );
}
! }
public void assemble(CollectionPersister persister)
throws HibernateException, SQLException {
--- 304,308 ----
list.add( entries.next() );
}
! }
public void assemble(CollectionPersister persister)
throws HibernateException, SQLException {
***************
*** 383,385 ****
}
!
--- 383,385 ----
}
!
Index: Map.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/Map.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** Map.java 5 Oct 2002 04:18:30 -0000 1.45
--- Map.java 26 Nov 2002 03:35:41 -0000 1.46
***************
*** 22,26 ****
/**
* A persistent wrapper for a java.util.Map
! */
public class Map extends PersistentCollection implements java.util.Map, DMap {
--- 22,26 ----
/**
* A persistent wrapper for a java.util.Map
! */
public class Map extends PersistentCollection implements java.util.Map, DMap {
***************
*** 68,72 ****
return map.size();
}
!
/**
* @see Map#isEmpty()
--- 68,72 ----
return map.size();
}
!
/**
* @see Map#isEmpty()
***************
*** 76,80 ****
return map.isEmpty();
}
!
/**
* @see Map#containsKey(Object)
--- 76,80 ----
return map.isEmpty();
}
!
/**
* @see Map#containsKey(Object)
***************
*** 84,88 ****
return map.containsKey(arg0);
}
!
/**
* @see Map#containsValue(Object)
--- 84,88 ----
return map.containsKey(arg0);
}
!
/**
* @see Map#containsValue(Object)
***************
*** 92,96 ****
return map.containsValue(arg0) ;
}
!
/**
* @see Map#get(Object)
--- 92,96 ----
return map.containsValue(arg0) ;
}
!
/**
* @see Map#get(Object)
***************
*** 100,104 ****
return map.get(arg0);
}
!
/**
* @see Map#put(Object, Object)
--- 100,104 ----
return map.get(arg0);
}
!
/**
* @see Map#put(Object, Object)
***************
*** 108,112 ****
return map.put( arg0, arg1);
}
!
/**
* @see Map#remove(Object)
--- 108,112 ----
return map.put( arg0, arg1);
}
!
/**
* @see Map#remove(Object)
***************
*** 116,120 ****
return map.remove( arg0);
}
!
/**
* @see Map#putAll(Map)
--- 116,120 ----
return map.remove( arg0);
}
!
/**
* @see Map#putAll(Map)
***************
*** 124,128 ****
map.putAll(arg0);
}
!
/**
* @see Map#clear()
--- 124,128 ----
map.putAll(arg0);
}
!
/**
* @see Map#clear()
***************
*** 132,136 ****
map.clear();
}
!
/**
* @see Map#keySet()
--- 132,136 ----
map.clear();
}
!
/**
* @see Map#keySet()
***************
*** 140,144 ****
return new SetProxy( map.keySet() );
}
!
/**
* @see Map#values()
--- 140,144 ----
return new SetProxy( map.keySet() );
}
!
/**
* @see Map#values()
***************
*** 148,152 ****
return new SetProxy( map.values() );
}
!
/**
* @see Map#entrySet()
--- 148,152 ----
return new SetProxy( map.values() );
}
!
/**
* @see Map#entrySet()
***************
*** 156,160 ****
return new EntrySetProxy( map.entrySet() );
}
!
/**
* @see PersistentCollection#replaceElements(Map)
--- 156,160 ----
return new EntrySetProxy( map.entrySet() );
}
!
/**
* @see PersistentCollection#replaceElements(Map)
***************
*** 172,176 ****
if ( n!=replacements.size() ) throw new HibernateException("Application error: don't use mutable values for keys of maps");
}
!
/**
* @see PersistentCollection#elements()
--- 172,176 ----
if ( n!=replacements.size() ) throw new HibernateException("Application error: don't use mutable values for keys of maps");
}
!
/**
* @see PersistentCollection#elements()
***************
*** 195,199 ****
persister.writeIndex(st, e.getKey(), writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
--- 195,199 ----
persister.writeIndex(st, e.getKey(), writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
***************
*** 205,209 ****
return element;
}
!
/**
* @see PersistentCollection#entries()
--- 205,209 ----
return element;
}
!
/**
* @see PersistentCollection#entries()
***************
*** 369,371 ****
}
!
--- 369,371 ----
}
!
Index: PersistentCollection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/PersistentCollection.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** PersistentCollection.java 26 Oct 2002 16:43:27 -0000 1.74
--- PersistentCollection.java 26 Nov 2002 03:35:41 -0000 1.75
***************
*** 40,44 ****
*/
! public abstract class PersistentCollection implements Serializable {
protected transient SessionImplementor session;
protected boolean initialized;
--- 40,44 ----
*/
! public abstract class PersistentCollection implements Serializable {
protected transient SessionImplementor session;
protected boolean initialized;
Index: Set.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/Set.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Set.java 1 Oct 2002 01:25:29 -0000 1.49
--- Set.java 26 Nov 2002 03:35:41 -0000 1.50
***************
*** 23,27 ****
/**
* A persistent wrapper for a java.util.Set
! */
public class Set extends ODMGCollection implements java.util.Set, DSet {
protected java.util.Set set;
--- 23,27 ----
/**
* A persistent wrapper for a java.util.Set
! */
public class Set extends ODMGCollection implements java.util.Set, DSet {
protected java.util.Set set;
***************
*** 69,73 ****
public void beforeInitialize(CollectionPersister persister) {
this.set = persister.hasOrdering() ? LinkedHashCollectionHelper.createLinkedHashSet() : new HashSet();
! }
public Set(SessionImplementor session, java.util.Set set) {
super(session);
--- 69,73 ----
public void beforeInitialize(CollectionPersister persister) {
this.set = persister.hasOrdering() ? LinkedHashCollectionHelper.createLinkedHashSet() : new HashSet();
! }
public Set(SessionImplementor session, java.util.Set set) {
super(session);
***************
*** 79,83 ****
initialized = true;
}
!
/**
* @see PersistentCollection#replaceElements(Map)
--- 79,83 ----
initialized = true;
}
!
/**
* @see PersistentCollection#replaceElements(Map)
***************
*** 93,97 ****
}
}
!
/**
* @see PersistentCollection#elements()
--- 93,97 ----
}
}
!
/**
* @see PersistentCollection#elements()
***************
*** 103,107 ****
return set.isEmpty();
}
!
/**
* @see Set#size()
--- 103,107 ----
return set.isEmpty();
}
!
/**
* @see Set#size()
***************
*** 111,115 ****
return set.size();
}
!
/**
* @see Set#isEmpty()
--- 111,115 ----
return set.size();
}
!
/**
* @see Set#isEmpty()
***************
*** 119,123 ****
return set.isEmpty();
}
!
/**
* @see Set#contains(Object)
--- 119,123 ----
return set.isEmpty();
}
!
/**
* @see Set#contains(Object)
***************
*** 127,131 ****
return set.contains(arg0);
}
!
/**
* @see Set#iterator()
--- 127,131 ----
return set.contains(arg0);
}
!
/**
* @see Set#iterator()
***************
*** 135,139 ****
return new IteratorProxy( set.iterator() );
}
!
/**
* @see Set#toArray()
--- 135,139 ----
return new IteratorProxy( set.iterator() );
}
!
/**
* @see Set#toArray()
***************
*** 143,147 ****
return set.toArray();
}
!
/**
* @see Set#toArray(Object[])
--- 143,147 ----
return set.toArray();
}
!
/**
* @see Set#toArray(Object[])
***************
*** 151,155 ****
return set.toArray(arg0);
}
!
/**
* @see Set#add(Object)
--- 151,155 ----
return set.toArray(arg0);
}
!
/**
* @see Set#add(Object)
***************
*** 159,163 ****
return set.add(arg0);
}
!
/**
* @see Set#remove(Object)
--- 159,163 ----
return set.add(arg0);
}
!
/**
* @see Set#remove(Object)
***************
*** 167,171 ****
return set.remove(arg0);
}
!
/**
* @see Set#containsAll(Collection)
--- 167,171 ----
return set.remove(arg0);
}
!
/**
* @see Set#containsAll(Collection)
***************
*** 175,179 ****
return set.containsAll(arg0);
}
!
/**
* @see Set#addAll(Collection)
--- 175,179 ----
return set.containsAll(arg0);
}
!
/**
* @see Set#addAll(Collection)
***************
*** 183,187 ****
return set.addAll(arg0);
}
!
/**
* @see Set#retainAll(Collection)
--- 183,187 ----
return set.addAll(arg0);
}
!
/**
* @see Set#retainAll(Collection)
***************
*** 191,195 ****
return set.retainAll(arg0);
}
!
/**
* @see Set#removeAll(Collection)
--- 191,195 ----
return set.retainAll(arg0);
}
!
/**
* @see Set#removeAll(Collection)
***************
*** 199,203 ****
return set.remove(arg0);
}
!
/**
* @see Set#clear()
--- 199,203 ----
return set.remove(arg0);
}
!
/**
* @see Set#clear()
***************
*** 212,216 ****
return set.toString();
}
!
/**
* @see PersistentCollection#writeTo(PreparedStatement, CollectionPersister, Object, int)
--- 212,216 ----
return set.toString();
}
!
/**
* @see PersistentCollection#writeTo(PreparedStatement, CollectionPersister, Object, int)
***************
*** 220,224 ****
persister.writeElement(st, entry, writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
--- 220,224 ----
persister.writeElement(st, entry, writeOrder, session);
}
!
/**
* @see PersistentCollection#readFrom(ResultSet, CollectionPersister)
***************
*** 229,233 ****
return element;
}
!
/**
* @see PersistentCollection#entries()
--- 229,233 ----
return element;
}
!
/**
* @see PersistentCollection#entries()
***************
*** 389,391 ****
}
!
--- 389,391 ----
}
!
Index: SortedMap.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/SortedMap.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SortedMap.java 1 Oct 2002 01:25:29 -0000 1.21
--- SortedMap.java 26 Nov 2002 03:35:41 -0000 1.22
***************
*** 19,23 ****
* @version 1.x
* @author <a href="mailto:dou...@al...">e</a>
! */
public class SortedMap extends Map implements java.util.SortedMap {
--- 19,23 ----
* @version 1.x
* @author <a href="mailto:dou...@al...">e</a>
! */
public class SortedMap extends Map implements java.util.SortedMap {
***************
*** 198,200 ****
public SortedMap() {}
}
!
--- 198,200 ----
public SortedMap() {}
}
!
|
