Trying to start integrate.

samutamm · samutamm · commit f9fa0b7d4bb9 · 2015-07-02T17:24:25.000+03:00
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/actions/RefreshCoursesAction.java b/tmc-plugin/src/fi/helsinki/cs/tmc/actions/RefreshCoursesAction.java
@@ -14,12 +14,8 @@
 import fi.helsinki.cs.tmc.utilities.BgTaskListenerList;
 import fi.helsinki.cs.tmc.utilities.CancellableCallable;
 import hy.tmc.core.TmcCore;
-import hy.tmc.core.exceptions.TmcCoreException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.openide.util.Exceptions;
@@ -35,18 +31,22 @@ public final class RefreshCoursesAction {
     private ConvenientDialogDisplayer dialogs;
     
     private BgTaskListenerList<List<Course>> listeners;
+    private final TmcCore tmcCore;
+    private final TmcSettings tmcSettings;
 
     public RefreshCoursesAction() {
         this(TmcSettings.getDefault());
     }
     
     public RefreshCoursesAction(TmcSettings 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();
     }
 
     public RefreshCoursesAction addDefaultListener(boolean showDialogOnError, boolean updateCourseDb) {
@@ -58,64 +58,42 @@ public RefreshCoursesAction addListener(BgTaskListener<List<Course>> listener) {
         this.listeners.addListener(listener);
         return this;
     }
-
-    public void run() throws TmcCoreException {
-        CancellableCallable<List<Course>> courseListTask = serverAccess.getDownloadingCourseListTask();
-        TmcCore c = new TmcCore();
-        final ListenableFuture<List<Course>> courses = c.listCourses();
-        /*
-        
-        courses.addListener(new Runnable() {
-
+    
+    public void run() {
+        Credentials credentials = new Credentials(this.tmcSettings.getUsername(),
+                this.tmcSettings.getPassword());
+        System.out.println(credentials);
+        ListenableFuture<Boolean> login = this.tmcCore.login(credentials, tmcSettings.getServerBaseUrl());
+        Futures.addCallback(login, new FutureCallback<Boolean>() {
             @Override
-            public void run() {
-                System.out.println("Jeee, kurssit haettu!");
-                
-                try {
-                    for (Course get : courses.get()) {
-                        System.out.println(get.getName());
-                    }
-                } catch (InterruptedException ex) {
-                    Exceptions.printStackTrace(ex);
-                } catch (ExecutionException ex) {
-                    Exceptions.printStackTrace(ex);
-                }
-            
+            public void onSuccess(Boolean v) {
+                System.out.println("TOIMIIIII: " + v);
             }
-
-        }, Executors.newFixedThreadPool(1));
-
-        if(true) {
-            return;
-        }*/
-        
-        /*Futures.addCallback(courses, new FutureCallback<List<Course>>(){
+            
             @Override
-            public void onSuccess(List<Course> v) {
-                for(Course c: v){
-                    System.out.println(c.getName());
-                }
+            public void onFailure(Throwable thrwbl) {
+                System.out.println("LOGIN LATAUS FEILASI1: " );
+                Exceptions.printStackTrace(thrwbl);
             }
+        });
+    }
 
-            @Override
-            public void onFailure(Throwable thrwbl) {
-                
-            }         
-        });*/
+    public void oldRun() {
         
+        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());
                 if (currentCourseStub != null) {
                     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())) {
@@ -126,12 +104,12 @@ 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);
@@ -143,12 +121,12 @@ public void bgTaskFailed(Throwable ex) {
                     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);
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/data/Course.java b/tmc-plugin/src/fi/helsinki/cs/tmc/data/Course.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+@Deprecated
 public class Course {
 
     private String name;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/data/Exercise.java b/tmc-plugin/src/fi/helsinki/cs/tmc/data/Exercise.java
@@ -4,6 +4,7 @@
 import java.io.Serializable;
 import java.util.Date;
 
+@Deprecated
 public class Exercise implements Serializable {
 
     private int id;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/data/ExerciseListUtils.java b/tmc-plugin/src/fi/helsinki/cs/tmc/data/ExerciseListUtils.java
@@ -1,5 +1,6 @@
 package fi.helsinki.cs.tmc.data;
 
+import hy.tmc.core.domain.Exercise;
 import java.util.List;
 
 public class ExerciseListUtils {
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java
@@ -5,9 +5,9 @@
 import hy.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.data.CourseListUtils;
 import hy.tmc.core.domain.Exercise;
-import fi.helsinki.cs.tmc.data.ExerciseKey;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
+import hy.tmc.core.domain.ExerciseKey;
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java b/tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java
@@ -1,5 +1,8 @@
 package fi.helsinki.cs.tmc.model;
 
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -19,6 +22,8 @@
 import fi.helsinki.cs.tmc.utilities.UriUtils;
 import fi.helsinki.cs.tmc.utilities.http.FailedHttpResponseException;
 import fi.helsinki.cs.tmc.utilities.http.HttpTasks;
+import hy.tmc.core.TmcCore;
+import hy.tmc.core.exceptions.TmcCoreException;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -31,6 +36,7 @@
 import java.util.Map;
 import java.util.zip.GZIPOutputStream;
 import org.openide.modules.Modules;
+import org.openide.util.Exceptions;
 
 /**
  * A frontend for the server.
@@ -43,6 +49,7 @@ public class ServerAccess {
     private CourseInfoParser courseInfoParser;
     private ReviewListParser reviewListParser;
     private String clientVersion;
+    private TmcCore tmcCore;
     
     public ServerAccess() {
         this(TmcSettings.getDefault());
diff --git a/tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/CourseListParserTest.java b/tmc-plugin/test/unit/src/fi/helsinki/cs/tmc/data/serialization/CourseListParserTest.java
@@ -44,7 +44,8 @@ public void itShouldParseJsonCourseLists() {
         assertEquals("TheCourse", exercise.getCourseName());
         
         GregorianCalendar cal = new GregorianCalendar();
-        cal.setTime(exercise.getDeadline());
+        cal.setTime(exercise.getDeadlineDate());
+        System.out.println("AIKA: " + exercise.getDeadlineDate());
         assertEquals(2015, cal.get(GregorianCalendar.YEAR));
         assertEquals(1, cal.get(GregorianCalendar.HOUR_OF_DAY));
         assertEquals(30, cal.get(GregorianCalendar.MINUTE));
