[tor-commits] [collector/master] Let Eclipse organize imports once more.
karsten at torproject.org
karsten at torproject.org
Thu Aug 11 08:44:43 UTC 2016
commit c0e1e3784de5643fef721b21bb253370beb4f94d
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Wed Aug 10 11:08:41 2016 +0200
Let Eclipse organize imports once more.
---
src/main/java/org/torproject/collector/Main.java | 3 ---
.../java/org/torproject/collector/conf/Configuration.java | 5 -----
.../java/org/torproject/collector/cron/CollecTorMain.java | 7 -------
src/main/java/org/torproject/collector/cron/Scheduler.java | 2 --
src/test/java/org/torproject/collector/MainTest.java | 6 ++----
.../org/torproject/collector/conf/ConfigurationTest.java | 1 -
.../org/torproject/collector/cron/CollecTorMainTest.java | 6 ------
.../java/org/torproject/collector/cron/SchedulerTest.java | 14 +-------------
8 files changed, 3 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/torproject/collector/Main.java b/src/main/java/org/torproject/collector/Main.java
index b48c3e6..cefbe2d 100644
--- a/src/main/java/org/torproject/collector/Main.java
+++ b/src/main/java/org/torproject/collector/Main.java
@@ -16,10 +16,7 @@ import org.torproject.collector.torperf.TorperfDownloader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
diff --git a/src/main/java/org/torproject/collector/conf/Configuration.java b/src/main/java/org/torproject/collector/conf/Configuration.java
index 0772bd5..86527af 100644
--- a/src/main/java/org/torproject/collector/conf/Configuration.java
+++ b/src/main/java/org/torproject/collector/conf/Configuration.java
@@ -11,19 +11,14 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.nio.file.FileSystems;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.nio.file.StandardWatchEventKinds;
import java.nio.file.attribute.FileTime;
-import java.util.List;
import java.util.Observable;
import java.util.Properties;
import java.util.concurrent.Executors;
-import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
/**
diff --git a/src/main/java/org/torproject/collector/cron/CollecTorMain.java b/src/main/java/org/torproject/collector/cron/CollecTorMain.java
index fa33fd3..021fc34 100644
--- a/src/main/java/org/torproject/collector/cron/CollecTorMain.java
+++ b/src/main/java/org/torproject/collector/cron/CollecTorMain.java
@@ -5,22 +5,15 @@ package org.torproject.collector.cron;
import org.torproject.collector.conf.Configuration;
import org.torproject.collector.conf.ConfigurationException;
-import org.torproject.collector.conf.Key;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Calendar;
-import java.util.Map;
import java.util.Observable;
import java.util.Observer;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
public abstract class CollecTorMain implements Observer, Runnable {
diff --git a/src/main/java/org/torproject/collector/cron/Scheduler.java b/src/main/java/org/torproject/collector/cron/Scheduler.java
index 85cde5d..3677664 100644
--- a/src/main/java/org/torproject/collector/cron/Scheduler.java
+++ b/src/main/java/org/torproject/collector/cron/Scheduler.java
@@ -6,13 +6,11 @@ package org.torproject.collector.cron;
import org.torproject.collector.conf.Configuration;
import org.torproject.collector.conf.ConfigurationException;
import org.torproject.collector.conf.Key;
-import org.torproject.collector.cron.CollecTorMain;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.InvocationTargetException;
-import java.util.Calendar;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
diff --git a/src/test/java/org/torproject/collector/MainTest.java b/src/test/java/org/torproject/collector/MainTest.java
index 10a6958..28d7133 100644
--- a/src/test/java/org/torproject/collector/MainTest.java
+++ b/src/test/java/org/torproject/collector/MainTest.java
@@ -3,14 +3,13 @@
package org.torproject.collector;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.torproject.collector.conf.Key;
-import org.torproject.collector.conf.Configuration;
import org.torproject.collector.conf.ConfigurationException;
+import org.torproject.collector.conf.Key;
import org.torproject.collector.cron.Scheduler;
import org.junit.Rule;
@@ -18,7 +17,6 @@ import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import java.io.BufferedWriter;
-import java.io.IOException;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
diff --git a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java
index d677ce8..b707f2f 100644
--- a/src/test/java/org/torproject/collector/conf/ConfigurationTest.java
+++ b/src/test/java/org/torproject/collector/conf/ConfigurationTest.java
@@ -23,7 +23,6 @@ import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Observable;
import java.util.Observer;
-import java.util.Properties;
import java.util.Random;
import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java
index 7eb1f38..fecd497 100644
--- a/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java
+++ b/src/test/java/org/torproject/collector/cron/CollecTorMainTest.java
@@ -2,15 +2,9 @@
* See LICENSE for licensing information */
package org.torproject.collector.cron;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.torproject.collector.conf.Key;
-import org.torproject.collector.conf.Configuration;
-import org.torproject.collector.cron.Scheduler;
-
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
diff --git a/src/test/java/org/torproject/collector/cron/SchedulerTest.java b/src/test/java/org/torproject/collector/cron/SchedulerTest.java
index 8bbc935..6314a8d 100644
--- a/src/test/java/org/torproject/collector/cron/SchedulerTest.java
+++ b/src/test/java/org/torproject/collector/cron/SchedulerTest.java
@@ -3,30 +3,18 @@
package org.torproject.collector.cron;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.torproject.collector.conf.Key;
import org.torproject.collector.conf.Configuration;
-import org.torproject.collector.cron.Scheduler;
+import org.torproject.collector.conf.Key;
import org.junit.Ignore;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
-import java.io.File;
import java.lang.reflect.Field;
-import java.nio.file.Files;
-import java.util.List;
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
public class SchedulerTest {
More information about the tor-commits
mailing list