11 modified files
lcio/src/java/hep/lcio/util
diff -u -r1.13 -r1.14
--- CommandLineTool.java 22 Jul 2006 23:17:58 -0000 1.13
+++ CommandLineTool.java 7 Dec 2006 00:47:32 -0000 1.14
@@ -61,7 +61,7 @@
* FIXME: Implement all of the above commands.
*
* @author jeremym
- * @version $Id: CommandLineTool.java,v 1.13 2006/07/22 23:17:58 jeremy Exp $
+ * @version $Id: CommandLineTool.java,v 1.14 2006/12/07 00:47:32 jeremy Exp $
*/
public class CommandLineTool
{
@@ -74,7 +74,7 @@
/**
* Get an instance of CommandLineTool.
- * @return A globall unique instance of CommandLineTool.
+ * @return A global unique instance of CommandLineTool.
*/
public static CommandLineTool instance()
{
lcio/src/java/hep/lcio/util
diff -u -r1.1 -r1.2
--- CompareCommandHandler.java 2 Jun 2006 23:48:34 -0000 1.1
+++ CompareCommandHandler.java 7 Dec 2006 00:47:32 -0000 1.2
@@ -17,7 +17,7 @@
* CommandHandler for the compare command.
*
* @author jeremym
- * @version $Id: CompareCommandHandler.java,v 1.1 2006/06/02 23:48:34 jeremy Exp $
+ * @version $Id: CompareCommandHandler.java,v 1.2 2006/12/07 00:47:32 jeremy Exp $
*/
public class CompareCommandHandler extends CommandHandler
{
@@ -41,8 +41,11 @@
private static Options createCompareOptions()
{
Options options = new Options();
+
+ Option opt = new Option("h", false, "Print compare usage.");
+ options.addOption(opt);
- Option opt = new Option("f", false, "Add a file to compare (Must have at least 2).");
+ opt = new Option("f", false, "Add a file to compare (Must have at least 2).");
opt.setArgs(1);
options.addOption(opt);
@@ -68,8 +71,14 @@
public void parse(String[] argv) throws Exception
{
CommandLine cl = parser.parse(options, argv);
+
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
String f[] = cl.getOptionValues("f");
+
if (f != null && f.length >= 2)
{
for (int i = 0; i < f.length; i++)
@@ -77,7 +86,17 @@
files.add(new File(f[i]));
}
}
- else
+
+ if (cl.getArgList() != null)
+ {
+ for (Object o : cl.getArgList())
+ {
+ String s = (String)o;
+ files.add(new File(s));
+ }
+ }
+
+ if ( files.size() == 0 )
{
printUsage(true);
}
lcio/src/java/hep/lcio/util
diff -u -r1.2 -r1.3
--- ConcatenateCommandHandler.java 2 Jun 2006 00:22:57 -0000 1.2
+++ ConcatenateCommandHandler.java 7 Dec 2006 00:47:32 -0000 1.3
@@ -15,7 +15,7 @@
* Command-line handling for concat command.
*
* @author jeremym
- * @version $Id: ConcatenateCommandHandler.java,v 1.2 2006/06/02 00:22:57 jeremy Exp $
+ * @version $Id: ConcatenateCommandHandler.java,v 1.3 2006/12/07 00:47:32 jeremy Exp $
*/
public class ConcatenateCommandHandler extends CommandHandler
{
@@ -39,7 +39,10 @@
{
Options options = new Options();
- Option opt = new Option("i",false,"Add an input file.");
+ Option opt = new Option("h", false, "Print concat usage.");
+ options.addOption(opt);
+
+ opt = new Option("f",false,"Add an input file.");
opt.setArgs(1);
options.addOption(opt);
@@ -47,7 +50,7 @@
opt.setArgs(1);
options.addOption(opt);
- opt = new Option("f", false,"List of input files, 1 per line.");
+ opt = new Option("i", false,"List of input files, 1 per line.");
opt.setArgs(1);
options.addOption(opt);
@@ -71,16 +74,15 @@
{
CommandLine cl = parser.parse(options, argv);
- // One of '-i' or '-f' is required.
- if (!cl.hasOption("i") && !cl.hasOption("f"))
+ if ( cl.hasOption("h") )
{
printUsage(true);
- }
-
+ }
+
// Add individual files.
- if (cl.hasOption("i"))
+ if (cl.hasOption("f"))
{
- String[] infilepaths = cl.getOptionValues("i");
+ String[] infilepaths = cl.getOptionValues("f");
for (int i=0; i<infilepaths.length; i++)
{
infiles.add(new File(infilepaths[i]));
@@ -88,9 +90,9 @@
}
// Add list of files.
- if (cl.hasOption("f"))
+ if (cl.hasOption("i"))
{
- String[] infilelists = cl.getOptionValues("f");
+ String[] infilelists = cl.getOptionValues("i");
for (int i=0; i<infilelists.length; i++)
{
List lines = FileUtil.loadFile(infilelists[i]);
@@ -102,6 +104,21 @@
}
}
+ // Interpret extra arguments as input files.
+ if (cl.getArgList() != null)
+ {
+ for (Object o : cl.getArgList())
+ {
+ String s = (String)o;
+ infiles.add(new File(s));
+ }
+ }
+
+ if ( infiles.size() == 0 )
+ {
+ printUsage(true);
+ }
+
// Set output file name.
if (cl.hasOption("o"))
{
lcio/src/java/hep/lcio/util
diff -u -r1.2 -r1.3
--- HeaderCountCommandHandler.java 11 Nov 2006 00:59:40 -0000 1.2
+++ HeaderCountCommandHandler.java 7 Dec 2006 00:47:32 -0000 1.3
@@ -12,7 +12,7 @@
* Command line handling for the count command.
*
* @author jeremym
- * @version $Id: HeaderCountCommandHandler.java,v 1.2 2006/11/11 00:59:40 jeremy Exp $
+ * @version $Id: HeaderCountCommandHandler.java,v 1.3 2006/12/07 00:47:32 jeremy Exp $
*/
public class HeaderCountCommandHandler extends CommandHandler
{
@@ -36,7 +36,10 @@
{
Options options = new Options();
- Option opt = new Option("r", false, "Print number of run headers.");
+ Option opt = new Option("h", false, "Print count usage.");
+ options.addOption(opt);
+
+ opt = new Option("r", false, "Print number of run headers.");
options.addOption(opt);
opt = new Option("e", false, "Print number of event headers.");
@@ -59,6 +62,11 @@
{
CommandLine cl = parser.parse(options, argv);
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
if (cl.hasOption("r"))
{
printRun = true;
lcio/src/java/hep/lcio/util
diff -u -r1.7 -r1.8
--- MergeCommandHandler.java 3 Nov 2006 08:41:26 -0000 1.7
+++ MergeCommandHandler.java 7 Dec 2006 00:47:32 -0000 1.8
@@ -20,7 +20,7 @@
* passes the results to a method from MergeUtil.
*
* @author jeremym
- * @version $Id: MergeCommandHandler.java,v 1.7 2006/11/03 08:41:26 jeremy Exp $
+ * @version $Id: MergeCommandHandler.java,v 1.8 2006/12/07 00:47:32 jeremy Exp $
*/
public class MergeCommandHandler extends CommandHandler
{
@@ -51,12 +51,15 @@
private static Options createMergeOptions()
{
Options options = new Options();
-
- Option opt = new Option("o", false, "Set the output file.");
+
+ Option opt = new Option("h", false, "Print merge usage.");
+ options.addOption(opt);
+
+ opt = new Option("o", false, "Set the output file.");
opt.setArgs(1);
options.addOption(opt);
-
- opt = new Option("i", false, "Add an input file.");
+
+ opt = new Option("f", false, "Add an input file.");
opt.setArgs(1);
options.addOption(opt);
@@ -76,8 +79,8 @@
opt.setArgs(1);
options.addOption(opt);
- opt = new Option("f", true, "Set input file list with format:\n[file_name],[n_reads_per_event],[start_time],[delta_time]\n" +
- "This option is not usable with the -i argument.");
+ opt = new Option("i", true, "Set input file list with format:\n[file_name],[n_reads_per_event],[start_time],[delta_time]\n" +
+ "This option is not usable with the -f argument.");
opt.setArgs(1);
options.addOption(opt);
@@ -92,6 +95,11 @@
{
CommandLine cl = parser.parse(options, argv);
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
// Must have at least one of -i or -f.
if (!cl.hasOption("i") && !cl.hasOption("f"))
{
@@ -107,13 +115,13 @@
}
// Read a file containing comma-delimited list of fname and nreads.
- if (cl.hasOption("f"))
+ if (cl.hasOption("i"))
{
mergeFiles = createMergeFiles(FileUtil.loadFile(cl.getOptionValue("f")));
}
// Add input files one-by-one.
- if (cl.hasOption("i"))
+ if (cl.hasOption("f"))
{
// Create input file array.
infiles = FileUtil.createFiles(cl.getOptionValues("i"));
@@ -121,7 +129,7 @@
// Create default merge files.
mergeFiles = createDefaultMergeFiles(infiles);
}
-
+
// Output file.
if (cl.hasOption("o"))
{
lcio/src/java/hep/lcio/util
diff -u -r1.2 -r1.3
--- PrintCommandHandler.java 26 Oct 2006 18:38:32 -0000 1.2
+++ PrintCommandHandler.java 7 Dec 2006 00:47:32 -0000 1.3
@@ -24,7 +24,10 @@
{
Options options = new Options();
- Option opt = new Option("f",true, "Set the LCIO file to dump.");
+ Option opt = new Option("h", false, "Print print command usage.");
+ options.addOption(opt);
+
+ opt = new Option("f",true, "Set the LCIO file to dump.");
opt.setArgs(1);
options.addOption(opt);
@@ -46,6 +49,11 @@
public void parse(String[] argv) throws Exception
{
CommandLine cl = parser.parse(options, argv);
+
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
if (cl.hasOption("f"))
{
lcio/src/java/hep/lcio/util
diff -u -r1.1 -r1.2
--- RandomEventCommandHandler.java 7 Jun 2006 22:32:34 -0000 1.1
+++ RandomEventCommandHandler.java 7 Dec 2006 00:47:33 -0000 1.2
@@ -14,7 +14,7 @@
* CommandHandler for the random command.
*
* @author jeremym
- * @version $Id: RandomEventCommandHandler.java,v 1.1 2006/06/07 22:32:34 jeremy Exp $
+ * @version $Id: RandomEventCommandHandler.java,v 1.2 2006/12/07 00:47:33 jeremy Exp $
*/
public class RandomEventCommandHandler extends CommandHandler
{
@@ -36,7 +36,10 @@
{
Options options = new Options();
- Option opt = new Option("o", true, "Set the LCIO output file name.");
+ Option opt = new Option("h", false, "Print random usage.");
+ options.addOption(opt);
+
+ opt = new Option("o", true, "Set the LCIO output file name.");
opt.setArgs(1);
options.addOption(opt);
@@ -74,7 +77,12 @@
{
CommandLine cl = parser.parse(options, argv);
- String fname = "randomevents";
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
+ String fname = "random_events";
if (cl.hasOption("o"))
{
fname = cl.getOptionValue("o");
lcio/src/java/hep/lcio/util
diff -u -r1.1 -r1.2
--- SIODumpCommandHandler.java 2 Jun 2006 00:22:57 -0000 1.1
+++ SIODumpCommandHandler.java 7 Dec 2006 00:47:33 -0000 1.2
@@ -20,7 +20,7 @@
* Command-line handling for Tony's SIODump utility.
*
* @author jeremym
- * @version $Id: SIODumpCommandHandler.java,v 1.1 2006/06/02 00:22:57 jeremy Exp $
+ * @version $Id: SIODumpCommandHandler.java,v 1.2 2006/12/07 00:47:33 jeremy Exp $
*/
public class SIODumpCommandHandler extends CommandHandler
{
@@ -44,7 +44,10 @@
{
Options options = new Options();
- Option opt = new Option("f", false, "Set the input LCIO file.");
+ Option opt = new Option("h", false, "Print siodump usage.");
+ options.addOption(opt);
+
+ opt = new Option("f", false, "Set the input LCIO file.");
opt.setArgs(1);
options.addOption(opt);
@@ -110,10 +113,15 @@
{
CommandLine cl = parser.parse(options, argv);
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
if (cl.hasOption("f"))
{
inputfile = new File(cl.getOptionValue("f"));
- }
+ }
else
{
printUsage(true);
lcio/src/java/hep/lcio/util
diff -u -r1.3 -r1.4
--- SplitCommandHandler.java 2 Jun 2006 00:22:57 -0000 1.3
+++ SplitCommandHandler.java 7 Dec 2006 00:47:33 -0000 1.4
@@ -13,7 +13,7 @@
* Command-line handler for the split utility.
*
* @author Jeremy McCormick
- * @version $Id: SplitCommandHandler.java,v 1.3 2006/06/02 00:22:57 jeremy Exp $
+ * @version $Id: SplitCommandHandler.java,v 1.4 2006/12/07 00:47:33 jeremy Exp $
*/
public class SplitCommandHandler extends CommandHandler
{
@@ -36,7 +36,10 @@
{
Options options = new Options();
- Option opt = new Option("i", true, "The input LCIO file.");
+ Option opt = new Option("h", false, "Print split usage.");
+ options.addOption(opt);
+
+ opt = new Option("i", true, "The input LCIO file.");
opt.setArgs(1);
options.addOption(opt);
@@ -56,6 +59,11 @@
{
CommandLine cl = parser.parse(options, argv);
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
if (!cl.hasOption("i") || !cl.hasOption("n"))
{
printUsage(true);
lcio/src/java/hep/lcio/util
diff -u -r1.1 -r1.2
--- StdhepConvertCommandHandler.java 28 Jun 2006 23:25:17 -0000 1.1
+++ StdhepConvertCommandHandler.java 7 Dec 2006 00:47:33 -0000 1.2
@@ -22,7 +22,10 @@
{
Options options = new Options();
- Option opt = new Option("i", true, "Input Stdhep file.");
+ Option opt = new Option("h", false, "Print stdhep usage.");
+ options.addOption(opt);
+
+ opt = new Option("i", true, "Input Stdhep file.");
opt.setArgs(1);
options.addOption(opt);
@@ -36,7 +39,12 @@
public void parse(String[] argv) throws Exception
{
CommandLine cl = parser.parse(options, argv);
-
+
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
if (cl.hasOption("i"))
{
infile = new File(cl.getOptionValue("i"));
lcio/src/java/hep/lcio/util
diff -u -r1.1 -r1.2
--- ValidateCommandHandler.java 28 Jun 2006 18:31:55 -0000 1.1
+++ ValidateCommandHandler.java 7 Dec 2006 00:47:33 -0000 1.2
@@ -12,7 +12,7 @@
* Command-line handler for the validate utility.
*
* @author Jeremy McCormick
- * @version $Id: ValidateCommandHandler.java,v 1.1 2006/06/28 18:31:55 jeremy Exp $
+ * @version $Id: ValidateCommandHandler.java,v 1.2 2006/12/07 00:47:33 jeremy Exp $
*/
public class ValidateCommandHandler extends CommandHandler
{
@@ -35,7 +35,10 @@
{
Options options = new Options();
- Option opt = new Option("f", true, "Add an LCIO file to validate.");
+ Option opt = new Option("h", false, "Print validate usage.");
+ options.addOption(opt);
+
+ opt = new Option("f", true, "Add an LCIO file to validate.");
opt.setArgs(1);
options.addOption(opt);
@@ -61,6 +64,11 @@
{
CommandLine cl = parser.parse(options, argv);
+ if ( cl.hasOption("h") )
+ {
+ printUsage(true);
+ }
+
if (cl.hasOption("f"))
{
String files[] = cl.getOptionValues("f");
@@ -69,7 +77,18 @@
infiles.add(new File(files[i]));
}
}
- else {
+
+ // Interpret extra arguments as input files.
+ if (cl.getArgList() != null)
+ {
+ for (Object o : cl.getArgList())
+ {
+ String s = (String)o;
+ infiles.add(new File(s));
+ }
+ }
+
+ if ( infiles.size() == 0 ) {
printUsage(true);
}
CVSspam 0.2.8