Enable/Disable openClosedExercises menu button depending on whether a course is selected

Author: Redande

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

@@ -0,0 +1,30 @@
+package fi.helsinki.cs.tmc.actions;
+
+import fi.helsinki.cs.tmc.core.events.TmcEventBus;
+import fi.helsinki.cs.tmc.core.events.TmcEventListener;
+import fi.helsinki.cs.tmc.model.CourseDb;
+
+import org.openide.nodes.Node;
+import org.openide.util.HelpCtx;
+import org.openide.util.actions.NodeAction;
+
+public abstract class AbstractCourseSensitiveAction extends NodeAction {
+    
+    public AbstractCourseSensitiveAction() {
+        TmcEventBus.getDefault().subscribeDependent(new TmcEventListener() {
+            public void receive(CourseDb.ChangedEvent event) throws Throwable {
+                setEnabled(CourseDb.getInstance().getCurrentCourse() != null);
+            }
+        }, this);
+    }
+    
+    @Override
+    protected boolean enable(Node[] nodes) {
+        return CourseDb.getInstance().getCurrentCourse() != null;
+    }
+
+    @Override
+    public HelpCtx getHelpCtx() {
+        return HelpCtx.DEFAULT_HELP;
+    }
+}

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

@@ -5,27 +5,36 @@
 import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
 import fi.helsinki.cs.tmc.ui.OpenClosedExercisesDialog;
 
-import java.awt.event.ActionEvent;
-import javax.swing.AbstractAction;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
 import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
+import org.openide.nodes.Node;
 import org.openide.util.NbBundle;
 
 @ActionID(category = "TMC",
         id = "fi.helsinki.cs.tmc.actions.OpenClosedExercisesFromMenu")
-@ActionRegistration(displayName = "#CTL_OpenClosedExercisesFromMenu")
+@ActionRegistration(displayName = "#CTL_OpenClosedExercisesFromMenu", lazy = false)
 @ActionReferences({
     @ActionReference(path = "Menu/TM&C", position = -43)
 })
 @NbBundle.Messages("CTL_OpenClosedExercisesFromMenu=&Open closed exercises")
-public class OpenClosedExercisesFromMenu extends AbstractAction {    
-    
+public class OpenClosedExercisesFromMenu extends AbstractCourseSensitiveAction {
+
     @Override
-    public void actionPerformed(ActionEvent e) {
+    public void performAction(Node[] nodes) {
         Course course = CourseDb.getInstance().getCurrentCourse();
         final LocalExerciseStatus status = LocalExerciseStatus.get(course.getExercises());
         OpenClosedExercisesDialog.display(status.closed);
     }
+
+    @Override
+    public String getName() {
+        return "&Open closed exercises";
+    }
+    
+    @Override
+    protected boolean asynchronous() {
+        return false;
+    }
 }

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

@@ -3,9 +3,11 @@
 import fi.helsinki.cs.tmc.core.TmcCore;
 import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
+import fi.helsinki.cs.tmc.core.events.TmcEventBus;
 import fi.helsinki.cs.tmc.core.holders.TmcLangsHolder;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
+import fi.helsinki.cs.tmc.events.LoginStateChangedEvent;
 import fi.helsinki.cs.tmc.langs.util.TaskExecutorImpl;
 import fi.helsinki.cs.tmc.spywareLocal.SpywareFacade;
 import fi.helsinki.cs.tmc.tasks.LoginTask;
@@ -79,7 +81,9 @@ public void run() {
                     prefs.putBoolean(PREF_FIRST_RUN, false);
                 } else {
                     // Do full refresh.
-                    if (LoginManager.loggedIn() && settings.getOrganization() != null && settings.getCurrentCourse().isPresent()) {
+                    if (!LoginManager.loggedIn()) {
+                        BgTask.start("Asking user to log in", new LoginTask());
+                    } else if (LoginManager.loggedIn() && settings.getOrganization().isPresent() && settings.getCurrentCourse().isPresent()) {
                         new RefreshCoursesAction().addDefaultListener(false, true).addListener(new BgTaskListener<List<Course>>() {
                             @Override
                             public void bgTaskReady(List<Course> result) {

tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java

@@ -3,6 +3,7 @@
 import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.OauthCredentials;
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import fi.helsinki.cs.tmc.core.events.TmcEvent;
 import fi.helsinki.cs.tmc.core.events.TmcEventBus;
 import fi.helsinki.cs.tmc.model.CourseDb;
@@ -12,7 +13,9 @@
 import fi.helsinki.cs.tmc.tailoring.Tailoring;
 
 import com.google.common.base.Optional;
-import fi.helsinki.cs.tmc.core.domain.Organization;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
 import java.io.IOException;
 import java.net.ProxySelector;
 import java.nio.file.Path;
@@ -147,25 +150,44 @@ public String hostProgramVersion() {
     }
 
     @Override
-    public OauthCredentials getOauthCredentials() {
-        return new OauthCredentials(settings.get(PREF_OAUTH_APPLICATION_ID, null), settings.get(PREF_OAUTH_SECRET, null));
+    public Optional<OauthCredentials> getOauthCredentials() {
+        OauthCredentials creds = new OauthCredentials(settings.get(PREF_OAUTH_APPLICATION_ID, null), settings.get(PREF_OAUTH_SECRET, null));
+        if (creds.getOauthApplicationId() == null || creds.getOauthSecret() == null) {
+            return Optional.absent();
+        } else {
+            return Optional.of(creds);
+        }
     }
 
     @Override
-    public void setOauthCredentials(OauthCredentials credentials) {
-        settings.put(PREF_OAUTH_APPLICATION_ID, credentials.getOauthApplicationId());
-        settings.put(PREF_OAUTH_SECRET, credentials.getOauthSecret());
+    public void setOauthCredentials(Optional<OauthCredentials> credentials) {
+        if (!credentials.isPresent()) {
+            settings.put(PREF_OAUTH_APPLICATION_ID, null);
+            settings.put(PREF_OAUTH_SECRET, null);
+        } else {
+            settings.put(PREF_OAUTH_APPLICATION_ID, credentials.get().getOauthApplicationId());
+            settings.put(PREF_OAUTH_SECRET, credentials.get().getOauthSecret());
+        }
     }
 
     @Override
-    public String getOrganization() {
-        return settings.get(PREF_ORGANIZATION, null);
+    public Optional<Organization> getOrganization() {
+        final String organizationJson = settings.get(PREF_ORGANIZATION, "");
+        if (organizationJson.isEmpty()) {
+            return Optional.absent();
+        } else {
+            Organization org = new Gson().fromJson(organizationJson, new TypeToken<Organization>(){}.getType());
+            return Optional.of(org);
+        }
     }
 
     @Override
-    public void setOrganization(String organization) {
-        settings.put(PREF_ORGANIZATION, organization);
-
+    public void setOrganization(Optional<Organization> organization) {
+        if (organization.isPresent()) {
+            settings.put(PREF_ORGANIZATION, new Gson().toJson(organization.get()));
+        } else {
+            settings.put(PREF_ORGANIZATION, "");
+        }
     }
 
     public static class SavedEvent implements TmcEvent {}
@@ -202,8 +224,8 @@ private String stripTrailingSlashes(String s) {
     }
 
     @Override
-    public String getUsername() {
-        return settings.get(PREF_USERNAME, tailoring.getDefaultUsername());
+    public Optional<String> getUsername() {
+        return Optional.of(settings.get(PREF_USERNAME, tailoring.getDefaultUsername()));
     }
 
     public void setUsername(String username) {

tmc-plugin/src/fi/helsinki/cs/tmc/events/LoginStateChangedEvent.java

@@ -0,0 +1,5 @@
+package fi.helsinki.cs.tmc.events;
+
+import fi.helsinki.cs.tmc.core.events.TmcEvent;
+
+public class LoginStateChangedEvent implements TmcEvent {}

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

@@ -7,6 +7,8 @@
 import fi.helsinki.cs.tmc.core.events.TmcEventBus;
 import fi.helsinki.cs.tmc.core.events.TmcEventListener;
 
+import com.google.common.base.Optional;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.TimerTask;
@@ -213,7 +215,12 @@ private synchronized void handleDisconnect() {
     }
 
     private synchronized void subscribeToReviews() {
-        String username = settings.getUsername();
+        final Optional<String> usernamePresent = settings.getUsername();
+        if (!usernamePresent.isPresent()) {
+            log.log(Level.WARNING, "Tried to subscribe to reviews while not logged in.");
+            return;
+        }
+        String username = usernamePresent.get();
         String channel = "/broadcast/user/" + username + "/review-available";
         client.getChannel(channel).subscribe(reviewAvailableListener);
     }

tmc-plugin/src/fi/helsinki/cs/tmc/ui/LoginDialog.java

@@ -41,7 +41,10 @@ public LoginDialog(ActionListener onLogin) {
         this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 
         this.settings = (TmcCoreSettingsImpl) TmcSettingsHolder.get();
-        this.usernameField.setText(settings.getUsername());
+        final Optional<String> username = settings.getUsername();
+        if (username.isPresent()) {
+            this.usernameField.setText(username.get());
+        }
 
         if (!usernameField.getText().isEmpty()) {
             SwingUtilities.invokeLater(new Runnable() {

tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationCard.java

@@ -11,9 +11,13 @@
 
 public class OrganizationCard extends javax.swing.JPanel {
 
+    private final Organization organization;
+    
     public OrganizationCard(Organization organization) {
         initComponents();
 
+        this.organization = organization;
+        
         DefaultCaret caret = (DefaultCaret)this.organizationInformation.getCaret();
         caret.setUpdatePolicy(DefaultCaret.NEVER_UPDATE);
 
@@ -32,8 +36,8 @@ public OrganizationCard(Organization organization) {
         this.logo.setIcon(image);
     }
 
-    public String getOrganizationName() {
-        return this.organizationName.getText();
+    public Organization getOrganization() {
+        return this.organization;
     }
 
     private URL logoUrl(String path) {

tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationListWindow.java

@@ -5,6 +5,8 @@
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 
+import com.google.common.base.Optional;
+
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Dimension;
@@ -112,10 +114,13 @@ public static boolean isWindowVisible() {
     }
 
     private int setDefaultSelectedIndex() {
-        String selectedOrganizationName = TmcSettingsHolder.get().getOrganization();
+        Optional<Organization> selectedOrganization = TmcSettingsHolder.get().getOrganization();
+        if (!selectedOrganization.isPresent()) {
+            return 0;
+        }
         final ListModel<OrganizationCard> list = organizations.getModel();
         for (int i = 0; i < list.getSize(); i++) {
-            if (list.getElementAt(i).getOrganizationName().equals(selectedOrganizationName)) {
+            if (list.getElementAt(i).getOrganization().getName().equals(selectedOrganization.get().getName())) {
                 return i;
             }
         }

tmc-plugin/src/fi/helsinki/cs/tmc/ui/PreferencesPanel.java

@@ -1,24 +1,18 @@
 package fi.helsinki.cs.tmc.ui;
 
 import com.google.common.base.Optional;
-import fi.helsinki.cs.tmc.actions.RefreshCoursesAction;
 import fi.helsinki.cs.tmc.core.TmcCore;
-import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Organization;
 import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
-import fi.helsinki.cs.tmc.core.exceptions.NotLoggedInException;
 import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 import fi.helsinki.cs.tmc.tailoring.SelectedTailoring;
 import fi.helsinki.cs.tmc.tasks.LoginTask;
 import fi.helsinki.cs.tmc.utilities.BgTask;
-import fi.helsinki.cs.tmc.utilities.BgTaskListener;
 import fi.helsinki.cs.tmc.utilities.DelayedRunner;
 import fi.helsinki.cs.tmc.utilities.LoginManager;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.io.File;
@@ -31,9 +25,6 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import org.openide.util.Exceptions;
 
 /**
  * The settings panel.
@@ -54,7 +45,11 @@
     }
 
     private void updateFields() {
-        final String username = TmcSettingsHolder.get().getUsername();
+        final Optional<String> usernamePresent = TmcSettingsHolder.get().getUsername();
+        String username = "";
+        if (usernamePresent.isPresent()) {
+            username = usernamePresent.get();
+        }
         final JLabel login = this.loginLabel;
         final JButton logout = this.logoutButton;
         if (!username.isEmpty()) {
@@ -65,10 +60,10 @@ private void updateFields() {
             logout.setEnabled(false);
         }
 
-        String org = TmcSettingsHolder.get().getOrganization();
+        Optional<Organization> org = TmcSettingsHolder.get().getOrganization();
         final JLabel selectedOrg = this.selectedOrganizationLabel;
-        if (org != null) {
-            selectedOrg.setText(org);
+        if (org.isPresent()) {
+            selectedOrg.setText(org.get().getName());
         } else {
             selectedOrg.setText("No organization selected");
         }
@@ -178,8 +173,8 @@ public void setSendDiagnosticsEnabled(boolean value) {
     }
 
     public void setOrganization(OrganizationCard organization) {
-        TmcSettingsHolder.get().setOrganization(organization.getOrganizationName());
-        this.selectedOrganizationLabel.setText(organization.getOrganizationName());
+        TmcSettingsHolder.get().setOrganization(Optional.of(organization.getOrganization()));
+        this.selectedOrganizationLabel.setText(organization.getOrganization().getName());
     }
 
     private static class LocaleWrapper {