Remove use of tabs in source code (#14)

Author: jhalexand

olcut-config-edn/src/test/java/com/oracle/labs/mlrg/olcut/config/edn/SerializeTest.java

@@ -72,7 +72,7 @@ public void setUp() throws IOException {
     @AfterEach
     public void tearDown() throws IOException {
         try {
-        	Files.delete(serPath);
+            Files.delete(serPath);
         }catch(Exception e) {}
     }
 

olcut-config-json/src/test/java/com/oracle/labs/mlrg/olcut/config/json/SerializeTest.java

@@ -72,7 +72,7 @@ public void setUp() throws IOException {
     @AfterEach
     public void tearDown() throws IOException {
         try {
-        	Files.delete(serPath);
+            Files.delete(serPath);
         }catch(Exception e) {}
     }
 

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/command/CommandInterface.java

@@ -42,9 +42,9 @@ public interface CommandInterface {
     /**
      * Execute the given command.
      *  
-     * @param ci	the command interpreter that invoked this command.
-     * @param args	command line arguments (just like main).
-     * @return		a command result
+     * @param ci    the command interpreter that invoked this command.
+     * @param args  command line arguments (just like main).
+     * @return      a command result
      * @throws Exception Can throw an exception.
      */
     public String execute(CommandInterpreter ci, String[] args) throws Exception;

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/command/CommandInterpreter.java

@@ -322,8 +322,8 @@ public void add(String commandName, String groupName, CommandInterface command)
     /**
      * Adds the given command to the command list.
      *
-     * @param name	the name of the command.
-     * @param command	the command to be executed.
+     * @param name     the name of the command.
+     * @param command  the command to be executed.
      *
      */
     public void add(String name, CommandInterface command) {
@@ -667,8 +667,8 @@ private String invokeMethod(Method m,
     /**
      * Adds an alias to the command
      *
-     * @param command	the name of the command.
-     * @param alias	the new alias
+     * @param command  the name of the command.
+     * @param alias    the new alias
      *
      */
     public void addAlias(String command, String alias) {
@@ -763,7 +763,7 @@ protected void onExit() {
     /**
      * Execute the given command.
      *
-     * @param args	command args, args[0] contains name of cmd.
+     * @param args  command args, args[0] contains name of cmd.
      * @return The output produced by the command.
      */
     public String execute(String[] args) {
@@ -773,7 +773,7 @@ public String execute(String[] args) {
     /**
      * Execute the given command.
      *
-     * @param args	command args, args[0] contains name of cmd.
+     * @param args  command args, args[0] contains name of cmd.
      * @return The output produced by the command.
      */
     private String execute(String[] args, boolean first) {

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/config/ConfigurationManager.java

@@ -208,7 +208,7 @@ public ConfigurationManager() throws PropertyException, ConfigLoaderException {
      * @throws ConfigLoaderException if an error occurs while loading configuration from the location
      */
     public ConfigurationManager(String path) throws PropertyException, ConfigLoaderException {
-    	this(new String[]{"-"+configFileOption.charName(),path},EMPTY_OPTIONS);
+        this(new String[]{"-"+configFileOption.charName(),path},EMPTY_OPTIONS);
     }
 
 

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/config/PropertySheet.java

@@ -820,13 +820,13 @@ public static List<Class<?>> getGenericClass(Field f) {
         if (genericType instanceof ParameterizedType) {
             ParameterizedType pt = (ParameterizedType) genericType;
             for (Type t : pt.getActualTypeArguments()) {
-            	//update the type to the raw type if appropriate
-            	if(t instanceof ParameterizedType) {
-                	t = ((ParameterizedType) t).getRawType();
+                //update the type to the raw type if appropriate
+                if(t instanceof ParameterizedType) {
+                    t = ((ParameterizedType) t).getRawType();
                 } 
-            	//not an else here.  t has been updated if the previous
-            	//condition holds.  
-            	if (t instanceof Class) {
+                //not an else here.  t has been updated if the previous
+                //condition holds.  
+                if (t instanceof Class) {
                     list.add((Class<?>)t);
                 } 
             }

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/provenance/ProvenanceUtil.java

@@ -806,47 +806,47 @@ private static Provenance unmarshalFlat(String hostProvName, FlatMarshalledProve
         }
     }
 
-	/**
-	 * This method can be used for custom implementations of the writeObject method
-	 * used for customized object serialization to facilitate the serialization of
-	 * member variables whose type is Provenancable. You should exercise extreme
-	 * caution when using this method as you are wandering into specialized usage of
-	 * java serialization which is problematic in its own right. Just because your
-	 * member satisfies the type of the first parameter does not mean it will
-	 * serialize and deserialize correctly now or in the future. Therefore, you are
-	 * advised to <b>avoid using this method</b> but if you do use it, then you
-	 * should extensively unit test code that depends on this method.
-	 * 
-	 * @param provenancable The provenancable object to serialize.
-	 * @param outputStream The output stream to write to.
-	 * @throws IOException If the stream couldn't be written to.
-	 */
-	public static void writeObject(Provenancable<? extends ConfiguredObjectProvenance> provenancable,  ObjectOutputStream outputStream) throws IOException {
-		ObjectProvenance provenance = provenancable.getProvenance();
-		outputStream.writeObject(provenance);
-	}
-
-	/**
-	 * This method can be used for custom implementations of the readObject method
-	 * used for customized object serialization. Please see the javadoc note for
-	 * {@link #writeObject(Provenancable, ObjectOutputStream)} for why you should
-	 * take extra care when deliberating whether or not to use this method.
-	 * 
-	 * @param inputStream The stream to read from.
-	 * @return The object reconstructed from it's provenance.
-	 * @throws ClassNotFoundException If the class isn't available.
-	 * @throws IOException If the stream couldn't be read.
-	 */
-	public static Provenancable<? extends ConfiguredObjectProvenance> readObject(ObjectInputStream inputStream) throws ClassNotFoundException, IOException {
-		ConfiguredObjectProvenance provenance = (ConfiguredObjectProvenance) inputStream.readObject();
-		List<ConfigurationData> configurationData = ProvenanceUtil.extractConfiguration(provenance);
-		String componentName = configurationData.get(0).getName();
-		ConfigurationManager cm = new ConfigurationManager();
-		cm.addConfiguration(configurationData);
-		@SuppressWarnings("unchecked")
-		Provenancable<ConfiguredObjectProvenance> provenancable = (Provenancable<ConfiguredObjectProvenance>) cm.lookup(componentName);
-		cm.close();
-		return provenancable;
-	}
+    /**
+     * This method can be used for custom implementations of the writeObject method
+     * used for customized object serialization to facilitate the serialization of
+     * member variables whose type is Provenancable. You should exercise extreme
+     * caution when using this method as you are wandering into specialized usage of
+     * java serialization which is problematic in its own right. Just because your
+     * member satisfies the type of the first parameter does not mean it will
+     * serialize and deserialize correctly now or in the future. Therefore, you are
+     * advised to <b>avoid using this method</b> but if you do use it, then you
+     * should extensively unit test code that depends on this method.
+     * 
+     * @param provenancable The provenancable object to serialize.
+     * @param outputStream The output stream to write to.
+     * @throws IOException If the stream couldn't be written to.
+     */
+    public static void writeObject(Provenancable<? extends ConfiguredObjectProvenance> provenancable,  ObjectOutputStream outputStream) throws IOException {
+        ObjectProvenance provenance = provenancable.getProvenance();
+        outputStream.writeObject(provenance);
+    }
+
+    /**
+     * This method can be used for custom implementations of the readObject method
+     * used for customized object serialization. Please see the javadoc note for
+     * {@link #writeObject(Provenancable, ObjectOutputStream)} for why you should
+     * take extra care when deliberating whether or not to use this method.
+     * 
+     * @param inputStream The stream to read from.
+     * @return The object reconstructed from it's provenance.
+     * @throws ClassNotFoundException If the class isn't available.
+     * @throws IOException If the stream couldn't be read.
+     */
+    public static Provenancable<? extends ConfiguredObjectProvenance> readObject(ObjectInputStream inputStream) throws ClassNotFoundException, IOException {
+        ConfiguredObjectProvenance provenance = (ConfiguredObjectProvenance) inputStream.readObject();
+        List<ConfigurationData> configurationData = ProvenanceUtil.extractConfiguration(provenance);
+        String componentName = configurationData.get(0).getName();
+        ConfigurationManager cm = new ConfigurationManager();
+        cm.addConfiguration(configurationData);
+        @SuppressWarnings("unchecked")
+        Provenancable<ConfiguredObjectProvenance> provenancable = (Provenancable<ConfiguredObjectProvenance>) cm.lookup(componentName);
+        cm.close();
+        return provenancable;
+    }
 
 }

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/util/CDateParser.java

@@ -46,7 +46,7 @@
  */
 public class CDateParser {
 
-    static long _32_bit_seconds = 0x7fffffffL * 1000L;	// largest date that fits in 32 bits
+    static long _32_bit_seconds = 0x7fffffffL * 1000L;  // largest date that fits in 32 bits
 
     LinkedList<DateFormat> dateFormats = new LinkedList<>();
 

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/util/Getopt.java

@@ -37,96 +37,96 @@
  */
 @Deprecated
 public final class Getopt {
-	private static final Logger logger = Logger.getLogger(Getopt.class.getName());
-
-	private final String[] argList;// the argument List to be parsed
-	private final String optStr;   // the string of arguments in the form "ab:" see getopt man
-	public String optArg;          // argument of an option
-	public int optInd = 0;         // index of the option
-	private int nbArgs = 0;        // number of args in the argList
-	private int optPos = 1;        // position of option letter in current argument scanned
-
-	static final int EOF = -1; // returned when no option left
-
-	public Getopt(String[] args, String opts) {
-		argList = args;
-		nbArgs = argList.length;
-		optStr = opts;
-		optInd = 0;
-		optPos = 1;
-		optArg = null;
-	}
-
-	private void optError(String msg, char optLetter) {
-		logger.warning("Getopt: " + msg + " / " + optLetter);
-	}
-
-	public int getopt() {
-		optArg = null;
-
-		// checking boundaries cases
-		if (argList == null || optStr == null) return EOF;
-		if (optInd < 0 || optInd >= nbArgs) return EOF;
-
-		// get current Arg out of the argList
-		String currentArg = argList[optInd];
-		int argLength = currentArg.length();
-
-		// checking special cases
-		// if arg starts with optLetter "a", "xyz"..
-		// if arg only 1 char in length "a", "-"
-		if (argLength <= 1 || currentArg.charAt(0) != '-') {
-			return EOF;
-		} else if (currentArg.equals("--")) { // end of options case
-			optInd++;
-			return EOF;
-		}
-
-		// get next "letter" from option argument
-		char optLetter = currentArg.charAt(optPos);
-
-		// find position of option in optStr
-		int pos = optStr.indexOf(optLetter);
-		if (pos == -1 || optLetter == ':') {
-			optError("illegal option", optLetter);
-			optLetter = '?';
-		} else { // check if option requires argument
-			if (pos < optStr.length() - 1 && optStr.charAt(pos + 1) == ':') {
-				// if remain characters after the current option in currentArg
-				if (optPos != argLength - 1) {
-					// take rest of current arg as the option argument
-					optArg = currentArg.substring(optPos + 1);
-					optPos = argLength - 1; // go to next arg below in argList
-				} else { // take next arg as optArg
-					optInd++;
-					if (optInd < nbArgs &&
-							(argList[optInd].charAt(0) != '-' ||
-									argList[optInd].length() >= 2 &&
-											(optStr.indexOf(argList[optInd].charAt(1)) == -1 ||
-													argList[optInd].charAt(1) == ':')
-							)
-							) {
-						optArg = argList[optInd];
-					} else {
-						optError("option '" + optLetter + "' requires an argument", optLetter);
-						optArg = null;
-						optLetter = '?';
-					}
-				}
-			}
-		}
-
-		// next option argument,
-		// either in currentArg or next arg in argList
-		optPos++;
-
-		// if no more option in currentArg
-		if (optPos >= argLength) {
-			optInd++;
-			optPos = 1;  // reset position of opt letter
-		}
-		return optLetter;
-	}
+    private static final Logger logger = Logger.getLogger(Getopt.class.getName());
+
+    private final String[] argList;// the argument List to be parsed
+    private final String optStr;   // the string of arguments in the form "ab:" see getopt man
+    public String optArg;          // argument of an option
+    public int optInd = 0;         // index of the option
+    private int nbArgs = 0;        // number of args in the argList
+    private int optPos = 1;        // position of option letter in current argument scanned
+
+    static final int EOF = -1; // returned when no option left
+
+    public Getopt(String[] args, String opts) {
+        argList = args;
+        nbArgs = argList.length;
+        optStr = opts;
+        optInd = 0;
+        optPos = 1;
+        optArg = null;
+    }
+
+    private void optError(String msg, char optLetter) {
+        logger.warning("Getopt: " + msg + " / " + optLetter);
+    }
+
+    public int getopt() {
+        optArg = null;
+
+        // checking boundaries cases
+        if (argList == null || optStr == null) return EOF;
+        if (optInd < 0 || optInd >= nbArgs) return EOF;
+
+        // get current Arg out of the argList
+        String currentArg = argList[optInd];
+        int argLength = currentArg.length();
+
+        // checking special cases
+        // if arg starts with optLetter "a", "xyz"..
+        // if arg only 1 char in length "a", "-"
+        if (argLength <= 1 || currentArg.charAt(0) != '-') {
+            return EOF;
+        } else if (currentArg.equals("--")) { // end of options case
+            optInd++;
+            return EOF;
+        }
+
+        // get next "letter" from option argument
+        char optLetter = currentArg.charAt(optPos);
+
+        // find position of option in optStr
+        int pos = optStr.indexOf(optLetter);
+        if (pos == -1 || optLetter == ':') {
+            optError("illegal option", optLetter);
+            optLetter = '?';
+        } else { // check if option requires argument
+            if (pos < optStr.length() - 1 && optStr.charAt(pos + 1) == ':') {
+                // if remain characters after the current option in currentArg
+                if (optPos != argLength - 1) {
+                    // take rest of current arg as the option argument
+                    optArg = currentArg.substring(optPos + 1);
+                    optPos = argLength - 1; // go to next arg below in argList
+                } else { // take next arg as optArg
+                    optInd++;
+                    if (optInd < nbArgs &&
+                            (argList[optInd].charAt(0) != '-' ||
+                                    argList[optInd].length() >= 2 &&
+                                            (optStr.indexOf(argList[optInd].charAt(1)) == -1 ||
+                                                    argList[optInd].charAt(1) == ':')
+                            )
+                            ) {
+                        optArg = argList[optInd];
+                    } else {
+                        optError("option '" + optLetter + "' requires an argument", optLetter);
+                        optArg = null;
+                        optLetter = '?';
+                    }
+                }
+            }
+        }
+
+        // next option argument,
+        // either in currentArg or next arg in argList
+        optPos++;
+
+        // if no more option in currentArg
+        if (optPos >= argLength) {
+            optInd++;
+            optPos = 1;  // reset position of opt letter
+        }
+        return optLetter;
+    }
 
 }
 

olcut-core/src/main/java/com/oracle/labs/mlrg/olcut/util/IOUtil.java

@@ -698,6 +698,6 @@ public static URI createClasspathURI(String resourcePath) throws URISyntaxExcept
     }
 
     public static String replaceBackSlashes(String path) {
-    	return path.replaceAll("\\\\", "/");
+        return path.replaceAll("\\\\", "/");
     }
 }