removed unreacheable catch blocks and unused imports

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

htroot/CacheAdmin_p.java

@@ -47,7 +47,6 @@
 // if the shell's current path is HTROOT
 
 import java.io.File;
-import java.io.OutputStream;
 import java.io.Writer;
 import java.util.Iterator;
 import java.util.Map;

source/de/anomic/htmlFilter/htmlFilterContentScraper.java

@@ -43,13 +43,8 @@
 
 package de.anomic.htmlFilter;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -60,9 +55,7 @@ import java.util.Properties;
 import java.util.TreeSet;
 
 import de.anomic.net.URL;
-import de.anomic.server.serverByteBuffer;
 import de.anomic.server.serverCharBuffer;
-import de.anomic.server.serverFileUtils;
 
 public class htmlFilterContentScraper extends htmlFilterAbstractScraper implements htmlFilterScraper {
 

source/de/anomic/htmlFilter/htmlFilterContentTransformer.java

@@ -46,7 +46,6 @@ package de.anomic.htmlFilter;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
-import java.io.IOException;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Locale;
@@ -113,7 +112,6 @@ public class htmlFilterContentTransformer extends htmlFilterAbstractTransformer
     }
 
     private static char[] genBlueLetters(int length) {
-        try {
             serverCharBuffer bb = new serverCharBuffer(" <FONT COLOR=#0000FF>".toCharArray());
             length = length / 2;
             if (length > 10) length = 7;
@@ -122,10 +120,6 @@ public class htmlFilterContentTransformer extends htmlFilterAbstractTransformer
             }
             bb.append("</FONT> ");
             return bb.getChars();
-        } catch (IOException e) {
-            // ignore this.
-            return null;
-        }
     }
 
     private boolean bluelistHit(char[] text) {

source/de/anomic/htmlFilter/htmlFilterWriter.java

@@ -117,7 +117,6 @@ public final class htmlFilterWriter extends Writer {
     }
 
     public static char[] genTag0raw(String tagname, boolean opening, char[] tagopts) {
-        try {
             serverCharBuffer bb = new serverCharBuffer(tagname.length() + tagopts.length + 3);
             bb.append('<');
             if (!opening) {
@@ -131,14 +130,9 @@ public final class htmlFilterWriter extends Writer {
             }
             bb.append('>');
             return bb.getChars();
-        } catch (IOException e) {
-            // ignore this
-            return null;
-        }
     }
 
     public static char[] genTag1raw(String tagname, char[] tagopts, char[] text) {
-        try {
             serverCharBuffer bb = new serverCharBuffer(2 * tagname.length() + tagopts.length + text.length + 5);
             bb.append('<').append(tagname);
             if (tagopts.length > 0) {
@@ -150,14 +144,9 @@ public final class htmlFilterWriter extends Writer {
             bb.append(text);
             bb.append('<').append('/').append(tagname).append('>');
             return bb.getChars();
-        } catch (IOException e) {
-            // ignore this
-            return null;
-        }
     }
 
     public static char[] genTag0(String tagname, Properties tagopts, char quotechar) {   
-        try {
             char[] tagoptsx = (tagopts.size() == 0) ? null : genOpts(tagopts, quotechar);
             serverCharBuffer bb = new serverCharBuffer(tagname.length() + ((tagoptsx == null) ? 0 : (tagoptsx.length + 1)) + tagname.length() + 2);
             bb.append('<').append(tagname);
@@ -166,28 +155,18 @@ public final class htmlFilterWriter extends Writer {
                 bb.append(tagoptsx);
             }
             bb.append('>');
-            return bb.getChars();    
+            return bb.getChars();          
-        } catch (IOException e) {
-            // ignore this
-            return null;
-        }        
     }
 
     public static char[] genTag1(String tagname, Properties tagopts, char[] text, char quotechar) {  
-        try {
             char[] gt0 = genTag0(tagname, tagopts, quotechar);
             serverCharBuffer cb = new serverCharBuffer(gt0, gt0.length + text.length + tagname.length() + 3);
             cb.append(text).append('<').append('/').append(tagname).append('>');
             return cb.getChars();        
-        } catch (IOException e) {
-            // ignore this
-            return null;
-        }
     }
 
     // a helper method for pretty-printing of properties for html tags
     public static char[] genOpts(Properties prop, char quotechar) {   
-        try {
             Enumeration e = prop.propertyNames();
             serverCharBuffer bb = new serverCharBuffer(prop.size() * 40);
             String key;
@@ -199,10 +178,6 @@ public final class htmlFilterWriter extends Writer {
             }
             if (bb.length() > 0) return bb.getChars(1);
             return bb.getChars(); 
-        }catch (IOException e) {
-            // ignore this
-            return null;
-        }
     }
 
     private char[] filterTag(String tag, boolean opening, char[] content, char quotechar) {

source/de/anomic/plasma/dbImport/plasmaDbImporter.java

@@ -1,7 +1,6 @@
 package de.anomic.plasma.dbImport;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.TreeSet;

source/de/anomic/plasma/plasmaParser.java

@@ -50,7 +50,6 @@ import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.Writer;
 import java.net.MalformedURLException;
 import java.net.URI;
 
@@ -73,7 +72,6 @@ import org.apache.commons.pool.impl.GenericObjectPool;
 import de.anomic.htmlFilter.htmlFilterContentScraper;
 import de.anomic.htmlFilter.htmlFilterWriter;
 import de.anomic.http.httpc;
-import de.anomic.net.URL;
 import de.anomic.plasma.parser.Parser;
 import de.anomic.plasma.parser.ParserException;
 import de.anomic.plasma.parser.ParserInfo;

source/de/anomic/plasma/plasmaSearchQuery.java

@@ -50,7 +50,6 @@ import java.util.Iterator;
 import de.anomic.htmlFilter.htmlFilterAbstractScraper;
 import de.anomic.index.indexEntryAttribute;
 import de.anomic.kelondro.kelondroNaturalOrder;
-import de.anomic.server.serverByteBuffer;
 import de.anomic.server.serverCharBuffer;
 
 public final class plasmaSearchQuery {

source/de/anomic/server/serverFileUtils.java

@@ -57,7 +57,6 @@ import java.io.PrintWriter;
 import java.io.Reader;
 import java.io.Writer;
 import java.util.StringTokenizer;
-import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;