FCL/sf/app/jrt: comparison javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/InstallerResultMessage.java

equal deleted inserted replaced

-:7cee158cb8cd
+:26b2b12093af
 package com.nokia.mj.impl.installer;
 import com.nokia.mj.impl.comms.CommsEndpoint;
 import com.nokia.mj.impl.comms.CommsMessage;
 import com.nokia.mj.impl.installer.applicationregistrator.SifNotifier;
-import com.nokia.mj.impl.installer.applicationregistrator.SifRegistrator;
 import com.nokia.mj.impl.installer.storagehandler.ApplicationInfo;
 import com.nokia.mj.impl.installer.storagehandler.SuiteInfo;
 import com.nokia.mj.impl.installer.utils.InstallerException;
 import com.nokia.mj.impl.installer.utils.Log;
 import com.nokia.mj.impl.installer.utils.PlatformUid;
 import com.nokia.mj.impl.utils.exception.ExceptionBase;
-import com.nokia.mj.impl.utils.ErrorMessageBase;
 import com.nokia.mj.impl.utils.InstallerErrorMessage;
 import com.nokia.mj.impl.utils.Tokenizer;
 import com.nokia.mj.impl.utils.Uid;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 /**
 * InstallerResultMessage contains information about install, uninstall
-* and componentinfo operation results. JavaInstaller sends it at the end
+* and componentinfo operations. It is sent to Comms endpoint specified
-* of operation to Comms endpoint specified at JavaInstaller startup with
+* at JavaInstaller startup.
-* -commsresult option.
-* <p>
-* InstallerResultMessage contains name-value pairs: name is a string,
-* value can be either a string or an int. Message syntax:
-* <p>
-* <pre>
-* message := length named_int_value* length named_string_value*
-* named_int_value := name int_value
-* named_string_value := name string_value
-* name := &lt;string&gt;
-* int_value := &lt;int&gt;
-* string_value := &lt;string&gt;
-* length := &lt;int telling the length of the table that follows&gt;
-* </pre>
-* <p>
 */
 public class InstallerResultMessage
 {
-/** Operation type. Value type: int.
-Possible values: 0: install, 1: uninstall, 2: componentinfo. */
 public static final String NAME_OPERATION = "operation";
-/** Status code indicating operation result. Value type: int. */
 public static final String NAME_RESULT = "result";
-/** SIF error category. Value type: int. */
 public static final String NAME_ERROR_CATEGORY = "error-category";
-/** Java runtime specific error code. Value type: int. */
-public static final String NAME_ERROR_CODE = "error-code";
-/** Localized error message. Value type: string. */
 public static final String NAME_ERROR_MSG = "error-message";
-/** Localized message with more details of the error reason. Value type: string. */
 public static final String NAME_ERROR_DETAILS = "error-details";
-/** Suite UID. Value type: int. */
 public static final String NAME_SUITE_UID = "suite-uid";
-/** Midlet-n UID. Value type: int. */
 public static final String NAME_MIDLET_UID = "midlet-uid-";
-/** Suite component id. Value type: int. */
 public static final String NAME_SUITE_CID = "suite-cid";
-/** Midlet-n component id. Value type: int. */
 public static final String NAME_MIDLET_CID = "midlet-cid-";
-/** Suite global id. Value type: string. */
 public static final String NAME_SUITE_GID = "suite-gid";
-/** Midlet-n global id. Value type: string. */
 public static final String NAME_MIDLET_GID = "midlet-gid-";
-/** Suite name. Value type: string. */
 public static final String NAME_SUITE_NAME = "suite-name";
-/** Midlet-n name. Value type: string. */
 public static final String NAME_MIDLET_NAME=  "midlet-name-";
-/** Suite vendor. Value type: string. */
 public static final String NAME_VENDOR = "vendor";
-/** Suite version. Value type: string. */
 public static final String NAME_VERSION = "version";
-/** Component installation status. Value type: int. Possible values:
-0: new component,
-1: upgrade,
-2: already installed,
-3: newer version already installed,
-4: invalid package, cannot be installed. */
 public static final String NAME_INSTALL_STATUS = "install-status";
-/** Component authenticity. Value type: int. Possible values:
-0: component is not authenticated, 1: component is authenticated. */
 public static final String NAME_AUTHENTICITY = "authenticity";
-/** Size of the files owned by the component at the time of the
-installation. Calculated from MIDlet-Data-Size and
-MIDlet-Jar-Size attributes. Value type: int. */
 public static final String NAME_COMPONENT_SIZE = "component-size";
-/** Id for installer result Comms message. */
-private static final int INSTALLER_RESULT_MESSAGE_ID = 601;
 private Hashtable iNamedIntValues = null;
 private Hashtable iNamedStringValues = null;
 private SifNotifier iSifNotifier = null;
 msg = eb.getDetailedMessage();
 if (msg != null)
 {
 addValue(NAME_ERROR_DETAILS, msg);
 }
-addErrorCodes(eb);
+addErrorCategory(eb);
 }
 if (aException instanceof InstallerException)
 {
 InstallerException ie =
 (InstallerException)aException;
 {
 iNamedIntValues.put(aName, new Integer(aValue));
 }
 /**
-* Returns a string value from this message, or null
+* Get a string value from this message.
-* if string value is not present.
+* @throws IllegalArgumentException if value with given name is not found
 */
-String getStringValue(String aName)
+public String getStringValue(String aName)
 {
 Object value = iNamedStringValues.get(aName);
 if (value instanceof String)
 {
 return (String)value;
 }
-return null;
+throw new IllegalArgumentException(
+"InstallerResultMessage: string value " + aName + " not found");
 }
 /**
 * Get an int value from this message.
 * @throws IllegalArgumentException if value with given name is not found
 */
-int getIntValue(String aName)
+public int getIntValue(String aName)
 {
 Object value = iNamedIntValues.get(aName);
 if (value instanceof Integer)
 {
 return ((Integer)value).intValue();
 }
 /**
 * Removes a value from this message.
 */
-void removeValue(String aName)
+public void removeValue(String aName)
 {
 iNamedStringValues.remove(aName);
 iNamedIntValues.remove(aName);
 }
 installerException = ie;
 }
 }
 if (iSifNotifier != null)
 {
+int errCategory = 0;
+int errCode = 0;
+String errMsg = null;
+String errDetails = null;
+if (getIntValue(NAME_RESULT) != Installer.ERR_NONE)
+{
+errCategory = getIntValue(NAME_ERROR_CATEGORY);
+errCode = Installer.ERR_GENERAL;
+errMsg = getStringValue(NAME_ERROR_MSG);
+errDetails = getStringValue(NAME_ERROR_DETAILS);
+}
 try
 {
-int result = getIntValue(NAME_RESULT);
-int errCategory = 0;
-int errCode = 0;
-String errMsg = null;
-String errDetails = null;
-if (result != Installer.ERR_NONE)
-{
-errCategory = getIntValue(NAME_ERROR_CATEGORY);
-errCode = getIntValue(NAME_ERROR_CODE);
-errMsg = getStringValue(NAME_ERROR_MSG);
-errDetails = getStringValue(NAME_ERROR_DETAILS);
-}
 iSifNotifier.notifyEnd(errCategory, errCode, errMsg, errDetails);
 }
 catch (Throwable t)
 {
 Log.logError("InstallerResultMessage: SifNotifier.notifyEnd failed", t);
 }
 try
 {
 comms.connect(aEndpoint);
 CommsMessage msg = new CommsMessage();
-msg.setMessageId(INSTALLER_RESULT_MESSAGE_ID);
+msg.setMessageId(601);
 // Initialise the message data.
 msg.write(iNamedIntValues.size());
 Enumeration e = iNamedIntValues.keys();
 while (e.hasMoreElements())
 {
 msg.write(name);
 msg.write((String)iNamedStringValues.get(name));
 }
 // Send the message.
 Log.log("Sending InstallerResultMessage to " + aEndpoint);
-comms.sendReceive(msg, 5);
+CommsMessage installerResultResponse = comms.sendReceive(msg, 5);
 comms.disconnect();
 Log.log("Received InstallerResultResponse from " + aEndpoint);
 }
 catch (Throwable t)
 {
 }
 return buf.toString();
 }
 /**
-* Adds error codes to the result message.
+* Adds error category to the result message.
 */
-private void addErrorCodes(ExceptionBase aEb)
+private void addErrorCategory(ExceptionBase aEb)
 {
-if (aEb.getShortMessageId() >= ErrorMessageBase.INSTALLER_RANGE_START &&
+switch (aEb.getShortMessageId())
-aEb.getShortMessageId() <= ErrorMessageBase.INSTALLER_RANGE_END)
+{
-{
+case InstallerErrorMessage.INST_NO_MEM:
-addValue(NAME_ERROR_CATEGORY,
+addValue(NAME_ERROR_CATEGORY, 2); // ELowDiskSpace
-SifRegistrator.getErrorCategory(aEb.getShortMessageId()));
+break;
-addValue(NAME_ERROR_CODE,
+case InstallerErrorMessage.INST_NO_NET:
-aEb.getShortMessageId()*1000 + aEb.getDetailedMessageId());
+addValue(NAME_ERROR_CATEGORY, 3); // ENetworkUnavailable
-}
+break;
-else if (aEb.getShortMessageId() >= ErrorMessageBase.SECURITY_RANGE_START &&
+case InstallerErrorMessage.INST_CORRUPT_PKG:
-aEb.getShortMessageId() <= ErrorMessageBase.SECURITY_RANGE_END)
+addValue(NAME_ERROR_CATEGORY, 5); // ECorruptedPackage
-{
+break;
-addValue(NAME_ERROR_CATEGORY,
+case InstallerErrorMessage.INST_COMPAT_ERR:
-SifRegistrator.getErrorCategory(
+addValue(NAME_ERROR_CATEGORY, 6); // EApplicationNotCompatible
-InstallerErrorMessage.INST_AUTHORIZATION_ERR));
+break;
-addValue(NAME_ERROR_CODE,
+case InstallerErrorMessage.INST_AUTHORIZATION_ERR:
-aEb.getShortMessageId()*1000 + aEb.getDetailedMessageId());
+// fall through
-}
+case InstallerErrorMessage.INST_AUTHENTICATION_ERR:
-else
+addValue(NAME_ERROR_CATEGORY, 7); // ESecurityError
-{
+break;
-addValue(NAME_ERROR_CATEGORY,
+case InstallerErrorMessage.INST_PUSH_REG_ERR:
-SifRegistrator.getErrorCategory(
+// fall through
-InstallerErrorMessage.INST_UNEXPECTED_ERR));
+case InstallerErrorMessage.INST_UNEXPECTED_ERR:
-addValue(NAME_ERROR_CODE,
+// fall through
-aEb.getShortMessageId()*1000 + aEb.getDetailedMessageId());
+case InstallerErrorMessage.UNINST_UNEXPECTED_ERR:
+// fall through
+case InstallerErrorMessage.OTHER_UNEXPECTED_ERR:
+addValue(NAME_ERROR_CATEGORY, 8); // EUnexpectedError
+break;
+case InstallerErrorMessage.INST_CANCEL:
+// fall through
+case InstallerErrorMessage.UNINST_CANCEL:
+addValue(NAME_ERROR_CATEGORY, 9); // EUserCancelled
+break;
+case InstallerErrorMessage.UNINST_NOT_ALLOWED:
+addValue(NAME_ERROR_CATEGORY, 10); // EUninstallationBlocked
+break;
+default:
+addValue(NAME_ERROR_CATEGORY, 8); // EUnexpectedError
 }
 }
 }

branch	RCL_3
changeset 83	26b2b12093af
parent 60	6c158198356e