Don't save password, ui improvements

Redande · Redande · commit 74abdcf87866 · 2018-01-09T19:58:58.000+02:00
diff --git a/tmc-plugin/nbproject/project.properties b/tmc-plugin/nbproject/project.properties
@@ -1,4 +1,4 @@
-javac.source=1.7
+javac.source=1.8
 javac.compilerargs=-Xlint -Xlint:-serial -Xlint:-path
 license.file=../LICENSE
 nbm.homepage=https://github.com/testmycode/tmc-netbeans
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java b/tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java
@@ -234,7 +234,7 @@ public Optional<String> getPassword() {
     @Override
     public void setPassword(Optional<String> password) {
         if (password.isPresent()) {
-            settings.put(PREF_PASSWORD, password.get());
+            throw new IllegalArgumentException("Setting passwords is no longer supported!");
         } else {
             settings.remove(PREF_PASSWORD);
         }
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/tailoring/DefaultTailoring.java b/tmc-plugin/src/fi/helsinki/cs/tmc/tailoring/DefaultTailoring.java
@@ -5,7 +5,7 @@
 public class DefaultTailoring implements Tailoring {
     @Override
     public String getDefaultServerUrl() {
-        return "";
+        return "https://tmc.mooc.fi";
     }
     
     @Override
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/Bundle.properties b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/Bundle.properties
@@ -75,7 +75,7 @@ OpenClosedExercisesDialog.openExercisesButton.text=Open exercises
 OpenClosedExercisesDialog.selectCompletedOrExpiredButton.text=Select all
 OpenClosedExercisesDialog.selectUncompletedButton.text=Select all
 LoginDialog.changeServerButton.text=Change
-LoginDialog.addressLabel.text=https://tmc.mooc.fi
+LoginDialog.addressLabel.text=
 LoginDialog.serverLabel.text=Server
 UpdateServerDialog.updateButton.text=Update
 UpdateServerDialog.cancelButton.text=Cancel
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CourseCard.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CourseCard.java
@@ -22,15 +22,13 @@ public CourseCard(Course course) {
         
         this.titleLabel.setText(course.getTitle());
         String information = course.getDescription();
-//        if (information.length() > 100) {
-//            information = information.substring(0, 99) + "...";
-//        }
-        this.informationLabel.setText(information);
-        this.informationLabel.setRows(2);
-        final String text = this.informationLabel.getText();
-        if (text.length() > 3) {
-            this.informationLabel.replaceRange("...", text.length() - 3, text.length());
+        if (information == null || information.isEmpty()) {
+            information = "A mysterious course without description.";
+        }
+        if (information.length() > 198) {
+            information = information.substring(0, 197) + "...";
         }
+        this.informationLabel.setText(information);
         this.nameLabel.setText("/" + course.getName());
     }
     
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CourseListWindow.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/CourseListWindow.java
@@ -58,7 +58,7 @@ public CourseListWindow(List<Course> courses, PreferencesPanel prefPanel) {
         this.courses.setVisibleRowCount(4);
         JScrollPane pane = new JScrollPane(this.courses);
         Dimension d = pane.getPreferredSize();
-        d.width = 400;
+        d.width = 800;
         pane.setPreferredSize(d);
         pane.setBorder(new EmptyBorder(5,0,5,0));
         this.courses.setBackground(new Color(242, 241, 240));
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/LoginDialog.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/LoginDialog.java
@@ -5,6 +5,7 @@
 import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
 
 import com.google.common.base.Optional;
+import fi.helsinki.cs.tmc.utilities.LoginListener;
 
 import org.openide.windows.WindowManager;
 
@@ -16,7 +17,7 @@
 
 public class LoginDialog extends javax.swing.JDialog {
 
-    public static void display(ActionListener onOk, final Runnable onClosed) {
+    public static void display(LoginListener onOk, final Runnable onClosed) {
         LoginDialog dialog = new LoginDialog(onOk);
         dialog.setLocationRelativeTo(null);
         dialog.setVisible(true);
@@ -29,13 +30,13 @@ public void windowClosed(WindowEvent e) {
     }
 
     private TmcCoreSettingsImpl settings;
-    private ActionListener onLogin;
+    private LoginListener onLogin;
     private static boolean visible;
 
     /**
      * Creates new form LoginForm
      */
-    public LoginDialog(ActionListener onLogin) {
+    public LoginDialog(LoginListener onLogin) {
         super(WindowManager.getDefault().getMainWindow(), false);
         initComponents();
 
@@ -222,9 +223,8 @@ private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
 
     private void loginButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_loginButtonActionPerformed
         settings.setUsername(usernameField.getText());
-        settings.setPassword(Optional.of(new String(passwordField.getPassword())));
         settings.save();
-
+        onLogin.setPassword(new String(passwordField.getPassword()));
         onLogin.actionPerformed(evt);
 
         this.setVisible(false);
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationCard.form b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationCard.form
@@ -40,7 +40,7 @@
               <EmptySpace type="unrelated" max="-2" attributes="0"/>
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" attributes="0">
-                      <Component id="organizationName" min="-2" pref="200" max="-2" attributes="0"/>
+                      <Component id="organizationName" pref="200" max="32767" attributes="0"/>
                       <EmptySpace max="32767" attributes="0"/>
                       <Component id="organizationSlug" min="-2" max="-2" attributes="0"/>
                   </Group>
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationCard.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationCard.java
@@ -23,8 +23,8 @@ public OrganizationCard(Organization organization) {
         
         this.organizationName.setText(organization.getName());
         String information = organization.getInformation();
-        if (information.length() > 75) {
-            information = information.substring(0, 74) + "...";
+        if (information.length() > 198) {
+            information = information.substring(0, 197) + "...";
         }
         this.organizationInformation.setText(information);
         this.organizationSlug.setText("/" + organization.getSlug());
@@ -123,7 +123,7 @@ private void initComponents() {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(organizationName, javax.swing.GroupLayout.PREFERRED_SIZE, 200, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(organizationName, javax.swing.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                         .addComponent(organizationSlug))
                     .addComponent(infoScrollPane, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationListWindow.java b/tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationListWindow.java
@@ -17,6 +17,7 @@
 import java.awt.event.MouseEvent;
 import java.awt.event.ComponentEvent;
 import java.awt.event.ComponentListener;
+import java.util.Collections;
 import java.util.List;
 
 import javax.swing.BoxLayout;
@@ -44,6 +45,18 @@ public OrganizationListWindow(List<Organization> organizations) {
         Font titleFont = this.title.getFont();
         this.title.setFont(new Font(titleFont.getName(), Font.BOLD, 20));
         OrganizationCard[] organizationCards = new OrganizationCard[organizations.size()];
+        Collections.sort(organizations, (a, b) -> {
+            if (a.isPinned() && b.isPinned()) {
+                return a.getName().compareTo(b.getName());
+            }
+            if (a.isPinned()) {
+                return -1;
+            }
+            if (b.isPinned()) {
+                return 1;
+            }
+            return a.getName().compareTo(b.getName());
+        });
         for (int i = 0; i < organizations.size(); i++) {
             organizationCards[i] = new OrganizationCard(organizations.get(i));
         }
@@ -57,7 +70,7 @@ public OrganizationListWindow(List<Organization> organizations) {
         this.organizations.setVisibleRowCount(4);
         JScrollPane pane = new JScrollPane(this.organizations);
         Dimension d = pane.getPreferredSize();
-        d.width = 400;
+        d.width = 800;
         pane.setPreferredSize(d);
         pane.setBorder(new EmptyBorder(5, 0, 5, 0));
         this.organizations.setBackground(new Color(242, 241, 240));
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BgTask.java b/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BgTask.java
@@ -152,7 +152,6 @@ public void run() {
                             authenticationSuccessful = false;
                         }
                     } while (!authenticationSuccessful);
-                    //TODO: add a message if username or password incorrect
                 }
             } while (!successful);
 
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/LoginListener.java b/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/LoginListener.java
@@ -0,0 +1,33 @@
+package fi.helsinki.cs.tmc.utilities;
+
+import fi.helsinki.cs.tmc.core.exceptions.AuthenticationFailedException;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.function.Consumer;
+import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
+
+public class LoginListener implements ActionListener {
+    private String password;
+    private final Consumer<String> onPerformed;
+    
+    public LoginListener(Consumer<String> onPerformed) {
+        this.onPerformed = onPerformed;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        try {
+            onPerformed.accept(password);
+        } catch (Exception ex) {
+            if (ex instanceof AuthenticationFailedException || ex instanceof OAuthProblemException) {
+                return;
+            }
+            throw ex;
+        }
+    }
+    
+    public void setPassword(String password) {
+        this.password = password;
+    }
+    
+}
diff --git a/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/LoginManager.java b/tmc-plugin/src/fi/helsinki/cs/tmc/utilities/LoginManager.java
@@ -61,32 +61,39 @@ public void run() {
                 if (loggedIn()) {
                     showOrganizationsOrCourses();
                 } else {
-                    LoginDialog.display(new ActionListener() {
-                        @Override
-                        public void actionPerformed(ActionEvent e) {
-                            try {
-                                TmcServerAddressNormalizer normalizer = new TmcServerAddressNormalizer();
-                                normalizer.normalize();
-                                TmcCore.get().authenticate(ProgressObserver.NULL_OBSERVER, TmcSettingsHolder.get().getPassword().get()).call();
-                                normalizer.selectOrganizationAndCourse();
-                            } catch (Exception ex) {
-                                if (ex instanceof IOException) {
-                                    connectionException = (IOException) ex;
-                                    if (ex instanceof UnknownHostException) {
-                                        ConvenientDialogDisplayer.getDefault().displayError("Couldn't connect to the server. Please check your internet connection.");
-                                    } else if (ex instanceof FileNotFoundException) {
-                                        ConvenientDialogDisplayer.getDefault().displayError("Server address is incorrect.");
+                    LoginDialog.display(new LoginListener(password -> {
+                        try {
+                            TmcServerAddressNormalizer normalizer = new TmcServerAddressNormalizer();
+                            normalizer.normalize();
+                            TmcCore.get().authenticate(ProgressObserver.NULL_OBSERVER, password).call();
+                            normalizer.selectOrganizationAndCourse();
+                        } catch (Exception ex) {
+                            log.log(Level.WARNING, "Error while logging in! " + ex.toString());
+                            if (ex instanceof IOException) {
+                                connectionException = (IOException) ex;
+                                if (ex instanceof UnknownHostException) {
+                                    ConvenientDialogDisplayer.getDefault().displayError("Couldn't connect to the server. Please check your internet connection.");
+                                } else if (ex instanceof FileNotFoundException) {
+                                    if (TmcSettingsHolder.get().getServerAddress().contains("tmc.mooc.fi/mooc")) {
+                                        ConvenientDialogDisplayer.getDefault().displayError("The server https://tmc.mooc.fi/mooc is no longer supported by this client.\n" +
+                                                "All the courses have been migrated to our main server https://tmc.mooc.fi.\n" +
+                                                "If you'd like to do the migrated courses, you'll need to update your server address to\n" +
+                                                "https://tmc.mooc.fi/org/mooc and create a new account there.\n\n" +
+                                                "For more information, check the course materials on mooc.fi.");
+                                    } else {
+                                        ConvenientDialogDisplayer.getDefault().displayError("Server address is incorrect or the server is not supported.");
                                     }
                                 }
-                                if (ex instanceof AuthenticationFailedException) {
-                                    authenticationException = (AuthenticationFailedException) ex;
-                                    ConvenientDialogDisplayer.getDefault().displayError("Username or password is incorrect.", ex);
-                                }
+                            } else if (ex instanceof AuthenticationFailedException) {
+                                authenticationException = (AuthenticationFailedException) ex;
+                                ConvenientDialogDisplayer.getDefault().displayError("Username or password is incorrect.", ex);
+                            } else {
+                                ConvenientDialogDisplayer.getDefault().displayError("Logging in failed! Try again.");
                             }
-                            setReady(true);
-                            bus.post(new LoginStateChangedEvent());
                         }
-                    }, closeHandler);
+                        setReady(true);
+                        bus.post(new LoginStateChangedEvent());
+                    }), closeHandler);
                 }
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-javac.source=1.7`
	`1`	`+javac.source=1.8`
`2`	`2`	`javac.compilerargs=-Xlint -Xlint:-serial -Xlint:-path`
`3`	`3`	`license.file=../LICENSE`
`4`	`4`	`nbm.homepage=https://github.com/testmycode/tmc-netbeans`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ public Optional<String> getPassword() {`
`234`	`234`	`@Override`
`235`	`235`	`public void setPassword(Optional<String> password) {`
`236`	`236`	`if (password.isPresent()) {`
`237`		`- settings.put(PREF_PASSWORD, password.get());`
	`237`	`+ throw new IllegalArgumentException("Setting passwords is no longer supported!");`
`238`	`238`	`} else {`
`239`	`239`	`settings.remove(PREF_PASSWORD);`
`240`	`240`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`public class DefaultTailoring implements Tailoring {`
`6`	`6`	`@Override`
`7`	`7`	`public String getDefaultServerUrl() {`
`8`		`- return "";`
	`8`	`+ return "https://tmc.mooc.fi";`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`@Override`