[MMBASE CVS] src/org/mmbase/bridge/util AbstractNodeManager.java AbstractCollectionNodeList.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/bridge/util
In directory james.mmbase.org:/tmp/cvs-serv25027

Modified Files:
        AbstractNodeManager.java AbstractCollectionNodeList.java 
Log Message:
didn't compile


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/util


Index: AbstractNodeManager.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractNodeManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- AbstractNodeManager.java    4 Sep 2008 06:54:27 -0000       1.10
+++ AbstractNodeManager.java    4 Sep 2008 09:34:51 -0000       1.11
@@ -24,7 +24,7 @@
  * org.mmbase.bridge.implementation.VirtualNodeManager}).
  *
  * @author Michiel Meeuwissen
- * @version $Id: AbstractNodeManager.java,v 1.10 2008/09/04 06:54:27 michiel 
Exp $
+ * @version $Id: AbstractNodeManager.java,v 1.11 2008/09/04 09:34:51 michiel 
Exp $
  * @see org.mmbase.bridge.NodeManager
  * @since MMBase-1.8
  */
@@ -73,11 +73,11 @@
     }
 
     public NodeList createNodeList() {
-        return new CollectionNodeList(Collections.emptyList(), this);
+        return new CollectionNodeList(BridgeCollections.EMPTY_NODELIST, this);
     }
 
     public RelationList createRelationList() {
-        return new CollectionRelationList(Collections.emptyList(), this);
+        return new 
CollectionRelationList(BridgeCollections.EMPTY_RELATIONLIST, this);
     }
 
     public boolean mayCreateNode() {


Index: AbstractCollectionNodeList.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/util/AbstractCollectionNodeList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- AbstractCollectionNodeList.java     4 Sep 2008 06:54:27 -0000       1.7
+++ AbstractCollectionNodeList.java     4 Sep 2008 09:34:51 -0000       1.8
@@ -23,7 +23,7 @@
  * implicitely [EMAIL PROTECTED] #convert}ed when necessary.
  *
  * @since MMBase-1.8
- * @version $Id: AbstractCollectionNodeList.java,v 1.7 2008/09/04 06:54:27 
michiel Exp $
+ * @version $Id: AbstractCollectionNodeList.java,v 1.8 2008/09/04 09:34:51 
michiel Exp $
  * @author Nico Klasens
  */
 
@@ -34,13 +34,13 @@
     protected final NodeManager nodeManager;
     protected final List wrappedCollection;
 
-    public AbstractCollectionNodeList(Collection<Node> c, NodeManager 
nodeManager) {
+    public AbstractCollectionNodeList(Collection<? extends Node> c, 
NodeManager nodeManager) {
         this.nodeManager = nodeManager;
         this.cloud = nodeManager.getCloud();
         this.wrappedCollection = convertedList(c, cloud);
     }
 
-    public AbstractCollectionNodeList(Collection<Node> c, Cloud cloud) {
+    public AbstractCollectionNodeList(Collection<? extends Node> c, Cloud 
cloud) {
         this.nodeManager = null;
         this.cloud = cloud;
         this.wrappedCollection = convertedList(c, cloud);
@@ -77,7 +77,7 @@
         return wrappedCollection;
     }
 
-    private static List<Node> convertedList(Collection<Node> c, Cloud cloud) {
+    private static List convertedList(Collection c, Cloud cloud) {
         if (c instanceof List) {
             return (List<Node>) c;
         } else {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs