Projects >> nuxeo >>9ca274b3ffd984f5f2669b7b7bfdf0eda18652f4

Chunk
Conflicting content 
import java.util.concurrent.Executors;
import java.util.regex.Pattern;

<<<<<<< HEAD
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;

=======
>>>>>>> d7412295356e3f1ca2e1d473fd2df854d0a5ed6d
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
Solution content 
import java.util.concurrent.Executors;
import java.util.regex.Pattern;

import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
File
NuxeoLauncher.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.MissingArgumentException;
<<<<<<< HEAD
import org.apache.commons.cli.Option;
=======
>>>>>>> d7412295356e3f1ca2e1d473fd2df854d0a5ed6d
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
Solution content 
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.MissingArgumentException;
import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
File
NuxeoLauncher.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    protected static void initParserOptions() {
        if (launcherOptions == null) {
            launcherOptions = new Options();
<<<<<<< HEAD
            Option helpOption = OptionBuilder.withLongOpt("help").withDescription(
                    "Show detailed help").create("h");
            Option quietOption = OptionBuilder.withLongOpt("quiet").withDescription(
                    "Suppress information messages").create("q");
            Option debugOption = OptionBuilder.withLongOpt("debug").withDescription(
                    "Activate debug messages").create("d");
            Option xmlOption = OptionBuilder.withLongOpt("xml").withDescription(
                    "Output XML for mp-commands").create();
            Option jsonOption = OptionBuilder.withLongOpt("json").withDescription(
                    "Output JSON for mp-commands").create();
            Option guiOption = OptionBuilder.withLongOpt("gui").hasArg().withArgName(
                    "true|false").withDescription("Use graphical interface").create();
            launcherOptions.addOption(helpOption);
            launcherOptions.addOption(quietOption);
            launcherOptions.addOption(debugOption);
            launcherOptions.addOption(xmlOption);
            launcherOptions.addOption(jsonOption);
            launcherOptions.addOption(guiOption);
        }
    }

=======
            // help option
            OptionBuilder.withLongOpt("help");
            OptionBuilder.withDescription("Show detailed help");
            launcherOptions.addOption(OptionBuilder.create("h"));
            // Quiet option
            OptionBuilder.withLongOpt("quiet");
            OptionBuilder.withDescription("Suppress information messages");
            launcherOptions.addOption(OptionBuilder.create("q"));
            // Debug option
            OptionBuilder.withLongOpt("debug");
            OptionBuilder.withDescription("Activate debug messages");
            launcherOptions.addOption(OptionBuilder.create("d"));
            // GUI option
            OptionBuilder.withLongOpt("gui");
            OptionBuilder.hasArg();
            OptionBuilder.withArgName("true|false");
            OptionBuilder.withDescription("Use graphical interface");
            launcherOptions.addOption(OptionBuilder.create());
        }
    }

    /**
     * @since 5.6
     */
>>>>>>> d7412295356e3f1ca2e1d473fd2df854d0a5ed6d
    protected static CommandLine parseOptions(String[] args)
            throws ParseException {
        initParserOptions();
Solution content 
    protected static void initParserOptions() {
        if (launcherOptions == null) {
            launcherOptions = new Options();
            // help option
            OptionBuilder.withLongOpt("help");
            OptionBuilder.withDescription("Show detailed help");
            launcherOptions.addOption(OptionBuilder.create("h"));
            // Quiet option
            OptionBuilder.withLongOpt("quiet");
            OptionBuilder.withDescription("Suppress information messages");
            launcherOptions.addOption(OptionBuilder.create("q"));
            // Debug option
            OptionBuilder.withLongOpt("debug");
            OptionBuilder.withDescription("Activate debug messages");
            launcherOptions.addOption(OptionBuilder.create("d"));
            // XML option
            OptionBuilder.withLongOpt("xml");
            OptionBuilder.withDescription("Output XML for mp-commands");
            launcherOptions.addOption(OptionBuilder.create());
            // JSON option
            OptionBuilder.withLongOpt("json");
            OptionBuilder.withDescription("Output JSON for mp-commands");
            launcherOptions.addOption(OptionBuilder.create());
            // GUI option
            OptionBuilder.withLongOpt("gui");
            OptionBuilder.hasArg();
            OptionBuilder.withArgName("true|false");
            OptionBuilder.withDescription("Use graphical interface");
            launcherOptions.addOption(OptionBuilder.create());
        }
    }

    /**
     * @since 5.6
     */
    protected static CommandLine parseOptions(String[] args)
            throws ParseException {
        initParserOptions();
File
NuxeoLauncher.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable