--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/utils/SecurityDetailedErrorMessage.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/utils/SecurityDetailedErrorMessage.java	Wed Oct 13 14:23:59 2010 +0300
@@ -39,7 +39,6 @@
     public static final int OCSP_GENERAL_ERR = 7;
     public static final int OCSP_SETTINGS_ERR = 8;
     public static final int OCSP_REVOKED_ERR = 9;
-    public static final int JAR_NOT_FOUND = 10;
 
 
     /*** ----------------------------- PUBLIC ------------------------------ */
@@ -57,32 +56,15 @@
             return iMessageTable;
         }
         Hashtable messageTable = new Hashtable();
-        if (getLocaleIdQt() == null)
-        {
-            messageTable.put(new Integer(JAR_TAMPERED), "jar_tampered_details");
-            messageTable.put(new Integer(CERT_DISABLED), "cert_disabled");
-            messageTable.put(new Integer(CERT_DELETED), "cert_deleted");
-            messageTable.put(new Integer(SIM_CHANGED), "sim_changed");
-            messageTable.put(new Integer(UNIDENTIFIED_APPLICATION), "unidentified_application");
-            messageTable.put(new Integer(NETWORK_RESTRICTION_VIOLATION), "net_restr_violation_details");
-            messageTable.put(new Integer(OCSP_GENERAL_ERR), "ocsp_general_details");
-            messageTable.put(new Integer(OCSP_SETTINGS_ERR), "ocsp_settings");
-            messageTable.put(new Integer(OCSP_REVOKED_ERR), "ocsp_revoked");
-            messageTable.put(new Integer(JAR_NOT_FOUND), "jar_not_found_details");
-        }
-        else
-        {
-            messageTable.put(new Integer(JAR_TAMPERED), "jar_tampered_details");
-            messageTable.put(new Integer(CERT_DISABLED), "cert_disabled");
-            messageTable.put(new Integer(CERT_DELETED), "cert_deleted");
-            messageTable.put(new Integer(SIM_CHANGED), "sim_changed");
-            messageTable.put(new Integer(UNIDENTIFIED_APPLICATION), "unidentified_application");
-            messageTable.put(new Integer(NETWORK_RESTRICTION_VIOLATION), "net_restr_violation_details");
-            messageTable.put(new Integer(OCSP_GENERAL_ERR), "error_ocsp_general_details");
-            messageTable.put(new Integer(OCSP_SETTINGS_ERR), "error_ocsp_settings");
-            messageTable.put(new Integer(OCSP_REVOKED_ERR), "error_ocsp_revoked");
-            messageTable.put(new Integer(JAR_NOT_FOUND), "jar_not_found_details");
-        }
+        messageTable.put(new Integer(JAR_TAMPERED), "jar_tampered_details");
+        messageTable.put(new Integer(CERT_DISABLED), "cert_disabled");
+        messageTable.put(new Integer(CERT_DELETED), "cert_deleted");
+        messageTable.put(new Integer(SIM_CHANGED), "sim_changed");
+        messageTable.put(new Integer(UNIDENTIFIED_APPLICATION), "unidentified_application");
+        messageTable.put(new Integer(NETWORK_RESTRICTION_VIOLATION), "net_restr_violation_details");
+        messageTable.put(new Integer(OCSP_GENERAL_ERR), "ocsp_general_details");
+        messageTable.put(new Integer(OCSP_SETTINGS_ERR), "ocsp_settings");
+        messageTable.put(new Integer(OCSP_REVOKED_ERR), "ocsp_revoked");
         iMessageTable = messageTable;
         return iMessageTable;
     }
@@ -96,37 +78,11 @@
     {
         if (iRes == null)
         {
-            if (getLocaleIdQt() == null)
-            {
-                iRes = ResourceLoader.getInstance(
-                    "javausermessages", "qtn_java_secur_error_");
-            }
+            iRes = ResourceLoader.getInstance("javausermessages", "qtn_java_secur_error_");
         }
         return iRes;
     }
 
-    /**
-     * Method for retrieving the ResourceLoader instance that is used
-     * to localise error message for specified error code.
-     *
-     * @param errorCode error code for which ResourceLoader is returned
-     */
-    protected ResourceLoader getResourceLoader(int errorCode)
-    {
-        String resFilename = "javaapplicationsecuritymessages";
-        String resPrefix = "txt_java_secur_info_";
-        switch (errorCode)
-        {
-        case OCSP_GENERAL_ERR:
-        case OCSP_SETTINGS_ERR:
-        case OCSP_REVOKED_ERR:
-            resFilename = "javaapplicationinstaller";
-            resPrefix = "txt_java_secur_info_";
-            break;
-        }
-        return getResourceLoader(resFilename, resPrefix);
-    }
-
     /*** ----------------------------- PACKAGE ---------------------------- */
     /*** ----------------------------- PRIVATE ---------------------------- */
     /*** ----------------------------- NATIVE ----------------------------- */