Merge branch 'master' into download-msg-fix-juha

Author: juvester

src/main/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommand.java

@@ -143,13 +143,13 @@ private void printStatistics(Course course, int requestCount, int downloadCount)
 
             int failedCount = (requestCount - downloadCount);
             if (failedCount > 0) {
-                io.println("  from which " + (requestCount - failedCount)
+                io.println("  of which " + (requestCount - failedCount)
                         + " exercises were succesfully downloaded");
                 io.println(Color.colorString("  and of which " + failedCount + " failed.",
                         Color.AnsiColor.ANSI_RED));
                 //TODO we could print the names of the not downloaded exercises here
             } else {
-                io.println("  from which "
+                io.println("  of which "
                         + downloadCount + " exercises were downloaded.");
             }
             if (!showAll && totalCount != downloadCount) {

src/test/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommandTest.java

@@ -201,7 +201,7 @@ public void failsToLoadExercises() throws ParseException {
         app.run(args);
 
         io.assertContains("The 'course1' course has 3 exercises");
-        io.assertContains("from which 2 exercises were succesfully downloaded");
+        io.assertContains("of which 2 exercises were succesfully downloaded");
         io.assertContains("and of which 1 failed.");
     }