| Chunk |
|---|
| Conflicting content |
|---|
String messageStr = Messages.getMessage("doxygen_utf_exception_detail.error_message");
logger.error(messageStr);
logger.error(e1.getMessage(), e1);
<<<<<<< HEAD
util.showWarningMessage(getMainFrame(), messageStr);
} catch (XmlParsingException e1) {
util.showWarningMessage(getMainFrame(), Messages.getMessage("doxygen_encoding_exception.error_message",e1.getMessage()));
logger.error(e1.getMessage(), e1);
=======
util.showWarningMessage(getMainFrame(), getMessageString(messageStr, e1.getMessage()));
>>>>>>> 43a500b0dce30d4d6daaf070d0bbd17a41538ae8
} catch (Throwable e1) {
String messageStr = Messages.getMessage("doxygen_parse_exception_detail.error_message");
logger.error(messageStr); |
| Solution content |
|---|
String messageStr = Messages.getMessage("doxygen_utf_exception_detail.error_message");
logger.error(messageStr);
logger.error(e1.getMessage(), e1);
util.showWarningMessage(getMainFrame(), messageStr);
} catch (XmlParsingException e1) {
util.showWarningMessage(getMainFrame(), Messages.getMessage("doxygen_encoding_exception.error_message",e1.getMessage()));
logger.error(e1.getMessage(), e1);
} catch (Throwable e1) {
String messageStr = Messages.getMessage("doxygen_parse_exception_detail.error_message");
logger.error(messageStr); |
| File |
|---|
| CPlusReverseFileChooserDialog.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Catch clause |
| Method invocation |