- * Helper class that provides methods to simplify working with arrays. - *
- * - * @author Steffen Herbold - * @version 1.0 - */ final public class ArrayTools { - + /** *- * Private constructor to prevent initializing of the class. - *
- */ - private ArrayTools() { - - } - - /** - *- * Finds the first occurrence of an object inside an array. + * Finds the first occurence of an object inside an array. *
*- * In case {@code other==null}, the first occurrence of a {@code null} value - * in the array is returned. + * In case {@code other==null}, the first occurence of a {@code null} value in the array is returned. *
- * - * @param array - * the array - * @param other - * the object + * + * @param array the array + * @param other the object * @return index of the object if found, -1 otherwise */ public static int findIndex(Object[] array, Object other) { int retVal = -1; - for (int i = 0; i < array.length && retVal == -1; i++) { - if (other != null) { - if (array[i] != null && array[i].equals(other)) { + for( int i=0 ; i- * Finds the lowest element in an array. If multiple elements have the - * minimal value, the index of the first one is returned; null-values are - * ignored. In case the parameter array is null, has length 0 or contains - * only null-values, -1 is returned. - *
- * - * @param- * Helper class that provides methods that simplify working with files. - *
- * - * @author Steffen Herbold - * @version 1.0 - */ -public class FileTools { - - /** - *- * Private constructor to prevent initializing of the class. - *
- */ - private FileTools() { - - } - - /** - *- * Returns an array of the lines contained in a file. The line separator is - * {@link StringTools#ENDLINE}. - *
- * - * @param filename - * name of the file - * @return string array, where each line contains a file - * @throws IOException - * see {@link FileReader#read(char[])}, - * {@link FileReader#close()} - * @throws FileNotFoundException - * see {@link FileReader#FileReader(File)} - */ - public static String[] getLinesFromFile(String filename) - throws IOException, FileNotFoundException { - boolean carriageReturn = true; - if( StringTools.ENDLINE.equals("\n") ) { - carriageReturn = false; - } - return getLinesFromFile(filename, carriageReturn); - } - - /** - *- * Returns an array of the lines contained in a file. - *
- * - * @param filename - * name of the file - * @param carriageReturn - * if true, "\r\n", if false "\n" is used as line separator - * @return string array, where each line contains a file - * @throws IOException - * see {@link FileReader#read(char[])}, - * {@link FileReader#close()} - * @throws FileNotFoundException - * see {@link FileReader#FileReader(File)} - */ - public static String[] getLinesFromFile(String filename, - boolean carriageReturn) throws IOException, FileNotFoundException { - File f = new File(filename); - FileInputStream fis = new FileInputStream(f); - InputStreamReader reader = new InputStreamReader(fis, - Charset.defaultCharset()); - char[] buffer = new char[(int) f.length()]; - reader.read(buffer); - reader.close(); - String splitString; - if (carriageReturn) { - splitString = "\r\n"; - } else { - splitString = "\n"; - } - return (new String(buffer)).split(splitString); - } - -} Index: trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java =================================================================== --- trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java (revision 425) +++ trunk/JavaHelperLib/src/de/ugoe/cs/util/StringTools.java (revision 1) @@ -1,52 +1,27 @@ package de.ugoe.cs.util; -/** - *- * Helper class that provides methods to simplify working with {@link String}s. - *
- * - * @author Steffen Herbold - * @version 1.0 - */ final public class StringTools { + public final static String ENDLINE = System.getProperty("line.separator"); + /** *- * Private constructor to prevent initializing of the class. - *
- */ - private StringTools() { - - } - - /** - *- * Simplifies use of operation system specific line separators. - *
- */ - public final static String ENDLINE = System.getProperty("line.separator"); - - /** - *- * Replaces all occurrences of {@literal &, <, >, ', and "} with their - * respective XML entities {@literal &, <, >, ', and "} + * Replaces all occurences of {@literal &, <, >, ', and "} with their + * respective XML entites {@literal &, <, >, ', and "} * without destroying already existing entities. *
* * @param str - * String where the XML entities are to be replaced - * @return new String, where the XML entities are used instead of the + * String where the XML entites are to be replaced + * @return new String, where the XML entites are used instead of the * literals */ public static String xmlEntityReplacement(String str) { String result = str; - if (result != null && !"".equals(result)) { - result = result - .replaceAll("&(?!(?:lt|gt|apos|quot|amp);)", "&"); - result = result.replaceAll("<", "<"); - result = result.replaceAll(">", ">"); - result = result.replaceAll("'", "'"); - result = result.replaceAll("\"", """); - } + result = result.replaceAll("&(?!(?:lt|gt|apos|quot|amp);)", "&"); + result = result.replaceAll("<", "<"); + result = result.replaceAll(">", ">"); + result = result.replaceAll("'", "'"); + result = result.replaceAll("\"", """); return result; } Index: trunk/JavaHelperLib/src/de/ugoe/cs/util/console/Command.java =================================================================== --- trunk/JavaHelperLib/src/de/ugoe/cs/util/console/Command.java (revision 425) +++ trunk/JavaHelperLib/src/de/ugoe/cs/util/console/Command.java (revision 1) @@ -11,5 +11,4 @@ * * @author Steffen Herbold - * @version 1.0 */ public interface Command { Index: trunk/JavaHelperLib/src/de/ugoe/cs/util/console/CommandExecuter.java =================================================================== --- trunk/JavaHelperLib/src/de/ugoe/cs/util/console/CommandExecuter.java (revision 425) +++ trunk/JavaHelperLib/src/de/ugoe/cs/util/console/CommandExecuter.java (revision 1) @@ -4,4 +4,5 @@ import java.util.ArrayList; import java.util.List; + /** @@ -13,9 +14,8 @@ * *- * This class is implemented as a Singleton. + * This class is implemented as a Singleton. *
* * @author Steffen Herbold - * @version 1.0 */ public class CommandExecuter { @@ -34,5 +34,5 @@ */ private static final String cmdPrefix = "CMD"; - + /** *@@ -48,6 +48,6 @@ *
*- * The de.ugoe.cs.util.console.defaultcommands package has always lowest - * priority, unless it is specifically added. + * The defaultcommands package has always lowest priority, unless it is + * specificially added. *
*/ @@ -78,18 +78,11 @@ /** *- * Adds a package that will be used by {@link #exec(String)} to load command - * from. + * Adds a package that will be used by exec to load command from. *
* * @param pkg * package where commands are located - * @throws InvalidParameterException - * thrown if the package name is null or empty string */ public void addCommandPackage(String pkg) { - if ("".equals(pkg) || pkg == null) { - throw new InvalidParameterException( - "package name must not be null or empty string"); - } commandPackageList.add(pkg); } @@ -114,15 +107,12 @@ */ public void exec(String command) { - Console.commandNotification(command); Command cmd = null; CommandParser parser = new CommandParser(); parser.parse(command); for (int i = 0; cmd == null && i < commandPackageList.size(); i++) { - cmd = loadCMD(commandPackageList.get(i) + "." + cmdPrefix - + parser.getCommandName()); + cmd = loadCMD(commandPackageList.get(i)+"."+cmdPrefix+parser.getCommandName()); } if (cmd == null) { // check if command is available as default command - cmd = loadCMD(defaultPackage + "." + cmdPrefix - + parser.getCommandName()); + cmd = loadCMD(defaultPackage+"."+cmdPrefix+parser.getCommandName()); } if (cmd == null) { @@ -138,12 +128,8 @@ /** - ** Helper method that loads a class and tries to cast it to {@link Command}. - *
* - * @param className - * qualified name of the class (including package name) - * @return if class is available and implement {@link Command} and instance - * of the class, null otherwise + * @param className qualified name of the class (including package name) + * @return if class is available and implement {@link Command} and instance of the class, null otherwise */ private Command loadCMD(String className) { @@ -154,7 +140,6 @@ } catch (NoClassDefFoundError e) { String[] splitResult = e.getMessage().split("CMD"); - String correctName = splitResult[splitResult.length - 1].replace( - ")", ""); - Console.println("Did you mean " + correctName + "?"); + String correctName = splitResult[splitResult.length-1].replace(")", ""); + Console.traceln("Did you mean " + correctName + "?"); } catch (ClassNotFoundException e) { } catch (IllegalAccessException e) { Index: trunk/JavaHelperLib/src/de/ugoe/cs/util/console/CommandParser.java =================================================================== --- trunk/JavaHelperLib/src/de/ugoe/cs/util/console/CommandParser.java (revision 425) +++ trunk/JavaHelperLib/src/de/ugoe/cs/util/console/CommandParser.java (revision 1) @@ -10,5 +10,4 @@ * * @author Steffen Herbold - * @version 1.0 */ public class CommandParser { @@ -55,5 +54,5 @@ * * - * @return {@link List} of parameters that were parsed. + * @return */ public List