From 215c4e65f16a1dc9181aa611e62503f958d6cdf1 Mon Sep 17 00:00:00 2001 From: orbiter Date: Tue, 31 Oct 2006 22:10:25 +0000 Subject: [PATCH] code cleanup git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@2887 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- source/de/anomic/http/httpdFileHandler.java | 2 +- source/de/anomic/kelondro/kelondroCache.java | 4 ++-- source/de/anomic/kelondro/kelondroFlexTable.java | 2 +- source/de/anomic/plasma/plasmaCrawlLURLNewEntry.java | 2 +- source/de/anomic/plasma/plasmaCrawlStacker.java | 3 ++- source/de/anomic/yacy/yacySeedDB.java | 4 ++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index 8a3198d89..7c799c33b 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -295,7 +295,7 @@ public final class httpdFileHandler extends httpdAbstractHandler implements http doResponse(conProp, requestHeader, response, body); } - public void doResponse(Properties conProp, httpHeader requestHeader, OutputStream out, InputStream body) throws IOException { + public void doResponse(Properties conProp, httpHeader requestHeader, OutputStream out, InputStream body) { this.connectionProperties = conProp; diff --git a/source/de/anomic/kelondro/kelondroCache.java b/source/de/anomic/kelondro/kelondroCache.java index 8961e78d2..d18ca46cb 100644 --- a/source/de/anomic/kelondro/kelondroCache.java +++ b/source/de/anomic/kelondro/kelondroCache.java @@ -235,7 +235,7 @@ public class kelondroCache implements kelondroIndex { return (serverMemory.available() < 2000000); } - private void checkMissSpace() throws IOException { + private void checkMissSpace() { if ((readMissCache != null) && ((readMissCache.size() >= maxmiss) || (shortMemory())) ) {readMissCache.clear(); readMissCache.trim();} @@ -248,7 +248,7 @@ public class kelondroCache implements kelondroIndex { if (((s = sumRecords()) >= maxrecords) && (readHitCache != null)) { readHitCache.clear(); readHitCache.trim(); - }; + } if (shortMemory()) { flushUnique(); flushDoubles(); diff --git a/source/de/anomic/kelondro/kelondroFlexTable.java b/source/de/anomic/kelondro/kelondroFlexTable.java index c8f8e707c..04e42b890 100644 --- a/source/de/anomic/kelondro/kelondroFlexTable.java +++ b/source/de/anomic/kelondro/kelondroFlexTable.java @@ -96,7 +96,7 @@ public class kelondroFlexTable extends kelondroFlexWidthArray implements kelondr return index.geti(key) >= 0; } - private kelondroIndex initializeRamIndex(kelondroOrder objectOrder) throws IOException { + private kelondroIndex initializeRamIndex(kelondroOrder objectOrder) { kelondroRowSet ri = new kelondroRowSet(new kelondroRow(new kelondroColumn[]{super.row().column(0), new kelondroColumn("int c-4 {b256}")}), objectOrder, 0, 0); //kelondroRowSet ri = new kelondroRowSet(new kelondroRow(new kelondroColumn[]{super.row().column(0), new kelondroColumn("int c-4 {b256}")}), 0); //ri.setOrdering(objectOrder, 0); diff --git a/source/de/anomic/plasma/plasmaCrawlLURLNewEntry.java b/source/de/anomic/plasma/plasmaCrawlLURLNewEntry.java index 4a6016660..9e1dd758b 100644 --- a/source/de/anomic/plasma/plasmaCrawlLURLNewEntry.java +++ b/source/de/anomic/plasma/plasmaCrawlLURLNewEntry.java @@ -106,7 +106,7 @@ public class plasmaCrawlLURLNewEntry implements plasmaCrawlLURLEntry { return s.toString().getBytes(); } - public plasmaCrawlLURLNewEntry(kelondroRow.Entry entry, indexEntry searchedWord) throws IOException { + public plasmaCrawlLURLNewEntry(kelondroRow.Entry entry, indexEntry searchedWord) { this.entry = entry; this.snippet = null; this.word = searchedWord; diff --git a/source/de/anomic/plasma/plasmaCrawlStacker.java b/source/de/anomic/plasma/plasmaCrawlStacker.java index 282777de8..0ff26505a 100644 --- a/source/de/anomic/plasma/plasmaCrawlStacker.java +++ b/source/de/anomic/plasma/plasmaCrawlStacker.java @@ -64,6 +64,7 @@ import de.anomic.kelondro.kelondroBase64Order; import de.anomic.kelondro.kelondroCache; import de.anomic.kelondro.kelondroException; import de.anomic.kelondro.kelondroFlexTable; +import de.anomic.kelondro.kelondroFlexWidthArray; import de.anomic.kelondro.kelondroIndex; import de.anomic.kelondro.kelondroRow; import de.anomic.kelondro.kelondroRowSet; @@ -664,7 +665,7 @@ public final class plasmaCrawlStacker { // do nothing.. } if (this.dbtype == QUEUE_DB_TYPE_FLEX) { - kelondroFlexTable.delete(cacheStacksPath, "urlPreNotice1.table"); + kelondroFlexWidthArray.delete(cacheStacksPath, "urlPreNotice1.table"); } if (this.dbtype == QUEUE_DB_TYPE_TREE) { File cacheFile = new File(cacheStacksPath, "urlPreNotice.db"); diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index 2afc08191..416515223 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -752,7 +752,7 @@ public final class yacySeedDB { /** * @deprecated: Function seems to be unused */ - public String copyCache(File seedFile, URL seedURL) throws IOException { + public String copyCache(File seedFile, URL seedURL) { if (seedURL == null) return "COPY - Error: URL not given"; try { @@ -775,7 +775,7 @@ public final class yacySeedDB { } } - private String checkCache(ArrayList uv, ArrayList check) throws IOException { + private String checkCache(ArrayList uv, ArrayList check) { if ((check == null) || (uv == null) || (uv.size() != check.size())) { serverLog.logFine("YACY","SaveSeedList: Local and uploades seed-list " + "contains varying numbers of entries." +