TaskManager: Refactor IoTask

- Make IoTask a subclass of Task and remove the code of the special case. git-svn-id: https://jedit.svn.sourceforge.net/svnroot/jedit/jEdit/trunk@22943 6b1eeb88-9816-0410-afa2-b43733a0f04e
romuloceccon · Apr 22, 2013 · 8264485 · 8264485
1 parent ccff7d5
commit 8264485
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 42 deletions.
diff --git a/org/gjt/sp/jedit/Buffer.java b/org/gjt/sp/jedit/Buffer.java
@@ -34,6 +34,7 @@
 import java.util.Vector;
 
 import javax.swing.*;
+import javax.swing.SwingWorker.StateValue;
 import javax.swing.text.Segment;
 
 import org.gjt.sp.jedit.browser.VFSBrowser;
@@ -42,6 +43,7 @@
 import org.gjt.sp.jedit.buffer.JEditBuffer;
 import org.gjt.sp.jedit.bufferio.BufferAutosaveRequest;
 import org.gjt.sp.jedit.bufferio.BufferIORequest;
+import org.gjt.sp.jedit.bufferio.IoTask;
 import org.gjt.sp.jedit.bufferio.MarkersSaveRequest;
 import org.gjt.sp.jedit.bufferset.BufferSet;
 import org.gjt.sp.jedit.gui.DockableWindowManager;
@@ -720,6 +722,19 @@ public void setAutoReload(boolean value)
 		setFlag(AUTORELOAD, value);
 		autoreloadOverridden = isAutoreloadPropertyOverriden();
 	} //}}}
+//
+//	//{{{ getIoTask() method
+//	public IoTask getIoTask()
+//	{
+//		return ioTask;
+//	} //}}}
+//
+//	//{{{ setIoTask() method
+//	public void setIoTask(IoTask task)
+//	{
+//		assert(ioTask == null || ioTask != null && ioTask.getState() == StateValue.DONE);
+//		this.ioTask = task;
+//	} //}}}
 
 	//{{{ getAutoReloadDialog() method
 	/**
@@ -1841,6 +1856,9 @@ private boolean isAutoreloadPropertyOverriden()
 
 	private Socket waitSocket;
 	private List<BufferUndoListener> undoListeners;
+//
+//	/** the current ioTask of this buffer */
+//	private volatile IoTask ioTask;
 	//}}}
 
 	//{{{ setPath() method

diff --git a/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java b/org/gjt/sp/jedit/browser/VFSFileChooserDialog.java
@@ -38,6 +38,7 @@
 import org.gjt.sp.jedit.io.*;
 import org.gjt.sp.jedit.*;
 import org.gjt.sp.jedit.buffer.JEditBuffer;
+import org.gjt.sp.jedit.bufferio.IoTask;
 import org.gjt.sp.util.*;
 //}}}
 
@@ -583,7 +584,7 @@ public void valueUpdated(Task task)
 	} //}}}
 
 	//{{{ GetFileTypeRequest class
-	private class GetFileTypeRequest extends Task
+	private class GetFileTypeRequest extends IoTask
 	{
 		VFS    vfs;
 		Object session;
@@ -593,7 +594,7 @@ private class GetFileTypeRequest extends Task
 		GetFileTypeRequest(VFS vfs, Object session,
 			String path, int[] type)
 		{
-			super(true);
+			super();
 			this.vfs     = vfs;
 			this.session = session;
 			this.path    = path;

diff --git a/org/gjt/sp/jedit/bufferio/BufferIORequest.java b/org/gjt/sp/jedit/bufferio/BufferIORequest.java
@@ -44,15 +44,14 @@
 import org.gjt.sp.jedit.io.EncodingServer;
 import org.gjt.sp.util.IntegerArray;
 import org.gjt.sp.util.SegmentBuffer;
-import org.gjt.sp.util.Task;
 //}}}
 
 /**
  * A buffer I/O request.
  * @author Slava Pestov
  * @version $Id$
  */
-public abstract class BufferIORequest extends Task
+public abstract class BufferIORequest extends IoTask
 {
 	//{{{ Constants
 
@@ -97,14 +96,15 @@ public abstract class BufferIORequest extends Task
 	protected BufferIORequest(View view, Buffer buffer,
 		Object session, VFS vfs, String path)
 	{
-		super(true);
+		super();
 		this.view = view;
 		this.buffer = buffer;
 		this.session = session;
 		this.vfs = vfs;
 		this.path = path;
 
 		markersPath = Buffer.getMarkersPath(vfs, path);
+		//buffer.setIoTask(this);
 	} //}}}
 
 	//{{{ toString() method

diff --git a/org/gjt/sp/jedit/io/VFSManager.java b/org/gjt/sp/jedit/io/VFSManager.java
@@ -31,6 +31,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 
+import org.gjt.sp.jedit.bufferio.IoTask;
 import org.gjt.sp.jedit.gui.ErrorListDialog;
 import org.gjt.sp.jedit.msg.VFSUpdate;
 import org.gjt.sp.jedit.*;
@@ -228,7 +229,7 @@ public static void runInAWTThread(Runnable run)
 	@Deprecated
 	public static void runInWorkThread(Task run)
 	{
-		if(!run.getIoTask())
+		if(!(run instanceof IoTask))
 			throw new IllegalArgumentException();
 
 		ThreadUtilities.runInBackground(run);

diff --git a/org/gjt/sp/jedit/textarea/TextAreaTransferHandler.java b/org/gjt/sp/jedit/textarea/TextAreaTransferHandler.java
@@ -24,14 +24,14 @@
 
 //{{{ Imports
 import org.gjt.sp.jedit.*;
+import org.gjt.sp.jedit.bufferio.IoTask;
 import org.gjt.sp.jedit.bufferset.BufferSetManager;
 import org.gjt.sp.jedit.browser.VFSBrowser;
 import org.gjt.sp.jedit.io.FileVFS;
 import org.gjt.sp.jedit.io.VFS;
 import org.gjt.sp.jedit.io.VFSManager;
 import org.gjt.sp.util.AwtRunnableQueue;
 import org.gjt.sp.util.Log;
-import org.gjt.sp.util.Task;
 import org.gjt.sp.util.ThreadUtilities;
 
 import javax.swing.*;
@@ -484,14 +484,14 @@ private static class TextAreaSelection extends StringSelection
 	} //}}}
 
 	//{{{ DraggedURLLoader class
-	private static class DraggedURLLoader extends Task
+	private static class DraggedURLLoader extends IoTask
 	{
 		private final JEditTextArea textArea;
 		private final String url;
 
 		DraggedURLLoader(JEditTextArea textArea, String url)
 		{
-			super(true);
+			super();
 			this.textArea = textArea;
 			this.url = url;
 		}

diff --git a/org/gjt/sp/util/Task.java b/org/gjt/sp/util/Task.java
@@ -41,22 +41,15 @@ public abstract class Task implements Runnable, ProgressObserver
 	 * It is set automatically when the task starts.
 	 */
 	private volatile Thread thread;
-	private final boolean ioTask;
 
-	private SwingWorker.StateValue state;
+	private volatile SwingWorker.StateValue state;
 
 	private volatile boolean cancellable = true;
 
 	//{{{ Task Constructor
 	protected Task()
-	{
-		this(false);
-	}
-
-	protected Task(boolean ioTask)
 	{
 		state = SwingWorker.StateValue.PENDING;
-		this.ioTask = ioTask;
 	} //}}}
 
 	//{{{ run() method
@@ -121,11 +114,6 @@ public long getMaximum()
 		return maximum;
 	}
 
-	public boolean getIoTask()
-	{
-		return ioTask;
-	}
-
 	public SwingWorker.StateValue getState()
 	{
 		return state;

diff --git a/org/gjt/sp/util/TaskManager.java b/org/gjt/sp/util/TaskManager.java
@@ -25,6 +25,8 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import org.gjt.sp.jedit.bufferio.IoTask;
+
 /**
  * The TaskManager manage Tasks in the Threadpool, it knows all of them, and
  * sends events to TaskListeners.
@@ -39,14 +41,12 @@ public class TaskManager
 	private final List<TaskListener> listeners;
 
 	private final List<Task> tasks;
-	private final List<Task> ioTasks;
 	private final Object ioWaitLock;
 
 	private TaskManager()
 	{
 		listeners = new CopyOnWriteArrayList<TaskListener>();
 		tasks = Collections.synchronizedList(new ArrayList<Task>());
-		ioTasks = Collections.synchronizedList(new ArrayList<Task>());
 		ioWaitLock = new Object();
 	}
 
@@ -69,7 +69,13 @@ public int countTasks()
 	 */
 	public int countIoTasks()
 	{
-		return ioTasks.size();
+		int size = 0;
+		synchronized (tasks) {
+			for(Task task : tasks)
+				if(task instanceof IoTask)
+					size++;
+		}
+		return size;
 	}
 
 	public void addTaskListener(TaskListener listener)
@@ -90,10 +96,7 @@ public void removeTaskListener(TaskListener listener)
 
 	void fireWaiting(Task task)
 	{
-		if(task.getIoTask())
-			ioTasks.add(task);
-		else
-			tasks.add(task);
+		tasks.add(task);
 
 		List<TaskListener> listeners = this.listeners;
 		for (TaskListener listener : listeners)
@@ -113,18 +116,15 @@ void fireRunning(Task task)
 
 	void fireDone(Task task)
 	{
-		if(task.getIoTask())
-			ioTasks.remove(task);
-		else
-			tasks.remove(task);
+		tasks.remove(task);
 
 		List<TaskListener> listeners = this.listeners;
 		for (TaskListener listener : listeners)
 		{
 			listener.done(task);
 		}
 
-		if(task.getIoTask())
+		if(task instanceof IoTask)
 		{
 			AwtRunnableQueue.INSTANCE.queueAWTRunner(false);
 
@@ -214,14 +214,6 @@ public void cancelTasksByClass(Class<? extends Task> clazz)
 					task.cancel();
 			}
 		}
-		synchronized (ioTasks)
-		{
-			for(Task task: ioTasks)
-			{
-				if(task.getClass().equals(clazz))
-					task.cancel();
-			}
-		}
 	}
 
 	/**