Author: toad
Date: 2008-09-05 13:42:11 +0000 (Fri, 05 Sep 2008)
New Revision: 22450
Removed:
branches/db4o/freenet/src/freenet/support/Db4oSet.java
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
Log:
Remove Db4oSet, not used any more, is based on the obsolete and problematic
class Db4oMap
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
===================================================================
---
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-09-05 13:40:06 UTC (rev 22449)
+++
branches/db4o/freenet/src/freenet/client/async/ClientRequestSchedulerCore.java
2008-09-05 13:42:11 UTC (rev 22450)
@@ -5,14 +5,11 @@
import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import com.db4o.ObjectContainer;
import com.db4o.ObjectSet;
import com.db4o.query.Predicate;
import com.db4o.query.Query;
-import com.db4o.types.Db4oList;
-import com.db4o.types.Db4oMap;
import freenet.client.FetchContext;
import freenet.crypt.RandomSource;
@@ -24,7 +21,6 @@
import freenet.node.RequestStarter;
import freenet.node.SendableGet;
import freenet.node.SendableRequest;
-import freenet.support.Db4oSet;
import freenet.support.Logger;
import freenet.support.PrioritizedSerialExecutor;
import freenet.support.RandomGrabArray;
Deleted: branches/db4o/freenet/src/freenet/support/Db4oSet.java
===================================================================
--- branches/db4o/freenet/src/freenet/support/Db4oSet.java 2008-09-05
13:40:06 UTC (rev 22449)
+++ branches/db4o/freenet/src/freenet/support/Db4oSet.java 2008-09-05
13:42:11 UTC (rev 22450)
@@ -1,88 +0,0 @@
-package freenet.support;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
-import com.db4o.ObjectContainer;
-import com.db4o.types.Db4oMap;
-
-public class Db4oSet implements Set {
-
- private final Db4oMap map;
- private final NullObject object = new NullObject();
-
- public Db4oSet(ObjectContainer container, int size) {
- map = container.ext().collections().newHashMap(size);
- }
-
- public boolean add(Object arg0) {
- // Avoid unnecessary modification.
- if(map.containsKey(arg0)) return false;
- map.put(arg0, object);
- return true;
- }
-
- public boolean addAll(Collection arg0) {
- throw new UnsupportedOperationException();
- }
-
- public void clear() {
- map.clear();
- }
-
- public boolean contains(Object key) {
- return map.containsKey(key);
- }
-
- public boolean containsAll(Collection arg0) {
- throw new UnsupportedOperationException();
- }
-
- public boolean isEmpty() {
- return map.isEmpty();
- }
-
- public Iterator iterator() {
- Set keys = map.keySet();
- return keys.iterator();
- }
-
- public boolean remove(Object key) {
- return map.remove(key) != null;
- }
-
- public boolean removeAll(Collection arg0) {
- throw new UnsupportedOperationException();
- }
-
- public boolean retainAll(Collection arg0) {
- throw new UnsupportedOperationException();
- }
-
- public int size() {
- return map.size();
- }
-
- public Object[] toArray() {
- return map.keySet().toArray();
- }
-
- public Object[] toArray(Object[] arg0) {
- return map.keySet().toArray(arg0);
- }
-
- public void objectOnActivate(ObjectContainer container) {
- container.activate(map, 1);
- }
-
- public boolean objectCanNew(ObjectContainer container) {
- if(map == null) throw new NullPointerException();
- return true;
- }
-
- public boolean objectCanUpdate(ObjectContainer container) {
- if(map == null) throw new NullPointerException();
- return true;
- }
-}
