Skip to content

Commit 200f986

Browse files
committed
Exercise & Course imports to tmc-core
1 parent 1fb01ef commit 200f986

File tree

54 files changed

+113
-60
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+113
-60
lines changed

tmc-plugin/src/fi/helsinki/cs/tmc/actions/AbstractExerciseSensitiveAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Exercise;
3+
import hy.tmc.core.domain.Exercise;
44
import fi.helsinki.cs.tmc.events.TmcEventBus;
55
import fi.helsinki.cs.tmc.events.TmcEventListener;
66
import fi.helsinki.cs.tmc.model.CourseDb;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewExercisesOrUpdates.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Course;
3+
import hy.tmc.core.domain.Course;
44
import fi.helsinki.cs.tmc.data.CourseListUtils;
55
import fi.helsinki.cs.tmc.model.CourseDb;
66
import fi.helsinki.cs.tmc.model.LocalExerciseStatus;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForNewReviews.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Course;
3+
import hy.tmc.core.domain.Course;
44
import fi.helsinki.cs.tmc.data.Review;
55
import fi.helsinki.cs.tmc.model.CourseDb;
66
import fi.helsinki.cs.tmc.model.ReviewDb;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/CheckForUnopenedExercises.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Exercise;
3+
import hy.tmc.core.domain.Exercise;
44
import fi.helsinki.cs.tmc.model.CourseDb;
55
import fi.helsinki.cs.tmc.model.ProjectMediator;
66
import fi.helsinki.cs.tmc.model.TmcProjectInfo;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadCompletedExercises.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Course;
3+
import hy.tmc.core.domain.Course;
44
import fi.helsinki.cs.tmc.data.CourseListUtils;
5-
import fi.helsinki.cs.tmc.data.Exercise;
5+
import hy.tmc.core.domain.Exercise;
66
import fi.helsinki.cs.tmc.model.CourseDb;
77
import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
88
import fi.helsinki.cs.tmc.model.ServerAccess;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadExercisesAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Exercise;
3+
import hy.tmc.core.domain.Exercise;
44
import fi.helsinki.cs.tmc.model.CourseDb;
55
import fi.helsinki.cs.tmc.model.ProjectMediator;
66
import fi.helsinki.cs.tmc.model.ServerAccess;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/DownloadSolutionAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fi.helsinki.cs.tmc.actions;
22

33
import com.google.common.base.Function;
4-
import fi.helsinki.cs.tmc.data.Exercise;
4+
import hy.tmc.core.domain.Exercise;
55
import fi.helsinki.cs.tmc.model.CourseDb;
66
import fi.helsinki.cs.tmc.model.ProjectMediator;
77
import fi.helsinki.cs.tmc.model.ServerAccess;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/PastebinAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Exercise;
3+
import hy.tmc.core.domain.Exercise;
44
import fi.helsinki.cs.tmc.model.CourseDb;
55
import fi.helsinki.cs.tmc.model.ProjectMediator;
66
import fi.helsinki.cs.tmc.model.ServerAccess;

tmc-plugin/src/fi/helsinki/cs/tmc/actions/RefreshCoursesAction.java

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package fi.helsinki.cs.tmc.actions;
22

3-
import fi.helsinki.cs.tmc.data.Course;
3+
import com.google.common.util.concurrent.FutureCallback;
4+
import com.google.common.util.concurrent.Futures;
5+
import com.google.common.util.concurrent.ListenableFuture;
6+
import hy.tmc.core.domain.Course;
47
import fi.helsinki.cs.tmc.data.CourseListUtils;
58
import fi.helsinki.cs.tmc.model.CourseDb;
69
import fi.helsinki.cs.tmc.model.ServerAccess;
@@ -10,10 +13,16 @@
1013
import fi.helsinki.cs.tmc.utilities.BgTask;
1114
import fi.helsinki.cs.tmc.utilities.BgTaskListenerList;
1215
import fi.helsinki.cs.tmc.utilities.CancellableCallable;
16+
import hy.tmc.core.TmcCore;
17+
import hy.tmc.core.exceptions.TmcCoreException;
1318
import java.util.ArrayList;
1419
import java.util.List;
20+
import java.util.concurrent.ExecutionException;
21+
import java.util.concurrent.ExecutorService;
22+
import java.util.concurrent.Executors;
1523
import java.util.logging.Level;
1624
import java.util.logging.Logger;
25+
import org.openide.util.Exceptions;
1726

1827
/**
1928
* Refreshes the course list in the background.
@@ -50,9 +59,50 @@ public RefreshCoursesAction addListener(BgTaskListener<List<Course>> listener) {
5059
return this;
5160
}
5261

53-
public void run() {
62+
public void run() throws TmcCoreException {
5463
CancellableCallable<List<Course>> courseListTask = serverAccess.getDownloadingCourseListTask();
64+
TmcCore c = new TmcCore();
65+
final ListenableFuture<List<Course>> courses = c.listCourses();
66+
/*
67+
68+
courses.addListener(new Runnable() {
5569
70+
@Override
71+
public void run() {
72+
System.out.println("Jeee, kurssit haettu!");
73+
74+
try {
75+
for (Course get : courses.get()) {
76+
System.out.println(get.getName());
77+
}
78+
} catch (InterruptedException ex) {
79+
Exceptions.printStackTrace(ex);
80+
} catch (ExecutionException ex) {
81+
Exceptions.printStackTrace(ex);
82+
}
83+
84+
}
85+
86+
}, Executors.newFixedThreadPool(1));
87+
88+
if(true) {
89+
return;
90+
}*/
91+
92+
/*Futures.addCallback(courses, new FutureCallback<List<Course>>(){
93+
@Override
94+
public void onSuccess(List<Course> v) {
95+
for(Course c: v){
96+
System.out.println(c.getName());
97+
}
98+
}
99+
100+
@Override
101+
public void onFailure(Throwable thrwbl) {
102+
103+
}
104+
});*/
105+
56106
BgTask.start("Refreshing course list", courseListTask, new BgTaskListener<List<Course>>() {
57107

58108
@Override

tmc-plugin/src/fi/helsinki/cs/tmc/actions/RequestReviewAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fi.helsinki.cs.tmc.actions;
22

33
import com.google.gson.Gson;
4-
import fi.helsinki.cs.tmc.data.Exercise;
4+
import hy.tmc.core.domain.Exercise;
55
import fi.helsinki.cs.tmc.events.TmcEventBus;
66
import fi.helsinki.cs.tmc.model.CourseDb;
77
import fi.helsinki.cs.tmc.model.ProjectMediator;

0 commit comments

Comments
 (0)