Fix imports

jamo · jamo · commit f1230e1a8b50 · 2016-07-25T12:52:24.000+03:00
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java
@@ -7,7 +7,7 @@
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.data.CourseListUtils;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadCompletedExercises.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadCompletedExercises.java
@@ -3,7 +3,7 @@
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java
@@ -4,7 +4,7 @@
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadSolutionAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadSolutionAction.java
@@ -4,7 +4,7 @@
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/PastebinAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/PastebinAction.java
@@ -5,7 +5,7 @@
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/RequestReviewAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/RequestReviewAction.java
@@ -3,12 +3,12 @@
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory;
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory.SubmissionResponse;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 
 import com.google.gson.Gson;
 
-import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
@@ -18,7 +18,6 @@
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
-import fi.helsinki.cs.tmc.utilities.CancellableCallable;
 import fi.helsinki.cs.tmc.utilities.zip.RecursiveZipper;
 
 import java.awt.event.ActionEvent;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/ReviewEventListener.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/ReviewEventListener.java
@@ -5,6 +5,7 @@
 import com.google.gson.Gson;
 
 import fi.helsinki.cs.tmc.core.domain.Review;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.events.TmcEventListener;
 import fi.helsinki.cs.tmc.model.CourseDb;
@@ -143,7 +144,7 @@ private void sendLoggableEvent(Review review) {
             String json = new Gson().toJson(dataObject);
             byte[] jsonBytes = json.getBytes(Charset.forName("UTF-8"));
 
-            LoggableEvent event = new LoggableEvent(courseName, review.getExerciseName(), "review_opened", jsonBytes);
+            TmcEvent event = new LoggableEvent(courseName, review.getExerciseName(), "review_opened", jsonBytes);
             eventBus.post(event);
         }
     }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SaveSettingsAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SaveSettingsAction.java
@@ -4,7 +4,7 @@
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SubmitExerciseAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/SubmitExerciseAction.java
@@ -3,7 +3,7 @@
 import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
-import fi.helsinki.cs.tmc.spyware.SpywareFacade;
+import fi.helsinki.cs.tmc.spywareLocal.SpywareFacade;
 
 import org.netbeans.api.project.Project;
 import org.openide.nodes.Node;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/TmcModuleInstall.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/TmcModuleInstall.java
@@ -9,7 +9,7 @@
 import fi.helsinki.cs.tmc.langs.util.TaskExecutorImpl;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.PushEventListener;
-import fi.helsinki.cs.tmc.spyware.SpywareFacade;
+import fi.helsinki.cs.tmc.spywareLocal.SpywareFacade;
 import fi.helsinki.cs.tmc.ui.LoginDialog;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/UpdateExercisesAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/UpdateExercisesAction.java
@@ -3,7 +3,7 @@
 import fi.helsinki.cs.tmc.core.communication.TmcServerCommunicationTaskFactory;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ExerciseUpdateOverwritingDecider;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java b/tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java
@@ -2,7 +2,7 @@
 
 import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.PersistableSettings;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/events/TmcEventBus.java b/tmc-plugin/src/fi/helsinki/cs/tmc/events/TmcEventBus.java
@@ -1,5 +1,7 @@
 package fi.helsinki.cs.tmc.events;
 
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
+
 import java.lang.ref.WeakReference;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/events/TmcEventListener.java b/tmc-plugin/src/fi/helsinki/cs/tmc/events/TmcEventListener.java
@@ -1,5 +1,7 @@
 package fi.helsinki.cs.tmc.events;
 
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java b/tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java
@@ -10,7 +10,7 @@
 import fi.helsinki.cs.tmc.core.utilities.ServerErrorHelper;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.data.ResultCollector;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java
@@ -8,7 +8,7 @@
 import com.google.gson.GsonBuilder;
 
 import fi.helsinki.cs.tmc.data.CourseListUtils;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 
 import java.io.IOException;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/PushEventListener.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/PushEventListener.java
@@ -3,7 +3,7 @@
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.events.TmcEventListener;
 
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/ReviewDb.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/ReviewDb.java
@@ -1,7 +1,7 @@
 package fi.helsinki.cs.tmc.model;
 
 import fi.helsinki.cs.tmc.core.domain.Review;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 
 import java.util.ArrayList;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/SourceSnapshotEventSource.java b/tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/SourceSnapshotEventSource.java
@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.spyware.eventsources;
 
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
@@ -190,7 +191,7 @@ public void run() {
             RecursiveZipper zipper = new RecursiveZipper(projectDir, zippingDecider);
             try {
                 byte[] data = zipper.zipProjectSources();
-                LoggableEvent event = new LoggableEvent(exercise, "code_snapshot", data, metadata);
+                TmcEvent event = new LoggableEvent(exercise, "code_snapshot", data, metadata);
                 receiver.receiveEvent(event);
             } catch (IOException ex) {
                 // Warning might be also appropriate, but this often races with project closing
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/TmcEventBusEventSource.java b/tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/TmcEventBusEventSource.java
@@ -18,7 +18,7 @@
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
 import fi.helsinki.cs.tmc.spyware.EventReceiver;
 import fi.helsinki.cs.tmc.spyware.LoggableEvent;
-import fi.helsinki.cs.tmc.spyware.SpywareFacade;
+import fi.helsinki.cs.tmc.spywareLocal.SpywareFacade;
 
 import java.nio.charset.Charset;
 import java.util.Collections;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/spywareLocal/SpywareFacade.java b/tmc-plugin/src/fi/helsinki/cs/tmc/spywareLocal/SpywareFacade.java
@@ -1,11 +1,17 @@
-package fi.helsinki.cs.tmc.spyware;
+package fi.helsinki.cs.tmc.spywareLocal;
 
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.spyware.eventsources.WindowStatechangesEventSource;
-import fi.helsinki.cs.tmc.events.TmcEvent;
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
-import fi.helsinki.cs.tmc.model.CourseDb;
+import fi.helsinki.cs.tmc.spyware.EventDeduplicater;
+import fi.helsinki.cs.tmc.spyware.EventReceiver;
+import fi.helsinki.cs.tmc.spyware.EventSendBuffer;
+import fi.helsinki.cs.tmc.spyware.EventStore;
+import fi.helsinki.cs.tmc.spyware.HostInformationGenerator;
+import fi.helsinki.cs.tmc.spyware.LoggableEvent;
+import fi.helsinki.cs.tmc.spyware.SpywareSettings;
 
 import fi.helsinki.cs.tmc.spyware.eventsources.TextInsertEventSource;
 import fi.helsinki.cs.tmc.spyware.eventsources.ProjectActionCaptor;
@@ -95,7 +101,7 @@ public void close() throws IOException {
     public SpywareFacade() {
         settings = (TmcCoreSettingsImpl)TmcSettingsHolder.get();
 
-        sender = new EventSendBuffer(this, CourseDb.getInstance(), new EventStore());
+        sender = new EventSendBuffer(this, new EventStore());
         sender.sendNow();
 
         String hostId = new HostInformationGenerator().updateHostInformation(sender);

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import com.google.gson.Gson;`
`6`	`6`
`7`	`7`	`import fi.helsinki.cs.tmc.core.domain.Review;`
	`8`	`+import fi.helsinki.cs.tmc.core.events.TmcEvent;`
`8`	`9`	`import fi.helsinki.cs.tmc.events.TmcEventBus;`
`9`	`10`	`import fi.helsinki.cs.tmc.events.TmcEventListener;`
`10`	`11`	`import fi.helsinki.cs.tmc.model.CourseDb;`
`@@ -143,7 +144,7 @@ private void sendLoggableEvent(Review review) {`
`143`	`144`	`String json = new Gson().toJson(dataObject);`
`144`	`145`	`byte[] jsonBytes = json.getBytes(Charset.forName("UTF-8"));`
`145`	`146`
`146`		`- LoggableEvent event = new LoggableEvent(courseName, review.getExerciseName(), "review_opened", jsonBytes);`
	`147`	`+ TmcEvent event = new LoggableEvent(courseName, review.getExerciseName(), "review_opened", jsonBytes);`
`147`	`148`	`eventBus.post(event);`
`148`	`149`	`}`
`149`	`150`	`}`