Projects >> args4j >>6964adf46e56cccc479e115a564492062d535295

Chunk
Conflicting content
        // Parse the metadata and create the setters
        new ClassParser().parse(bean,this);

<<<<<<< HEAD
        if (parserProperties.optionSorter()!=null) {
            Collections.sort(options, parserProperties.optionSorter());
        }
=======
        // for display purposes, we like the arguments in argument order, but the options in alphabetical order
        Collections.sort(options, new Comparator() {
            public int compare(OptionHandler o1, OptionHandler o2) {
                return o1.option.toString().compareTo(o2.option.toString());
            }
        });
>>>>>>> 1f3b557606dc292e1588f565926e74197a4e5f8d
    }

    /** This method is similar to {@code Objects.requireNonNull()}.
Solution content
        // Parse the metadata and create the setters
        new ClassParser().parse(bean,this);

        if (parserProperties.optionSorter()!=null) {
            Collections.sort(options, parserProperties.optionSorter());
        }
    }

    /** This method is similar to {@code Objects.requireNonNull()}.
File
CmdLineParser.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation