organise imports

.classpath

@@ -28,22 +28,5 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="target/generated-sources/annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="ignore_optional_problems" value="true"/>
-			<attribute name="m2e-apt" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

src/main/java/unimelb/mf/client/sync/task/FileSetArchiveCreateTask.java

@@ -13,7 +13,6 @@ import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.TreeSet;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

src/main/java/unimelb/mf/client/sync/task/FileSetUploadTask.java

@@ -6,7 +6,7 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
 import java.util.logging.Logger;
 
 import arc.xml.XmlDoc;
@@ -32,7 +32,7 @@ public class FileSetUploadTask extends AbstractMFTask {
 
     private int _retry = 0;
 
-    private ExecutorService _workers;
+    private ThreadPoolExecutor _workers;
     private DataTransferListener<Path, String> _ul;
 
     /**
@@ -47,7 +47,7 @@ public class FileSetUploadTask extends AbstractMFTask {
      */
     public FileSetUploadTask(MFSession session, Logger logger, List<Path> files, boolean followSymlinks, UploadJob job,
                              boolean csumCheck, boolean worm, boolean wormCanAddVersions, boolean wormCanMove, long aggregateThreshold,
-                             long splitThreshold, int retry, DataTransferListener<Path, String> ul, ExecutorService workers) {
+                             long splitThreshold, int retry, DataTransferListener<Path, String> ul, ThreadPoolExecutor workers) {
         super(session, logger);
         _workers = workers;
         _csumCheck = csumCheck;

src/main/java/unimelb/mf/client/sync/task/SyncDeleteAssetsTask.java

@@ -16,7 +16,6 @@ import unimelb.mf.client.sync.settings.Settings;
 import unimelb.mf.client.sync.settings.downstream.DownJob;
 import unimelb.mf.client.sync.settings.upstream.DirectoryUploadJob;
 import unimelb.mf.client.task.AbstractMFTask;
-import unimelb.mf.model.asset.SymlinkAsset;
 
 public class SyncDeleteAssetsTask extends AbstractMFTask {