svn commit: r612035 - /labs/droids/trunk/src/core/java/org/apache/droids/DefaultWorker.java

[th...@apache.org]

Author: thorsten
Date: Mon Jan 14 23:58:07 2008
New Revision: 612035

URL: http://svn.apache.org/viewvc?rev=612035&view=rev
Log:
Changing method scope of some methods to provide an own implementation for them.

Modified:
    labs/droids/trunk/src/core/java/org/apache/droids/DefaultWorker.java

Modified: labs/droids/trunk/src/core/java/org/apache/droids/DefaultWorker.java
URL: http://svn.apache.org/viewvc/labs/droids/trunk/src/core/java/org/apache/droids/DefaultWorker.java?rev=612035&r1=612034&r2=612035&view=diff
==============================================================================
--- labs/droids/trunk/src/core/java/org/apache/droids/DefaultWorker.java (original)
+++ labs/droids/trunk/src/core/java/org/apache/droids/DefaultWorker.java Mon Jan 14 23:58:07 2008
@@ -5,6 +5,8 @@
 import java.net.URL;
 import java.util.ArrayList;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.droids.api.Droid;
 import org.apache.droids.api.Parse;
 import org.apache.droids.api.Parser;
@@ -18,11 +20,15 @@
 import org.apache.droids.helper.factories.URLFiltersFactory;
 import org.apache.droids.parse.Outlink;
 
-public class DefaultWorker implements Worker{
+public class DefaultWorker implements Worker {
+
+  protected final Log log = LogFactory.getLog(this.getClass()
+      .getCanonicalName());
+
   private Queue queue;
 
   private Droid droid;
-  
+
   private Task link;
 
   private ProtocolFactory protocolFactory;
@@ -42,15 +48,15 @@
   private HandlerFactory handlerFactory;
 
   private int depth;
-  
+
   public synchronized void run() {
     Core.threadMessage("Starting " + this.getClass().getCanonicalName());
-    uri =link.getId();
-    Core.threadMessage("uri "+uri);
+    uri = link.getId();
+    Core.threadMessage("uri " + uri);
     try {
       protocol = protocolFactory.getProtocol(uri);
       String contentType = protocol.getContentType(uri);
-      Core.threadMessage("contentType "+contentType);
+      Core.threadMessage("contentType " + contentType);
       parser = parserFactory.getParser(contentType);
       // parse contains the outlinks and can be used later
       Parse parse = getParse();
@@ -59,44 +65,45 @@
     } catch (Exception e) {
       e.printStackTrace();
     }
-    
+
   }
 
-  private void handle(Parse parse) throws MalformedURLException, IOException {
+  protected void handle(Parse parse) throws MalformedURLException, IOException {
     if (null != parse)
-    handlerFactory.handle(protocol.openStream(uri), new URL(uri), parse);
+      handlerFactory.handle(protocol.openStream(uri), new URL(uri), parse);
   }
 
-  private Parse getParse() {
-    Parse parse =null;
+  protected Parse getParse() {
+    Parse parse = null;
     if (null != parser) {
       try {
-          // extract links
-          parse = parser.getParse(protocol.openStream(uri), link);
-          // all links from the page unfiltered
-          filter(parse);
+        // extract links
+        parse = parser.getParse(protocol.openStream(uri), link);
+        // all links from the page unfiltered
+        filter(parse);
       } catch (Exception e) {
-          Core.threadMessage(e.getMessage());
+        Core.threadMessage(e.getMessage());
       }
-  }
+    }
     return parse;
   }
 
-  private void filter(Parse parse) {
+  protected void filter(Parse parse) {
     Outlink[] filterLinks = filterLinks(parse);
     queue.merge(filterLinks);
   }
 
-  private Outlink[] filterLinks(Parse parse) {
- // filter the link 
+  protected Outlink[] filterLinks(Parse parse) {
+    // filter the link
     Outlink[] links = parse.getData().getOutlinks();
     // new cleaned list
     ArrayList<Outlink> filtered = new ArrayList<Outlink>();
     for (int i = 0; i < links.length; i++) {
-        Outlink outlink = links[i];
-        if (filtersFactory.accept(outlink.getToUrl()) & !filtered.contains(outlink)) {
-            filtered.add(outlink);
-        }
+      Outlink outlink = links[i];
+      if (filtersFactory.accept(outlink.getToUrl())
+          & !filtered.contains(outlink)) {
+        filtered.add(outlink);
+      }
     }
     // this are the links we need to follow
     Outlink[] filterLinks = filtered.toArray(new Outlink[filtered.size()]);
@@ -104,21 +111,22 @@
   }
 
   public void setQueue(Queue queue) {
-    this.queue=queue;
+    this.queue = queue;
     link = queue.next();
-    depth=link.getDepth();
+    if (link != null)
+      depth = link.getDepth();
   }
 
   public void setDroid(Droid droid) {
-    this.droid=droid;
+    this.droid = droid;
     protocolFactory = droid.getCore().getProtocolFactory();
-    parserFactory=droid.getCore().getParserFactory();
-    filtersFactory=droid.getCore().getFiltersFactory();
-    handlerFactory=droid.getCore().getHandlerFactory();
+    parserFactory = droid.getCore().getParserFactory();
+    filtersFactory = droid.getCore().getFiltersFactory();
+    handlerFactory = droid.getCore().getHandlerFactory();
   }
 
   public void setId(int x) {
-    id=x;
+    id = x;
   }
 
   public int getDepth() {
@@ -126,6 +134,6 @@
   }
 
   public void setDepth(int x) {
-    depth=x;
+    depth = x;
   }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org