Skip to content

Commit e279de4

Browse files
committed
updated tmc-nb to new core
1 parent daf07e6 commit e279de4

13 files changed

+18
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void run() {
8888
"Checking for new exercises");
8989
exerciseRefresh.start();
9090
ListenableFuture<Course> currentCourseFuture = this.tmcCore.getCourse(
91-
NBTmcSettings.getDefault(), detailUrl(currentCourseBeforeUpdate)
91+
detailUrl(currentCourseBeforeUpdate)
9292
);
9393
Futures.addCallback(currentCourseFuture, new UpdateCourseForExerciseUpdate(exerciseRefresh));
9494
} catch (TmcCoreException ex) {

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,8 @@ private void getReviews(Course course){
101101
final ProgressHandle progress = ProgressHandleFactory.createHandle("Checking for code reviews");
102102
progress.start();
103103
try {
104-
ListenableFuture<List<Review>> reviews = TmcCoreSingleton.getInstance().getNewReviews(
105-
course, NBTmcSettings.getDefault()
106-
);
104+
ListenableFuture<List<Review>> reviews = TmcCoreSingleton.getInstance()
105+
.getNewReviews(course);
107106
Futures.addCallback(reviews, new FutureCallback<List<Review>>() {
108107

109108
@Override

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void run() throws TmcCoreException {
6161
"Downloading " + batch.size() + " exercises.");
6262
exerciseDownload.start();
6363

64-
ListenableFuture<List<Exercise>> dlFuture = tmcCore.downloadExercises(batch, settings);
64+
ListenableFuture<List<Exercise>> dlFuture = tmcCore.downloadExercises(batch);
6565

6666
Futures.addCallback(dlFuture, new ProjectOpener(exerciseDownload, end));
6767
}
@@ -114,7 +114,7 @@ private void downloadNextBatch() {
114114

115115
ListenableFuture<List<Exercise>> dlFuture;
116116
try {
117-
dlFuture = tmcCore.downloadExercises(batch, settings);
117+
dlFuture = tmcCore.downloadExercises(batch);
118118
} catch (TmcCoreException ex) {
119119
List<Exercise> empty = new ArrayList<Exercise>();
120120
dlFuture = Futures.immediateFuture(empty);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private void submitPaste(final TmcProjectInfo projectInfo, final Exercise exerci
108108
projectMediator.saveAllFiles();
109109
final String errorMsgLocale = settings.getErrorMsgLocale().toString();
110110
try {
111-
ListenableFuture<URI> result = TmcCoreSingleton.getInstance().pasteWithComment(projectInfo.getProjectDirAbsPath(), settings, messageForReviewer);
111+
ListenableFuture<URI> result = TmcCoreSingleton.getInstance().pasteWithComment(projectInfo.getProjectDirAbsPath(), messageForReviewer);
112112
Futures.addCallback(result, new PasteResult());
113113
} catch (TmcCoreException ex) {
114114
Exceptions.printStackTrace(ex);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public void run() {
8282
ProgressHandle courseRefresh = ProgressHandleFactory.createSystemHandle(
8383
"Refreshing course list");
8484
courseRefresh.start();
85-
ListenableFuture<List<Course>> listCourses = this.tmcCore.listCourses(tmcSettings);
85+
ListenableFuture<List<Course>> listCourses = this.tmcCore.listCourses();
8686
Futures.addCallback(listCourses, new LoadCourses(courseRefresh));
8787
}
8888
} catch (TmcCoreException ex) {
@@ -125,7 +125,7 @@ public void onSuccess(final List<Course> courses) {
125125
createSystemHandle("Loading course");
126126
loadingCourse.start();
127127
ListenableFuture<Course> courseFuture = tmcCore.getCourse(
128-
tmcSettings, currentCourse.getDetailsUrl()
128+
currentCourse.getDetailsUrl()
129129
);
130130
Futures.addCallback(courseFuture, new UpdateCourse(courses, loadingCourse));
131131
} catch (TmcCoreException ex) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void run() {
4141
try {
4242
ListenableFuture<HttpResult> feedbackFuture;
4343
feedbackFuture = core.sendFeedback(
44-
getFeedbackAnswers(), result.getFeedbackAnswerUrl(), settings
44+
getFeedbackAnswers(), result.getFeedbackAnswerUrl()
4545
);
4646
Futures.addCallback(feedbackFuture, new FeedbackReplyCallback());
4747
} catch (TmcCoreException ex) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ private void submitProject(TmcProjectInfo info) {
8383
final SubmissionResultWaitingDialog dialog = SubmissionResultWaitingDialog.createAndShow();
8484
try {
8585
ListenableFuture<SubmissionResult> result;
86-
result = core.submit(info.getProjectDirAbsPath(), settings);
86+
result = core.submit(info.getProjectDirAbsPath());
8787
Futures.addCallback(result, new SubmissionCallback(exercise, dialog));
8888
} catch (TmcCoreException ex) {
8989
String message = "There was an error submitting project " + info.getProjectName();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ public void run() {
5050
return;
5151
}
5252
try {
53-
ListenableFuture<List<Exercise>> downloadFuture = core.downloadExercises(exercisesToUpdate,
54-
NBTmcSettings.getDefault());
53+
ListenableFuture<List<Exercise>> downloadFuture =
54+
core.downloadExercises(exercisesToUpdate);
5555
Futures.addCallback(downloadFuture, new ProjectOpenerCallback());
5656

5757
} catch (TmcCoreException ex) {

tmc-plugin/src/fi/helsinki/cs/tmc/model/TmcCoreSingleton.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class TmcCoreSingleton {
99

1010
public static TmcCore getInstance() {
1111
if (defaultInstance == null) {
12-
defaultInstance = new TmcCore();
12+
defaultInstance = new TmcCore(NBTmcSettings.getDefault());
1313
}
1414
return defaultInstance;
1515
}

tmc-plugin/src/fi/helsinki/cs/tmc/runners/CheckstyleRunHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void performAction(final ResultCollector resultCollector, final Project p
3232
ProjectMediator.getInstance().saveAllFiles();
3333

3434
try {
35-
ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(projectInfo.getProjectDirAsFile().getAbsolutePath(), NBTmcSettings.getDefault());
35+
ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(projectInfo.getProjectDirAsFile().getAbsolutePath());
3636
Futures.addCallback(result, new ExplainValidationResult(resultCollector, dialogDisplayer));
3737

3838
} catch (TmcCoreException ex) {

0 commit comments

Comments
 (0)