Merge branch 'sorry' into 'master'

Minor formatting fixes and bugs.

See merge request !417

code/moya-database/src/main/java/fi/codecrew/moya/model/LanguageAwareString.java

@@ -2,6 +2,7 @@ package fi.codecrew.moya.model;
 
 
 
 
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Map;
 
 
 public class LanguageAwareString {
 public class LanguageAwareString {
@@ -9,7 +10,6 @@ public class LanguageAwareString {
 	private Map<String, String> values = new HashMap<>();
 	private Map<String, String> values = new HashMap<>();
 
 
 
 
-
 	public String getValue(String language) {
 	public String getValue(String language) {
 		if (values.isEmpty()) {
 		if (values.isEmpty()) {
 			return null;
 			return null;
@@ -20,12 +20,16 @@ public class LanguageAwareString {
 			ret = values.get(defaultLanguage);
 			ret = values.get(defaultLanguage);
 			// If everything else fails, get a random entry from the map.
 			// If everything else fails, get a random entry from the map.
 			if (ret == null) {
 			if (ret == null) {
-				ret = values.get(0);
+				Iterator<String> rndIter = values.values().iterator();
+				if (rndIter.hasNext()) {
+					ret = rndIter.next();
+				}
 			}
 			}
 		}
 		}
 		return ret;
 		return ret;
 	}
 	}
-	public String getDefaultValue(){
+
+	public String getDefaultValue() {
 		return getValue(defaultLanguage);
 		return getValue(defaultLanguage);
 	}
 	}
 
 

code/moya-web/src/main/java/fi/codecrew/moya/cmdline/ICommandlineCommand.java

@@ -16,11 +16,11 @@
  * future versions of the Software. 
  * future versions of the Software. 
  * 
  * 
  */
  */
-package fi.codecrew.moya.cmdline;
-
+package fi.codecrew.moya.cmdline;
+
 import java.io.InputStreamReader;
 import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-
-public interface ICommandlineCommand {
-	public int execute(String[] argv, InputStreamReader stdin, OutputStreamWriter stdout, OutputStreamWriter errstream);
-}
+import java.io.OutputStreamWriter;
+
+public interface ICommandlineCommand {
+	int execute(String[] argv, InputStreamReader stdin, OutputStreamWriter stdout, OutputStreamWriter errstream);
+}