| Chunk |
|---|
| Conflicting content |
|---|
private LooksFrame looksFrame;
private JCheckBox singleInstance;
private CustomJButton installService;
<<<<<<< HEAD
private JLabel currentLanguage = new JLabel();
=======
private JCheckBox showSplashScreen;
>>>>>>> 1be8a2af9e65ef1d259b59e4145837ec1d1c40ad
GeneralTab(PmsConfiguration configuration, LooksFrame looksFrame) {
this.configuration = configuration; |
| Solution content |
|---|
private LooksFrame looksFrame;
private JCheckBox singleInstance;
private CustomJButton installService;
private JCheckBox showSplashScreen;
private JLabel currentLanguage = new JLabel();
GeneralTab(PmsConfiguration configuration, LooksFrame looksFrame) {
this.configuration = configuration; |
| File |
|---|
| GeneralTab.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
<<<<<<< HEAD
configuration.setSortMethod(kcbm.getSelectedKey());
LOGGER.info("Setting {} {}", Messages.getRootString("FoldTab.18"), kcbm.getSelectedValue());
=======
try {
configuration.setSortMethod(Integer.parseInt((String) kcbm.getSelectedKey()));
} catch (NumberFormatException nfe) {
LOGGER.debug("Could not parse sort method from \"" + kcbm.getSelectedKey() + "\"");
}
>>>>>>> 1be8a2af9e65ef1d259b59e4145837ec1d1c40ad
}
}
}); |
| Solution content |
|---|
@Override
public void itemStateChanged(ItemEvent e) {
if (e.getStateChange() == ItemEvent.SELECTED) {
configuration.setSortMethod(kcbm.getSelectedKey());
LOGGER.info("Setting {} {}", Messages.getRootString("FoldTab.18"), kcbm.getSelectedValue());
}
}
}); |
| File |
|---|
| NavigationShareTab.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Try statement |