diff --git a/source/de/anomic/data/listManager.java b/source/de/anomic/data/listManager.java index 46f9e5bd6..b323a779f 100644 --- a/source/de/anomic/data/listManager.java +++ b/source/de/anomic/data/listManager.java @@ -56,6 +56,7 @@ import java.util.Iterator; import java.util.Vector; import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.urlPattern.plasmaURLPattern.blacklistFile; import de.anomic.server.serverCore; // The Naming of the functions is a bit strange... @@ -336,15 +337,16 @@ public class listManager { ArrayList blacklistFiles = new ArrayList(supportedBlacklistTypes.length); for (int i=0; i < supportedBlacklistTypes.length; i++) { - String[] blacklistFile = new String[]{ - supportedBlacklistTypes[i], - switchboard.getConfig(supportedBlacklistTypes[i] + ".BlackLists", "") - }; - blacklistFiles.add(blacklistFile); + blacklistFile blFile = new blacklistFile( + switchboard.getConfig(supportedBlacklistTypes[i] + ".BlackLists", ""), + supportedBlacklistTypes[i]); + blacklistFiles.add(blFile); } - de.anomic.plasma.plasmaSwitchboard.urlBlacklist.clear(); - de.anomic.plasma.plasmaSwitchboard.urlBlacklist.loadList((String[][])blacklistFiles.toArray(new String[blacklistFiles.size()][]), "/"); + plasmaSwitchboard.urlBlacklist.clear(); + plasmaSwitchboard.urlBlacklist.loadList( + (blacklistFile[])blacklistFiles.toArray(new blacklistFile[blacklistFiles.size()]), + "/"); // switchboard.urlBlacklist.clear(); // if (f != "") switchboard.urlBlacklist.loadLists("black", f, "/"); diff --git a/source/de/anomic/plasma/urlPattern/abstractURLPattern.java b/source/de/anomic/plasma/urlPattern/abstractURLPattern.java index e07a7e98d..3058680d6 100644 --- a/source/de/anomic/plasma/urlPattern/abstractURLPattern.java +++ b/source/de/anomic/plasma/urlPattern/abstractURLPattern.java @@ -45,11 +45,7 @@ package de.anomic.plasma.urlPattern; -import java.io.BufferedReader; import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -57,7 +53,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import java.util.TreeMap; import de.anomic.kelondro.kelondroMSetTools; import de.anomic.net.URL;