Merge branch 'core_integration' of github.com:rage/tmc-netbeans into core_integration

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

Author: samutamm

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

@@ -6,7 +6,7 @@
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.model.ObsoleteClientException;
 import fi.helsinki.cs.tmc.model.ServerAccess;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
@@ -74,7 +74,7 @@ public void actionPerformed(ActionEvent e) {
     public void run() {
         final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
 
-        if (backgroundCheck && !TmcSettings.getDefault().isCheckingForUpdatesInTheBackground()) {
+        if (backgroundCheck && !NBTmcSettings.getDefault().isCheckingForUpdatesInTheBackground()) {
             return;
         }
 

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

@@ -4,7 +4,7 @@
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -16,7 +16,7 @@
 
 public class CheckForUnopenedExercises implements ActionListener {
     public static boolean shouldRunOnStartup() {
-        return TmcSettings.getDefault().isCheckingForUnopenedAtStartup();
+        return NBTmcSettings.getDefault().isCheckingForUnopenedAtStartup();
     }
 
     private static final TmcNotificationDisplayer.SingletonToken notifierToken = TmcNotificationDisplayer.createSingletonToken();

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

@@ -10,13 +10,15 @@
 import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
+import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.Collections;
 import java.util.List;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionRegistration;
+import org.openide.util.Exceptions;
 import org.openide.util.NbBundle.Messages;
 
 @ActionID(category = "TMC", id = "fi.helsinki.cs.tmc.actions.DownloadCompletedExercises")
@@ -28,13 +30,13 @@ public final class DownloadCompletedExercises implements ActionListener {
     private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ConvenientDialogDisplayer dialogs;
-    
+
     public DownloadCompletedExercises() {
         this.serverAccess = new ServerAccess();
         this.courseDb = CourseDb.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
     }
-    
+
     @Override
     public void actionPerformed(ActionEvent e) {
         final Course currentCourse = courseDb.getCurrentCourse();

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

@@ -6,7 +6,7 @@
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
@@ -119,7 +119,7 @@ public Void apply(Boolean yes) {
     }
 
     private void downloadSolution(final Exercise ex, final TmcProjectInfo proj) {
-        ServerAccess serverAccess = new ServerAccess(TmcSettings.getDefault());
+        ServerAccess serverAccess = new ServerAccess(NBTmcSettings.getDefault());
         CancellableCallable<byte[]> downloadTask = serverAccess.getDownloadingExerciseSolutionZipTask(ex);
         BgTask.start("Downloading solution for " + ex.getName(), downloadTask, new BgTaskListener<byte[]>() {
             @Override

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

@@ -5,7 +5,7 @@
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.PastebinDialog;
 import fi.helsinki.cs.tmc.ui.PastebinResponseDialog;
@@ -46,13 +46,13 @@
 public final class PastebinAction extends AbstractExerciseSensitiveAction {
 
     private static final Logger log = Logger.getLogger(RequestReviewAction.class.getName());
-    private TmcSettings settings;
+    private NBTmcSettings settings;
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private ConvenientDialogDisplayer dialogs;
 
     public PastebinAction() {
-        this.settings = TmcSettings.getDefault();
+        this.settings = NBTmcSettings.getDefault();
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();

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

@@ -7,7 +7,8 @@
 import fi.helsinki.cs.tmc.data.CourseListUtils;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ServerAccess;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.utilities.BgTask;
@@ -25,29 +26,30 @@
  * Refreshes the course list in the background.
  */
 public final class RefreshCoursesAction {
+
     private final static Logger log = Logger.getLogger(RefreshCoursesAction.class.getName());
 
     private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ConvenientDialogDisplayer dialogs;
-    
+
     private BgTaskListenerList<List<Course>> listeners;
     private final TmcCore tmcCore;
-    private final TmcSettings tmcSettings;
+    private final NBTmcSettings tmcSettings;
 
     public RefreshCoursesAction() {
-        this(TmcSettings.getDefault());
+        this(NBTmcSettings.getDefault());
     }
-    
-    public RefreshCoursesAction(TmcSettings settings) {
+
+    public RefreshCoursesAction(NBTmcSettings settings) {
         this.tmcSettings = settings;
         this.serverAccess = new ServerAccess(settings);
         this.serverAccess.setSettings(settings);
         this.courseDb = CourseDb.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();
 
         this.listeners = new BgTaskListenerList<List<Course>>();
-        this.tmcCore = new TmcCore();
+        this.tmcCore = TmcCoreSingleton.getInstance();
     }
 
     public RefreshCoursesAction addDefaultListener(boolean showDialogOnError, boolean updateCourseDb) {
@@ -59,46 +61,70 @@ public RefreshCoursesAction addListener(BgTaskListener<List<Course>> listener) {
         this.listeners.addListener(listener);
         return this;
     }
-    
-    public void run() {
-//        try {
-//            Credentials credentials = new Credentials(this.tmcSettings.getUsername(),
-//                    this.tmcSettings.getPassword()) {};
-//            System.out.println(credentials);
-//            ListenableFuture<Boolean> login = this.tmcCore.login(credentials, tmcSettings.getServerBaseUrl()+"/user");
-//            Futures.addCallback(login, new FutureCallback<Boolean>() {
-//                @Override
-//                public void onSuccess(Boolean loginSuccess) {
-//                    
-//                }
-//                
-//                @Override
-//                public void onFailure(Throwable thrwbl) {
-//                    System.out.println("LOGIN LATAUS FEILASI1: " );
-//                    Exceptions.printStackTrace(thrwbl);
-//                }
-//            });
-//        } catch (TmcCoreException ex) {
-//            Exceptions.printStackTrace(ex);
-//        }
+
+    //HUOM metodissa oldRun on vanha toteutus. Se hakee palvelmelta nykyisen kurssin "fullcourse info".
+    public void newrun() {
+        try {
+            ListenableFuture<List<Course>> listCourses = this.tmcCore.listCourses(tmcSettings);
+            Futures.addCallback(listCourses, new FutureCallback<List<Course>>() {
+                @Override
+                public void onSuccess(List<Course> courses) {
+                    Course currentCourse = CourseListUtils.getCourseByName(courses, courseDb.getCurrentCourseName());
+                    if (currentCourse != null) {
+                       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(detailedCourses);
+                                       } else {
+                                           finalCourses.add(course);
+                                       }
+                                   }
+                                   listeners.bgTaskReady(finalCourses);
+                               }
+                               @Override
+                               public void onFailure() {
+                                   
+                               }
+                       );
+                    } else {
+                        listeners.bgTaskReady(courses);
+                    }
+                }
+
+                @Override
+                public void onFailure(Throwable ex) {
+                    log.log(Level.INFO, "Failed to download current course info.", ex);
+                    listeners.bgTaskFailed(ex);
+                }
+            }
+            );
+        } catch (TmcCoreException ex) {
+            Exceptions.printStackTrace(ex);
+        }
     }
 
-    public void oldRun() {
-        
+    public void run() {
         CancellableCallable<List<Course>> courseListTask = serverAccess.getDownloadingCourseListTask();
         BgTask.start("Refreshing course list", courseListTask, new BgTaskListener<List<Course>>() {
-            
+
             @Override
             public void bgTaskReady(final List<Course> courses) {
                 Course currentCourseStub = CourseListUtils.getCourseByName(courses, courseDb.getCurrentCourseName());
+                // CurrentCourseStub on null jos on vanhentunut/ ei enää olemassa servulla
                 if (currentCourseStub != null) {
+                    // Jos on olemassa servulla, päivitetään lokaali kurssi servun kurssia vastaavaksi
                     CancellableCallable<Course> currentCourseTask = serverAccess.getFullCourseInfoTask(currentCourseStub);
-                    
+
                     BgTask.start("Loading course", currentCourseTask, new BgTaskListener<Course>() {
                         @Override
                         public void bgTaskReady(Course currentCourse) {
                             currentCourse.setExercisesLoaded(true);
-                            
+
                             ArrayList<Course> finalCourses = new ArrayList<Course>();
                             for (Course course : courses) {
                                 if (course.getName().equals(currentCourse.getName())) {
@@ -109,29 +135,28 @@ public void bgTaskReady(Course currentCourse) {
                             }
                             listeners.bgTaskReady(finalCourses);
                         }
-                        
+
                         @Override
                         public void bgTaskCancelled() {
                             listeners.bgTaskCancelled();
                         }
-                        
+
                         @Override
                         public void bgTaskFailed(Throwable ex) {
                             log.log(Level.INFO, "Failed to download current course info.", ex);
                             listeners.bgTaskFailed(ex);
                         }
                     });
-                    
                 } else {
                     listeners.bgTaskReady(courses);
                 }
             }
-            
+
             @Override
             public void bgTaskCancelled() {
                 listeners.bgTaskCancelled();
             }
-            
+
             @Override
             public void bgTaskFailed(Throwable ex) {
                 log.log(Level.INFO, "Failed to download course list.", ex);
@@ -141,6 +166,7 @@ public void bgTaskFailed(Throwable ex) {
     }
 
     private class DefaultListener implements BgTaskListener<List<Course>> {
+
         private final boolean showDialogOnError;
         private final boolean updateCourseDb;
 

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

@@ -7,7 +7,7 @@
 import fi.helsinki.cs.tmc.model.ProjectMediator;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcProjectInfo;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.spyware.LoggableEvent;
 import fi.helsinki.cs.tmc.ui.CodeReviewRequestDialog;
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
@@ -44,14 +44,14 @@
 public class RequestReviewAction extends AbstractExerciseSensitiveAction {
 
     private static final Logger log = Logger.getLogger(RequestReviewAction.class.getName());
-    private TmcSettings settings;
+    private NBTmcSettings settings;
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
     private ConvenientDialogDisplayer dialogs;
     private TmcEventBus eventBus;
 
     public RequestReviewAction() {
-        this.settings = TmcSettings.getDefault();
+        this.settings = NBTmcSettings.getDefault();
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();
         this.dialogs = ConvenientDialogDisplayer.getDefault();

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

@@ -14,6 +14,7 @@
 import fi.helsinki.cs.tmc.utilities.BgTask;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import fi.helsinki.cs.tmc.utilities.CancellableCallable;
+import hy.tmc.core.exceptions.TmcCoreException;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -24,6 +25,7 @@
 import javax.imageio.ImageIO;
 import javax.swing.Icon;
 import javax.swing.SwingUtilities;
+import org.openide.util.Exceptions;
 import org.openide.util.ImageUtilities;
 
 public class ReviewEventListener extends TmcEventListener {
@@ -68,7 +70,11 @@ public void receive(ReviewDb.NewUnreadReviewEvent e) throws Throwable {
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
-                refreshCourseDb();
+                try {
+                    refreshCourseDb();
+                } catch (TmcCoreException ex) {
+                    Exceptions.printStackTrace(ex);
+                }
 
                 String title = "Code review";
                 String msg = "Code review for " + review.getExerciseName() + " ready.";
@@ -90,7 +96,7 @@ public void actionPerformed(ActionEvent e) {
         });
     }
 
-    private void refreshCourseDb() {
+    private void refreshCourseDb() throws TmcCoreException {
         // Exercise properties have probably changed
         new RefreshCoursesAction().addDefaultListener(false, true).run();
     }