Merge branch 'develop'

Author: DeOldSax

.gitignore

@@ -1,3 +1,4 @@
+/.idea
 /bin
 /.settings
 /.classpath

pom.xml

@@ -7,6 +7,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- select one for build + select plugin in IliasManager.java -->
+		<!-- supported: kit tueb -->
+		<project.university>kit</project.university>
 	</properties>
 
 	<organization>
@@ -99,7 +102,7 @@
 						</goals>
 						<configuration>
 							<outputDirectory>
-								release/IliasDownloaderTool-${project.version}/lib
+								release/IliasDownloaderTool-${project.university}-${project.version}/lib
 							</outputDirectory>
 						</configuration>
 					</execution>
@@ -117,7 +120,7 @@
 						<configuration>
 							<target>
 								<copy file="target/Ilias-${project.version}.jar"
-									tofile="release/IliasDownloaderTool-${project.version}/Ilias-Downloader-Tool-${project.version}.jar">
+									tofile="release/IliasDownloaderTool-${project.university}-${project.version}/Ilias-Downloader-Tool-${project.university}-${project.version}.jar">
 								</copy>
 							</target>
 						</configuration>

src/main/java/control/IliasManager.java

@@ -1,15 +1,18 @@
 package control;
 
-import org.apache.http.impl.client.*;
-
-import plugin.*;
+import org.apache.http.impl.client.CloseableHttpClient;
+import plugin.IliasPlugin;
 import plugin.IliasPlugin.LoginStatus;
+import plugin.KITIlias;
+import plugin.TuebIlias;
 
 public class IliasManager {
 	private IliasPlugin ilias;
 	private static IliasManager iliasManager;
 
 	private IliasManager() {
+		this.ilias = new KITIlias();
+//		this.ilias = new TuebIlias();
 	}
 
 	public static IliasManager getInstance() {
@@ -19,10 +22,6 @@ public static IliasManager getInstance() {
 		return iliasManager;
 	}
 
-	public void setIliasPlugin(IliasPlugin ilias) {
-		this.ilias = ilias;
-	}
-
 	public LoginStatus login(String username, String password) {
 		return this.ilias.login(username, password);
 	}
@@ -31,7 +30,7 @@ public String getDashboardHTML() {
 		return this.ilias.getDashboardHTML();
 	}
 
-	public DefaultHttpClient getIliasClient() {
+	public CloseableHttpClient getIliasClient() {
 		return this.ilias.getClient();
 	}
 

src/main/java/control/IliasScraper.java

@@ -28,15 +28,18 @@ public IliasScraper(Dashboard dashboard) {
 
 	public void run(String dashboardHtml) {
 		this.iliasTree = getCourses(dashboardHtml);
-		startThread(iliasTree);
-	}
 
-	private void startThread(List<IliasFolder> iliasTree) {
-		if (Settings.getInstance().getFlags().updateCanceled()) {
-			return;
+		for (IliasFolder parent : iliasTree) {
+			if (!Settings.getInstance().getFlags().updateCanceled()) {
+				startThread(parent);
+			}
 		}
+
+	}
+
+	private void startThread(IliasFolder parent) {
 		threadCount.incrementAndGet();
-		new Thread(new IliasScraperThread(this, iliasTree)).start();
+		new Thread(new IliasScraperThread(this, parent)).start();
 	}
 
 	public List<IliasFolder> getIliasTree() {
@@ -72,19 +75,17 @@ private List<IliasFolder> getCourses(String dashboardHtml) {
 	private class IliasScraperThread implements Runnable {
 		String BASE_URI = IliasManager.getInstance().getBaseUri();
 		private final IliasScraper iliasScraper;
-		private final List<IliasFolder> courses;
+		private final IliasFolder parent;
 
-		private IliasScraperThread(IliasScraper iliasScraper, List<IliasFolder> courses) {
+		private IliasScraperThread(IliasScraper iliasScraper, IliasFolder parent) {
 			this.iliasScraper = iliasScraper;
-			this.courses = courses;
+			this.parent = parent;
 		}
 
 		@Override
 		public void run() {
-			for (IliasFolder parent : courses) {
-				if (Settings.getInstance().getFlags().updateCanceled()) {
-					break;
-				}
+			if (!Settings.getInstance().getFlags().updateCanceled()) {
+
 				List<Element> directory = openFolder(parent);
 				for (Element dir : directory) {
 					if (Settings.getInstance().getFlags().updateCanceled()) {
@@ -105,15 +106,14 @@ public void run() {
 					} else if (linkToForum) {
 						createForum(parent, dir);
 					} else if (linkToFolder) {
-						List<IliasFolder> tempo = new ArrayList<IliasFolder>();
 						IliasFolder newFolder = createFolder(parent, dir);
-						tempo.add(newFolder);
-						iliasScraper.startThread(tempo);
+						iliasScraper.startThread(newFolder);
 					} else if (linkToHyperlink) {
 						// TODO implement
 					}
 				}
 			}
+
 			iliasScraper.threadCount.decrementAndGet();
 		}
 
@@ -140,8 +140,8 @@ private IliasFile createFile(IliasFolder parentFolder, Element dir) {
 			final String link = dir.attr("abs:href");
 			final int fileSize = new IliasConnector().getFileSize(link);
 			final IliasFileMetaInformation metaInf = suggestMetaInformation(dir);
-			final IliasFile iliasFile = new IliasFile(name, link, parentFolder, fileSize,
-					metaInf.getSizeLabel(), metaInf.getFileExtension());
+			final IliasFile iliasFile = new IliasFile(name, link, parentFolder, fileSize, metaInf.getSizeLabel(),
+					metaInf.getFileExtension());
 			return iliasFile;
 		}
 

src/main/java/control/IliasSessionUtils.java

@@ -1,25 +1,21 @@
 package control;
 
 import java.io.*;
-import java.util.*;
-
 import org.apache.http.*;
 import org.apache.http.client.*;
 import org.apache.http.client.methods.*;
 import org.apache.http.cookie.*;
-import org.apache.http.impl.client.*;
 import org.apache.http.protocol.*;
 
 public class IliasSessionUtils {
-	public void printCookies(DefaultHttpClient client) {
+	public void printCookies(CookieStore cookieStore) {
 		int counter = 1;
 		System.out.println("----------->Cookies: " + counter + ":");
-		List<Cookie> cookies = client.getCookieStore().getCookies();
-		if (cookies.isEmpty()) {
+		if (cookieStore.getCookies().isEmpty()) {
 			System.out.println("\nNone");
 		} else {
-			for (int i = 0; i < cookies.size(); i++) {
-				System.out.println("\n- " + cookies.get(i).toString());
+			for (Cookie cookie : cookieStore.getCookies()) {
+				System.out.println("\n- " + cookie);
 			}
 		}
 		System.out.println("\n");
@@ -37,7 +33,7 @@ public static void getStatus(HttpResponse response) {
 		System.out.println("\nStatus: " + response.getStatusLine() + "\n");
 	}
 
-	public void logout() {
+	public void logout() throws IOException {
 		final String urlLogout = "https://ilias.studium.kit.edu/logout.php?lang=de";
 		final String urlLogoutIdp = "https://idp.scc.kit.edu/idp/Logout";
 		BasicHttpContext context = new BasicHttpContext();
@@ -66,6 +62,6 @@ public void logout() {
 		}
 		request.releaseConnection();
 
-		IliasManager.getInstance().getIliasClient().getConnectionManager().shutdown();
+		IliasManager.getInstance().getIliasClient().close();
 	}
 }

src/main/java/control/IliasStarter.java

@@ -26,8 +26,6 @@ public IliasStarter(Dashboard dashboard, String username, String password) {
 	}
 
 	public boolean login() {
-		KITIlias kitIlias = new KITIlias();
-		IliasManager.getInstance().setIliasPlugin(kitIlias);
 		LoginStatus loginStatusMessage = IliasManager.getInstance().login(username, password);
 		if (loginStatusMessage.equals(LoginStatus.WRONG_PASSWORD)) {
 			Platform.runLater(new Runnable() {

src/main/java/control/LocalFileStorage.java

@@ -13,8 +13,6 @@
 
 /**
  * This class stores all Files. Currently a .zip {@link IliasZip} is treated as a "File" and derives from {@link IliasFile}.
- * 
- * @author David
  *
  */
 public class LocalFileStorage {

src/main/java/control/LoginProvider.java

@@ -17,7 +17,8 @@ public class LoginProvider implements EventHandler<ActionEvent> {
 	private final RadioButton savePwd;
 	private final Dashboard dashboard;
 
-	public LoginProvider(Dashboard dashboard, TextField usernameField, PasswordField passwordField, RadioButton savePwd) {
+	public LoginProvider(Dashboard dashboard, TextField usernameField, PasswordField passwordField,
+			RadioButton savePwd) {
 		this.dashboard = dashboard;
 		this.usernameField = usernameField;
 		this.passwordField = passwordField;
@@ -31,33 +32,29 @@ public void handle(ActionEvent event) {
 		dashboard.setMenuTransparent(false);
 		dashboard.setSigInTransparent(true);
 		final String username = usernameField.getText();
-		final boolean validUsername = username.length() == 5 || username.startsWith("u");
-		if (!validUsername) {
-			toggleDashboardLoginState("Ungültiger Benutzername");
+		final String password = passwordField.getText();
+		if (password.length() < 1) {
+			toggleDashboardLoginState("Ungültiges Passwort");
 			return;
-		} else {
-			final String password = passwordField.getText();
-			if (password.length() < 1) {
-				toggleDashboardLoginState("Ungültiges Passwort");
-				return;
-			}
-			User user = Settings.getInstance().getUser();
-			if (savePwd.isSelected()) {
-				user.setName(username);
-				user.setPassword(password);
-			} else {
-				user.setName("");
-				user.setPassword("");
-			}
+		}
 
-			new Thread(new Runnable() {
-				@Override
-				public void run() {
-					new IliasStarter(dashboard, username, password).login();
-				}
-			}).start();
+		User user = Settings.getInstance().getUser();
+		if (savePwd.isSelected()) {
+			user.setName(username);
+			user.setPassword(password);
+		} else {
+			user.setName("");
+			user.setPassword("");
 		}
+
+		new Thread(new Runnable() {
+			@Override
+			public void run() {
+				new IliasStarter(dashboard, username, password).login();
+			}
+		}).start();
 	}
+
 	private void toggleDashboardLoginState(final String message) {
 		Platform.runLater(new Runnable() {
 			@Override
@@ -70,5 +67,5 @@ public void run() {
 			}
 		});
 	}
-	
-}
+
+}

src/main/java/control/VersionValidator.java

@@ -23,7 +23,7 @@ public class VersionValidator {
 
 	public boolean validate() {
 
-		DefaultHttpClient client = new DefaultHttpClient();
+		CloseableHttpClient client = HttpClientBuilder.create().build();
 		final HttpGet request = new HttpGet(
 				"https://github.com/DeOldSax/iliasDownloaderTool/releases/latest");
 		HttpResponse response = null;