You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/03/31 20:57:13 UTC
cvs commit: avalon-sandbox/merlin/merlin-cli/src/java Merlin.java
bloritsch 2003/03/31 10:57:13
Modified: merlin/merlin-cli/src/java Merlin.java
Log:
fix some style issues--Statics should be accessed as Statics
Revision Changes Path
1.2 +17 -21 avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java
Index: Merlin.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-cli/src/java/Merlin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Merlin.java 13 Mar 2003 01:04:58 -0000 1.1
+++ Merlin.java 31 Mar 2003 18:57:13 -0000 1.2
@@ -49,33 +49,29 @@
*/
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.util.Properties;
-import java.util.Date;
-import java.util.List;
+import java.io.IOException;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.Map;
+import java.util.Date;
import java.util.Hashtable;
+import java.util.List;
import java.util.Locale;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
+import java.util.Map;
+import org.apache.avalon.excalibur.i18n.ResourceManager;
+import org.apache.avalon.excalibur.i18n.Resources;
+import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.BasicParser;
+import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.CommandLine;
-
-import org.apache.avalon.excalibur.i18n.ResourceManager;
-import org.apache.avalon.excalibur.i18n.Resources;
/**
* Merlin commandline bootstrap handler.
@@ -558,7 +554,7 @@
"Unable to locate a block defintion relative to the paths: " + file;
throw new IllegalArgumentException( error );
}
-
+/* NEVER USED
private static File getProfile( File home, CommandLine command ) throws IOException
{
boolean flag = false;
@@ -591,7 +587,7 @@
throw new FileNotFoundException( error );
}
}
-
+*/
/**
* Return the directory to be used as the working home directory. If no command line
* argument is supplied, the home directory defaults to the directory derived from
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org