Author: olegk
Date: Sun Nov 2 12:28:20 2008
New Revision: 709921
URL: http://svn.apache.org/viewvc?rev=709921&view=rev
Log:
Fixed remaining issues with generics
Modified:
incubator/droids/trunk/src/java/org/apache/droids/robot/crawler/CrawlingDroid.java
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/FileWorker.java
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/WalkingDroid.java
incubator/droids/trunk/src/java/org/apache/http/norobots/NoRobotException.java
incubator/droids/trunk/src/java/org/apache/http/norobots/RulesEngine.java
incubator/droids/trunk/src/test/java/org/apache/droids/examples/FileRenameDroid.java
incubator/droids/trunk/src/test/java/org/apache/droids/examples/IndexerDroid.java
incubator/droids/trunk/src/test/java/org/apache/droids/examples/SimpleRuntime.java
incubator/droids/trunk/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
Modified:
incubator/droids/trunk/src/java/org/apache/droids/robot/crawler/CrawlingDroid.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/java/org/apache/droids/robot/crawler/CrawlingDroid.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/java/org/apache/droids/robot/crawler/CrawlingDroid.java
(original)
+++
incubator/droids/trunk/src/java/org/apache/droids/robot/crawler/CrawlingDroid.java
Sun Nov 2 12:28:20 2008
@@ -30,7 +30,7 @@
import org.apache.droids.impl.MultiThreadedTaskMaster;
import org.apache.droids.impl.SimpleTaskQueue;
-public class CrawlingDroid extends AbstractDroid
+public class CrawlingDroid extends AbstractDroid<Link>
{
private Collection<String> initialLocations;
@@ -39,7 +39,7 @@
HandlerFactory handlerFactory;
URLFiltersFactory filtersFactory;
- public CrawlingDroid( TaskQueue queue, TaskMaster taskMaster )
+ public CrawlingDroid( TaskQueue<Link> queue, TaskMaster<Link> taskMaster )
{
super( queue, taskMaster );
}
@@ -114,10 +114,10 @@
public static void main( String[] args )
{
try {
- MultiThreadedTaskMaster taskMaster = new MultiThreadedTaskMaster();
+ MultiThreadedTaskMaster<Link> taskMaster = new
MultiThreadedTaskMaster<Link>();
taskMaster.setMaxThreads( 3 );
- TaskQueue queue = new SimpleTaskQueue();
+ TaskQueue<Link> queue = new SimpleTaskQueue<Link>();
Collection<String> locations = new ArrayList<String>();
locations.add( args[0] );
Modified:
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/FileWorker.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/java/org/apache/droids/robot/walker/FileWorker.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/FileWorker.java
(original)
+++
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/FileWorker.java
Sun Nov 2 12:28:20 2008
@@ -25,9 +25,9 @@
public class FileWorker implements Worker<FileTask>
{
- final TaskQueue queue;
+ final TaskQueue<FileTask> queue;
- public FileWorker( TaskQueue queue )
+ public FileWorker( TaskQueue<FileTask> queue )
{
this.queue = queue;
}
Modified:
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/WalkingDroid.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/java/org/apache/droids/robot/walker/WalkingDroid.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/WalkingDroid.java
(original)
+++
incubator/droids/trunk/src/java/org/apache/droids/robot/walker/WalkingDroid.java
Sun Nov 2 12:28:20 2008
@@ -21,7 +21,7 @@
import org.apache.droids.api.Droid;
-public interface WalkingDroid extends Droid
+public interface WalkingDroid extends Droid<FileTask>
{
public void setInitialFiles(Collection<File> initialFiles);
public FileWorker getNewWorker();
Modified:
incubator/droids/trunk/src/java/org/apache/http/norobots/NoRobotException.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/java/org/apache/http/norobots/NoRobotException.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/java/org/apache/http/norobots/NoRobotException.java
(original)
+++
incubator/droids/trunk/src/java/org/apache/http/norobots/NoRobotException.java
Sun Nov 2 12:28:20 2008
@@ -32,7 +32,9 @@
*/
public class NoRobotException extends Exception {
- public NoRobotException(String message) {
+ private static final long serialVersionUID = 7185905140738392746L;
+
+public NoRobotException(String message) {
super(message);
}
Modified:
incubator/droids/trunk/src/java/org/apache/http/norobots/RulesEngine.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/java/org/apache/http/norobots/RulesEngine.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
--- incubator/droids/trunk/src/java/org/apache/http/norobots/RulesEngine.java
(original)
+++ incubator/droids/trunk/src/java/org/apache/http/norobots/RulesEngine.java
Sun Nov 2 12:28:20 2008
@@ -35,10 +35,10 @@
*/
class RulesEngine {
- private List rules;
+ private List<Rule> rules;
public RulesEngine() {
- this.rules = new ArrayList();
+ this.rules = new ArrayList<Rule>();
}
public void allowPath(String path) {
@@ -61,7 +61,7 @@
*/
public Boolean isAllowed(String path) {
- Iterator iterator = this.rules.iterator();
+ Iterator<Rule> iterator = this.rules.iterator();
while(iterator.hasNext()) {
Rule rule = (Rule)iterator.next();
Boolean test = rule.isAllowed(path);
Modified:
incubator/droids/trunk/src/test/java/org/apache/droids/examples/FileRenameDroid.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/test/java/org/apache/droids/examples/FileRenameDroid.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/test/java/org/apache/droids/examples/FileRenameDroid.java
(original)
+++
incubator/droids/trunk/src/test/java/org/apache/droids/examples/FileRenameDroid.java
Sun Nov 2 12:28:20 2008
@@ -30,13 +30,13 @@
import org.apache.log4j.Logger;
-public class FileRenameDroid extends AbstractDroid
+public class FileRenameDroid extends AbstractDroid<FileTask>
{
static final Logger log = Logger.getLogger( FileRenameDroid.class );
private Collection<File> initialFiles;
- public FileRenameDroid( TaskQueue queue, TaskMaster taskMaster )
+ public FileRenameDroid( TaskQueue<FileTask> queue, TaskMaster<FileTask>
taskMaster )
{
super( queue, taskMaster );
}
@@ -128,10 +128,10 @@
public static void main( String[] args )
{
- MultiThreadedTaskMaster taskMaster = new MultiThreadedTaskMaster();
+ MultiThreadedTaskMaster<FileTask> taskMaster = new
MultiThreadedTaskMaster<FileTask>();
taskMaster.setMaxThreads( 3 );
- TaskQueue queue = new SimpleTaskQueue();
+ TaskQueue<FileTask> queue = new SimpleTaskQueue<FileTask>();
Collection<File> files = new ArrayList<File>();
files.add( new File( args[0] ) );
Modified:
incubator/droids/trunk/src/test/java/org/apache/droids/examples/IndexerDroid.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/test/java/org/apache/droids/examples/IndexerDroid.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/test/java/org/apache/droids/examples/IndexerDroid.java
(original)
+++
incubator/droids/trunk/src/test/java/org/apache/droids/examples/IndexerDroid.java
Sun Nov 2 12:28:20 2008
@@ -16,13 +16,14 @@
*/
package org.apache.droids.examples;
+import org.apache.droids.api.Link;
import org.apache.droids.api.TaskMaster;
import org.apache.droids.api.TaskQueue;
import org.apache.droids.robot.crawler.CrawlingDroid;
public class IndexerDroid extends CrawlingDroid {
- public IndexerDroid(TaskQueue queue, TaskMaster taskMaster) {
+ public IndexerDroid(TaskQueue<Link> queue, TaskMaster<Link> taskMaster) {
super(queue, taskMaster);
}
Modified:
incubator/droids/trunk/src/test/java/org/apache/droids/examples/SimpleRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/test/java/org/apache/droids/examples/SimpleRuntime.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/test/java/org/apache/droids/examples/SimpleRuntime.java
(original)
+++
incubator/droids/trunk/src/test/java/org/apache/droids/examples/SimpleRuntime.java
Sun Nov 2 12:28:20 2008
@@ -21,6 +21,7 @@
import java.util.HashMap;
import org.apache.droids.robot.crawler.CrawlingDroid;
+import org.apache.droids.api.Link;
import org.apache.droids.delay.SimpleDelayTimer;
import org.apache.droids.handle.Sysout;
import org.apache.droids.helper.factories.DroidFactory;
@@ -84,18 +85,18 @@
handlerFactory.getMap().put("default", defaultHandler);
// Create droid factory. Leave it empty for now.
- DroidFactory droidFactory = new DroidFactory();
+ DroidFactory<Link> droidFactory = new DroidFactory<Link>();
droidFactory.setMap(new HashMap<String, Object>());
// Create default droid
SimpleDelayTimer simpleDelayTimer = new SimpleDelayTimer();
simpleDelayTimer.setDelayMillis(100);
- SimpleTaskQueue simpleQueue = new SimpleTaskQueue();
+ SimpleTaskQueue<Link> simpleQueue = new SimpleTaskQueue<Link>();
// simpleQueue.setMaxDepth(3);
// simpleQueue.setMaxSize(-1);
- MultiThreadedTaskMaster taskMaster = new MultiThreadedTaskMaster();
+ MultiThreadedTaskMaster<Link> taskMaster = new
MultiThreadedTaskMaster<Link>();
taskMaster.setMaxThreads( 5 );
taskMaster.setDelayTimer( simpleDelayTimer );
Modified:
incubator/droids/trunk/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
URL:
http://svn.apache.org/viewvc/incubator/droids/trunk/src/test/java/org/apache/droids/impl/TestSimpleQueue.java?rev=709921&r1=709920&r2=709921&view=diff
==============================================================================
---
incubator/droids/trunk/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
(original)
+++
incubator/droids/trunk/src/test/java/org/apache/droids/impl/TestSimpleQueue.java
Sun Nov 2 12:28:20 2008
@@ -40,7 +40,7 @@
public void testMaxSize() throws Exception
{
- SimpleTaskQueue taskQueue = new SimpleTaskQueue();
+ SimpleTaskQueue<LinkTask> taskQueue = new SimpleTaskQueue<LinkTask>();
taskQueue.setMaxSize( 10 );
// we should be able to put in 10 tasks...
@@ -58,7 +58,7 @@
public void testMaxDepth() throws Exception
{
- SimpleTaskValidator validator = new SimpleTaskValidator();
+ SimpleTaskValidator<FileTask> validator = new
SimpleTaskValidator<FileTask>();
validator.setMaxDepth( 5 );
// Testing directly...
