refactoring in cora: added sorting package

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@7890 6c8d7289-2bf4-0310-a012-ef5d649a1542

htroot/yacy/search.java

@@ -43,8 +43,8 @@ import net.yacy.cora.protocol.Domains;
 import net.yacy.cora.protocol.HeaderFramework;
 import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.ranking.ScoreMap;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue;
 import net.yacy.cora.services.federated.yacy.CacheStrategy;
-import net.yacy.cora.storage.WeakPriorityBlockingQueue;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.word.WordReference;
 import net.yacy.kelondro.data.word.WordReferenceFactory;

source/de/anomic/search/MetadataRepository.java

@@ -44,7 +44,7 @@ import net.yacy.cora.document.UTF8;
 import net.yacy.cora.protocol.http.HTTPClient;
 import net.yacy.cora.ranking.ConcurrentScoreMap;
 import net.yacy.cora.ranking.ScoreMap;
-import net.yacy.cora.storage.WeakPriorityBlockingQueue;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue;
 import net.yacy.document.parser.html.CharacterCoding;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadataRow;

source/de/anomic/search/RankingProcess.java

@@ -45,8 +45,8 @@ import net.yacy.cora.protocol.Scanner;
 import net.yacy.cora.ranking.ClusteredScoreMap;
 import net.yacy.cora.ranking.ConcurrentScoreMap;
 import net.yacy.cora.ranking.ScoreMap;
-import net.yacy.cora.storage.WeakPriorityBlockingQueue;
-import net.yacy.cora.storage.WeakPriorityBlockingQueue.ReverseElement;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue.ReverseElement;
 import net.yacy.document.Condenser;
 import net.yacy.kelondro.data.meta.DigestURI;
 import net.yacy.kelondro.data.meta.URIMetadataRow;

source/de/anomic/search/ResultFetcher.java

@@ -34,9 +34,9 @@ import java.util.regex.Pattern;
 import net.yacy.cora.document.MultiProtocolURI;
 import net.yacy.cora.protocol.ResponseHeader;
 import net.yacy.cora.ranking.ScoreMap;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue.ReverseElement;
 import net.yacy.cora.services.federated.yacy.CacheStrategy;
-import net.yacy.cora.storage.WeakPriorityBlockingQueue;
-import net.yacy.cora.storage.WeakPriorityBlockingQueue.ReverseElement;
 import net.yacy.document.Condenser;
 import net.yacy.kelondro.data.meta.URIMetadataRow;
 import net.yacy.kelondro.data.word.Word;

source/net/yacy/cora/ranking/WeakPriorityBlockingQueue.java

@@ -23,7 +23,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.storage;
+package net.yacy.cora.ranking;
 
 import java.util.ArrayList;
 import java.util.Comparator;

source/net/yacy/cora/services/federated/SearchResult.java

@@ -26,7 +26,7 @@
 
 package net.yacy.cora.services.federated;
 
-import net.yacy.cora.storage.WeakPriorityBlockingQueue;
+import net.yacy.cora.ranking.WeakPriorityBlockingQueue;
 
 public class SearchResult extends WeakPriorityBlockingQueue<Object> {
 

source/net/yacy/cora/sorting/Array.java

@@ -22,7 +22,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.storage;
+package net.yacy.cora.sorting;
 
 import java.util.ArrayList;
 import java.util.Random;
@@ -30,6 +30,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
 
+
 /**
  * an abstraction of the quicksort from the java.util.Array class
  * @author admin

source/net/yacy/cora/sorting/Sortable.java

@@ -22,7 +22,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.storage;
+package net.yacy.cora.sorting;
 
 import java.util.Comparator;
 

source/net/yacy/cora/sorting/UpDownLatch.java

@@ -22,7 +22,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.yacy.cora.storage;
+package net.yacy.cora.sorting;
 
 import java.util.concurrent.locks.AbstractQueuedSynchronizer;
 

source/net/yacy/kelondro/index/RowCollection.java

@@ -34,8 +34,8 @@ import java.util.concurrent.Callable;
 
 import net.yacy.cora.document.ASCII;
 import net.yacy.cora.document.UTF8;
-import net.yacy.cora.storage.Array;
-import net.yacy.cora.storage.Sortable;
+import net.yacy.cora.sorting.Array;
+import net.yacy.cora.sorting.Sortable;
 import net.yacy.kelondro.index.Row.Entry;
 import net.yacy.kelondro.logging.Log;
 import net.yacy.kelondro.order.Base64Order;
@@ -618,7 +618,7 @@ public class RowCollection implements Sortable<Row.Entry>, Iterable<Row.Entry>,
         if (this.sortBound == this.chunkcount) return; // this is sorted
         synchronized (this) {
             if (this.sortBound == this.chunkcount) return; // check again
-            net.yacy.cora.storage.Array.sort(this);
+            net.yacy.cora.sorting.Array.sort(this);
             this.sortBound = this.chunkcount;
         }
     }

source/net/yacy/yacy.java

@@ -52,7 +52,7 @@ import net.yacy.cora.protocol.RequestHeader;
 import net.yacy.cora.protocol.http.HTTPClient;
 import net.yacy.cora.ranking.OrderedScoreMap;
 import net.yacy.cora.ranking.ScoreMap;
-import net.yacy.cora.storage.Array;
+import net.yacy.cora.sorting.Array;
 import net.yacy.gui.YaCyApp;
 import net.yacy.gui.framework.Browser;
 import net.yacy.kelondro.blob.MapDataMining;