diff --git a/htroot/ConfigAccounts_p.java b/htroot/ConfigAccounts_p.java index f7217e2d9..f7e0b2a3d 100644 --- a/htroot/ConfigAccounts_p.java +++ b/htroot/ConfigAccounts_p.java @@ -33,11 +33,12 @@ import java.io.IOException; import java.util.HashMap; import java.util.Iterator; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.data.userDB; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.server.HTTPDemon; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/IndexControlRWIs_p.java b/htroot/IndexControlRWIs_p.java index ccf69282e..efdcadbd6 100644 --- a/htroot/IndexControlRWIs_p.java +++ b/htroot/IndexControlRWIs_p.java @@ -36,13 +36,14 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import net.yacy.kelondro.order.Bitfield; + import de.anomic.data.AbstractBlacklist; import de.anomic.data.Blacklist; import de.anomic.data.listManager; import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceContainerCache; diff --git a/htroot/IndexControlURLs_p.java b/htroot/IndexControlURLs_p.java index 500edac50..46013555a 100644 --- a/htroot/IndexControlURLs_p.java +++ b/htroot/IndexControlURLs_p.java @@ -30,9 +30,10 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.Iterator; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.RotateIterator; + import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.RotateIterator; import de.anomic.kelondro.text.MetadataRepository; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index f5100c9ee..9a38e90ae 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -35,12 +35,13 @@ import java.util.StringTokenizer; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.http.client.RemoteProxyConfig; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.HTTPDProxyHandler; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.DateFormatter; import de.anomic.search.Switchboard; import de.anomic.server.serverCore; diff --git a/htroot/Supporter.java b/htroot/Supporter.java index 0327a5f4f..74f99f374 100644 --- a/htroot/Supporter.java +++ b/htroot/Supporter.java @@ -31,11 +31,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.data.Blacklist; import de.anomic.http.metadata.RequestHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.search.Switchboard; diff --git a/htroot/Surftips.java b/htroot/Surftips.java index 08b0e99bc..65d3fe5f9 100644 --- a/htroot/Surftips.java +++ b/htroot/Surftips.java @@ -31,11 +31,12 @@ import java.util.Date; import java.util.HashMap; import java.util.Iterator; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.data.Blacklist; import de.anomic.http.metadata.RequestHeader; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.search.Switchboard; diff --git a/htroot/User.java b/htroot/User.java index 2f3e89b44..2516e71ec 100644 --- a/htroot/User.java +++ b/htroot/User.java @@ -29,13 +29,14 @@ import java.io.IOException; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.data.userDB; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseHeader; import de.anomic.http.server.HTTPDemon; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/ViewProfile.java b/htroot/ViewProfile.java index a831bed42..1e315e0e2 100644 --- a/htroot/ViewProfile.java +++ b/htroot/ViewProfile.java @@ -41,8 +41,9 @@ import java.util.Iterator; import java.util.Map; import java.util.Properties; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Base64Order; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/WebStructurePicture_p.java b/htroot/WebStructurePicture_p.java index 121aec269..98b9dab09 100644 --- a/htroot/WebStructurePicture_p.java +++ b/htroot/WebStructurePicture_p.java @@ -31,8 +31,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Base64Order; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/api/bookmarks/posts/all.java b/htroot/api/bookmarks/posts/all.java index d8ef7c4bb..2aeb7972f 100755 --- a/htroot/api/bookmarks/posts/all.java +++ b/htroot/api/bookmarks/posts/all.java @@ -2,9 +2,10 @@ import java.util.Date; import java.util.Iterator; +import net.yacy.kelondro.order.Digest; + import de.anomic.data.bookmarksDB; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.DateFormatter; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; diff --git a/htroot/api/bookmarks/posts/get.java b/htroot/api/bookmarks/posts/get.java index 4f7b52363..8e1b45e29 100755 --- a/htroot/api/bookmarks/posts/get.java +++ b/htroot/api/bookmarks/posts/get.java @@ -5,9 +5,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.Iterator; +import net.yacy.kelondro.order.Digest; + import de.anomic.data.bookmarksDB; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.DateFormatter; import de.anomic.search.Switchboard; import de.anomic.server.serverObjects; diff --git a/htroot/yacy/search.java b/htroot/yacy/search.java index 09e3c195e..11d097824 100644 --- a/htroot/yacy/search.java +++ b/htroot/yacy/search.java @@ -34,12 +34,13 @@ import java.util.Iterator; import java.util.Map; import java.util.TreeSet; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; + import de.anomic.content.RSSMessage; import de.anomic.document.parser.xml.RSSFeed; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segments; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/htroot/yacy/transfer.java b/htroot/yacy/transfer.java index e8b45d796..9ffe26d43 100644 --- a/htroot/yacy/transfer.java +++ b/htroot/yacy/transfer.java @@ -27,10 +27,11 @@ import java.io.File; import java.io.IOException; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.FileUtils; import de.anomic.search.Switchboard; import de.anomic.search.blockrank.CRDistribution; diff --git a/htroot/yacysearch.java b/htroot/yacysearch.java index 5ff846db4..2b5d78f18 100644 --- a/htroot/yacysearch.java +++ b/htroot/yacysearch.java @@ -34,6 +34,7 @@ import java.util.Set; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Bitfield; import de.anomic.content.RSSMessage; import de.anomic.crawler.retrieval.LoaderDispatcher; @@ -46,7 +47,6 @@ import de.anomic.document.Document; import de.anomic.document.parser.xml.RSSFeed; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.Segments; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; diff --git a/source/dbtest.java b/source/dbtest.java index 4d1f7c978..0c7c19ed7 100644 --- a/source/dbtest.java +++ b/source/dbtest.java @@ -12,13 +12,14 @@ import java.util.Random; import javax.imageio.ImageIO; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowSet; import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.index.ObjectArrayCache; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.table.SQLTable; import de.anomic.kelondro.table.SplitTable; diff --git a/source/de/anomic/crawler/Balancer.java b/source/de/anomic/crawler/Balancer.java index 64ee2e56d..b8d0b1699 100644 --- a/source/de/anomic/crawler/Balancer.java +++ b/source/de/anomic/crawler/Balancer.java @@ -34,12 +34,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentLinkedQueue; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.CloneableIterator; import de.anomic.crawler.retrieval.Request; import de.anomic.http.client.Cache; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.CloneableIterator; import de.anomic.kelondro.table.Table; public class Balancer { diff --git a/source/de/anomic/crawler/CrawlProfile.java b/source/de/anomic/crawler/CrawlProfile.java index 8ea304b7d..8a74ef94c 100644 --- a/source/de/anomic/crawler/CrawlProfile.java +++ b/source/de/anomic/crawler/CrawlProfile.java @@ -32,13 +32,13 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.Digest; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.Digest; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/crawler/ResultURLs.java b/source/de/anomic/crawler/ResultURLs.java index 72efbc568..c4c9b0eb9 100644 --- a/source/de/anomic/crawler/ResultURLs.java +++ b/source/de/anomic/crawler/ResultURLs.java @@ -40,8 +40,8 @@ import java.util.LinkedList; import java.util.List; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Bitfield; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/crawler/RobotsTxt.java b/source/de/anomic/crawler/RobotsTxt.java index 9b959e6bc..d6f5a8fe7 100644 --- a/source/de/anomic/crawler/RobotsTxt.java +++ b/source/de/anomic/crawler/RobotsTxt.java @@ -37,6 +37,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.http.client.Client; @@ -45,7 +46,6 @@ import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseContainer; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.ByteBuffer; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/crawler/ZURL.java b/source/de/anomic/crawler/ZURL.java index c0a9f1066..7a6bd4d12 100755 --- a/source/de/anomic/crawler/ZURL.java +++ b/source/de/anomic/crawler/ZURL.java @@ -32,11 +32,12 @@ import java.util.Date; import java.util.Iterator; import java.util.LinkedList; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.crawler.retrieval.Request; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowSet; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.table.SplitTable; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/crawler/retrieval/Request.java b/source/de/anomic/crawler/retrieval/Request.java index 37cbb0883..d6bce899b 100755 --- a/source/de/anomic/crawler/retrieval/Request.java +++ b/source/de/anomic/crawler/retrieval/Request.java @@ -30,10 +30,11 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Date; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.server.serverProcessorJob; import de.anomic.yacy.yacySeedDB; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/data/URLAnalysis.java b/source/de/anomic/data/URLAnalysis.java index 0b420e751..42d62e6eb 100644 --- a/source/de/anomic/data/URLAnalysis.java +++ b/source/de/anomic/data/URLAnalysis.java @@ -50,9 +50,10 @@ import java.util.regex.Pattern; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.kelondro.index.HandleSet; import de.anomic.kelondro.index.HandleMap; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.text.MetadataRepository; import de.anomic.kelondro.text.ReferenceContainerArray; import de.anomic.kelondro.text.Segment; diff --git a/source/de/anomic/data/blogBoard.java b/source/de/anomic/data/blogBoard.java index 2afe953b1..44f269050 100644 --- a/source/de/anomic/data/blogBoard.java +++ b/source/de/anomic/data/blogBoard.java @@ -43,6 +43,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.NaturalOrder; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -52,8 +54,6 @@ import org.xml.sax.SAXException; import de.anomic.data.wiki.wikiBoard; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/data/blogBoardComments.java b/source/de/anomic/data/blogBoardComments.java index d49af6668..d6c51c584 100644 --- a/source/de/anomic/data/blogBoardComments.java +++ b/source/de/anomic/data/blogBoardComments.java @@ -42,6 +42,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.NaturalOrder; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -51,8 +53,6 @@ import org.xml.sax.SAXException; import de.anomic.data.wiki.wikiBoard; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.NaturalOrder; public class blogBoardComments { diff --git a/source/de/anomic/data/bookmarksDB.java b/source/de/anomic/data/bookmarksDB.java index de8de67cb..139599267 100644 --- a/source/de/anomic/data/bookmarksDB.java +++ b/source/de/anomic/data/bookmarksDB.java @@ -56,6 +56,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -70,8 +72,6 @@ import de.anomic.document.parser.html.ContentScraper; import de.anomic.document.parser.html.TransformerWriter; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Segments; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/data/messageBoard.java b/source/de/anomic/data/messageBoard.java index 1ebae0eb7..18608e44a 100644 --- a/source/de/anomic/data/messageBoard.java +++ b/source/de/anomic/data/messageBoard.java @@ -31,10 +31,11 @@ import java.util.Iterator; import java.util.Map; import java.util.TimeZone; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.NaturalOrder; public class messageBoard { diff --git a/source/de/anomic/data/userDB.java b/source/de/anomic/data/userDB.java index b31bbac1e..a168ebb99 100644 --- a/source/de/anomic/data/userDB.java +++ b/source/de/anomic/data/userDB.java @@ -35,13 +35,14 @@ import java.util.Iterator; import java.util.Map; import java.util.Random; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.Digest; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.http.metadata.RequestHeader; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.Digest; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/data/wiki/wikiBoard.java b/source/de/anomic/data/wiki/wikiBoard.java index 053b6e8e9..f7f82fa90 100644 --- a/source/de/anomic/data/wiki/wikiBoard.java +++ b/source/de/anomic/data/wiki/wikiBoard.java @@ -34,10 +34,11 @@ import java.util.Iterator; import java.util.Map; import java.util.TimeZone; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.NaturalOrder; public class wikiBoard { diff --git a/source/de/anomic/document/Condenser.java b/source/de/anomic/document/Condenser.java index 9c8c654c3..fff72aa43 100644 --- a/source/de/anomic/document/Condenser.java +++ b/source/de/anomic/document/Condenser.java @@ -46,11 +46,12 @@ import java.util.Properties; import java.util.TreeMap; import java.util.TreeSet; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; + import de.anomic.document.language.Identificator; import de.anomic.document.parser.html.ContentScraper; import de.anomic.document.parser.html.ImageEntry; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; import de.anomic.kelondro.util.SetTools; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/document/Word.java b/source/de/anomic/document/Word.java index d907e4dad..bfe3268d4 100644 --- a/source/de/anomic/document/Word.java +++ b/source/de/anomic/document/Word.java @@ -32,11 +32,12 @@ import java.util.Locale; import java.util.Set; import java.util.TreeSet; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.Digest; + import de.anomic.kelondro.index.ARC; import de.anomic.kelondro.index.ConcurrentARC; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.MemoryControl; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/document/parser/vcfParser.java b/source/de/anomic/document/parser/vcfParser.java index 5f43d7b60..6a29faa5c 100644 --- a/source/de/anomic/document/parser/vcfParser.java +++ b/source/de/anomic/document/parser/vcfParser.java @@ -38,6 +38,8 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.Set; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.document.AbstractParser; import de.anomic.document.Idiom; @@ -46,7 +48,6 @@ import de.anomic.document.Document; import de.anomic.http.client.Client; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; -import de.anomic.kelondro.order.Base64Order; import de.anomic.yacy.yacyURL; /** diff --git a/source/de/anomic/http/client/Cache.java b/source/de/anomic/http/client/Cache.java index c404d654c..147622069 100644 --- a/source/de/anomic/http/client/Cache.java +++ b/source/de/anomic/http/client/Cache.java @@ -43,13 +43,13 @@ import java.util.HashMap; import java.util.Map; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import de.anomic.http.metadata.ResponseHeader; import de.anomic.kelondro.blob.ArrayStack; import de.anomic.kelondro.blob.Compressor; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapView; -import de.anomic.kelondro.order.Base64Order; import de.anomic.yacy.yacySeedDB; import de.anomic.yacy.yacyURL; diff --git a/source/de/anomic/http/client/Client.java b/source/de/anomic/http/client/Client.java index fac54bc2d..f91dede6d 100644 --- a/source/de/anomic/http/client/Client.java +++ b/source/de/anomic/http/client/Client.java @@ -36,6 +36,7 @@ import java.util.Map.Entry; import java.util.zip.GZIPOutputStream; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import org.apache.commons.httpclient.ConnectMethod; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; @@ -65,7 +66,6 @@ import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseContainer; import de.anomic.http.metadata.ResponseHeader; import de.anomic.http.metadata.HeaderFramework; -import de.anomic.kelondro.order.Base64Order; import de.anomic.yacy.yacyURL; /** diff --git a/source/de/anomic/http/server/HTTPDemon.java b/source/de/anomic/http/server/HTTPDemon.java index ac8c4ca31..ebd046c76 100644 --- a/source/de/anomic/http/server/HTTPDemon.java +++ b/source/de/anomic/http/server/HTTPDemon.java @@ -51,6 +51,8 @@ import java.util.Map.Entry; import java.util.zip.GZIPInputStream; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; import org.apache.commons.fileupload.FileItem; import org.apache.commons.fileupload.FileItemFactory; @@ -67,8 +69,6 @@ import de.anomic.document.parser.html.CharacterCoding; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseHeader; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.ByteBuffer; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/kelondro/blob/ArrayStack.java b/source/de/anomic/kelondro/blob/ArrayStack.java index d08d78db9..6769c2732 100755 --- a/source/de/anomic/kelondro/blob/ArrayStack.java +++ b/source/de/anomic/kelondro/blob/ArrayStack.java @@ -48,12 +48,12 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.MergeIterator; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; -import de.anomic.kelondro.order.MergeIterator; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceFactory; diff --git a/source/de/anomic/kelondro/blob/BLOB.java b/source/de/anomic/kelondro/blob/BLOB.java index 1da391761..5f44fea9a 100644 --- a/source/de/anomic/kelondro/blob/BLOB.java +++ b/source/de/anomic/kelondro/blob/BLOB.java @@ -28,8 +28,9 @@ package de.anomic.kelondro.blob; import java.io.IOException; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; + public interface BLOB { diff --git a/source/de/anomic/kelondro/blob/Compressor.java b/source/de/anomic/kelondro/blob/Compressor.java index fa2913356..f714051e7 100644 --- a/source/de/anomic/kelondro/blob/Compressor.java +++ b/source/de/anomic/kelondro/blob/Compressor.java @@ -38,9 +38,9 @@ import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; import de.anomic.kelondro.util.ByteArray; public class Compressor implements BLOB { diff --git a/source/de/anomic/kelondro/blob/Heap.java b/source/de/anomic/kelondro/blob/Heap.java index 74b09e729..509bbe94d 100755 --- a/source/de/anomic/kelondro/blob/Heap.java +++ b/source/de/anomic/kelondro/blob/Heap.java @@ -32,10 +32,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.io.random.AbstractWriter; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; public final class Heap extends HeapModifier implements BLOB { diff --git a/source/de/anomic/kelondro/blob/HeapModifier.java b/source/de/anomic/kelondro/blob/HeapModifier.java index afb7f357e..5d8f33027 100644 --- a/source/de/anomic/kelondro/blob/HeapModifier.java +++ b/source/de/anomic/kelondro/blob/HeapModifier.java @@ -29,9 +29,9 @@ import java.io.IOException; import java.util.SortedMap; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; import de.anomic.kelondro.io.random.CachedFileWriter; -import de.anomic.kelondro.order.ByteOrder; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.MemoryControl; diff --git a/source/de/anomic/kelondro/blob/HeapReader.java b/source/de/anomic/kelondro/blob/HeapReader.java index c1a932499..91eb71115 100644 --- a/source/de/anomic/kelondro/blob/HeapReader.java +++ b/source/de/anomic/kelondro/blob/HeapReader.java @@ -35,13 +35,13 @@ import java.util.Map.Entry; import java.util.concurrent.ExecutionException; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.RotateIterator; import de.anomic.kelondro.index.HandleMap; import de.anomic.kelondro.io.random.CachedFileWriter; import de.anomic.kelondro.io.random.Writer; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.RotateIterator; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.MemoryControl; diff --git a/source/de/anomic/kelondro/blob/HeapWriter.java b/source/de/anomic/kelondro/blob/HeapWriter.java index 3e9c92fea..31087b118 100644 --- a/source/de/anomic/kelondro/blob/HeapWriter.java +++ b/source/de/anomic/kelondro/blob/HeapWriter.java @@ -31,10 +31,10 @@ import java.io.FileOutputStream; import java.io.IOException; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.Digest; import de.anomic.kelondro.index.HandleMap; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.FileUtils; public final class HeapWriter { diff --git a/source/de/anomic/kelondro/blob/MapDataMining.java b/source/de/anomic/kelondro/blob/MapDataMining.java index 0b4964ebd..5cc58feb7 100644 --- a/source/de/anomic/kelondro/blob/MapDataMining.java +++ b/source/de/anomic/kelondro/blob/MapDataMining.java @@ -34,7 +34,8 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.CloneableIterator; + import de.anomic.kelondro.util.ScoreCluster; public class MapDataMining extends MapView { diff --git a/source/de/anomic/kelondro/blob/MapView.java b/source/de/anomic/kelondro/blob/MapView.java index 52208f9cf..09bb0b28a 100644 --- a/source/de/anomic/kelondro/blob/MapView.java +++ b/source/de/anomic/kelondro/blob/MapView.java @@ -36,11 +36,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.RotateIterator; + import de.anomic.kelondro.index.ARC; import de.anomic.kelondro.index.ConcurrentARC; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; -import de.anomic.kelondro.order.RotateIterator; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/blob/ObjectBuffer.java b/source/de/anomic/kelondro/blob/ObjectBuffer.java index 196bfbfa6..2ce4cb81b 100644 --- a/source/de/anomic/kelondro/blob/ObjectBuffer.java +++ b/source/de/anomic/kelondro/blob/ObjectBuffer.java @@ -56,7 +56,7 @@ package de.anomic.kelondro.blob; -import de.anomic.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.NaturalOrder; public class ObjectBuffer { diff --git a/source/de/anomic/kelondro/blob/Stack.java b/source/de/anomic/kelondro/blob/Stack.java index 8162df651..f3229bee6 100644 --- a/source/de/anomic/kelondro/blob/Stack.java +++ b/source/de/anomic/kelondro/blob/Stack.java @@ -28,7 +28,8 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; -import de.anomic.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.NaturalOrder; + public class Stack { diff --git a/source/de/anomic/kelondro/index/BinSearch.java b/source/de/anomic/kelondro/index/BinSearch.java index 104860788..97244a278 100644 --- a/source/de/anomic/kelondro/index/BinSearch.java +++ b/source/de/anomic/kelondro/index/BinSearch.java @@ -26,8 +26,8 @@ package de.anomic.kelondro.index; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.NaturalOrder; public class BinSearch { diff --git a/source/de/anomic/kelondro/index/Cache.java b/source/de/anomic/kelondro/index/Cache.java index 3163a5520..bab1a62f1 100644 --- a/source/de/anomic/kelondro/index/Cache.java +++ b/source/de/anomic/kelondro/index/Cache.java @@ -36,7 +36,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.CloneableIterator; + import de.anomic.kelondro.util.MemoryControl; public class Cache implements ObjectIndex { diff --git a/source/de/anomic/kelondro/index/HandleMap.java b/source/de/anomic/kelondro/index/HandleMap.java index 00381604c..8fbeddfed 100644 --- a/source/de/anomic/kelondro/index/HandleMap.java +++ b/source/de/anomic/kelondro/index/HandleMap.java @@ -46,9 +46,10 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; + import de.anomic.kelondro.util.MemoryControl; import de.anomic.yacy.dht.FlatWordPartitionScheme; diff --git a/source/de/anomic/kelondro/index/HandleSet.java b/source/de/anomic/kelondro/index/HandleSet.java index 04feb115e..7acf3e8b3 100644 --- a/source/de/anomic/kelondro/index/HandleSet.java +++ b/source/de/anomic/kelondro/index/HandleSet.java @@ -34,8 +34,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Iterator; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; + public class HandleSet implements Iterable { diff --git a/source/de/anomic/kelondro/index/IndexTest.java b/source/de/anomic/kelondro/index/IndexTest.java index 538106cd5..34b3ebf1c 100644 --- a/source/de/anomic/kelondro/index/IndexTest.java +++ b/source/de/anomic/kelondro/index/IndexTest.java @@ -32,7 +32,8 @@ import java.util.HashMap; import java.util.Random; import java.util.TreeMap; -import de.anomic.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.kelondro.util.ByteArray; import de.anomic.kelondro.util.MemoryControl; diff --git a/source/de/anomic/kelondro/index/ObjectArrayCache.java b/source/de/anomic/kelondro/index/ObjectArrayCache.java index 58fd1d403..d981102fb 100644 --- a/source/de/anomic/kelondro/index/ObjectArrayCache.java +++ b/source/de/anomic/kelondro/index/ObjectArrayCache.java @@ -29,7 +29,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Random; -import de.anomic.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.NaturalOrder; + public class ObjectArrayCache { diff --git a/source/de/anomic/kelondro/index/ObjectIndex.java b/source/de/anomic/kelondro/index/ObjectIndex.java index 7740e18d7..fd9f277e4 100644 --- a/source/de/anomic/kelondro/index/ObjectIndex.java +++ b/source/de/anomic/kelondro/index/ObjectIndex.java @@ -34,7 +34,8 @@ package de.anomic.kelondro.index; import java.io.IOException; import java.util.ArrayList; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.CloneableIterator; + public interface ObjectIndex { diff --git a/source/de/anomic/kelondro/index/ObjectIndexCache.java b/source/de/anomic/kelondro/index/ObjectIndexCache.java index 130ca531c..13895989c 100644 --- a/source/de/anomic/kelondro/index/ObjectIndexCache.java +++ b/source/de/anomic/kelondro/index/ObjectIndexCache.java @@ -28,10 +28,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.MergeIterator; +import net.yacy.kelondro.order.StackIterator; + import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.MergeIterator; -import de.anomic.kelondro.order.StackIterator; public class ObjectIndexCache implements ObjectIndex { diff --git a/source/de/anomic/kelondro/index/Row.java b/source/de/anomic/kelondro/index/Row.java index 4f5e55a0f..6b79ad03c 100644 --- a/source/de/anomic/kelondro/index/Row.java +++ b/source/de/anomic/kelondro/index/Row.java @@ -37,13 +37,13 @@ import java.util.StringTokenizer; import java.util.concurrent.ArrayBlockingQueue; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.AbstractOrder; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.Order; -import de.anomic.kelondro.order.AbstractOrder; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.NaturalOrder; -import de.anomic.kelondro.order.Order; import de.anomic.kelondro.util.ByteBuffer; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/index/RowCollection.java b/source/de/anomic/kelondro/index/RowCollection.java index 123ea2954..39d563750 100644 --- a/source/de/anomic/kelondro/index/RowCollection.java +++ b/source/de/anomic/kelondro/index/RowCollection.java @@ -38,10 +38,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.MemoryControl; import de.anomic.kelondro.util.NamePrefixThreadFactory; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/index/RowSet.java b/source/de/anomic/kelondro/index/RowSet.java index de9b25645..8ea911270 100644 --- a/source/de/anomic/kelondro/index/RowSet.java +++ b/source/de/anomic/kelondro/index/RowSet.java @@ -28,10 +28,10 @@ import java.util.Iterator; import java.util.Random; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; public class RowSet extends RowCollection implements ObjectIndex, Iterable { diff --git a/source/de/anomic/kelondro/index/RowSetArray.java b/source/de/anomic/kelondro/index/RowSetArray.java index a0f40fcb1..bb6c6b343 100644 --- a/source/de/anomic/kelondro/index/RowSetArray.java +++ b/source/de/anomic/kelondro/index/RowSetArray.java @@ -26,10 +26,11 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.MergeIterator; +import net.yacy.kelondro.order.StackIterator; + import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.MergeIterator; -import de.anomic.kelondro.order.StackIterator; public class RowSetArray implements ObjectIndex, Iterable { diff --git a/source/de/anomic/kelondro/table/RecordStack.java b/source/de/anomic/kelondro/table/RecordStack.java index 35e6f07a6..36950294c 100644 --- a/source/de/anomic/kelondro/table/RecordStack.java +++ b/source/de/anomic/kelondro/table/RecordStack.java @@ -35,9 +35,9 @@ import java.util.Iterator; import java.util.StringTokenizer; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/table/Records.java b/source/de/anomic/kelondro/table/Records.java index 6bd1cda43..13b26190c 100644 --- a/source/de/anomic/kelondro/table/Records.java +++ b/source/de/anomic/kelondro/table/Records.java @@ -39,6 +39,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; @@ -47,8 +49,6 @@ import de.anomic.kelondro.io.chunks.IOChunksInterface; import de.anomic.kelondro.io.chunks.RandomAccessIOChunks; import de.anomic.kelondro.io.random.CachedFileWriter; import de.anomic.kelondro.io.random.Writer; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/table/Relations.java b/source/de/anomic/kelondro/table/Relations.java index 59e6afcc5..b68e8f9c7 100755 --- a/source/de/anomic/kelondro/table/Relations.java +++ b/source/de/anomic/kelondro/table/Relations.java @@ -30,9 +30,10 @@ import java.io.File; import java.io.IOException; import java.util.HashMap; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.NaturalOrder; public class Relations { diff --git a/source/de/anomic/kelondro/table/SQLTable.java b/source/de/anomic/kelondro/table/SQLTable.java index e19358dfe..ee9ac9e3b 100644 --- a/source/de/anomic/kelondro/table/SQLTable.java +++ b/source/de/anomic/kelondro/table/SQLTable.java @@ -36,12 +36,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowCollection; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; /* * Commands to create a database using mysql: diff --git a/source/de/anomic/kelondro/table/SplitTable.java b/source/de/anomic/kelondro/table/SplitTable.java index f1e260231..27c10d01c 100644 --- a/source/de/anomic/kelondro/table/SplitTable.java +++ b/source/de/anomic/kelondro/table/SplitTable.java @@ -44,6 +44,11 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.MergeIterator; +import net.yacy.kelondro.order.NaturalOrder; +import net.yacy.kelondro.order.Order; +import net.yacy.kelondro.order.StackIterator; import de.anomic.kelondro.blob.ArrayStack; import de.anomic.kelondro.index.Cache; @@ -52,11 +57,6 @@ import de.anomic.kelondro.index.ObjectIndexCache; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowCollection; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; -import de.anomic.kelondro.order.MergeIterator; -import de.anomic.kelondro.order.Order; -import de.anomic.kelondro.order.StackIterator; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.NamePrefixThreadFactory; diff --git a/source/de/anomic/kelondro/table/Table.java b/source/de/anomic/kelondro/table/Table.java index d03b64349..0157982b2 100644 --- a/source/de/anomic/kelondro/table/Table.java +++ b/source/de/anomic/kelondro/table/Table.java @@ -39,6 +39,8 @@ import java.util.TreeMap; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.HandleMap; @@ -49,8 +51,6 @@ import de.anomic.kelondro.index.ObjectIndex; import de.anomic.kelondro.index.Row.Entry; import de.anomic.kelondro.io.records.BufferedRecords; import de.anomic.kelondro.io.records.Records; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.MemoryControl; import de.anomic.kelondro.util.kelondroException; diff --git a/source/de/anomic/kelondro/text/AbstractBufferedIndex.java b/source/de/anomic/kelondro/text/AbstractBufferedIndex.java index df8811f55..bdc513d4d 100644 --- a/source/de/anomic/kelondro/text/AbstractBufferedIndex.java +++ b/source/de/anomic/kelondro/text/AbstractBufferedIndex.java @@ -31,7 +31,8 @@ import java.io.IOException; import java.util.Iterator; import java.util.TreeSet; -import de.anomic.kelondro.order.Order; +import net.yacy.kelondro.order.Order; + public abstract class AbstractBufferedIndex extends AbstractIndex implements BufferedIndex { diff --git a/source/de/anomic/kelondro/text/AbstractIndex.java b/source/de/anomic/kelondro/text/AbstractIndex.java index 083e750cd..6c942a0fd 100644 --- a/source/de/anomic/kelondro/text/AbstractIndex.java +++ b/source/de/anomic/kelondro/text/AbstractIndex.java @@ -33,7 +33,8 @@ import java.util.Iterator; import java.util.Set; import java.util.TreeSet; -import de.anomic.kelondro.order.Order; +import net.yacy.kelondro.order.Order; + public abstract class AbstractIndex implements Index { diff --git a/source/de/anomic/kelondro/text/BufferedIndex.java b/source/de/anomic/kelondro/text/BufferedIndex.java index 6312340b0..01de3b262 100644 --- a/source/de/anomic/kelondro/text/BufferedIndex.java +++ b/source/de/anomic/kelondro/text/BufferedIndex.java @@ -30,7 +30,8 @@ package de.anomic.kelondro.text; import java.io.IOException; import java.util.TreeSet; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.CloneableIterator; + /* * an IndexPackage is an integration of different index types, i.e. diff --git a/source/de/anomic/kelondro/text/Index.java b/source/de/anomic/kelondro/text/Index.java index efd5e4b40..a179c0221 100644 --- a/source/de/anomic/kelondro/text/Index.java +++ b/source/de/anomic/kelondro/text/Index.java @@ -33,8 +33,9 @@ import java.util.HashMap; import java.util.Set; import java.util.TreeSet; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; + public interface Index { diff --git a/source/de/anomic/kelondro/text/IndexCell.java b/source/de/anomic/kelondro/text/IndexCell.java index 81f42466d..62f3f7915 100644 --- a/source/de/anomic/kelondro/text/IndexCell.java +++ b/source/de/anomic/kelondro/text/IndexCell.java @@ -31,13 +31,14 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.MergeIterator; +import net.yacy.kelondro.order.Order; + import de.anomic.kelondro.index.ARC; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.SimpleARC; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.MergeIterator; -import de.anomic.kelondro.order.Order; import de.anomic.kelondro.util.ByteArray; import de.anomic.kelondro.util.MemoryControl; import de.anomic.server.serverProfiling; diff --git a/source/de/anomic/kelondro/text/IndexReader.java b/source/de/anomic/kelondro/text/IndexReader.java index 951e1dc44..38869fd0f 100644 --- a/source/de/anomic/kelondro/text/IndexReader.java +++ b/source/de/anomic/kelondro/text/IndexReader.java @@ -28,7 +28,8 @@ package de.anomic.kelondro.text; import java.util.Set; -import de.anomic.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.CloneableIterator; + public interface IndexReader { diff --git a/source/de/anomic/kelondro/text/Metadata.java b/source/de/anomic/kelondro/text/Metadata.java index c7ac0d222..a5448553b 100644 --- a/source/de/anomic/kelondro/text/Metadata.java +++ b/source/de/anomic/kelondro/text/Metadata.java @@ -28,9 +28,10 @@ package de.anomic.kelondro.text; import java.util.Date; +import net.yacy.kelondro.order.Bitfield; + import de.anomic.crawler.retrieval.Request; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.Reference; public interface Metadata { diff --git a/source/de/anomic/kelondro/text/MetadataRepository.java b/source/de/anomic/kelondro/text/MetadataRepository.java index 5147219f6..cd74d778a 100644 --- a/source/de/anomic/kelondro/text/MetadataRepository.java +++ b/source/de/anomic/kelondro/text/MetadataRepository.java @@ -39,6 +39,7 @@ import java.util.Map; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.CloneableIterator; import de.anomic.data.Blacklist; import de.anomic.document.parser.html.CharacterCoding; @@ -49,7 +50,6 @@ import de.anomic.kelondro.index.Cache; import de.anomic.kelondro.index.HandleSet; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.CloneableIterator; import de.anomic.kelondro.table.SplitTable; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/kelondro/text/ReferenceContainer.java b/source/de/anomic/kelondro/text/ReferenceContainer.java index cbdee18d6..fd241dffc 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainer.java +++ b/source/de/anomic/kelondro/text/ReferenceContainer.java @@ -34,10 +34,11 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.ByteOrder; + import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowSet; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.ByteOrder; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; import de.anomic.kelondro.util.ByteBuffer; diff --git a/source/de/anomic/kelondro/text/ReferenceContainerArray.java b/source/de/anomic/kelondro/text/ReferenceContainerArray.java index ccf477c5b..e02f0c6f0 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerArray.java +++ b/source/de/anomic/kelondro/text/ReferenceContainerArray.java @@ -30,14 +30,14 @@ import java.util.Date; import java.util.Iterator; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; import de.anomic.kelondro.blob.BLOB; import de.anomic.kelondro.blob.ArrayStack; import de.anomic.kelondro.index.HandleMap; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowSet; -import de.anomic.kelondro.order.ByteOrder; -import de.anomic.kelondro.order.CloneableIterator; public final class ReferenceContainerArray { diff --git a/source/de/anomic/kelondro/text/ReferenceContainerCache.java b/source/de/anomic/kelondro/text/ReferenceContainerCache.java index fe0501d2b..34190e693 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerCache.java +++ b/source/de/anomic/kelondro/text/ReferenceContainerCache.java @@ -36,12 +36,12 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.CloneableIterator; import de.anomic.kelondro.blob.HeapReader; import de.anomic.kelondro.blob.HeapWriter; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.ByteOrder; import de.anomic.kelondro.util.ByteArray; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.index.Row; diff --git a/source/de/anomic/kelondro/text/ReferenceContainerOrder.java b/source/de/anomic/kelondro/text/ReferenceContainerOrder.java index f09f1d2c5..ff2a47a89 100644 --- a/source/de/anomic/kelondro/text/ReferenceContainerOrder.java +++ b/source/de/anomic/kelondro/text/ReferenceContainerOrder.java @@ -26,8 +26,8 @@ package de.anomic.kelondro.text; -import de.anomic.kelondro.order.AbstractOrder; -import de.anomic.kelondro.order.Order; +import net.yacy.kelondro.order.AbstractOrder; +import net.yacy.kelondro.order.Order; public class ReferenceContainerOrder extends AbstractOrder> implements Order>, Cloneable { diff --git a/source/de/anomic/kelondro/text/ReferenceOrder.java b/source/de/anomic/kelondro/text/ReferenceOrder.java index 79d1fc5e8..5f93840f1 100644 --- a/source/de/anomic/kelondro/text/ReferenceOrder.java +++ b/source/de/anomic/kelondro/text/ReferenceOrder.java @@ -32,8 +32,9 @@ import java.util.Map; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import net.yacy.kelondro.order.Bitfield; + import de.anomic.document.Condenser; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; import de.anomic.kelondro.text.referencePrototype.WordReferenceVars; diff --git a/source/de/anomic/kelondro/text/Segment.java b/source/de/anomic/kelondro/text/Segment.java index 9248b2432..747e6001e 100644 --- a/source/de/anomic/kelondro/text/Segment.java +++ b/source/de/anomic/kelondro/text/Segment.java @@ -35,6 +35,8 @@ import java.util.Map; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.ByteOrder; import de.anomic.crawler.retrieval.Response; import de.anomic.data.Blacklist; @@ -42,8 +44,6 @@ import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.document.Document; import de.anomic.document.parser.html.ContentScraper; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.ByteOrder; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.text.navigationPrototype.NavigationReference; import de.anomic.kelondro.text.navigationPrototype.NavigationReferenceFactory; diff --git a/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java b/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java index 29a73c5c8..1d03070d0 100644 --- a/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java +++ b/source/de/anomic/kelondro/text/citationPrototype/CitationReferenceRow.java @@ -26,11 +26,11 @@ package de.anomic.kelondro.text.citationPrototype; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.MicroDate; import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.MicroDate; import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java b/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java index 8fed0dcd4..2b5f8a45b 100644 --- a/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java +++ b/source/de/anomic/kelondro/text/metadataPrototype/URLMetadataRow.java @@ -33,12 +33,13 @@ import java.util.Date; import java.util.Iterator; import java.util.Properties; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.Digest; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.crawler.retrieval.Request; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.Digest; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Metadata; import de.anomic.kelondro.text.referencePrototype.WordReference; import de.anomic.kelondro.text.referencePrototype.WordReferenceRow; diff --git a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java index 03b882cdb..d8309a08c 100644 --- a/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java +++ b/source/de/anomic/kelondro/text/navigationPrototype/NavigationReferenceRow.java @@ -26,10 +26,10 @@ package de.anomic.kelondro.text.navigationPrototype; +import net.yacy.kelondro.order.Base64Order; import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReference.java b/source/de/anomic/kelondro/text/referencePrototype/WordReference.java index e330d890c..8c44c6a8b 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReference.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReference.java @@ -26,7 +26,7 @@ package de.anomic.kelondro.text.referencePrototype; -import de.anomic.kelondro.order.Bitfield; +import net.yacy.kelondro.order.Bitfield; import de.anomic.kelondro.text.Reference; public interface WordReference extends Reference { diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java index fe3de17f9..c96bb1119 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceRow.java @@ -26,13 +26,13 @@ package de.anomic.kelondro.text.referencePrototype; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.MicroDate; import de.anomic.document.Word; import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.MicroDate; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java index de00027c5..43e8fc150 100644 --- a/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java +++ b/source/de/anomic/kelondro/text/referencePrototype/WordReferenceVars.java @@ -30,9 +30,10 @@ import java.util.ArrayList; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.MicroDate; + import de.anomic.kelondro.index.Row.Entry; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.MicroDate; import de.anomic.kelondro.text.AbstractReference; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; diff --git a/source/de/anomic/kelondro/util/AttrSeq.java b/source/de/anomic/kelondro/util/AttrSeq.java index 3c19bccfc..3eaa08f49 100644 --- a/source/de/anomic/kelondro/util/AttrSeq.java +++ b/source/de/anomic/kelondro/util/AttrSeq.java @@ -43,10 +43,11 @@ import java.util.TreeSet; import java.util.logging.Logger; import java.util.zip.GZIPInputStream; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowCollection; -import de.anomic.kelondro.order.Base64Order; public class AttrSeq { diff --git a/source/de/anomic/kelondro/util/ByteArray.java b/source/de/anomic/kelondro/util/ByteArray.java index 9e4f5f6a7..3735664d7 100644 --- a/source/de/anomic/kelondro/util/ByteArray.java +++ b/source/de/anomic/kelondro/util/ByteArray.java @@ -26,7 +26,8 @@ package de.anomic.kelondro.util; import java.util.HashMap; -import de.anomic.kelondro.order.ByteOrder; +import net.yacy.kelondro.order.ByteOrder; + /** * this class is a experimental replacement of byte[]. diff --git a/source/de/anomic/search/QueryParams.java b/source/de/anomic/search/QueryParams.java index 295c989fa..b85caa681 100644 --- a/source/de/anomic/search/QueryParams.java +++ b/source/de/anomic/search/QueryParams.java @@ -30,13 +30,14 @@ import java.util.HashSet; import java.util.Iterator; import java.util.TreeSet; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.document.parser.html.AbstractScraper; import de.anomic.document.parser.html.CharacterCoding; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.SetTools; import de.anomic.yacy.yacySeed; import de.anomic.yacy.yacySeedDB; diff --git a/source/de/anomic/search/RankingProcess.java b/source/de/anomic/search/RankingProcess.java index f10b102b5..f5d2f4192 100644 --- a/source/de/anomic/search/RankingProcess.java +++ b/source/de/anomic/search/RankingProcess.java @@ -41,11 +41,12 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; +import net.yacy.kelondro.order.Digest; + import de.anomic.document.Condenser; import de.anomic.document.Word; import de.anomic.document.parser.html.ContentScraper; import de.anomic.kelondro.index.BinSearch; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceOrder; diff --git a/source/de/anomic/search/ResultEntry.java b/source/de/anomic/search/ResultEntry.java index 2de572de9..c4968f2b5 100644 --- a/source/de/anomic/search/ResultEntry.java +++ b/source/de/anomic/search/ResultEntry.java @@ -30,9 +30,10 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Date; +import net.yacy.kelondro.order.Bitfield; + import de.anomic.document.Condenser; import de.anomic.document.Word; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; diff --git a/source/de/anomic/search/SearchEvent.java b/source/de/anomic/search/SearchEvent.java index d66b9b4ce..de24d842d 100644 --- a/source/de/anomic/search/SearchEvent.java +++ b/source/de/anomic/search/SearchEvent.java @@ -34,9 +34,9 @@ import java.util.TreeMap; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import de.anomic.crawler.ResultURLs; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/search/Switchboard.java b/source/de/anomic/search/Switchboard.java index 9f2ab5fc6..32f071184 100644 --- a/source/de/anomic/search/Switchboard.java +++ b/source/de/anomic/search/Switchboard.java @@ -112,6 +112,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.regex.Pattern; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; +import net.yacy.kelondro.order.NaturalOrder; import de.anomic.content.DCEntry; import de.anomic.content.RSSMessage; @@ -159,12 +162,9 @@ import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseHeader; import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.RobotsTxtConfig; -import de.anomic.kelondro.order.Digest; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.Segments; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.kelondro.util.MemoryControl; diff --git a/source/de/anomic/search/TextSnippet.java b/source/de/anomic/search/TextSnippet.java index e5147d6fd..09017117d 100644 --- a/source/de/anomic/search/TextSnippet.java +++ b/source/de/anomic/search/TextSnippet.java @@ -36,6 +36,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import de.anomic.crawler.retrieval.Response; import de.anomic.document.Condenser; @@ -47,7 +48,6 @@ import de.anomic.http.client.Cache; import de.anomic.http.metadata.ResponseHeader; import de.anomic.kelondro.index.ARC; import de.anomic.kelondro.index.ConcurrentARC; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.metadataPrototype.URLMetadataRow; import de.anomic.kelondro.util.SetTools; diff --git a/source/de/anomic/search/blockrank/CRProcess.java b/source/de/anomic/search/blockrank/CRProcess.java index b46f41385..6ff577e85 100644 --- a/source/de/anomic/search/blockrank/CRProcess.java +++ b/source/de/anomic/search/blockrank/CRProcess.java @@ -30,13 +30,14 @@ import java.io.File; import java.io.IOException; import java.util.Iterator; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.CloneableIterator; +import net.yacy.kelondro.order.MicroDate; + import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.RowSet; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.CloneableIterator; -import de.anomic.kelondro.order.MicroDate; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.text.IndexCell; import de.anomic.kelondro.text.ReferenceContainer; diff --git a/source/de/anomic/search/blockrank/RCIEvaluation.java b/source/de/anomic/search/blockrank/RCIEvaluation.java index 925224a20..65aa1ccfb 100644 --- a/source/de/anomic/search/blockrank/RCIEvaluation.java +++ b/source/de/anomic/search/blockrank/RCIEvaluation.java @@ -34,8 +34,9 @@ import java.util.HashSet; import java.util.Iterator; import java.util.TreeSet; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.kelondro.util.AttrSeq; import de.anomic.kelondro.util.FileUtils; import de.anomic.search.RankingProcess; diff --git a/source/de/anomic/tools/CryptoLib.java b/source/de/anomic/tools/CryptoLib.java index b870535d9..172dd5bcd 100644 --- a/source/de/anomic/tools/CryptoLib.java +++ b/source/de/anomic/tools/CryptoLib.java @@ -46,7 +46,8 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; -import de.anomic.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.server.serverCharBuffer; /** diff --git a/source/de/anomic/tools/crypt.java b/source/de/anomic/tools/crypt.java index ac3f608c7..1c1ba2b17 100644 --- a/source/de/anomic/tools/crypt.java +++ b/source/de/anomic/tools/crypt.java @@ -28,7 +28,8 @@ import java.text.SimpleDateFormat; import java.util.Locale; import java.util.Random; -import de.anomic.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Base64Order; + public class crypt { diff --git a/source/de/anomic/tools/cryptbig.java b/source/de/anomic/tools/cryptbig.java index 3848f9e66..7401e2325 100644 --- a/source/de/anomic/tools/cryptbig.java +++ b/source/de/anomic/tools/cryptbig.java @@ -52,8 +52,9 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEParameterSpec; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + public class cryptbig { diff --git a/source/de/anomic/yacy/dht/Dispatcher.java b/source/de/anomic/yacy/dht/Dispatcher.java index f75968a09..ad003e99b 100755 --- a/source/de/anomic/yacy/dht/Dispatcher.java +++ b/source/de/anomic/yacy/dht/Dispatcher.java @@ -33,8 +33,8 @@ import java.util.LinkedHashMap; import java.util.Map; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.text.referencePrototype.WordReference; diff --git a/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java b/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java index 4be71a0d9..a575122b6 100755 --- a/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java +++ b/source/de/anomic/yacy/dht/FlatWordPartitionScheme.java @@ -25,7 +25,7 @@ package de.anomic.yacy.dht; -import de.anomic.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Base64Order; import de.anomic.yacy.yacySeed; /** diff --git a/source/de/anomic/yacy/dht/PeerSelection.java b/source/de/anomic/yacy/dht/PeerSelection.java index 386f0ef2b..bd95c52a0 100755 --- a/source/de/anomic/yacy/dht/PeerSelection.java +++ b/source/de/anomic/yacy/dht/PeerSelection.java @@ -30,11 +30,11 @@ import java.util.HashSet; import java.util.Iterator; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.kelondroException; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacySeed; diff --git a/source/de/anomic/yacy/yacyClient.java b/source/de/anomic/yacy/yacyClient.java index 854b37409..87aa303cb 100644 --- a/source/de/anomic/yacy/yacyClient.java +++ b/source/de/anomic/yacy/yacyClient.java @@ -55,6 +55,10 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Bitfield; +import net.yacy.kelondro.order.Digest; + import org.apache.commons.httpclient.methods.multipart.ByteArrayPartSource; import org.apache.commons.httpclient.methods.multipart.Part; @@ -71,9 +75,6 @@ import de.anomic.http.client.RemoteProxyConfig; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseContainer; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Bitfield; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.ReferenceContainerCache; diff --git a/source/de/anomic/yacy/yacyNetwork.java b/source/de/anomic/yacy/yacyNetwork.java index 60b032f72..a25753a57 100644 --- a/source/de/anomic/yacy/yacyNetwork.java +++ b/source/de/anomic/yacy/yacyNetwork.java @@ -31,10 +31,11 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import net.yacy.kelondro.order.Digest; + import org.apache.commons.httpclient.methods.multipart.Part; import de.anomic.http.client.DefaultCharsetStringPart; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.DateFormatter; import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; diff --git a/source/de/anomic/yacy/yacyNewsDB.java b/source/de/anomic/yacy/yacyNewsDB.java index 58c6a88ae..909b1d6b6 100644 --- a/source/de/anomic/yacy/yacyNewsDB.java +++ b/source/de/anomic/yacy/yacyNewsDB.java @@ -49,9 +49,10 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Iterator; +import net.yacy.kelondro.order.Base64Order; + import de.anomic.kelondro.index.Row; import de.anomic.kelondro.index.ObjectIndex; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.table.Table; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/yacy/yacyNewsQueue.java b/source/de/anomic/yacy/yacyNewsQueue.java index b121b6853..e6ba37b28 100644 --- a/source/de/anomic/yacy/yacyNewsQueue.java +++ b/source/de/anomic/yacy/yacyNewsQueue.java @@ -50,9 +50,10 @@ import java.util.Date; import java.util.HashSet; import java.util.Iterator; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.index.Column; import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.table.RecordStack; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; diff --git a/source/de/anomic/yacy/yacyNewsRecord.java b/source/de/anomic/yacy/yacyNewsRecord.java index 6325f6ec7..9801f3d76 100644 --- a/source/de/anomic/yacy/yacyNewsRecord.java +++ b/source/de/anomic/yacy/yacyNewsRecord.java @@ -51,8 +51,9 @@ import java.util.Map; import java.util.Properties; import java.util.Map.Entry; +import net.yacy.kelondro.order.NaturalOrder; + import de.anomic.kelondro.index.Row; -import de.anomic.kelondro.order.NaturalOrder; import de.anomic.kelondro.util.DateFormatter; import de.anomic.server.serverCodings; diff --git a/source/de/anomic/yacy/yacyRelease.java b/source/de/anomic/yacy/yacyRelease.java index 204e23afe..befdd2165 100644 --- a/source/de/anomic/yacy/yacyRelease.java +++ b/source/de/anomic/yacy/yacyRelease.java @@ -45,6 +45,7 @@ import java.util.SortedSet; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import de.anomic.crawler.CrawlProfile; import de.anomic.crawler.retrieval.HTTPLoader; @@ -53,7 +54,6 @@ import de.anomic.http.client.Client; import de.anomic.http.metadata.HeaderFramework; import de.anomic.http.metadata.RequestHeader; import de.anomic.http.metadata.ResponseContainer; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.util.FileUtils; import de.anomic.search.Switchboard; import de.anomic.server.serverCharBuffer; diff --git a/source/de/anomic/yacy/yacySearch.java b/source/de/anomic/yacy/yacySearch.java index b97c93e90..7faf4af6f 100644 --- a/source/de/anomic/yacy/yacySearch.java +++ b/source/de/anomic/yacy/yacySearch.java @@ -32,10 +32,10 @@ import java.util.TreeMap; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Bitfield; import de.anomic.crawler.ResultURLs; import de.anomic.data.Blacklist; -import de.anomic.kelondro.order.Bitfield; import de.anomic.kelondro.text.Segment; import de.anomic.kelondro.util.ScoreCluster; import de.anomic.search.QueryParams; diff --git a/source/de/anomic/yacy/yacySeed.java b/source/de/anomic/yacy/yacySeed.java index b98cc2069..98af770c2 100644 --- a/source/de/anomic/yacy/yacySeed.java +++ b/source/de/anomic/yacy/yacySeed.java @@ -56,9 +56,10 @@ import java.util.Set; import java.util.TreeMap; import java.util.TreeSet; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.document.Word; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.DateFormatter; import de.anomic.net.natLib; import de.anomic.server.serverCodings; diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index 9cf8845db..3863b32c8 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -40,6 +40,7 @@ import java.util.Map; import java.util.TreeMap; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import de.anomic.crawler.retrieval.HTTPLoader; import de.anomic.http.client.Client; @@ -50,7 +51,6 @@ import de.anomic.http.server.HTTPDemon; import de.anomic.http.server.AlternativeDomainNames; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapDataMining; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.util.kelondroException; import de.anomic.kelondro.util.FileUtils; import de.anomic.server.serverCore; diff --git a/source/de/anomic/yacy/yacyURL.java b/source/de/anomic/yacy/yacyURL.java index 06e6ec420..8f4eaff11 100644 --- a/source/de/anomic/yacy/yacyURL.java +++ b/source/de/anomic/yacy/yacyURL.java @@ -35,8 +35,9 @@ import java.util.TreeSet; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + import de.anomic.server.serverDomains; import de.anomic.tools.Punycode; import de.anomic.tools.Punycode.PunycodeException; diff --git a/source/de/anomic/ymage/WebStructureGraph.java b/source/de/anomic/ymage/WebStructureGraph.java index 29b54d0fe..bf3660980 100644 --- a/source/de/anomic/ymage/WebStructureGraph.java +++ b/source/de/anomic/ymage/WebStructureGraph.java @@ -38,11 +38,11 @@ import java.util.TreeMap; import java.util.TreeSet; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.MicroDate; import de.anomic.document.Condenser; import de.anomic.document.Document; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.MicroDate; import de.anomic.kelondro.util.DateFormatter; import de.anomic.kelondro.util.FileUtils; import de.anomic.yacy.yacyURL; diff --git a/source/genpw.java b/source/genpw.java index 402942e70..ce9084800 100644 --- a/source/genpw.java +++ b/source/genpw.java @@ -2,8 +2,9 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; + // migration.java // ----------------------- diff --git a/source/migration.java b/source/migration.java index a00789f95..752502a5b 100644 --- a/source/migration.java +++ b/source/migration.java @@ -23,11 +23,11 @@ import java.io.IOException; import java.util.List; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; +import net.yacy.kelondro.order.Digest; import de.anomic.data.listManager; import de.anomic.http.server.HTTPDemon; -import de.anomic.kelondro.order.Base64Order; -import de.anomic.kelondro.order.Digest; import de.anomic.kelondro.util.FileUtils; import de.anomic.search.Switchboard; import de.anomic.search.SwitchboardConstants; diff --git a/source/de/anomic/kelondro/order/AbstractOrder.java b/source/net/yacy/kelondro/order/AbstractOrder.java similarity index 98% rename from source/de/anomic/kelondro/order/AbstractOrder.java rename to source/net/yacy/kelondro/order/AbstractOrder.java index 1026442d4..c72e691b8 100644 --- a/source/de/anomic/kelondro/order/AbstractOrder.java +++ b/source/net/yacy/kelondro/order/AbstractOrder.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; diff --git a/source/de/anomic/kelondro/order/Base64Order.java b/source/net/yacy/kelondro/order/Base64Order.java similarity index 97% rename from source/de/anomic/kelondro/order/Base64Order.java rename to source/net/yacy/kelondro/order/Base64Order.java index 4cd8273b3..f7761a365 100644 --- a/source/de/anomic/kelondro/order/Base64Order.java +++ b/source/net/yacy/kelondro/order/Base64Order.java @@ -25,7 +25,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.io.UnsupportedEncodingException; import java.util.Comparator; diff --git a/source/de/anomic/kelondro/order/Bitfield.java b/source/net/yacy/kelondro/order/Bitfield.java similarity index 99% rename from source/de/anomic/kelondro/order/Bitfield.java rename to source/net/yacy/kelondro/order/Bitfield.java index 668da29a9..b8c5eb602 100644 --- a/source/de/anomic/kelondro/order/Bitfield.java +++ b/source/net/yacy/kelondro/order/Bitfield.java @@ -22,7 +22,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; public class Bitfield implements Cloneable { diff --git a/source/de/anomic/kelondro/order/ByteOrder.java b/source/net/yacy/kelondro/order/ByteOrder.java similarity index 97% rename from source/de/anomic/kelondro/order/ByteOrder.java rename to source/net/yacy/kelondro/order/ByteOrder.java index 6bbe46a0d..4f5f54fc8 100644 --- a/source/de/anomic/kelondro/order/ByteOrder.java +++ b/source/net/yacy/kelondro/order/ByteOrder.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; public interface ByteOrder extends Order { diff --git a/source/de/anomic/kelondro/order/CloneableIterator.java b/source/net/yacy/kelondro/order/CloneableIterator.java similarity index 97% rename from source/de/anomic/kelondro/order/CloneableIterator.java rename to source/net/yacy/kelondro/order/CloneableIterator.java index 0b26cf964..36fc373f6 100644 --- a/source/de/anomic/kelondro/order/CloneableIterator.java +++ b/source/net/yacy/kelondro/order/CloneableIterator.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Iterator; diff --git a/source/de/anomic/kelondro/order/CloneableMapIterator.java b/source/net/yacy/kelondro/order/CloneableMapIterator.java similarity index 98% rename from source/de/anomic/kelondro/order/CloneableMapIterator.java rename to source/net/yacy/kelondro/order/CloneableMapIterator.java index 582abd79c..fe423277d 100644 --- a/source/de/anomic/kelondro/order/CloneableMapIterator.java +++ b/source/net/yacy/kelondro/order/CloneableMapIterator.java @@ -25,7 +25,7 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Iterator; import java.util.TreeMap; diff --git a/source/de/anomic/kelondro/order/Digest.java b/source/net/yacy/kelondro/order/Digest.java similarity index 99% rename from source/de/anomic/kelondro/order/Digest.java rename to source/net/yacy/kelondro/order/Digest.java index d2b330dda..24e1811c0 100644 --- a/source/de/anomic/kelondro/order/Digest.java +++ b/source/net/yacy/kelondro/order/Digest.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/source/de/anomic/kelondro/order/MergeIterator.java b/source/net/yacy/kelondro/order/MergeIterator.java similarity index 99% rename from source/de/anomic/kelondro/order/MergeIterator.java rename to source/net/yacy/kelondro/order/MergeIterator.java index 1b99f0aaf..d2fac403e 100644 --- a/source/de/anomic/kelondro/order/MergeIterator.java +++ b/source/net/yacy/kelondro/order/MergeIterator.java @@ -20,7 +20,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/source/de/anomic/kelondro/order/MicroDate.java b/source/net/yacy/kelondro/order/MicroDate.java similarity index 98% rename from source/de/anomic/kelondro/order/MicroDate.java rename to source/net/yacy/kelondro/order/MicroDate.java index 59325c763..eade41197 100644 --- a/source/de/anomic/kelondro/order/MicroDate.java +++ b/source/net/yacy/kelondro/order/MicroDate.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Date; diff --git a/source/de/anomic/kelondro/order/NaturalOrder.java b/source/net/yacy/kelondro/order/NaturalOrder.java similarity index 99% rename from source/de/anomic/kelondro/order/NaturalOrder.java rename to source/net/yacy/kelondro/order/NaturalOrder.java index 8d16cd757..0686db122 100644 --- a/source/de/anomic/kelondro/order/NaturalOrder.java +++ b/source/net/yacy/kelondro/order/NaturalOrder.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Comparator; import java.util.Iterator; diff --git a/source/de/anomic/kelondro/order/Order.java b/source/net/yacy/kelondro/order/Order.java similarity index 98% rename from source/de/anomic/kelondro/order/Order.java rename to source/net/yacy/kelondro/order/Order.java index 74414d0c2..66832c215 100644 --- a/source/de/anomic/kelondro/order/Order.java +++ b/source/net/yacy/kelondro/order/Order.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Comparator; diff --git a/source/de/anomic/kelondro/order/RotateIterator.java b/source/net/yacy/kelondro/order/RotateIterator.java similarity index 98% rename from source/de/anomic/kelondro/order/RotateIterator.java rename to source/net/yacy/kelondro/order/RotateIterator.java index 0547c2df3..6e95ac383 100644 --- a/source/de/anomic/kelondro/order/RotateIterator.java +++ b/source/net/yacy/kelondro/order/RotateIterator.java @@ -24,7 +24,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; public class RotateIterator implements CloneableIterator { diff --git a/source/de/anomic/kelondro/order/StackIterator.java b/source/net/yacy/kelondro/order/StackIterator.java similarity index 98% rename from source/de/anomic/kelondro/order/StackIterator.java rename to source/net/yacy/kelondro/order/StackIterator.java index 42dbd7a9f..253e3423e 100644 --- a/source/de/anomic/kelondro/order/StackIterator.java +++ b/source/net/yacy/kelondro/order/StackIterator.java @@ -20,7 +20,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Collection; import java.util.ConcurrentModificationException; diff --git a/source/de/anomic/kelondro/order/StringOrder.java b/source/net/yacy/kelondro/order/StringOrder.java similarity index 97% rename from source/de/anomic/kelondro/order/StringOrder.java rename to source/net/yacy/kelondro/order/StringOrder.java index 76abaf968..b55310a01 100644 --- a/source/de/anomic/kelondro/order/StringOrder.java +++ b/source/net/yacy/kelondro/order/StringOrder.java @@ -25,7 +25,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package de.anomic.kelondro.order; +package net.yacy.kelondro.order; import java.util.Comparator; diff --git a/source/yacy.java b/source/yacy.java index e0bd15da6..6c99c4122 100644 --- a/source/yacy.java +++ b/source/yacy.java @@ -44,6 +44,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; import net.yacy.kelondro.logging.Log; +import net.yacy.kelondro.order.Base64Order; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; @@ -56,7 +57,6 @@ import de.anomic.http.server.HTTPDemon; import de.anomic.kelondro.blob.Heap; import de.anomic.kelondro.blob.MapDataMining; import de.anomic.kelondro.index.RowCollection; -import de.anomic.kelondro.order.Base64Order; import de.anomic.kelondro.text.Reference; import de.anomic.kelondro.text.ReferenceContainer; import de.anomic.kelondro.text.MetadataRepository;