From a04930f0256aa70315bdf7ca2f85fcbc283153ba Mon Sep 17 00:00:00 2001 From: orbiter Date: Sun, 4 Dec 2005 23:51:28 +0000 Subject: [PATCH] code cleanup git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@1158 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/IndexCreateLoaderQueue_p.java | 9 --------- htroot/IndexCreateWWWGlobalQueue_p.java | 1 - htroot/IndexCreateWWWLocalQueue_p.java | 1 - htroot/IndexImport_p.java | 2 +- htroot/IndexMonitor.java | 2 +- htroot/IndexTransfer_p.java | 5 ++--- htroot/Log_p.java | 2 -- htroot/MessageSend_p.java | 4 +--- htroot/QuickCrawlLink_p.java | 4 ++-- htroot/SettingsAck_p.java | 6 +----- htroot/Settings_p.java | 4 ---- htroot/Steering.java | 2 +- htroot/ViewFile.java | 2 -- htroot/Wiki.java | 4 ++-- htroot/htdocsdefault/dir.java | 2 +- htroot/xml/queues/indexing_p.java | 9 +++++---- htroot/yacy/crawlOrder.java | 9 ++++----- htroot/yacy/crawlReceipt.java | 19 +++++++++---------- htroot/yacy/transfer.java | 1 - source/de/anomic/http/httpc.java | 1 - source/de/anomic/http/httpd.java | 1 - .../de/anomic/kelondro/kelondroRecords.java | 7 ++++--- source/de/anomic/kelondro/kelondroTree.java | 2 -- .../parser/mimeType/mimeTypeParser.java | 1 - .../anomic/plasma/parser/tar/tarParser.java | 2 -- .../de/anomic/plasma/plasmaCrawlStacker.java | 1 - source/de/anomic/plasma/plasmaGrafics.java | 1 - .../plasma/plasmaRankingDistribution.java | 1 - .../plasma/plasmaRankingRCIEvaluation.java | 1 - .../de/anomic/plasma/plasmaSearchQuery.java | 1 - .../de/anomic/server/serverClassLoader.java | 1 - source/de/anomic/server/serverCore.java | 1 - source/de/anomic/tools/cryptbig.java | 2 +- source/de/anomic/yacy/yacySeedDB.java | 1 - .../de/anomic/ymage/ymagePNGEncoderAWT.java | 2 -- .../de/anomic/ymage/ymagePNGEncoderJDE.java | 1 - 36 files changed, 35 insertions(+), 80 deletions(-) diff --git a/htroot/IndexCreateLoaderQueue_p.java b/htroot/IndexCreateLoaderQueue_p.java index c7db406d1..1e465937e 100644 --- a/htroot/IndexCreateLoaderQueue_p.java +++ b/htroot/IndexCreateLoaderQueue_p.java @@ -43,10 +43,6 @@ // javac -classpath .:../classes IndexCreate_p.java // if the shell's current path is HTROOT -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Locale; - import de.anomic.data.wikiCode; import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaCrawlLoaderMessage; @@ -59,11 +55,6 @@ import de.anomic.yacy.yacySeed; public class IndexCreateLoaderQueue_p { - private static SimpleDateFormat dayFormatter = new SimpleDateFormat("yyyy/MM/dd", Locale.US); - private static String daydate(Date date) { - if (date == null) return ""; else return dayFormatter.format(date); - } - public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { // return variable that accumulates replacements plasmaSwitchboard switchboard = (plasmaSwitchboard) env; diff --git a/htroot/IndexCreateWWWGlobalQueue_p.java b/htroot/IndexCreateWWWGlobalQueue_p.java index 4bc87517d..b09a96e34 100644 --- a/htroot/IndexCreateWWWGlobalQueue_p.java +++ b/htroot/IndexCreateWWWGlobalQueue_p.java @@ -71,7 +71,6 @@ public class IndexCreateWWWGlobalQueue_p { if (post != null) { if (post.containsKey("clearcrawlqueue")) { - String urlHash; int c = switchboard.urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_LIMIT); switchboard.urlPool.noticeURL.clear(plasmaCrawlNURL.STACK_TYPE_LIMIT); switchboard.cleanProfiles(); diff --git a/htroot/IndexCreateWWWLocalQueue_p.java b/htroot/IndexCreateWWWLocalQueue_p.java index 39c447d3f..7a099eb92 100644 --- a/htroot/IndexCreateWWWLocalQueue_p.java +++ b/htroot/IndexCreateWWWLocalQueue_p.java @@ -71,7 +71,6 @@ public class IndexCreateWWWLocalQueue_p { if (post != null) { if (post.containsKey("clearcrawlqueue")) { - String urlHash; int c = switchboard.urlPool.noticeURL.stackSize(plasmaCrawlNURL.STACK_TYPE_CORE); switchboard.urlPool.noticeURL.clear(plasmaCrawlNURL.STACK_TYPE_CORE); switchboard.cleanProfiles(); diff --git a/htroot/IndexImport_p.java b/htroot/IndexImport_p.java index 8f182b65c..7dfd44920 100644 --- a/htroot/IndexImport_p.java +++ b/htroot/IndexImport_p.java @@ -144,7 +144,7 @@ public final class IndexImport_p { long currWordEntryCount = currThread.getWordEntryCounter(); long currWordEntityCounter = currThread.getWordEntityCounter(); long currUrlCounter = currThread.getUrlCounter(); - long currImportDbSize = currThread.getImportWordDbSize(); + //long currImportDbSize = currThread.getImportWordDbSize(); long estimatedTime = currThread.getEstimatedTime(); long elapsedTime = currThread.getElapsedTime(); int jobNr = currThread.getJobNr(); diff --git a/htroot/IndexMonitor.java b/htroot/IndexMonitor.java index 95ae5f3dd..9e061084c 100644 --- a/htroot/IndexMonitor.java +++ b/htroot/IndexMonitor.java @@ -86,7 +86,7 @@ public class IndexMonitor { return prop; } String adminAccountBase64MD5 = switchboard.getConfig("adminAccountBase64MD5", ""); - boolean authenticated = (adminAccountBase64MD5.equals(serverCodings.standardCoder.encodeMD5Hex(authorization))); + boolean authenticated = (adminAccountBase64MD5.equals(serverCodings.encodeMD5Hex(authorization))); if (!authenticated) { // force log-in (again, because wrong password was given) prop.put("AUTHENTICATE", "admin log-in"); diff --git a/htroot/IndexTransfer_p.java b/htroot/IndexTransfer_p.java index 0eefed90a..b921468ea 100644 --- a/htroot/IndexTransfer_p.java +++ b/htroot/IndexTransfer_p.java @@ -94,9 +94,8 @@ public final class IndexTransfer_p { // insert constants plasmaWordIndexDistribution.transferIndexThread transfThread = switchboard.indexDistribution.transferIdxThread; - int wcount = 0, ucount = 0; - prop.put("wcount", Integer.toString(wcount = switchboard.wordIndex.size())); - prop.put("ucount", Integer.toString(ucount = switchboard.urlPool.loadedURL.size())); + prop.put("wcount", Integer.toString(switchboard.wordIndex.size())); + prop.put("ucount", Integer.toString(switchboard.urlPool.loadedURL.size())); prop.put("running",(transfThread==null)?0:1); if (transfThread != null) { String[] status = transfThread.getStatus(); diff --git a/htroot/Log_p.java b/htroot/Log_p.java index d0066ebdb..7d78e03fc 100644 --- a/htroot/Log_p.java +++ b/htroot/Log_p.java @@ -50,7 +50,6 @@ import java.util.logging.Handler; import java.util.logging.Logger; import de.anomic.http.httpHeader; -import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.server.logging.GuiHandler; @@ -59,7 +58,6 @@ public class Log_p { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - plasmaSwitchboard switchboard = (plasmaSwitchboard) env; serverObjects prop = new serverObjects(); String log = ""; boolean reversed = false; diff --git a/htroot/MessageSend_p.java b/htroot/MessageSend_p.java index 38e554a1c..0f83a3bef 100644 --- a/htroot/MessageSend_p.java +++ b/htroot/MessageSend_p.java @@ -49,7 +49,6 @@ import java.util.Date; import java.util.HashMap; import de.anomic.http.httpHeader; -import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.yacy.yacyClient; @@ -65,7 +64,6 @@ public class MessageSend_p { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { - plasmaSwitchboard switchboard = (plasmaSwitchboard) env; serverObjects prop = new serverObjects(); String body = ""; @@ -125,7 +123,7 @@ public class MessageSend_p { // send written message to peer try { int messagesize = Integer.parseInt(post.get("messagesize", "0")); - int attachmentsize = Integer.parseInt(post.get("attachmentsize", "0")); + //int attachmentsize = Integer.parseInt(post.get("attachmentsize", "0")); if (messagesize < 1000) messagesize = 1000; // debug if (subject.length() > 100) subject = subject.substring(0, 100); diff --git a/htroot/QuickCrawlLink_p.java b/htroot/QuickCrawlLink_p.java index ceca581cf..c4952d4a8 100644 --- a/htroot/QuickCrawlLink_p.java +++ b/htroot/QuickCrawlLink_p.java @@ -83,11 +83,11 @@ public class QuickCrawlLink_p { // getting the http host header String hostSocket = (String) header.get(httpHeader.CONNECTION_PROP_HOST); - String host = hostSocket; + //String host = hostSocket; int port = 80, pos = hostSocket.indexOf(":"); if (pos != -1) { port = Integer.parseInt(hostSocket.substring(pos + 1)); - host = hostSocket.substring(0, pos); + //host = hostSocket.substring(0, pos); } prop.put("mode_host", "localhost"); diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 8e710581e..5e40e04dc 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -90,10 +90,6 @@ public class SettingsAck_p { //if (post == null) System.out.println("POST: NULL"); else System.out.println("POST: " + post.toString()); - // set values - String s; - int pos; - if (post == null) { prop.put("info", 1);//no information submitted return prop; @@ -381,7 +377,7 @@ public class SettingsAck_p { String remoteProxyPwd = post.get("remoteProxyPwd", ""); String remoteProxyNoProxyStr = post.get("remoteProxyNoProxy", ""); - String[] remoteProxyNoProxyPatterns = remoteProxyNoProxyStr.split(","); + //String[] remoteProxyNoProxyPatterns = remoteProxyNoProxyStr.split(","); /* ==================================================================== * Storing settings into config file diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index af3735ee5..c7bc14430 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -43,14 +43,10 @@ // javac -classpath .:../Classes Settings_p.java // if the shell's current path is HTROOT -import java.util.Arrays; -import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; -import java.util.Hashtable; import java.util.Iterator; -import java.util.List; import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaSwitchboard; diff --git a/htroot/Steering.java b/htroot/Steering.java index 89fdd17a5..0d11f337e 100644 --- a/htroot/Steering.java +++ b/htroot/Steering.java @@ -64,7 +64,7 @@ public class Steering { // handle access rights switch (sb.adminAuthenticated(header)) { case 0: // wrong password given - try {Thread.currentThread().sleep(3000);} catch (InterruptedException e) {} // prevent brute-force + try {Thread.sleep(3000);} catch (InterruptedException e) {} // prevent brute-force prop.put("AUTHENTICATE", "admin log-in"); // force log-in return prop; case 1: // no password given diff --git a/htroot/ViewFile.java b/htroot/ViewFile.java index 5c01c6b73..1bace063d 100644 --- a/htroot/ViewFile.java +++ b/htroot/ViewFile.java @@ -52,11 +52,9 @@ import java.net.URLEncoder; import de.anomic.http.httpHeader; import de.anomic.http.httpc; -import de.anomic.plasma.plasmaCrawlProfile; import de.anomic.plasma.plasmaParserDocument; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.plasma.plasmaCrawlLURL.Entry; -import de.anomic.plasma.plasmaCrawlProfile.entry; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; diff --git a/htroot/Wiki.java b/htroot/Wiki.java index 672b4cd35..0de3016d6 100644 --- a/htroot/Wiki.java +++ b/htroot/Wiki.java @@ -64,8 +64,8 @@ import de.anomic.yacy.yacyCore; public class Wiki { - private static String ListLevel = ""; - private static String numListLevel = ""; + //private static String ListLevel = ""; + //private static String numListLevel = ""; private static SimpleDateFormat SimpleFormatter = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); public static String dateString(Date date) { diff --git a/htroot/htdocsdefault/dir.java b/htroot/htdocsdefault/dir.java index 2c1468d81..14ddfec53 100644 --- a/htroot/htdocsdefault/dir.java +++ b/htroot/htdocsdefault/dir.java @@ -470,7 +470,7 @@ public class dir { ); final String urlHash = newEntry.hash(); - final int words = switchboard.wordIndex.addPageIndex(url, urlHash, new Date(), condenser, "**", plasmaWordIndexEntry.DT_SHARE); + /*final int words =*/ switchboard.wordIndex.addPageIndex(url, urlHash, new Date(), condenser, "**", plasmaWordIndexEntry.DT_SHARE); } catch (IOException e) {} } diff --git a/htroot/xml/queues/indexing_p.java b/htroot/xml/queues/indexing_p.java index df8954332..62415f8d0 100644 --- a/htroot/xml/queues/indexing_p.java +++ b/htroot/xml/queues/indexing_p.java @@ -1,4 +1,4 @@ -// /xml/queues/indexing_p.java +// /xml.queues/indexing_p.java // ------------------------------- // part of the AnomicHTTPD caching proxy // (C) by Michael Peter Christen; mc@anomic.de @@ -44,11 +44,12 @@ // javac -classpath .:../classes IndexCreate_p.java // if the shell's current path is HTROOT +package xml.queues; + import java.util.ArrayList; import java.util.Date; import java.text.SimpleDateFormat; import java.util.Locale; -import java.util.Iterator; import java.io.IOException; import de.anomic.data.wikiCode; @@ -70,10 +71,10 @@ public class indexing_p { public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) { // return variable that accumulates replacements plasmaSwitchboard switchboard = (plasmaSwitchboard) env; - wikiCode wikiTransformer = new wikiCode(switchboard); + //wikiCode wikiTransformer = new wikiCode(switchboard); serverObjects prop = new serverObjects(); prop.put("rejected", 0); - int showRejectedCount = 10; + //int showRejectedCount = 10; yacySeed initiator; diff --git a/htroot/yacy/crawlOrder.java b/htroot/yacy/crawlOrder.java index 34f6d5a03..f33382c0d 100644 --- a/htroot/yacy/crawlOrder.java +++ b/htroot/yacy/crawlOrder.java @@ -50,7 +50,6 @@ import java.util.Date; import de.anomic.htmlFilter.htmlFilterContentScraper; import de.anomic.http.httpHeader; import de.anomic.plasma.plasmaCrawlLURL; -import de.anomic.plasma.plasmaParser; import de.anomic.plasma.plasmaSwitchboard; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; @@ -67,8 +66,8 @@ public final class crawlOrder { if ((post == null) || (env == null)) return prop; - int proxyPrefetchDepth = Integer.parseInt(env.getConfig("proxyPrefetchDepth", "0")); - int crawlingdepth = Integer.parseInt(env.getConfig("crawlingDepth", "0")); + //int proxyPrefetchDepth = Integer.parseInt(env.getConfig("proxyPrefetchDepth", "0")); + //int crawlingdepth = Integer.parseInt(env.getConfig("crawlingDepth", "0")); // request values String iam = (String) post.get("iam", ""); // seed hash of requester @@ -192,8 +191,8 @@ public final class crawlOrder { } else { // new method: several urls int stackCount = 0; - int doubleCount = 0; - int rejectedCount = 0; + //int doubleCount = 0; + //int rejectedCount = 0; for (int i = 0; i < count; i++) { env.getLog().logFinest("crawlOrder: b: url='" + (String) urlv.get(i) + "'"); diff --git a/htroot/yacy/crawlReceipt.java b/htroot/yacy/crawlReceipt.java index 298131cbd..e15683c9a 100644 --- a/htroot/yacy/crawlReceipt.java +++ b/htroot/yacy/crawlReceipt.java @@ -54,7 +54,6 @@ import de.anomic.server.logging.serverLog; import de.anomic.tools.bitfield; import de.anomic.tools.crypt; import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacyVersion; public final class crawlReceipt { @@ -69,20 +68,20 @@ public final class crawlReceipt { serverObjects prop = new serverObjects(); serverLog log = switchboard.getLog(); - if ((post == null) || (env == null)) return prop; + if ((post == null) || (env == null)) return prop; - int proxyPrefetchDepth = Integer.parseInt(env.getConfig("proxyPrefetchDepth", "0")); - int crawlingDepth = Integer.parseInt(env.getConfig("crawlingDepth", "0")); + //int proxyPrefetchDepth = Integer.parseInt(env.getConfig("proxyPrefetchDepth", "0")); + //int crawlingDepth = Integer.parseInt(env.getConfig("crawlingDepth", "0")); - // request values - String iam = (String) post.get("iam", ""); // seed hash of requester + // request values + String iam = (String) post.get("iam", ""); // seed hash of requester String youare = (String) post.get("youare", ""); // seed hash of the target peer, needed for network stability - String process = (String) post.get("process", ""); // process type - String key = (String) post.get("key", ""); // transmission key - String receivedUrlhash = (String) post.get("urlhash", ""); // the url hash that has been crawled + //String process = (String) post.get("process", ""); // process type + String key = (String) post.get("key", ""); // transmission key + String receivedUrlhash = (String) post.get("urlhash", ""); // the url hash that has been crawled String result = (String) post.get("result", ""); // the result; either "ok" or "fail" String reason = (String) post.get("reason", ""); // the reason for that result - String words = (String) post.get("wordh", ""); // priority word hashes + //String words = (String) post.get("wordh", ""); // priority word hashes String propStr = crypt.simpleDecode((String) post.get("lurlEntry", ""), key); /* diff --git a/htroot/yacy/transfer.java b/htroot/yacy/transfer.java index 1680897fb..f4d2d3eb9 100644 --- a/htroot/yacy/transfer.java +++ b/htroot/yacy/transfer.java @@ -55,7 +55,6 @@ import de.anomic.server.serverSwitch; import de.anomic.server.serverCodings; import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; public final class transfer { diff --git a/source/de/anomic/http/httpc.java b/source/de/anomic/http/httpc.java index f75f845fc..75cdf2532 100644 --- a/source/de/anomic/http/httpc.java +++ b/source/de/anomic/http/httpc.java @@ -46,7 +46,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.io.PushbackInputStream; -import java.net.Inet4Address; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.MalformedURLException; diff --git a/source/de/anomic/http/httpd.java b/source/de/anomic/http/httpd.java index 927d4513f..801e70f9f 100644 --- a/source/de/anomic/http/httpd.java +++ b/source/de/anomic/http/httpd.java @@ -53,7 +53,6 @@ import java.lang.reflect.Constructor; import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; -import java.net.UnknownHostException; import java.util.Arrays; import java.util.Date; import java.util.HashMap; diff --git a/source/de/anomic/kelondro/kelondroRecords.java b/source/de/anomic/kelondro/kelondroRecords.java index 9ed4f2043..b1aee9537 100644 --- a/source/de/anomic/kelondro/kelondroRecords.java +++ b/source/de/anomic/kelondro/kelondroRecords.java @@ -465,7 +465,8 @@ public class kelondroRecords { this.headChanged = true; this.tailChanged = true; } - + + /* private Node(Handle handle) throws IOException { // this creates an entry with an pre-reserved entry position // values can be written using the setValues() method @@ -479,7 +480,8 @@ public class kelondroRecords { // init the content initContent(); } - + */ + private Node(Handle handle, Node parentNode, int referenceInParent) throws IOException { // this creates an entry with an pre-reserved entry position // values can be written using the setValues() method @@ -863,7 +865,6 @@ public class kelondroRecords { for (int cp = 0; cp < 3; cp++) { Iterator i = XcacheHeaders[cp].entrySet().iterator(); Map.Entry entry; - byte[] b; while (i.hasNext()) { entry = (Map.Entry) i.next(); diff --git a/source/de/anomic/kelondro/kelondroTree.java b/source/de/anomic/kelondro/kelondroTree.java index 69f090ae2..b18b25964 100644 --- a/source/de/anomic/kelondro/kelondroTree.java +++ b/source/de/anomic/kelondro/kelondroTree.java @@ -55,7 +55,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; -import java.util.Map; import java.util.StringTokenizer; import java.util.Vector; @@ -1484,7 +1483,6 @@ public class kelondroTree extends kelondroRecords implements Comparator, kelondr String[] s = permutations(elements); kelondroTree tt; File testFile = new File("test.db"); - byte[] b; try { for (int i = 0; i < s.length; i++) { System.out.println("*** probing tree " + i + " for permutation " + s[i]); diff --git a/source/de/anomic/plasma/parser/mimeType/mimeTypeParser.java b/source/de/anomic/plasma/parser/mimeType/mimeTypeParser.java index 6f2f73454..ff961261b 100644 --- a/source/de/anomic/plasma/parser/mimeType/mimeTypeParser.java +++ b/source/de/anomic/plasma/parser/mimeType/mimeTypeParser.java @@ -47,7 +47,6 @@ import java.io.File; import java.io.InputStream; import java.net.URL; import java.util.Collection; -import java.util.HashMap; import java.util.Hashtable; import org.apache.log4j.Level; diff --git a/source/de/anomic/plasma/parser/tar/tarParser.java b/source/de/anomic/plasma/parser/tar/tarParser.java index 10d512425..2621bb8be 100644 --- a/source/de/anomic/plasma/parser/tar/tarParser.java +++ b/source/de/anomic/plasma/parser/tar/tarParser.java @@ -43,10 +43,8 @@ package de.anomic.plasma.parser.tar; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.InputStream; -import java.io.PushbackInputStream; import java.net.URL; import java.util.Arrays; import java.util.HashMap; diff --git a/source/de/anomic/plasma/plasmaCrawlStacker.java b/source/de/anomic/plasma/plasmaCrawlStacker.java index a5b172741..f3eac70c9 100644 --- a/source/de/anomic/plasma/plasmaCrawlStacker.java +++ b/source/de/anomic/plasma/plasmaCrawlStacker.java @@ -51,7 +51,6 @@ import java.io.IOException; import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; -import java.net.UnknownHostException; import java.util.Date; import java.util.Iterator; import java.util.LinkedList; diff --git a/source/de/anomic/plasma/plasmaGrafics.java b/source/de/anomic/plasma/plasmaGrafics.java index 06b4aa1cb..93b16f5f7 100644 --- a/source/de/anomic/plasma/plasmaGrafics.java +++ b/source/de/anomic/plasma/plasmaGrafics.java @@ -135,7 +135,6 @@ public class plasmaGrafics { //System.out.println("Seed Minimum distance is " + yacySeed.minDHTNumber); yacySeed seed; - int angle; long lastseen; // draw connected senior and principals diff --git a/source/de/anomic/plasma/plasmaRankingDistribution.java b/source/de/anomic/plasma/plasmaRankingDistribution.java index 85f4be7d9..0531c4023 100644 --- a/source/de/anomic/plasma/plasmaRankingDistribution.java +++ b/source/de/anomic/plasma/plasmaRankingDistribution.java @@ -50,7 +50,6 @@ import java.util.Random; import java.util.StringTokenizer; import de.anomic.yacy.yacyCore; -import de.anomic.yacy.yacySeedDB; import de.anomic.yacy.yacyClient; import de.anomic.yacy.yacySeed; import de.anomic.yacy.yacyVersion; diff --git a/source/de/anomic/plasma/plasmaRankingRCIEvaluation.java b/source/de/anomic/plasma/plasmaRankingRCIEvaluation.java index a51d2835b..128c075dc 100644 --- a/source/de/anomic/plasma/plasmaRankingRCIEvaluation.java +++ b/source/de/anomic/plasma/plasmaRankingRCIEvaluation.java @@ -57,7 +57,6 @@ import java.util.TreeSet; import de.anomic.kelondro.kelondroAttrSeq; import de.anomic.server.serverCodings; import de.anomic.server.serverFileUtils; -import de.anomic.tools.bitfield; public class plasmaRankingRCIEvaluation { diff --git a/source/de/anomic/plasma/plasmaSearchQuery.java b/source/de/anomic/plasma/plasmaSearchQuery.java index 71235c989..1aca17d61 100644 --- a/source/de/anomic/plasma/plasmaSearchQuery.java +++ b/source/de/anomic/plasma/plasmaSearchQuery.java @@ -97,7 +97,6 @@ public final class plasmaSearchQuery { this.wantedResults = wantedResults; this.maximumTime = maximumTime; this.urlMask = urlMask; - this.referrer = referrer; this.domType = -1; this.domGroupName = null; this.domMaxTargets = -1; diff --git a/source/de/anomic/server/serverClassLoader.java b/source/de/anomic/server/serverClassLoader.java index 868cd11a3..6e9948367 100644 --- a/source/de/anomic/server/serverClassLoader.java +++ b/source/de/anomic/server/serverClassLoader.java @@ -44,7 +44,6 @@ package de.anomic.server; import java.io.File; import java.io.IOException; import java.util.HashMap; -import java.util.Hashtable; public final class serverClassLoader extends ClassLoader { diff --git a/source/de/anomic/server/serverCore.java b/source/de/anomic/server/serverCore.java index a4a8c0c53..8f800715f 100644 --- a/source/de/anomic/server/serverCore.java +++ b/source/de/anomic/server/serverCore.java @@ -82,7 +82,6 @@ import de.anomic.server.logging.serverLog; import de.anomic.urlRedirector.urlRedirectord; import de.anomic.yacy.yacyCore; import de.anomic.yacy.yacySeed; -import de.anomic.yacy.yacySeedDB; import de.anomic.plasma.plasmaSwitchboard; public final class serverCore extends serverAbstractThread implements serverThread { diff --git a/source/de/anomic/tools/cryptbig.java b/source/de/anomic/tools/cryptbig.java index 330a5f36e..39337d862 100644 --- a/source/de/anomic/tools/cryptbig.java +++ b/source/de/anomic/tools/cryptbig.java @@ -256,7 +256,7 @@ public class cryptbig { String encryptionDate = dateFormatter.format(new Date()); // 17 byte String inFileSize = serverCodings.standardCoder.encodeBase64Long(inFile.length(), 11); // 64 / 6 = 11; 11 byte String flag = "1"; // 1 byte - int inFileNameLength = inFileName.length(); // 256 + //int inFileNameLength = inFileName.length(); // 256 String X = inFileDate + encryptionDate + inFileSize + flag + inFileName; System.out.println("TEST: preserving inFileDate : " + dateFormatter.parse(inFileDate, new ParsePosition(0))); diff --git a/source/de/anomic/yacy/yacySeedDB.java b/source/de/anomic/yacy/yacySeedDB.java index 9a59df265..3102bfc68 100644 --- a/source/de/anomic/yacy/yacySeedDB.java +++ b/source/de/anomic/yacy/yacySeedDB.java @@ -54,7 +54,6 @@ import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Enumeration; -import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.Map; diff --git a/source/de/anomic/ymage/ymagePNGEncoderAWT.java b/source/de/anomic/ymage/ymagePNGEncoderAWT.java index 18557910b..429f15f82 100644 --- a/source/de/anomic/ymage/ymagePNGEncoderAWT.java +++ b/source/de/anomic/ymage/ymagePNGEncoderAWT.java @@ -63,8 +63,6 @@ public class ymagePNGEncoderAWT { gr.clearRect(0, 0, matrix.getWidth(), matrix.getHeight()); WritableRaster wr = bi.getRaster(); - int n; - int r, g, b; matrix.getColorMode(complementary); for (int i = matrix.getWidth() - 1; i >= 0; i--) { for (int j = matrix.getHeight() - 1; j >= 0; j--) { diff --git a/source/de/anomic/ymage/ymagePNGEncoderJDE.java b/source/de/anomic/ymage/ymagePNGEncoderJDE.java index f5d91ba9a..ba576f245 100644 --- a/source/de/anomic/ymage/ymagePNGEncoderJDE.java +++ b/source/de/anomic/ymage/ymagePNGEncoderJDE.java @@ -104,7 +104,6 @@ public class ymagePNGEncoderJDE extends Object } width = matrix.getWidth(); height = matrix.getHeight(); - this.matrix = matrix; /* * start with an array that is big enough to hold all the pixels