Author: j16sdiz Date: 2008-12-19 15:52:25 +0000 (Fri, 19 Dec 2008) New Revision: 24613
Modified:
trunk/plugins/XMLLibrarian/XMLLibrarian.java
Log:
simplify code
Modified: trunk/plugins/XMLLibrarian/XMLLibrarian.java
===================================================================
--- trunk/plugins/XMLLibrarian/XMLLibrarian.java 2008-12-19 15:29:44 UTC
(rev 24612)
+++ trunk/plugins/XMLLibrarian/XMLLibrarian.java 2008-12-19 15:52:25 UTC
(rev 24613)
@@ -592,24 +592,14 @@
synchronized(hs){
hs.clear();
if (keyuris != null) {
-
Iterator<URIWrapper> it = keyuris.iterator();
- while
(it.hasNext()){
-
hs.add(it.next());
- }
+
hs.addAll(keyuris);
}
}
}
else{
try{
synchronized(hs){
-
if(keyuris.size() > 0){
-
Iterator<URIWrapper> it = hs.iterator();
-
while(it.hasNext()){
-
URIWrapper uri = it.next();
-
if(!Contains(uri.URI,keyuris)) it.remove();
- }
- }
-
if(keyuris.size() == 0) hs.clear();
+
hs.retainAll(keyuris);
}
}
catch(Exception e){
@@ -797,6 +787,12 @@
return URI.compareTo(((URIWrapper)o).URI);
return -1;
}
+
+ public boolean equals(Object o) {
+ if (o == null || o.getClass() != getClass())
+ return false;
+ return URI.equals(((URIWrapper) o).URI);
+ }
}
/**
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
