incubator-droids-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r983424 - in /incubator/droids/trunk/droids-core/src: main/java/org/apache/droids/ main/java/org/apache/droids/impl/ main/java/org/apache/droids/monitor/ main/java/org/apache/droids/robot/walker/ test/java/org/apache/droids/ test/java/org/a...
Date Sun, 08 Aug 2010 15:22:10 GMT
Author: olegk
Date: Sun Aug  8 15:22:09 2010
New Revision: 983424

URL: http://svn.apache.org/viewvc?rev=983424&view=rev
Log:
Fixed generics; removed unused imports; added missing serialVersionUID

Modified:
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/SimpleWorkMonitor.java
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/WorkBean.java
    incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java
    incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
    incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
    incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
    incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
    incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleQueue.java

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java (original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/LinkTask.java Sun Aug
 8 15:22:09 2010
@@ -25,6 +25,8 @@ import org.apache.droids.api.Link;
 
 public class LinkTask implements Link, Serializable
 {
+  private static final long serialVersionUID = -44808094386453088L;
+
   private Date started;
   private final int depth;
   private final URI uri;

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
(original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/MultiThreadedTaskMaster.java
Sun Aug  8 15:22:09 2010
@@ -196,7 +196,7 @@ public class MultiThreadedTaskMaster<T e
    * @param queue
    * @return
    */
-  protected Future submitNewTaskRunner(ExecutorService executor, final TaskQueue<? extends
T> queue) {
+  protected Future<?> submitNewTaskRunner(ExecutorService executor, final TaskQueue<?
extends T> queue) {
     return executor.submit(new Runnable() {
       public void run() {
         String threadName = Thread.currentThread().getName();

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java
(original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/impl/SimpleTaskQueue.java
Sun Aug  8 15:22:09 2010
@@ -45,7 +45,7 @@ public class SimpleTaskQueue<T extends T
     taskMap = new ConcurrentHashMap<String, T>();
   }
 
-  public SimpleTaskQueue(Queue queue) {
+  public SimpleTaskQueue(Queue<T> queue) {
     this.queue = queue;
     taskMap = new ConcurrentHashMap<String, T>();
   }

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/SimpleWorkMonitor.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/SimpleWorkMonitor.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/SimpleWorkMonitor.java
(original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/SimpleWorkMonitor.java
Sun Aug  8 15:22:09 2010
@@ -17,8 +17,6 @@
 package org.apache.droids.monitor;
 
 import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/WorkBean.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/WorkBean.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/WorkBean.java
(original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/monitor/WorkBean.java
Sun Aug  8 15:22:09 2010
@@ -16,17 +16,10 @@
  */
 package org.apache.droids.monitor;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.apache.droids.api.*;
-import org.apache.droids.exception.InvalidTaskException;
+import org.apache.droids.api.Task;
+import org.apache.droids.api.Worker;
 
 /**
  * A simple 

Modified: incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java
(original)
+++ incubator/droids/trunk/droids-core/src/main/java/org/apache/droids/robot/walker/FileTask.java
Sun Aug  8 15:22:09 2010
@@ -24,6 +24,8 @@ import org.apache.droids.api.Task;
 
 public class FileTask implements Task
 {
+  private static final long serialVersionUID = 122177113684842951L;
+
   private final Date started;
   private final int depth;
   private final File file;

Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
(original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/DroidsFactory.java
Sun Aug  8 15:22:09 2010
@@ -38,7 +38,6 @@ import org.apache.droids.impl.SaveCrawli
 import org.apache.droids.impl.SequentialTaskMaster;
 import org.apache.droids.impl.SimpleTaskQueue;
 import org.apache.droids.impl.SimpleTaskQueueWithHistory;
-import org.apache.droids.impl.SysoutCrawlingDroid;
 import org.apache.droids.parse.html.HtmlParser;
 import org.apache.droids.protocol.http.HttpProtocol;
 import org.apache.droids.robot.crawler.CrawlingDroid;

Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
(original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ExceptionCrawlingDroid.java
Sun Aug  8 15:22:09 2010
@@ -18,10 +18,7 @@
 */
 package org.apache.droids.impl;
 
-import java.net.URI;
-
 import org.apache.droids.DroidsFactory;
-import org.apache.droids.api.ContentEntity;
 import org.apache.droids.api.Handler;
 import org.apache.droids.api.Link;
 import org.apache.droids.api.TaskMaster;

Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
(original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/ReportCrawlingDroid.java
Sun Aug  8 15:22:09 2010
@@ -24,8 +24,6 @@ import org.apache.droids.api.TaskMaster;
 import org.apache.droids.api.TaskQueue;
 import org.apache.droids.api.Worker;
 import org.apache.droids.examples.handler.ReportHandler;
-import org.apache.droids.handle.Save;
-import org.apache.droids.handle.Sysout;
 import org.apache.droids.robot.crawler.CrawlingDroid;
 import org.apache.droids.robot.crawler.CrawlingWorker;
 

Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
(original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/SysoutCrawlingDroid.java
Sun Aug  8 15:22:09 2010
@@ -23,7 +23,6 @@ import org.apache.droids.api.Link;
 import org.apache.droids.api.TaskMaster;
 import org.apache.droids.api.TaskQueue;
 import org.apache.droids.api.Worker;
-import org.apache.droids.handle.Save;
 import org.apache.droids.handle.Sysout;
 import org.apache.droids.robot.crawler.CrawlingDroid;
 import org.apache.droids.robot.crawler.CrawlingWorker;

Modified: incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
URL: http://svn.apache.org/viewvc/incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleQueue.java?rev=983424&r1=983423&r2=983424&view=diff
==============================================================================
--- incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
(original)
+++ incubator/droids/trunk/droids-core/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
Sun Aug  8 15:22:09 2010
@@ -17,15 +17,13 @@
 package org.apache.droids.impl;
 
 import java.io.File;
-import java.net.URI;
 
-import org.apache.droids.LinkTask;
+import junit.framework.Assert;
+
 import org.apache.droids.exception.InvalidTaskException;
 import org.apache.droids.robot.walker.FileTask;
 import org.junit.Test;
 
-import junit.framework.Assert;
-
 public class TestSimpleQueue
 {
 



Mime
View raw message