| Chunk |
|---|
| Conflicting content |
|---|
return element.getDate(false);
} catch (Exception e) {
// Value not valid according to DICOM standard
<<<<<<< HEAD
LOGGER.error("Cannot parse date {}", element.toString()); //$NON-NLS-1$
return defaultValue;
=======
LOGGER.error("Cannot parse date {}", element.toString());
>>>>>>> caf21b4d573b360b1c72a144bc0b0bcff4d99638
}
}
return defaultValue; |
| Solution content |
|---|
return element.getDate(false);
} catch (Exception e) {
// Value not valid according to DICOM standard
LOGGER.error("Cannot parse date {}", element.toString());
}
}
return defaultValue; |
| File |
|---|
| DicomMediaIO.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
private final void initGUI() {
setBorder(new EmptyBorder(15, 10, 10, 10));
<<<<<<< HEAD
=======
setTitle(View2dFactory.NAME);
>>>>>>> caf21b4d573b360b1c72a144bc0b0bcff4d99638
labels.put(-100, new JLabel(Messages.getString("ViewerPrefView.low"))); //$NON-NLS-1$
labels.put(0, new JLabel(Messages.getString("ViewerPrefView.mid"))); //$NON-NLS-1$
labels.put(100, new JLabel(Messages.getString("ViewerPrefView.high"))); //$NON-NLS-1$ |
| Solution content |
|---|
private final void initGUI() {
setBorder(new EmptyBorder(15, 10, 10, 10));
labels.put(-100, new JLabel(Messages.getString("ViewerPrefView.low"))); //$NON-NLS-1$
labels.put(0, new JLabel(Messages.getString("ViewerPrefView.mid"))); //$NON-NLS-1$
labels.put(100, new JLabel(Messages.getString("ViewerPrefView.high"))); //$NON-NLS-1$ |
| File |
|---|
| ViewerPrefView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method invocation |