Hotfix for #30.

Cleanup and rebase.

Clarified a line.

Ops, my mistake!

A few minor tweaks.

Cleaned up comments and allowed for prefix search in specific namespaces.

Fixed null error.

Missed a few edits.

Author: Choco31415

src/main/java/WikiBot/ContentRep/InfoContainer.java

@@ -5,7 +5,7 @@
 /**
  * This class stores information on about an object.
  */
-class InfoContainer {
+public class InfoContainer {
 
 	protected ArrayList<String> propertyNames;
 	protected ArrayList<String> propertyValues;

src/main/java/WikiBot/Core/BotPanel.java

@@ -377,10 +377,18 @@ protected void printToConsole(String line) {
 			console.append("\n" + line);
 		}
 
-		//Move console position.
+		//Move console caret position.
 		if (console.getLineCount() > 2) {
 			try {
-				console.setCaretPosition(console.getLineEndOffset(console.getLineCount()-2)+1);
+				int lineOffset = console.getLineEndOffset(console.getLineCount()-2) + 1;
+				
+				//Move the caret.
+				try {
+					console.setCaretPosition(lineOffset);
+				} catch (IllegalArgumentException e) {
+					//If console complains about bad caret position, go somewhere we know 100% is valid.
+					console.setCaretPosition(console.getLineEndOffset(console.getLineCount() - 1));
+				}
 			} catch (BadLocationException e) {
 				e.printStackTrace();
 			}
@@ -668,27 +676,11 @@ public void actionPerformed(ActionEvent e) {
 		if (e.getSource() == logInButton) {
 			logInMenu.show(logInButton, 0, logInButton.getHeight());
 		} else if (e.getSource() == logInHomeButton) {
-			logInAt(homeWikiLanguage);
+			logInAtHome();
 		} else if (e.getSource() == logInSelectedButton) {
-			int[] index = wikiTable.getSelectedRows();
-			for (int i : index) {
-				logInAt(mdm.getWikiPrefix(i));
-			}
+			logInAtSelected();
 		} else if (e.getSource() == logInAllButton) {
-		    SwingWorker<Void, Void> worker = new SwingWorker<Void, Void>() {
-		        @Override
-		        public Void doInBackground() {
-		        	logInEverywhere();
-					
-		        	return null;
-		        }
-
-		        @Override
-		        protected void done() {
-		        }
-		    };
-
-		    worker.execute();
+			logInEverywhere();
 		} else if (e.getSource() == exitButton){
 			System.exit(0);
 		} else if (e.getSource() == printLogButton) {
@@ -755,18 +747,51 @@ protected void done() {
 	}
 
 	/*
-	 * Logging in methods
+	 * Logging in methods for GUI only.
 	 */
 
+	public void logInAtHome() {
+		ArrayList<String> languageCodes = new ArrayList<String>();
+		languageCodes.add(homeWikiLanguage);
+		logInAt(languageCodes);
+	}
+	
+	public void logInAtSelected() {
+		ArrayList<String> languageCodes = new ArrayList<String>();
+		int[] index = wikiTable.getSelectedRows();
+		for (int i : index) {
+			languageCodes.add(mdm.getWikiPrefix(i));
+		}
+		logInAt(languageCodes);
+	}
+	
 	public void logInEverywhere() {
 		logInfo("Attempting login everywhere.");
-		for (String languageCode : mdm.getWikiPrefixes()) {
-			logInAt(languageCode);
-		}
+		logInAt(mdm.getWikiPrefixes());
+	}
+	
+	private void logInAt(final ArrayList<String> languageCodes) {
+	    pushWorker = new SwingWorker<Void, Void>() {
+	        @Override
+	        public Void doInBackground() {
+			    for (String languageCode : languageCodes) {
+			    	logInAt(languageCode);
+			    }
+			    
+			    return null;
+	        }
+
+	        @Override
+	        protected void done() {
+
+	        }
+	    };
+
+	    pushWorker.execute();
 	}
 
 	private void logInAt(String languageCode) {
-		boolean success = logIn(new User(botUsername, languageCode), botPassword);
+		boolean success = logIn(new User(languageCode, botUsername), botPassword);
 
 		if (success) {
 			logInfo("Logged in at: " + languageCode);
@@ -778,4 +803,4 @@ private void logInAt(String languageCode) {
 			logWarning("Log in failed at: " + languageCode);
 		}
 	}
-}
+}

src/main/java/WikiBot/Core/GenericBot.java

@@ -912,7 +912,7 @@ public String APIcommand(APIcommand command) {
 		boolean networkError;
 		do {
 			networkError = false;//No bugs have occurred yet this loop...
-
+			
 			//Look out for network issues. Attempt the command.
 			try {
 				if (command.requiresPOST()) {

src/main/java/WikiBot/Core/NetworkingBase.java

@@ -128,12 +128,7 @@ public void logError(String line) {
 	}
 
 	public boolean log(Level level, String line) {
-		if (level.intValue() >= logLevel.intValue()) {
-			logger.log(level, line);
-			
-			return true;
-		}
-		return false;
+		return logger.log(level, line);
 	}
 
 	/**
@@ -143,7 +138,7 @@ public boolean log(Level level, String line) {
 	 * @param level The fineness level.
 	 */
 	public void setLoggerLevel(Level level) {
-		logLevel = level;
+		logger.setLoggerLevel(level);
 	}
 
 	/**
@@ -306,7 +301,7 @@ public void logCookies() {
 	    } else {
 	        for (int i = 0; i < cookies.size(); i++) {
 	            logFinest("- " + cookies.get(i).toString());
-	           }
+	        }
 	    }
 	}
 
@@ -347,4 +342,4 @@ protected String parseTextForItem(String text, String opening, String ending, in
 		i += opening.length() + bufferBot;
 		return text.substring(i, text.indexOf(ending, i) - bufferTop);
 	}
-}
+}

src/main/java/WikiBot/MediawikiData/MediawikiDataManager.java

@@ -93,6 +93,7 @@ public String getWikiURL(int index) {
 
 	public String getWikiURL(String wikiPrefix) {
 		int index = WikiPrefix.indexOf(wikiPrefix);
+		
 		return WikiURL.get(index);
 	}