refactoring of switchboard queueing

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

htroot/AccessTracker_p.java

@@ -53,7 +53,7 @@ public class AccessTracker_p {
 		return accessClone;
 	}
 	
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
      
         // return variable that accumulates replacements

htroot/Banner.java

@@ -60,7 +60,7 @@ import javax.imageio.ImageIO;
 /** draw a banner with information about the peer */
 public class Banner {
 
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) throws IOException {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) throws IOException {
 
         final String IMAGE = "htroot/env/grafics/yacy.gif";
         int width = 468;

htroot/BlacklistCleaner_p.java

@@ -89,7 +89,7 @@ public class BlacklistCleaner_p {
         defaultURLPattern.class
     };
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         
         // initialize the list manager

htroot/Blacklist_p.java

@@ -74,7 +74,7 @@ public class Blacklist_p {
     private final static String BLACKLIST        = "blackLists_";
     private final static String BLACKLIST_SHARED = "BlackLists.Shared";
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         // initialize the list manager
         listManager.switchboard = (plasmaSwitchboard) env;

htroot/Blog.java

@@ -75,7 +75,7 @@ public class Blog {
         return SimpleFormatter.format(date);
     }
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
         blogBoard.BlogEntry page = null;

htroot/BlogComments.java

@@ -76,7 +76,7 @@ public class BlogComments {
         return SimpleFormatter.format(date);
     }
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         blogBoard.BlogEntry page = null;
@@ -338,7 +338,7 @@ public class BlogComments {
         return prop;
     }
 
-    private static void messageForwardingViaEmail(serverSwitch env, messageBoard.entry msgEntry) {
+    private static void messageForwardingViaEmail(serverSwitch<?> env, messageBoard.entry msgEntry) {
         try {
             if (!Boolean.valueOf(env.getConfig("msgForwardingEnabled","false")).booleanValue()) return;
 

htroot/Bookmarks.java

@@ -88,7 +88,7 @@ public class Bookmarks {
 	final static boolean TAGS = false;
 	final static boolean FOLDERS = true;
 	
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
     	int max_count = 10;
     	int start=0;

htroot/CacheAdmin_p.java

@@ -95,7 +95,7 @@ public class CacheAdmin_p {
         }
     }
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
 

htroot/CacheResource_p.java

@@ -55,7 +55,7 @@ import de.anomic.server.serverSwitch;
 
 public class CacheResource_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
 

htroot/ConfigBasic.java

@@ -73,7 +73,7 @@ public class ConfigBasic {
     private static final int NEXTSTEP_RECONNECT = 4;
     
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         // return variable that accumulates replacements
         ConfigBasic config = new ConfigBasic();
@@ -279,7 +279,7 @@ public class ConfigBasic {
         return new Object[]{upnp,scanForRouter};
     }
     */
-    private void reinitPortForwarding(serverObjects post, serverSwitch env) {
+    private void reinitPortForwarding(serverObjects post, serverSwitch<?> env) {
         if ((post != null)) {
             try {
                 boolean reinitPortForwarding = false;

htroot/ConfigLanguage_p.java

@@ -67,7 +67,7 @@ import de.anomic.yacy.yacyURL;
 
 public class ConfigLanguage_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         //listManager.switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;

htroot/ConfigNetwork_p.java

@@ -35,7 +35,7 @@ import de.anomic.yacy.yacyCore;
 
 public class ConfigNetwork_p {
 
-	public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+	public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/ConfigProfile_p.java

@@ -63,7 +63,7 @@ import de.anomic.yacy.yacyNewsRecord;
 
 public class ConfigProfile_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         //listManager.switchboard = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
         final Properties profile = new Properties();

htroot/ConfigProperties_p.java

@@ -58,7 +58,7 @@ import de.anomic.server.serverSwitch;
 
 public class ConfigProperties_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         final serverObjects prop = new serverObjects();
         int count=0;

htroot/ConfigRobotsTxt_p.java

@@ -58,7 +58,7 @@ import de.anomic.yacy.yacyCore;
 
 public class ConfigRobotsTxt_p {
     
-    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final servletProperties prop = new servletProperties();
         
         httpdRobotsTxtConfig rbc = ((plasmaSwitchboard)env).robotstxtConfig;

htroot/ConfigSkins_p.java

@@ -90,7 +90,7 @@ public class ConfigSkins_p {
 		return false;
 	}
 
-	public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+	public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 	serverObjects prop = new serverObjects();
 	plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
 	String skinPath = new File(env.getRootPath(), env.getConfig("skinPath", "DATA/SKINS")).toString();

htroot/ConfigUpdate_p.java

@@ -40,7 +40,7 @@ import de.anomic.yacy.yacyVersion;
 
 public class ConfigUpdate_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         final serverObjects prop = new serverObjects();
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;

htroot/Config_p.java

@@ -58,7 +58,7 @@ import de.anomic.server.serverSwitch;
 
 public class Config_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         final serverObjects prop = new serverObjects();
         int count=0;

htroot/Connections_p.java

@@ -69,7 +69,7 @@ import de.anomic.yacy.yacySeed;
 
 public final class Connections_p {    
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
         serverObjects prop = new serverObjects();

htroot/CookieMonitorIncoming_p.java

@@ -55,7 +55,7 @@ import de.anomic.server.serverSwitch;
 
 public class CookieMonitorIncoming_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
 
         // return variable that accumulates replacements

htroot/CookieMonitorOutgoing_p.java

@@ -55,7 +55,7 @@ import de.anomic.server.serverSwitch;
 
 public class CookieMonitorOutgoing_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
 
         // return variable that accumulates replacements

htroot/CookieTest.java

@@ -56,7 +56,7 @@ import de.anomic.server.servletProperties;
 
 public class CookieTest {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
       
 
         // case if no values are requested

htroot/CrawlProfileEditor_p.java

@@ -78,7 +78,7 @@ public class CrawlProfileEditor_p {
         labels.add(new eentry(entry.XPSTOPW,          "Parent stop-words",    false, eentry.BOOLEAN));
     }
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final servletProperties prop = new servletProperties();
         final plasmaSwitchboard sb = (plasmaSwitchboard)env;
         

htroot/CrawlResults.java

@@ -42,7 +42,7 @@ import de.anomic.yacy.yacyURL;
 
 public class CrawlResults {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();

htroot/CrawlStartExpert_p.java

@@ -31,7 +31,7 @@ import de.anomic.server.serverSwitch;
 
 public class CrawlStartExpert_p {
     
-	public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+	public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         

htroot/CrawlStartSimple_p.java

@@ -38,7 +38,7 @@ import de.anomic.yacy.yacyURL;
 
 public class CrawlStartSimple_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         

htroot/FeedReader_p.java

@@ -35,7 +35,7 @@ import de.anomic.yacy.yacyURL;
 
 public class FeedReader_p {
     
-    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         servletProperties prop = new servletProperties();
         
         prop.put("page", "0");

htroot/IndexCleaner_p.java

@@ -54,7 +54,7 @@ public class IndexCleaner_p {
     private static plasmaCrawlLURL.Cleaner urldbCleanerThread;
     private static plasmaWordIndex.Cleaner indexCleanerThread;
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         prop.put("title", "DbCleanup_p");

htroot/IndexControlRWIs_p.java

@@ -56,7 +56,7 @@ import de.anomic.yacy.yacyURL;
 
 public class IndexControlRWIs_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/IndexControlURLs_p.java

@@ -43,7 +43,7 @@ import de.anomic.yacy.yacyURL;
 
 public class IndexControlURLs_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         

htroot/IndexCreateIndexingQueue_p.java

@@ -60,7 +60,7 @@ import de.anomic.yacy.yacyURL;
 
 public class IndexCreateIndexingQueue_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/IndexCreateLoaderQueue_p.java

@@ -53,7 +53,7 @@ import de.anomic.yacy.yacySeed;
 
 public class IndexCreateLoaderQueue_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/IndexCreateWWWGlobalQueue_p.java

@@ -65,7 +65,7 @@ public class IndexCreateWWWGlobalQueue_p {
         return dayFormatter.format(date);
     }
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/IndexCreateWWWLocalQueue_p.java

@@ -77,7 +77,7 @@ public class IndexCreateWWWLocalQueue_p {
     private static final int INITIATOR  = 5;
     private static final int MODIFIED   = 6;
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/IndexCreateWWWRemoteQueue_p.java

@@ -66,7 +66,7 @@ public class IndexCreateWWWRemoteQueue_p {
         return dayFormatter.format(date);
     }
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final servletProperties prop = new servletProperties();
         final plasmaSwitchboard sb = (plasmaSwitchboard)env;
         

htroot/IndexImport_p.java

@@ -61,7 +61,7 @@ import de.anomic.server.serverSwitch;
 
 public final class IndexImport_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/IndexShare_p.java

@@ -55,7 +55,7 @@ import de.anomic.server.serverSwitch;
 
 public class IndexShare_p {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
     	// return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
 		serverObjects prop = new serverObjects();

htroot/IndexTransfer_p.java

@@ -63,7 +63,7 @@ import de.anomic.yacy.yacySeed;
 
 public final class IndexTransfer_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/MessageSend_p.java

@@ -64,7 +64,7 @@ public class MessageSend_p {
     }
 
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
 
         if ((post == null) || (post.get("hash","").length() == 0)) {

htroot/Messages_p.java

@@ -70,7 +70,7 @@ public class Messages_p {
         return SimpleFormatter.format(date);
     }
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
 

htroot/Network.java

@@ -72,7 +72,7 @@ public class Network {
 
     private static final String STR_TABLE_LIST = "table_list_";
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch switchboard) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> switchboard) {
         plasmaSwitchboard sb = (plasmaSwitchboard) switchboard;
         final long start = System.currentTimeMillis();
         

htroot/NetworkPicture.java

@@ -52,7 +52,7 @@ import de.anomic.ymage.ymageMatrix;
 /** draw a picture of the yacy network */
 public class NetworkPicture {
     
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         int width = 768;
         int height = 576;

htroot/News.java

@@ -60,7 +60,7 @@ import de.anomic.yacy.yacySeed;
 
 public class News {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         boolean overview = (post == null) || (post.get("page", "0").equals("0"));

htroot/PeerLoadPicture.java

@@ -13,7 +13,7 @@ import de.anomic.server.serverThread;
 
 public class PeerLoadPicture {
     
-    public static Image respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static Image respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         int width = 800;
         int height = 600;

htroot/PerformanceGraph.java

@@ -32,7 +32,7 @@ import de.anomic.ymage.ymageMatrix;
 
 public class PerformanceGraph {
     
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         //plasmaSwitchboard sb = (plasmaSwitchboard) env;
         
         if (post == null) post = new serverObjects();

htroot/PerformanceMemory_p.java

@@ -66,7 +66,7 @@ public class PerformanceMemory_p {
     private static final long MB = 1024 * KB;
     private static Map<String, String> defaultSettings = null;
         
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         if (defaultSettings == null) {

htroot/PerformanceQueues_p.java

@@ -58,7 +58,7 @@ import de.anomic.tools.yFormatter;
 
 public class PerformanceQueues_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
         serverObjects prop = new serverObjects();

htroot/PerformanceSearch_p.java

@@ -35,7 +35,7 @@ import de.anomic.server.serverSwitch;
 
 public class PerformanceSearch_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         

htroot/ProxyIndexingMonitor_p.java

@@ -62,7 +62,7 @@ public class ProxyIndexingMonitor_p {
 //      if (date == null) return ""; else return dayFormatter.format(date);
 //  }
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/QuickCrawlLink_p.java

@@ -71,7 +71,7 @@ public class QuickCrawlLink_p {
      * @param env the serverSwitch object holding all runtime-data
      * @return the rewrite-properties for the template
      */
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         serverObjects prop = new serverObjects();
         plasmaSwitchboard switchboard = (plasmaSwitchboard)env;

htroot/Ranking_p.java

@@ -128,7 +128,7 @@ public class Ranking_p {
     	}
     }
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
 
         // clean up all search events

htroot/SearchEventPicture.java

@@ -55,7 +55,7 @@ import de.anomic.ymage.ymageMatrix;
 
 public class SearchEventPicture {
     
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         String eventID = (String) header.get("event", plasmaSearchEvent.lastEventID);
         if (eventID == null) return null;

htroot/SettingsAck_p.java

@@ -79,7 +79,7 @@ public class SettingsAck_p {
     
     private static boolean nothingChanged;
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         

htroot/Settings_p.java

@@ -60,7 +60,7 @@ import de.anomic.yacy.yacySeedUploader;
 
 public final class Settings_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         

htroot/Statistics.java

@@ -55,7 +55,7 @@ import de.anomic.yacy.yacyURL;
 
 public class Statistics {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch sb) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> sb) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) sb;
         serverObjects prop = new serverObjects();

htroot/Status.java

@@ -70,7 +70,7 @@ public class Status {
     private static final String SEEDSERVER = "seedServer";
     private static final String PEERSTATUS = "peerStatus";
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         final serverObjects prop = new serverObjects();
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;

htroot/Steering.java

@@ -56,7 +56,7 @@ import de.anomic.yacy.yacyVersion;
 
 public class Steering {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch ss) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> ss) {
         if (post == null || ss == null) { return new serverObjects(); }
 
         final plasmaSwitchboard sb = (plasmaSwitchboard) ss;

htroot/Supporter.java

@@ -51,7 +51,7 @@ import de.anomic.yacy.yacyURL;
 
 public class Supporter {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
         

htroot/Surftips.java

@@ -51,7 +51,7 @@ import de.anomic.yacy.yacyURL;
 
 public class Surftips {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
         

htroot/Threaddump_p.java

@@ -68,7 +68,7 @@ public class Threaddump_p {
 	private static serverObjects prop;
 	private static plasmaSwitchboard sb;
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
     	prop = new serverObjects();
     	sb = (plasmaSwitchboard) env;

htroot/User.java

@@ -60,7 +60,7 @@ import de.anomic.server.servletProperties;
 
 public class User{
     
-    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         servletProperties prop = new servletProperties();
         plasmaSwitchboard sb = plasmaSwitchboard.getSwitchboard();
         userDB.Entry entry=null;

htroot/User_p.java

@@ -59,7 +59,7 @@ import de.anomic.server.serverSwitch;
 
 public class User_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         plasmaSwitchboard sb = plasmaSwitchboard.getSwitchboard();
         userDB.Entry entry=null;

htroot/ViewFile.java

@@ -82,7 +82,7 @@ public class ViewFile {
     private static final String HIGHLIGHT_CSS = "searchHighlight";
     private static final int MAX_HIGHLIGHTS = 6;
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         serverObjects prop = new serverObjects();
         plasmaSwitchboard sb = (plasmaSwitchboard)env;     

htroot/ViewImage.java

@@ -62,7 +62,7 @@ public class ViewImage {
     private static HashMap<String, Image> iconcache = new HashMap<String, Image>();
     private static String defaulticon = "htroot/env/grafics/dfltfvcn.ico";
     
-    public static Image respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static Image respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         plasmaSwitchboard sb = (plasmaSwitchboard)env;
         

htroot/ViewLog_p.java

@@ -60,7 +60,7 @@ import de.anomic.server.logging.LogalizerHandler;
 
 public class ViewLog_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         String[] log = new String[0];
         boolean reversed = false;

htroot/WatchCrawler_p.java

@@ -59,7 +59,7 @@ public class WatchCrawler_p {
     // this servlet does NOT create the WatchCrawler page content!
     // this servlet starts a web crawl. The interface for entering the web crawl parameters is in IndexCreate_p.html
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/WatchWebStructure_p.java

@@ -9,7 +9,7 @@ import de.anomic.server.serverSwitch;
 
 
 public class WatchWebStructure_p {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         

htroot/WebStructurePicture_p.java

@@ -45,7 +45,7 @@ public class WebStructurePicture_p {
     
     private static final double maxlongd = Long.MAX_VALUE;
     
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         
         int width = 768;

htroot/Wiki.java

@@ -74,7 +74,7 @@ public class Wiki {
     }
 
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) throws IOException {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) throws IOException {
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         if (post == null) {

htroot/WikiHelp.java

@@ -52,7 +52,7 @@ import de.anomic.server.serverSwitch;
 
 public class WikiHelp {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         //final plasmaSwitchboard sb = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
         return prop;

htroot/YaCySearchPluginFF.java

@@ -56,7 +56,7 @@ public class YaCySearchPluginFF {
      * @param env the serverSwitch object holding all runtime-data
      * @return the rewrite-properties for the template
      */
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         serverObjects prop = new serverObjects();
         

htroot/autoconfig.java

@@ -57,7 +57,7 @@ public class autoconfig {
      * @param env the serverSwitch object holding all runtime-data
      * @return the rewrite-properties for the template
      */
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         serverObjects prop = new serverObjects();
         

htroot/imagetest.java

@@ -51,7 +51,7 @@ import de.anomic.ymage.ymageToolPrint;
 
 public class imagetest {
     
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         /*
         BufferedImage bi = new BufferedImage(640, 400, BufferedImage.TYPE_INT_RGB); 
         Graphics2D g = bi.createGraphics();

htroot/index.java

@@ -38,7 +38,7 @@ import de.anomic.yacy.yacyCore;
 
 public class index {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final plasmaSwitchboard sb = (plasmaSwitchboard) env;
         final serverObjects prop = new serverObjects();
         

htroot/opensearchdescription.java

@@ -32,7 +32,7 @@ import de.anomic.yacy.yacyCore;
 
 public class opensearchdescription {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         // generate message content for open search description
         String promoteSearchPageGreeting = env.getConfig("promoteSearchPageGreeting", "");

htroot/osm.java

@@ -8,7 +8,7 @@ import de.anomic.ymage.ymageOSM;
 
 public class osm {
 
-    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static ymageMatrix respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
 
         int zoom = 10;
         double lat = 47.968056d;

htroot/rct_p.java

@@ -43,7 +43,7 @@ import de.anomic.yacy.yacyURL;
 
 public class rct_p {
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/robots.java

@@ -12,7 +12,7 @@ import de.anomic.server.servletProperties;
 
 public class robots {
     
-    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static servletProperties respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         final servletProperties prop = new servletProperties();
         final httpdRobotsTxtConfig rbc = ((plasmaSwitchboard)env).robotstxtConfig;
         

htroot/sharedBlacklist_p.java

@@ -76,7 +76,7 @@ public class sharedBlacklist_p {
     public static final int STATUS_URL_PROBLEM = 4;
     public static final int STATUS_WRONG_INVOCATION = 5;
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;

htroot/ssitestservlet.java

@@ -31,7 +31,7 @@ import de.anomic.server.serverSwitch;
 
 public class ssitestservlet {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         
         //plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/test.java

@@ -6,7 +6,7 @@ public class test {
     
     // http://localhost:8080/test.xml?count=10
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         int count = Math.min(1000, (post == null) ? 0 : post.getInt("count", 0));
         

htroot/www/welcome.java

@@ -61,7 +61,7 @@ import de.anomic.yacy.yacySeed;
 
 public class welcome {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         final serverObjects prop = new serverObjects();
 

htroot/xml/blacklists_p.java

@@ -31,7 +31,7 @@ import de.anomic.server.serverSwitch;
 public class blacklists_p {
     
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         
         listManager.listsPath = new File(listManager.switchboard.getRootPath(),listManager.switchboard.getConfig("listManager.listsPath", "DATA/LISTS"));

htroot/xml/bookmarks/posts/all.java

@@ -57,7 +57,7 @@ import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 
 public class all {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         boolean isAdmin=switchboard.verifyAuthentication(header, true);

htroot/xml/bookmarks/posts/delete_p.java

@@ -51,7 +51,7 @@ import de.anomic.server.serverSwitch;
 import de.anomic.yacy.yacyURL;
 
 public class delete_p {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/xml/bookmarks/posts/get.java

@@ -33,7 +33,7 @@ import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 
 public class get {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         boolean isAdmin=switchboard.verifyAuthentication(header, true);

htroot/xml/bookmarks/tags/get.java

@@ -56,7 +56,7 @@ import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 
 public class get {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         boolean isAdmin=switchboard.verifyAuthentication(header, true);

htroot/xml/bookmarks/tags/rename_p.java

@@ -52,7 +52,7 @@ import de.anomic.server.serverObjects;
 import de.anomic.server.serverSwitch;
 
 public class rename_p {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/xml/bookmarks/xbel/xbel.java

@@ -14,7 +14,7 @@ public class xbel {
 	private static plasmaSwitchboard switchboard;
 	private static boolean isAdmin;	
 	
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
  
     	int count = 0;;
     	

htroot/xml/config_p.java

@@ -34,7 +34,7 @@ import de.anomic.server.serverSwitch;
 public class config_p {
     
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         //plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/xml/queues_p.java

@@ -74,7 +74,7 @@ public class queues_p {
         return dayFormatter.format(date);
     }
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         //wikiCode wikiTransformer = new wikiCode(switchboard);

htroot/xml/status_p.java

@@ -52,7 +52,7 @@ import de.anomic.yacy.yacyCore;
 public class status_p {
     
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/xml/util/getpageinfo_p.java

@@ -62,7 +62,7 @@ import de.anomic.server.serverSwitch;
 import de.anomic.yacy.yacyURL;
 
 public class getpageinfo_p {
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         prop.put("sitemap", "");
         prop.put("title", "");

htroot/xml/version.java

@@ -29,7 +29,7 @@ import de.anomic.server.serverSwitch;
 public class version {
     
     
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         

htroot/xml/webstructure.java

@@ -38,7 +38,7 @@ import de.anomic.server.serverSwitch;
 
 public class webstructure {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         serverObjects prop = new serverObjects();
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         Iterator<plasmaWebStructure.structureEntry> i = sb.webStructure.structureEntryIterator();

htroot/yacy/crawlReceipt.java

@@ -67,7 +67,7 @@ public final class crawlReceipt {
      * this is used to respond on a remote crawling request
      */
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         plasmaSwitchboard switchboard = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();

htroot/yacy/hello.java

@@ -64,7 +64,7 @@ import de.anomic.yacy.yacyVersion;
 
 public final class hello {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) throws InterruptedException {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) throws InterruptedException {
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         serverObjects prop = new serverObjects();
         prop.put("message", "none");

htroot/yacy/list.java

@@ -41,7 +41,7 @@ import de.anomic.yacy.yacySeed;
 
 public final class list {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         if (post == null || env == null) throw new NullPointerException("post: " + post + ", sb: " + env);
         plasmaSwitchboard sb = (plasmaSwitchboard) env;
         

htroot/yacy/message.java

@@ -72,7 +72,7 @@ public final class message {
         return SimpleFormatter.format(date);
     }
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         if (post == null || env == null) { return null; }
 
         // return variable that accumulates replacements
@@ -181,7 +181,7 @@ public final class message {
 
      #[message]#
      */
-    private static void messageForwardingViaEmail(serverSwitch env, messageBoard.entry msgEntry) {
+    private static void messageForwardingViaEmail(serverSwitch<?> env, messageBoard.entry msgEntry) {
         try {
             if (!Boolean.valueOf(env.getConfig("msgForwardingEnabled","false")).booleanValue()) return;
 

htroot/yacy/profile.java

@@ -62,7 +62,7 @@ import de.anomic.yacy.yacyNetwork;
 
 public final class profile {
 
-    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch env) {
+    public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
         // return variable that accumulates replacements
         serverObjects prop = new serverObjects();
         plasmaSwitchboard sb = (plasmaSwitchboard) env;