package de.oppermann.pomutils.commands;

import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.ParameterException;

import de.oppermann.pomutils.select.SelectionStrategy;

public class SelectionStrategyConverter implements IStringConverter<SelectionStrategy> {

	@Override
	public SelectionStrategy convert(String value) {
		if (value == null) {
			return SelectionStrategy.OUR;
		}

		try {
			return SelectionStrategy.valueOf(value.toUpperCase());
		} catch (IllegalArgumentException e) {
			throw new ParameterException("--select must be one of 'our', 'their', or 'prompt'");
		}
	}

}

package de.oppermann.pomutils.commands;

import com.beust.jcommander.IStringConverter;
import com.beust.jcommander.ParameterException;

import de.oppermann.pomutils.select.SelectionStrategy;

public class SelectionStrategyConverter implements IStringConverter<SelectionStrategy> {

	@Override
	public SelectionStrategy convert(String value) {
		if (value == null) {
			return SelectionStrategy.OUR;
		}

		try {
			return SelectionStrategy.valueOf(value.toUpperCase());
		} catch (IllegalArgumentException e) {
			throw new ParameterException("--select must be one of 'ours', 'theirs', or 'prompt'");
		}
	}

}

--- 
+++ 
@@ -16,7 +16,7 @@
 		try {
 			return SelectionStrategy.valueOf(value.toUpperCase());
 		} catch (IllegalArgumentException e) {
-			throw new ParameterException("--select must be one of 'ours', 'theirs', or 'prompt'");
+			throw new ParameterException("--select must be one of 'our', 'their', or 'prompt'");
 		}
 	}
 
Fix error message for illegal select value
