| Chunk |
|---|
| Conflicting content |
|---|
/**
* This event is used by AutoTester.
*/
public static final int AUTOTESTER_EVENT = 53;
<<<<<<< HEAD
/**
* This event is sent when the display hardware state is changed.
*/
public static final int DISPLAY_DEVICE_STATE_CHANGED_EVENT = 54;
/**
* Notification sent by ODT agent indicating that it has installed a new
* MIDlet suite.
*/
public static final int MIDP_ODD_SUITE_INSTALLED_EVENT = 55;
/**
* Notification sent by ODT agent indicating that it has removed
* an installed MIDlet suite.
*/
public static final int MIDP_ODD_SUITE_REMOVED_EVENT = 56;
/**
* Major ID for a request to restart a MIDlet event.
*/
public static final int RESTART_MIDLET_EVENT = 57;
/**
* This event is used for show or hide java virtual keyboard
*/
public static final int VIRTUAL_KEYBOARD_EVENT = 58;
/**
* This event is sent by a native code to the Java installer to
* enable or disable OCSP check.
*/
public static final int NATIVE_ENABLE_OCSP_REQUEST = 59;
/**
* This event is sent by a native code to the Java installer to
* check if OCSP is currently enabled.
*/
public static final int NATIVE_CHECK_OCSP_ENABLED_REQUEST = 60;
/**
* This event is sent by a native code to InstallerPeerMIDlet
* to unblock the installer thread waiting for a user's answer.
*/
public static final int NATIVE_UNBLOCK_INSTALLER = 61;
/**
* This event is used for change current locale
*/
public static final int CHANGE_LOCALE_EVENT = 62;
/**
* JSR290 Fluid listener notification event
*/
public static final int FLUID_EVENT = 63;
/**
* JSR290 DOM object finalize notification event
*/
public static final int DOM_FINALIZE_EVENT = 64;
/**
* This event is sent on RMS storage changing to
* asynchronously notify registered RMS listeners
*/
public static final int RECORD_STORE_CHANGE_EVENT = 65;
/**
* This event is sent to AMS task when asynchronous notification
* of record store changes can not be delivered to listener task
* during predefined timeout period
*/
public static final int RECORD_STORE_FAILED_NOTIFICATION_EVENT = 66;
/**
* This event is sent when the clamshell state is changed.
*/
public static final int DISPLAY_CLAMSHELL_STATE_CHANGED_EVENT = 67;
/**
* Request to AMS to terminate all running midlets from the given suite.
*/
public static final int MIDP_KILL_MIDLETS_EVENT = 68;
/**
* Notification sent by AMS to inform the listeners that
* the midlets from the given suite were killed.
*/
public static final int MIDP_MIDLETS_KILLED_EVENT = 69;
* Request to exit a running midlet from the debug agent to AMS.
*/
public static final int MIDP_ODD_EXIT_MIDLET_EVENT = 70;
=======
/**
* Request invalidation from outside LCDUI
*/
public static final int REQUEST_INVALIDATE_EVENT = 54;
>>>>>>> bb008849e226096b4d8cb3031c2c7f40a9c85356
} |
| Solution content |
|---|
* This event is used by AutoTester.
*/
public static final int AUTOTESTER_EVENT = 53;
/**
* This event is sent when the display hardware state is changed.
*/
public static final int DISPLAY_DEVICE_STATE_CHANGED_EVENT = 54;
/**
* Notification sent by ODT agent indicating that it has installed a new
* MIDlet suite.
*/
public static final int MIDP_ODD_SUITE_INSTALLED_EVENT = 55;
/**
* Notification sent by ODT agent indicating that it has removed
* an installed MIDlet suite.
*/
public static final int MIDP_ODD_SUITE_REMOVED_EVENT = 56;
/**
* Major ID for a request to restart a MIDlet event.
*/
public static final int RESTART_MIDLET_EVENT = 57;
/**
* This event is used for show or hide java virtual keyboard
*/
public static final int VIRTUAL_KEYBOARD_EVENT = 58;
/**
* This event is sent by a native code to the Java installer to
* enable or disable OCSP check.
*/
public static final int NATIVE_ENABLE_OCSP_REQUEST = 59;
/**
* This event is sent by a native code to the Java installer to
* check if OCSP is currently enabled.
*/
public static final int NATIVE_CHECK_OCSP_ENABLED_REQUEST = 60;
/**
* This event is sent by a native code to InstallerPeerMIDlet
* to unblock the installer thread waiting for a user's answer.
*/
public static final int NATIVE_UNBLOCK_INSTALLER = 61;
/**
* This event is used for change current locale
*/
public static final int CHANGE_LOCALE_EVENT = 62;
/**
* JSR290 Fluid listener notification event
*/
public static final int FLUID_EVENT = 63;
/**
* JSR290 DOM object finalize notification event
*/
public static final int DOM_FINALIZE_EVENT = 64;
/**
* This event is sent on RMS storage changing to
* asynchronously notify registered RMS listeners
*/
public static final int RECORD_STORE_CHANGE_EVENT = 65;
/**
* This event is sent to AMS task when asynchronous notification
* of record store changes can not be delivered to listener task
* during predefined timeout period
*/
public static final int RECORD_STORE_FAILED_NOTIFICATION_EVENT = 66;
/**
* This event is sent when the clamshell state is changed.
*/
public static final int DISPLAY_CLAMSHELL_STATE_CHANGED_EVENT = 67;
/**
* Request to AMS to terminate all running midlets from the given suite.
*/
public static final int MIDP_KILL_MIDLETS_EVENT = 68;
/**
* Notification sent by AMS to inform the listeners that
* the midlets from the given suite were killed.
*/
/**
public static final int MIDP_MIDLETS_KILLED_EVENT = 69;
* Request to exit a running midlet from the debug agent to AMS.
*/
public static final int MIDP_ODD_EXIT_MIDLET_EVENT = 70;
/**
* Request invalidation from outside LCDUI
*/
public static final int REQUEST_INVALIDATE_EVENT = 71;
} |
| File |
|---|
| EventTypes.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
eventQueue.registerEventListener(EventTypes.PEN_EVENT, this);
eventQueue.registerEventListener(EventTypes.COMMAND_EVENT, this);
eventQueue.registerEventListener(EventTypes.PEER_CHANGED_EVENT, this);
<<<<<<< HEAD
eventQueue.registerEventListener(EventTypes.ROTATION_EVENT,this);
eventQueue.registerEventListener(EventTypes.DISPLAY_DEVICE_STATE_CHANGED_EVENT,this);
eventQueue.registerEventListener(EventTypes.DISPLAY_CLAMSHELL_STATE_CHANGED_EVENT,this);
eventQueue.registerEventListener(EventTypes.VIRTUAL_KEYBOARD_EVENT,this);
eventQueue.registerEventListener(EventTypes.CHANGE_LOCALE_EVENT,this);
=======
eventQueue.registerEventListener(EventTypes.ROTATION_EVENT, this);
eventQueue.registerEventListener(EventTypes.REQUEST_INVALIDATE_EVENT, this);
>>>>>>> bb008849e226096b4d8cb3031c2c7f40a9c85356
}
/** |
| Solution content |
|---|
eventQueue.registerEventListener(EventTypes.PEN_EVENT, this);
eventQueue.registerEventListener(EventTypes.COMMAND_EVENT, this);
eventQueue.registerEventListener(EventTypes.PEER_CHANGED_EVENT, this);
eventQueue.registerEventListener(EventTypes.ROTATION_EVENT, this);
eventQueue.registerEventListener(EventTypes.DISPLAY_DEVICE_STATE_CHANGED_EVENT,this);
eventQueue.registerEventListener(EventTypes.DISPLAY_CLAMSHELL_STATE_CHANGED_EVENT,this);
eventQueue.registerEventListener(EventTypes.VIRTUAL_KEYBOARD_EVENT,this);
eventQueue.registerEventListener(EventTypes.CHANGE_LOCALE_EVENT,this);
eventQueue.registerEventListener(EventTypes.REQUEST_INVALIDATE_EVENT, this);
}
/** |
| File |
|---|
| DisplayEventListener.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
"unknown system event (" +
event.getType() + ")");
}
<<<<<<< HEAD
=======
} else {
dc.handleKeyEvent(
nativeEvent.intParam1,
nativeEvent.intParam2);
}
return;
case EventTypes.PEN_EVENT:
dc.handlePointerEvent(
nativeEvent.intParam1,
nativeEvent.intParam2,
nativeEvent.intParam3);
return;
case EventTypes.COMMAND_EVENT:
dc.handleCommandEvent(
/* nativeEvent.intParamX - will contain screenId */
nativeEvent.intParam1);
return;
case EventTypes.PEER_CHANGED_EVENT:
dc.handlePeerStateChangeEvent(
nativeEvent.intParam1,
nativeEvent.intParam2,
nativeEvent.intParam3,
nativeEvent.intParam5);
return;
case EventTypes.ROTATION_EVENT:
dc.handleRotationEvent();
return;
case EventTypes.REQUEST_INVALIDATE_EVENT:
dc.handleInvalidateEvent();
return;
default:
if (Logging.REPORT_LEVEL <= Logging.WARNING) {
Logging.report(Logging.WARNING, LogChannels.LC_CORE,
"unknown system event (" +
event.getType() + ")");
}
>>>>>>> bb008849e226096b4d8cb3031c2c7f40a9c85356
}
}
} |
| Solution content |
|---|
"unknown system event (" +
event.getType() + ")");
}
}
}
} |
| File |
|---|
| DisplayEventListener.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Case statement |
| If statement |
| Method invocation |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
space,
itemLFs));
<<<<<<< HEAD
itemLFs[i].lGetContentSize(itemLFs[i].lGetContentBounds(),itemLFs[i].bounds[WIDTH] + space);
=======
//itemLFs[i].lGetContentSize(itemLFs[i].contentBounds,itemLFs[i].bounds[WIDTH] + space);
>>>>>>> bb008849e226096b4d8cb3031c2c7f40a9c85356
|
| Solution content |
|---|
space,
itemLFs));
itemLFs[i].lGetContentSize(itemLFs[i].lGetContentBounds(),itemLFs[i].bounds[WIDTH] + space);
|
| File |
|---|
| LayoutManager.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |