NbTmcSettings

Author: UMTti

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/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

@@ -8,7 +8,7 @@
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+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;
@@ -35,13 +35,13 @@ public final class RefreshCoursesAction {
 
     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);
@@ -62,7 +62,7 @@ public RefreshCoursesAction addListener(BgTaskListener<List<Course>> listener) {
         return this;
     }
 
-    public void run() {
+    /*public void run() {
         try {
             Credentials credentials = new Credentials(this.tmcSettings.getUsername(),
                     this.tmcSettings.getPassword()) {};
@@ -83,9 +83,9 @@ public void onFailure(Throwable thrwbl) {
         } 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>>() {

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/SaveSettingsAction.java

@@ -3,7 +3,7 @@
 import hy.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.model.CourseDb;
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.ui.PreferencesUI;
 import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
 import fi.helsinki.cs.tmc.utilities.BgTaskListener;
@@ -32,7 +32,7 @@ public void actionPerformed(ActionEvent e) {
 
         PreferencesUI prefUi = (PreferencesUI) e.getSource();
 
-        TmcSettings settings = TmcSettings.getDefault();
+        NBTmcSettings settings = NBTmcSettings.getDefault();
         settings.setUsername(prefUi.getUsername());
         settings.setPassword(prefUi.getPassword());
         settings.setSavingPassword(prefUi.getShouldSavePassword());

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

@@ -1,7 +1,7 @@
 package fi.helsinki.cs.tmc.actions;
 
 import fi.helsinki.cs.tmc.model.CourseDb;
-import fi.helsinki.cs.tmc.model.TmcSettings;
+import fi.helsinki.cs.tmc.model.NBTmcSettings;
 import fi.helsinki.cs.tmc.tailoring.SelectedTailoring;
 import fi.helsinki.cs.tmc.tailoring.Tailoring;
 import fi.helsinki.cs.tmc.ui.PreferencesUI;
@@ -50,11 +50,11 @@ public void run() {
 
         final PreferencesUI prefUI = prefUiFactory.createCurrentPreferencesUI();
 
-        TmcSettings settings = TmcSettings.getDefault();
+        NBTmcSettings settings = NBTmcSettings.getDefault();
         prefUI.setUsername(settings.getUsername());
         prefUI.setPassword(settings.getPassword());
         prefUI.setShouldSavePassword(settings.isSavingPassword());
-        prefUI.setServerBaseUrl(settings.getServerBaseUrl());
+        prefUI.setServerBaseUrl(settings.getServerAddress());
         prefUI.setProjectDir(settings.getProjectRootDir());
         prefUI.setCheckForUpdatesInTheBackground(settings.isCheckingForUpdatesInTheBackground());
         prefUI.setCheckForUnopenedExercisesAtStartup(settings.isCheckingForUnopenedAtStartup());

tmc-plugin/src/fi/helsinki/cs/tmc/exerciseSubmitter/ExerciseSubmitter.java

@@ -13,7 +13,7 @@
 import fi.helsinki.cs.tmc.model.ServerAccess;
 import fi.helsinki.cs.tmc.model.SubmissionResultWaiter;
 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.SubmissionResultWaitingDialog;
 import fi.helsinki.cs.tmc.ui.TestResultDisplayer;
@@ -41,7 +41,7 @@ public InvokedEvent(TmcProjectInfo projectInfo) {
         }
     }
 
-    private TmcSettings settings;
+    private NBTmcSettings settings;
     private ServerAccess serverAccess;
     private CourseDb courseDb;
     private ProjectMediator projectMediator;
@@ -50,7 +50,7 @@ public InvokedEvent(TmcProjectInfo projectInfo) {
     private TmcEventBus eventBus;
 
     public ExerciseSubmitter() {
-        this.settings = TmcSettings.getDefault();
+        this.settings = NBTmcSettings.getDefault();
         this.serverAccess = new ServerAccess();
         this.courseDb = CourseDb.getInstance();
         this.projectMediator = ProjectMediator.getInstance();

tmc-plugin/src/fi/helsinki/cs/tmc/model/TmcSettings.java renamed to tmc-plugin/src/fi/helsinki/cs/tmc/model/NBTmcSettings.java

@@ -1,15 +1,18 @@
 package fi.helsinki.cs.tmc.model;
 
+import com.google.common.base.Optional;
 import fi.helsinki.cs.tmc.events.TmcEvent;
 import fi.helsinki.cs.tmc.events.TmcEventBus;
 import fi.helsinki.cs.tmc.tailoring.SelectedTailoring;
 import fi.helsinki.cs.tmc.tailoring.Tailoring;
+import hy.tmc.core.configuration.TmcSettings;
+import hy.tmc.core.domain.Course;
 import java.util.Locale;
 
 /**
  * A transient saveable collection of all settings of the TMC plugin.
  */
-public class TmcSettings {
+public class NBTmcSettings implements TmcSettings {
     private static final String PREF_BASE_URL = "baseUrl";
     private static final String PREF_USERNAME = "username";
     private static final String PREF_PASSWORD = "password";
@@ -20,34 +23,59 @@ public class TmcSettings {
     private static final String PREF_DETAILED_SPYWARE_ENABLED = "detailedSpywareEnabled";
     private static final String PREF_ERROR_MSG_LOCALE = "errorMsgLocale";
 
-    private static final TmcSettings defaultInstance =
-            new TmcSettings(
-                    PersistableSettings.forModule(TmcSettings.class),
+    private static final NBTmcSettings defaultInstance =
+            new NBTmcSettings(
+                    PersistableSettings.forModule(NBTmcSettings.class),
                     SelectedTailoring.get(),
                     TmcEventBus.getDefault()
                     );
 
     private PersistableSettings settings;
     private Tailoring tailoring;
     private TmcEventBus eventBus;
+    private final String api_version = "7";
 
     private String unsavedPassword;
+
+    @Override
+    public boolean userDataExists() {
+        return !(this.getUsername().isEmpty() || this.getPassword().isEmpty());
+    }
+
+    @Override
+    public Optional<Course> getCurrentCourse() {
+        if(CourseDb.getInstance().getCurrentCourse() == null){
+            return Optional.absent();
+        } else {
+            return Optional.of(CourseDb.getInstance().getCurrentCourse());
+        }
+    }
+
+    @Override
+    public String apiVersion() {
+        return this.api_version;
+    }
+
+    @Override
+    public String getFormattedUserData() {
+        return this.getUsername() + ":" + this.getPassword();
+    }
 
     public static class SavedEvent implements TmcEvent {}
 
-    public static TmcSettings getDefault() {
+    public static NBTmcSettings getDefault() {
         return defaultInstance;
     }
 
-    public static TmcSettings getTransient() {
-        return new TmcSettings(
-                PersistableSettings.forModule(TmcSettings.class),
+    public static NBTmcSettings getTransient() {
+        return new NBTmcSettings(
+                PersistableSettings.forModule(NBTmcSettings.class),
                 SelectedTailoring.get(),
                 TmcEventBus.getDefault()
                 );
     }
 
-    /*package*/ TmcSettings(PersistableSettings settings, Tailoring tailoring, TmcEventBus eventBus) {
+    /*package*/ NBTmcSettings(PersistableSettings settings, Tailoring tailoring, TmcEventBus eventBus) {
         this.settings = settings;
         this.tailoring = tailoring;
         this.eventBus = eventBus;
@@ -64,7 +92,8 @@ public void save() {
 
     }
 
-    public String getServerBaseUrl() {
+    @Override
+    public String getServerAddress() {
         return settings.get(PREF_BASE_URL, tailoring.getDefaultServerUrl());
     }
 
@@ -80,6 +109,7 @@ private String stripTrailingSlashes(String s) {
         return s;
     }
 
+    @Override
     public String getUsername() {
         return settings.get(PREF_USERNAME, tailoring.getDefaultUsername());
     }
@@ -88,6 +118,7 @@ public void setUsername(String username) {
         settings.put(PREF_USERNAME, username);
     }
 
+    @Override
     public String getPassword() {
         return unsavedPassword;
     }
@@ -182,3 +213,4 @@ private Locale parseLocale(String s, Locale dflt) {
     }
 
 }
+