Author: [log in to unmask]
Date: Sun Feb 28 16:37:22 2016
New Revision: 4263
Log:
[HPSJAVA-660] Revert DefaultParser back to deprecated PosixParser (new parser does not accept spaces before arguments).
Modified:
java/trunk/analysis/src/main/java/org/hps/analysis/plots/AddPlots.java
java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java
java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
java/trunk/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java
java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java
java/trunk/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java
java/trunk/crawler/src/main/java/org/hps/crawler/MetadataWriter.java
java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java
java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java
java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java
java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java
java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java
java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java
java/trunk/tracking/src/main/java/org/hps/svt/alignment/MillepedeCompactDump.java
java/trunk/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java
java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java
java/trunk/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java
java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java
java/trunk/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java
java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java
java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java
java/trunk/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java
java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java
java/trunk/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java
Modified: java/trunk/analysis/src/main/java/org/hps/analysis/plots/AddPlots.java
=============================================================================
--- java/trunk/analysis/src/main/java/org/hps/analysis/plots/AddPlots.java (original)
+++ java/trunk/analysis/src/main/java/org/hps/analysis/plots/AddPlots.java Sun Feb 28 16:37:22 2016
@@ -15,7 +15,7 @@
import java.util.logging.Logger;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.lcsim.util.aida.AIDA;
@@ -43,7 +43,7 @@
}
public static void main(String[] args) throws Exception {
- CommandLine cl = new DefaultParser().parse(OPTIONS, args);
+ CommandLine cl = new PosixParser().parse(OPTIONS, args);
if (cl.getArgList().isEmpty()) {
throw new RuntimeException("No input AIDA files to add.");
}
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/AbstractCommand.java Sun Feb 28 16:37:22 2016
@@ -1,7 +1,7 @@
package org.hps.conditions.cli;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
@@ -32,7 +32,7 @@
/**
* The parser for the options.
*/
- private final DefaultParser parser = new DefaultParser();
+ private final PosixParser parser = new PosixParser();
/**
* Class constructor.
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/cli/CommandLineTool.java Sun Feb 28 16:37:22 2016
@@ -11,7 +11,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
@@ -79,7 +79,7 @@
/**
* The options parser.
*/
- private final DefaultParser parser = new DefaultParser();
+ private final PosixParser parser = new PosixParser();
/**
* Exit with the given status.
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/MotorPositionLoader.java Sun Feb 28 16:37:22 2016
@@ -16,7 +16,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
/**
* Load SVT motor positions from a MYA dump, figure out time ranges (same position for > 10 seconds), and then convert
@@ -195,7 +195,7 @@
*/
void run(final String args[]) {
- final DefaultParser parser = new DefaultParser();
+ final PosixParser parser = new PosixParser();
CommandLine cl = null;
try {
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtBiasConditionsLoader.java Sun Feb 28 16:37:22 2016
@@ -23,7 +23,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.conditions.api.ConditionsRecord;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.run.RunRange;
@@ -176,7 +176,7 @@
// options.addOption(new Option("b", true, "beam current file"));
options.addOption(new Option("s", false, "Show plots"));
- final CommandLineParser parser = new DefaultParser();
+ final CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java
=============================================================================
--- java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java (original)
+++ java/trunk/conditions/src/main/java/org/hps/conditions/svt/SvtConditionsLoader.java Sun Feb 28 16:37:22 2016
@@ -8,7 +8,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.conditions.api.ConditionsRecord;
import org.hps.conditions.api.TableMetaData;
import org.hps.conditions.database.DatabaseConditionsManager;
@@ -60,7 +60,7 @@
final Options options = setupCommandLineOptions();
// Parse the command line arguments
- final CommandLineParser parser = new DefaultParser();
+ final CommandLineParser parser = new PosixParser();
final CommandLine commandLine;
try {
commandLine = parser.parse(options, args);
Modified: java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java
=============================================================================
--- java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/DatacatAddFile.java Sun Feb 28 16:37:22 2016
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
@@ -55,7 +55,7 @@
/**
* The options parser.
*/
- private final DefaultParser parser = new DefaultParser();
+ private final PosixParser parser = new PosixParser();
/**
* Parse command line options.
Modified: java/trunk/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java
=============================================================================
--- java/trunk/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/DatacatCrawler.java Sun Feb 28 16:37:22 2016
@@ -13,7 +13,7 @@
import java.util.logging.Logger;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
@@ -83,7 +83,7 @@
/**
* The options parser.
*/
- private final DefaultParser parser = new DefaultParser();
+ private final PosixParser parser = new PosixParser();
/**
* Parse command line options.
Modified: java/trunk/crawler/src/main/java/org/hps/crawler/MetadataWriter.java
=============================================================================
--- java/trunk/crawler/src/main/java/org/hps/crawler/MetadataWriter.java (original)
+++ java/trunk/crawler/src/main/java/org/hps/crawler/MetadataWriter.java Sun Feb 28 16:37:22 2016
@@ -9,7 +9,7 @@
import java.util.logging.Logger;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
@@ -39,7 +39,7 @@
private MetadataWriter parse(final String[] args) {
try {
- final CommandLine cl = new DefaultParser().parse(OPTIONS, args);
+ final CommandLine cl = new PosixParser().parse(OPTIONS, args);
// Print help.
if (cl.hasOption("h") || args.length == 0) {
Modified: java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java Sun Feb 28 16:37:22 2016
@@ -8,7 +8,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.record.evio.EvioEventUtilities;
import org.hps.record.triggerbank.AbstractIntData.IntBankDefinition;
import org.hps.record.triggerbank.HeadBankData;
@@ -33,7 +33,7 @@
if (args.length == 0) {
printUsage(options);
}
- final CommandLineParser parser = new DefaultParser();
+ final CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java
=============================================================================
--- java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java (original)
+++ java/trunk/monitoring-app/src/main/java/org/hps/monitoring/application/Main.java Sun Feb 28 16:37:22 2016
@@ -8,7 +8,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.monitoring.application.model.Configuration;
/**
@@ -29,7 +29,7 @@
final Options options = new Options();
options.addOption(new Option("h", false, "Print help."));
options.addOption(new Option("c", true, "Load a properties file with configuration parameters."));
- final CommandLineParser parser = new DefaultParser();
+ final CommandLineParser parser = new PosixParser();
// Parse command line arguments.
final CommandLine cl;
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventSkimmer.java Sun Feb 28 16:37:22 2016
@@ -14,7 +14,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.jlab.coda.jevio.EventWriter;
import org.jlab.coda.jevio.EvioEvent;
import org.jlab.coda.jevio.EvioReader;
@@ -51,7 +51,7 @@
*/
public static void main(String[] args) {
- DefaultParser parser = new DefaultParser();
+ PosixParser parser = new PosixParser();
CommandLine commandLine = null;
try {
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java Sun Feb 28 16:37:22 2016
@@ -16,7 +16,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.jlab.coda.et.EtAttachment;
import org.jlab.coda.et.EtConstants;
import org.jlab.coda.et.EtEvent;
@@ -195,7 +195,7 @@
public void run(final String[] args) {
// Command line parser.
- final DefaultParser parser = new DefaultParser();
+ final PosixParser parser = new PosixParser();
try {
Modified: java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java
=============================================================================
--- java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java (original)
+++ java/trunk/run-database/src/main/java/org/hps/run/database/RunDatabaseCommandLine.java Sun Feb 28 16:37:22 2016
@@ -4,7 +4,7 @@
import java.net.URISyntaxException;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
@@ -119,7 +119,7 @@
*/
private RunDatabaseCommandLine parse(final String args[]) {
try {
- final CommandLine cl = new DefaultParser().parse(OPTIONS, args);
+ final CommandLine cl = new PosixParser().parse(OPTIONS, args);
// Print help and exit.
if (cl.hasOption("h") || args.length == 0) {
Modified: java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildCompact.java Sun Feb 28 16:37:22 2016
@@ -23,7 +23,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.jdom.Document;
import org.jdom.Element;
@@ -156,7 +156,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/svt/alignment/BuildMillepedeCompact.java Sun Feb 28 16:37:22 2016
@@ -29,7 +29,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.recon.tracking.CoordinateTransformations;
import org.jdom.Attribute;
import org.jdom.DataConversionException;
@@ -85,7 +85,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/tracking/src/main/java/org/hps/svt/alignment/MillepedeCompactDump.java
=============================================================================
--- java/trunk/tracking/src/main/java/org/hps/svt/alignment/MillepedeCompactDump.java (original)
+++ java/trunk/tracking/src/main/java/org/hps/svt/alignment/MillepedeCompactDump.java Sun Feb 28 16:37:22 2016
@@ -15,7 +15,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
@@ -54,7 +54,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/jeremym/EvioFileScanner.java Sun Feb 28 16:37:22 2016
@@ -28,7 +28,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.ConnectionParameters;
import org.hps.record.evio.EvioEventConstants;
import org.hps.record.evio.EvioEventUtilities;
@@ -484,7 +484,7 @@
final Set<Integer> acceptRuns = new HashSet<Integer>();
- final DefaultParser parser = new DefaultParser();
+ final PosixParser parser = new PosixParser();
boolean printSummary = false;
Modified: java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/FilterMCBunches.java Sun Feb 28 16:37:22 2016
@@ -17,7 +17,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.RawCalorimeterHit;
@@ -70,7 +70,7 @@
public static void main(String[] args) {
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/trunk/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/MergeMCBunches.java Sun Feb 28 16:37:22 2016
@@ -13,7 +13,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.event.EventHeader;
import org.lcsim.event.MCParticle;
import org.lcsim.event.SimCalorimeterHit;
@@ -49,7 +49,7 @@
public static void main(String[] args) {
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
// Parse command line arguments.
CommandLine cl = null;
@@ -191,4 +191,4 @@
throw new RuntimeException(e);
}
}
-}
+}
Modified: java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/meeg/SvtChargeIntegrator.java Sun Feb 28 16:37:22 2016
@@ -12,7 +12,7 @@
import java.util.logging.Logger;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
@@ -50,7 +50,7 @@
options.addOption(new Option("t", false, "use TI timestamp instead of Unix time (higher precision, but requires TI time offset in run DB)"));
options.addOption(new Option("c", false, "get TI time offset from CSV log file instead of run DB"));
- final CommandLineParser parser = new DefaultParser();
+ final CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/omoreno/LheToStdhep.java Sun Feb 28 16:37:22 2016
@@ -15,7 +15,7 @@
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
@@ -58,7 +58,7 @@
String stdhepFileName = "output.stdhep";
// Instantiate te command line parser
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
// Create the Options
// TODO: Add ability to parse list of files.
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/dataMCPlots.java Sun Feb 28 16:37:22 2016
@@ -25,7 +25,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.util.aida.AIDA;
/**
@@ -93,7 +93,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cmd=null;
try {
cmd = parser.parse(opts, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/ecalPlots.java Sun Feb 28 16:37:22 2016
@@ -19,7 +19,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
/**
*
@@ -72,7 +72,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cmd=null;
try {
cmd = parser.parse(opts, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/testrun/trigRate.java Sun Feb 28 16:37:22 2016
@@ -17,7 +17,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
/**
*
@@ -73,7 +73,7 @@
help.printHelp(" ", options);
System.exit(1);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/DumpAIDATextFiles.java Sun Feb 28 16:37:22 2016
@@ -21,7 +21,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
/**
*
@@ -116,7 +116,7 @@
help.printHelp(" ", options);
System.exit(1);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/tools/mergeSimpleAIDA.java Sun Feb 28 16:37:22 2016
@@ -20,7 +20,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.util.aida.AIDA;
/**
@@ -52,7 +52,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
CommandLine cmd = null;
try {
cmd = parser.parse(opts, args);
Modified: java/trunk/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java
=============================================================================
--- java/trunk/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java (original)
+++ java/trunk/util/src/main/java/org/hps/util/CalculateAcceptanceFromMadGraph.java Sun Feb 28 16:37:22 2016
@@ -21,7 +21,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.fit.helicaltrack.HelixParamCalculator;
public class CalculateAcceptanceFromMadGraph {
@@ -165,7 +165,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java
=============================================================================
--- java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java (original)
+++ java/trunk/util/src/main/java/org/hps/util/ConvertToStdhep.java Sun Feb 28 16:37:22 2016
@@ -31,7 +31,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.detector.IRotation3D;
import org.lcsim.detector.RotationGeant;
@@ -95,7 +95,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
// Parse command line arguments.
CommandLine cl = null;
Modified: java/trunk/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java
=============================================================================
--- java/trunk/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java (original)
+++ java/trunk/util/src/main/java/org/hps/util/DumpLHEEventsToASCII.java Sun Feb 28 16:37:22 2016
@@ -26,7 +26,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.DefaultParser;
+import org.apache.commons.cli.PosixParser;
import org.lcsim.detector.IRotation3D;
import org.lcsim.detector.RotationGeant;
@@ -89,7 +89,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new DefaultParser();
+ CommandLineParser parser = new PosixParser();
// Parse command line arguments.
CommandLine cl = null;
