Separate error messages if incorrect server address or there's no connection

Author: Redande

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/BgTask.java

@@ -4,6 +4,7 @@
 import fi.helsinki.cs.tmc.core.exceptions.AuthenticationFailedException;
 import fi.helsinki.cs.tmc.core.exceptions.NotLoggedInException;
 import fi.helsinki.cs.tmc.coreimpl.BridgingProgressObserver;
+import java.io.IOException;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
@@ -140,14 +141,14 @@ public void run() {
                 try {
                     successful = true;
                     resultTemp = callable.call();
-                } catch (NotLoggedInException | OAuthProblemException | OAuthSystemException | AuthenticationFailedException ex) {
+                } catch (NotLoggedInException | OAuthProblemException | OAuthSystemException | AuthenticationFailedException | IOException ex) {
                     successful = false;
                     boolean authenticationSuccessful;
                     do {
                         try {
                             authenticationSuccessful = true;
                             new LoginManager().login();
-                        } catch (AuthenticationFailedException loginException) {
+                        } catch (AuthenticationFailedException | IOException | InterruptedException exception) {
                             authenticationSuccessful = false;
                         }
                     } while (!authenticationSuccessful);

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/LoginManager.java

@@ -16,6 +16,9 @@
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.net.UnknownHostException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -26,8 +29,9 @@ public class LoginManager {
     private boolean ready;
     private Logger log = Logger.getLogger(LoginManager.class.getName());
     private AuthenticationFailedException authenticationException;
+    private IOException connectionException;
 
-    public synchronized void login() throws InterruptedException, AuthenticationFailedException {
+    public synchronized void login() throws InterruptedException, AuthenticationFailedException, IOException {
         if (LoginDialog.isWindowVisible() || OrganizationListWindow.isWindowVisible() || CourseListWindow.isWindowVisible()) {
             return;
         }
@@ -49,6 +53,14 @@ public void actionPerformed(ActionEvent e) {
                         try {
                             TmcCore.get().authenticate(ProgressObserver.NULL_OBSERVER, TmcSettingsHolder.get().getPassword().get()).call();
                         } 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.");
+                                } 
+                            }
                             if (ex instanceof AuthenticationFailedException) {
                                 authenticationException = (AuthenticationFailedException) ex;
                                 ConvenientDialogDisplayer.getDefault().displayError("Username or password is incorrect.", ex);
@@ -66,7 +78,10 @@ public void actionPerformed(ActionEvent e) {
         if (authenticationException != null) {
             throw authenticationException;
         }
-        showOrganizations();
+        if (connectionException != null) {
+            throw connectionException;
+        }
+        showOrganizations(); 
     }
 
     public void setReady(boolean value) {