Refactored RefreshCoursesAction

Author: UMTti

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

@@ -71,29 +71,8 @@ public void onSuccess(final List<Course> courses) {
                     Course currentCourse = CourseListUtils.getCourseByName(courses, courseDb.getCurrentCourseName());
                     if (currentCourse != null) {
                         try {
-                            System.out.println("DETAILS URL: " + currentCourse.getDetailsUrl());
                             ListenableFuture<Course> courseFuture = tmcCore.getCourse(tmcSettings, currentCourse.getDetailsUrl());
-                            Futures.addCallback(courseFuture, new FutureCallback<Course>() {
-                                @Override
-                                public void onSuccess(Course detailedCourse) {
-                                    detailedCourse.setExercisesLoaded(true);
-                                    ArrayList<Course> finalCourses = new ArrayList<Course>();
-                                    for(Course course: courses){
-                                        if(course.getName().equals(detailedCourse.getName())) {
-                                            finalCourses.add(detailedCourse);
-                                        } else {
-                                            finalCourses.add(course);
-                                        }
-                                    }
-                                    callbacks.onSuccess(finalCourses);
-                                }
-                                
-                                @Override
-                                public void onFailure(Throwable ex) {
-                                    log.log(Level.INFO, "Failed to download current course info.", ex);
-                                    callbacks.onFailure(ex);
-                                }
-                            });
+                            Futures.addCallback(courseFuture, new UpdateCourse(courses));
                         } catch (TmcCoreException ex) {
                             Exceptions.printStackTrace(ex);
                             callbacks.onFailure(ex);
@@ -116,6 +95,34 @@ public void onFailure(Throwable ex) {
         }
     }
 
+    class UpdateCourse implements FutureCallback<Course> {
+        
+        List<Course> courses;
+        public UpdateCourse(List<Course> courses){
+            this.courses = courses;
+        }
+        
+        @Override
+        public void onSuccess(Course detailedCourse) {
+            detailedCourse.setExercisesLoaded(true);
+            ArrayList<Course> finalCourses = new ArrayList<Course>();
+            for (Course course : courses) {
+                if (course.getName().equals(detailedCourse.getName())) {
+                    finalCourses.add(detailedCourse);
+                } else {
+                    finalCourses.add(course);
+                }
+            }
+            callbacks.onSuccess(finalCourses);
+        }
+
+        @Override
+        public void onFailure(Throwable ex) {
+            log.log(Level.INFO, "Failed to download current course info.", ex);
+            callbacks.onFailure(ex);
+        }
+    }
+
 //    public void run() {
 //        CancellableCallable<List<Course>> courseListTask = serverAccess.getDownloadingCourseListTask();
 //        BgTask.start("Refreshing course list", courseListTask, new BgTaskListener<List<Course>>() {
@@ -172,7 +179,6 @@ public void onFailure(Throwable ex) {
 //            }
 //        });
 //    }
-
     private class DefaultListener implements FutureCallback<List<Course>> {
 
         private final boolean showDialogOnError;
@@ -200,7 +206,6 @@ public DefaultListener(boolean showDialogOnError, boolean updateCourseDb) {
 //                dialogs.displayError("Course refresh failed.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
 //            }
 //        }
-
         @Override
         public void onSuccess(List<Course> result) {
             if (updateCourseDb) {