| Chunk |
|---|
| Conflicting content |
|---|
=======
/** Changes the name of an item in the Window menu. */
public static synchronized void updateWindowMenuItem(String oldLabel, String newLabel) {
<<<<<<< HEAD
instance.doUpdateWindowMenuItem(oldLabel, newLabel);
}
private void doUpdateWindowMenuItem(String oldLabel, String newLabel) {
if (oldLabel.equals(newLabel))
if (oldLabel==null || oldLabel.equals(newLabel))
>>>>>>> 2929c6fbaf52f80274badb00d825c2fdaf2bd03a
return;
int first = WINDOW_MENU_ITEMS;
int last = window.getItemCount()-1; |
| Solution content |
|---|
/** Changes the name of an item in the Window menu. */
public static synchronized void updateWindowMenuItem(String oldLabel, String newLabel) {
instance.doUpdateWindowMenuItem(oldLabel, newLabel);
}
private void doUpdateWindowMenuItem(String oldLabel, String newLabel) {
if (oldLabel == null || oldLabel.equals(newLabel))
return;
int first = WINDOW_MENU_ITEMS;
int last = window.getItemCount()-1; |
| File |
|---|
| Menus.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Method signature |