--- a/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.button/src/com/nokia/carbide/cpp/pi/button/BupEventMapManager.java	Tue Apr 20 14:41:43 2010 +0300
+++ b/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.button/src/com/nokia/carbide/cpp/pi/button/BupEventMapManager.java	Wed Apr 21 15:14:16 2010 +0300
@@ -226,7 +226,7 @@
 			MapEntry entry = keyCodeMap.get(keyCode);	// support override of mapping
 			if (entry == null) {
 				entry = new MapEntry();
-				keyCodeMap.put(new Integer(keyCode), entry);
+				keyCodeMap.put(Integer.valueOf(keyCode), entry);
 			}
 			entry.enumString = enumString;
 			entry.label = label;
@@ -235,7 +235,7 @@
 		public void removeMapping(int keyCode) {
 			MapEntry entry = keyCodeMap.get(keyCode);
 			if (entry != null) {
-				keyCodeMap.remove(new Integer(keyCode));
+				keyCodeMap.remove(Integer.valueOf(keyCode));
 			}
 		}