Author: [log in to unmask]
Date: Tue Nov 3 14:07:06 2015
New Revision: 3936
Log:
Change use of deprecated PosixParser from apache cli to DefaultParser for all command line tools.
Modified:
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/DatacatCrawler.java
java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.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/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/DumpAIDATextFiles.java
java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java
java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java
java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.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/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 Tue Nov 3 14:07:06 2015
@@ -1,11 +1,10 @@
package org.hps.conditions.cli;
import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.Parser;
-import org.apache.commons.cli.PosixParser;
import org.hps.conditions.database.DatabaseConditionsManager;
/**
@@ -33,7 +32,7 @@
/**
* The parser for the options.
*/
- private final Parser parser = new PosixParser();
+ private final DefaultParser parser = new DefaultParser();
/**
* 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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
@@ -80,7 +80,7 @@
/**
* The options parser.
*/
- private final PosixParser parser = new PosixParser();
+ private final DefaultParser parser = new DefaultParser();
/**
* 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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
* 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 PosixParser parser = new PosixParser();
+ final DefaultParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -30,7 +30,7 @@
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.api.ConditionsRecord;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.conditions.run.RunRange;
@@ -183,7 +183,7 @@
options.addOption(new Option("b", true, "beam current file"));
options.addOption(new Option("s", false, "Show plots"));
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ final CommandLineParser parser = new DefaultParser();
final CommandLine commandLine;
try {
commandLine = parser.parse(options, args);
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 Tue Nov 3 14:07:06 2015
@@ -24,7 +24,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.datacat.client.DatacatClient;
import org.hps.datacat.client.DatacatClientFactory;
import org.hps.datacat.client.DatasetFileFormat;
@@ -165,7 +165,7 @@
/**
* The options parser.
*/
- private final PosixParser parser = new PosixParser();
+ private final DefaultParser parser = new DefaultParser();
/**
* Throw an exception if the path doesn't exist in the data catalog or it is not a folder.
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ final CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/EvioToLcio.java Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.freehep.record.source.NoSuchRecordException;
import org.hps.conditions.database.DatabaseConditionsManager;
import org.hps.job.JobManager;
@@ -255,7 +255,7 @@
if (args.length == 0) {
this.printUsage();
}
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ final CommandLineParser parser = new DefaultParser();
// 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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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) {
- PosixParser parser = new PosixParser();
+ DefaultParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser parser = new PosixParser();
+ final DefaultParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -15,7 +15,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.conditions.database.ConnectionParameters;
import org.hps.datacat.client.DatacatClient;
import org.hps.datacat.client.DatacatClientFactory;
@@ -187,7 +187,7 @@
*/
RunDatabaseCommandLine parse(final String args[]) {
try {
- final CommandLine cl = new PosixParser().parse(OPTIONS, args);
+ final CommandLine cl = new DefaultParser().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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.jdom.Document;
import org.jdom.Element;
@@ -156,7 +156,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.hps.recon.tracking.CoordinateTransformations;
import org.jdom.Attribute;
import org.jdom.DataConversionException;
@@ -83,7 +83,7 @@
printHelpAndExit(options);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser parser = new PosixParser();
+ final DefaultParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ CommandLineParser parser = new DefaultParser();
// 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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
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 Tue Nov 3 14:07:06 2015
@@ -15,7 +15,7 @@
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.apache.commons.csv.CSVFormat;
import org.apache.commons.csv.CSVParser;
import org.apache.commons.csv.CSVRecord;
@@ -64,7 +64,7 @@
// options.addOption(new Option("b", true, "beam current file"));
// options.addOption(new Option("s", false, "Show plots"));
- final CommandLineParser parser = new PosixParser();
+ final CommandLineParser parser = new DefaultParser();
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Create the Options
// TODO: Add ability to parse list of files.
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/DumpAIDATextFiles.java Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
*
@@ -116,7 +116,7 @@
help.printHelp(" ", options);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
cl = parser.parse(options, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/dataMCPlots.java Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.util.aida.AIDA;
/**
@@ -93,7 +93,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cmd=null;
try {
cmd = parser.parse(opts, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/ecalPlots.java Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
*
@@ -72,7 +72,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cmd=null;
try {
cmd = parser.parse(opts, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/mergeSimpleAIDA.java Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.util.aida.AIDA;
/**
@@ -52,7 +52,7 @@
help.printHelp(" ", opts);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cmd = null;
try {
cmd = parser.parse(opts, args);
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/trigRate.java Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
/**
*
@@ -73,7 +73,7 @@
help.printHelp(" ", options);
System.exit(1);
}
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
CommandLine cl = null;
try {
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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
import org.lcsim.fit.helicaltrack.HelixParamCalculator;
public class CalculateAcceptanceFromMadGraph {
@@ -165,7 +165,7 @@
// Set up command line parsing.
Options options = createCommandLineOptions();
- CommandLineParser parser = new PosixParser();
+ CommandLineParser parser = new DefaultParser();
// 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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ CommandLineParser parser = new DefaultParser();
// 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 Tue Nov 3 14:07:06 2015
@@ -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.PosixParser;
+import org.apache.commons.cli.DefaultParser;
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 PosixParser();
+ CommandLineParser parser = new DefaultParser();
// Parse command line arguments.
CommandLine cl = null;
