26 import com.nokia.mj.impl.installer.storagehandler.SuiteInfo; |
26 import com.nokia.mj.impl.installer.storagehandler.SuiteInfo; |
27 import com.nokia.mj.impl.installer.utils.InstallerException; |
27 import com.nokia.mj.impl.installer.utils.InstallerException; |
28 import com.nokia.mj.impl.installer.utils.Log; |
28 import com.nokia.mj.impl.installer.utils.Log; |
29 import com.nokia.mj.impl.installer.utils.PlatformUid; |
29 import com.nokia.mj.impl.installer.utils.PlatformUid; |
30 import com.nokia.mj.impl.utils.exception.ExceptionBase; |
30 import com.nokia.mj.impl.utils.exception.ExceptionBase; |
|
31 import com.nokia.mj.impl.utils.ErrorMessageBase; |
31 import com.nokia.mj.impl.utils.InstallerErrorMessage; |
32 import com.nokia.mj.impl.utils.InstallerErrorMessage; |
32 import com.nokia.mj.impl.utils.Tokenizer; |
33 import com.nokia.mj.impl.utils.Tokenizer; |
33 import com.nokia.mj.impl.utils.Uid; |
34 import com.nokia.mj.impl.utils.Uid; |
34 |
35 |
35 import java.util.Enumeration; |
36 import java.util.Enumeration; |
435 /** |
436 /** |
436 * Adds error codes to the result message. |
437 * Adds error codes to the result message. |
437 */ |
438 */ |
438 private void addErrorCodes(ExceptionBase aEb) |
439 private void addErrorCodes(ExceptionBase aEb) |
439 { |
440 { |
440 addValue(NAME_ERROR_CATEGORY, |
441 if (aEb.getShortMessageId() >= ErrorMessageBase.INSTALLER_RANGE_START && |
441 SifRegistrator.getErrorCategory(aEb.getShortMessageId())); |
442 aEb.getShortMessageId() <= ErrorMessageBase.INSTALLER_RANGE_END) |
442 addValue(NAME_ERROR_CODE, |
443 { |
443 aEb.getShortMessageId()*1000 + aEb.getDetailedMessageId()); |
444 addValue(NAME_ERROR_CATEGORY, |
|
445 SifRegistrator.getErrorCategory(aEb.getShortMessageId())); |
|
446 addValue(NAME_ERROR_CODE, |
|
447 aEb.getShortMessageId() + aEb.getDetailedMessageId()); |
|
448 } |
|
449 else if (aEb.getShortMessageId() >= ErrorMessageBase.SECURITY_RANGE_START && |
|
450 aEb.getShortMessageId() <= ErrorMessageBase.SECURITY_RANGE_END) |
|
451 { |
|
452 addValue(NAME_ERROR_CATEGORY, |
|
453 SifRegistrator.getErrorCategory( |
|
454 InstallerErrorMessage.INST_AUTHORIZATION_ERR)); |
|
455 addValue(NAME_ERROR_CODE, |
|
456 aEb.getShortMessageId() + aEb.getDetailedMessageId()); |
|
457 } |
|
458 else |
|
459 { |
|
460 addValue(NAME_ERROR_CATEGORY, |
|
461 SifRegistrator.getErrorCategory( |
|
462 InstallerErrorMessage.INST_UNEXPECTED_ERR)); |
|
463 addValue(NAME_ERROR_CODE, |
|
464 aEb.getShortMessageId()*1000 + aEb.getDetailedMessageId()); |
|
465 } |
444 } |
466 } |
445 } |
467 } |