--- a/javacommons/security/javasrc/com/nokia/mj/impl/security/utils/SecurityErrorMessage.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javacommons/security/javasrc/com/nokia/mj/impl/security/utils/SecurityErrorMessage.java	Wed Oct 13 14:23:59 2010 +0300
@@ -23,16 +23,18 @@
 
 /**
  * Class defining Security short error messages.
+ *
+ * @author Nokia Corporation
+ * @version 1.0
  */
 public final class SecurityErrorMessage extends ErrorMessageBase
 {
     // Security error codes.
-    public static final int JAR_TAMPERED = 1 + ErrorMessageBase.SECURITY_RANGE_START;
-    public static final int CERT_NOT_AVAILABLE = 2 + ErrorMessageBase.SECURITY_RANGE_START;
-    public static final int UNEXPECTED_ERR = 3 + ErrorMessageBase.SECURITY_RANGE_START;
-    public static final int NETWORK_RESTRICTION_VIOLATION = 4 + ErrorMessageBase.SECURITY_RANGE_START;
-    public static final int OCSP_GENERAL_ERR = 5 + ErrorMessageBase.SECURITY_RANGE_START;
-    public static final int JAR_NOT_FOUND = 6 + ErrorMessageBase.SECURITY_RANGE_START;
+    public static final int JAR_TAMPERED = 1;
+    public static final int CERT_NOT_AVAILABLE = 2;
+    public static final int UNEXPECTED_ERR = 3;
+    public static final int NETWORK_RESTRICTION_VIOLATION = 4;
+    public static final int OCSP_GENERAL_ERR = 5;
 
     /*** ----------------------------- PUBLIC ------------------------------ */
     /*** ---------------------------- PROTECTED --------------------------- */
@@ -49,24 +51,11 @@
             return iMessageTable;
         }
         Hashtable messageTable = new Hashtable();
-        if (getLocaleIdQt() == null)
-        {
-            messageTable.put(new Integer(JAR_TAMPERED), "jar_tampered");
-            messageTable.put(new Integer(CERT_NOT_AVAILABLE), "cert_not_available");
-            messageTable.put(new Integer(UNEXPECTED_ERR), "unexpected_err");
-            messageTable.put(new Integer(NETWORK_RESTRICTION_VIOLATION), "net_restr_violation");
-            messageTable.put(new Integer(OCSP_GENERAL_ERR), "ocsp_general");
-            messageTable.put(new Integer(JAR_NOT_FOUND), "jar_not_found");
-        }
-        else
-        {
-            messageTable.put(new Integer(JAR_TAMPERED), "jar_tampered");
-            messageTable.put(new Integer(CERT_NOT_AVAILABLE), "cert_not_available");
-            messageTable.put(new Integer(UNEXPECTED_ERR), "unexpected_error");
-            messageTable.put(new Integer(NETWORK_RESTRICTION_VIOLATION), "net_restr_violation");
-            messageTable.put(new Integer(OCSP_GENERAL_ERR), "there_is_a_security_issue_with_this");
-            messageTable.put(new Integer(JAR_NOT_FOUND), "error_jar_not_found");
-        }
+        messageTable.put(new Integer(JAR_TAMPERED), "jar_tampered");
+        messageTable.put(new Integer(CERT_NOT_AVAILABLE), "cert_not_available");
+        messageTable.put(new Integer(UNEXPECTED_ERR), "unexpected_err");
+        messageTable.put(new Integer(NETWORK_RESTRICTION_VIOLATION), "net_restr_violation");
+        messageTable.put(new Integer(OCSP_GENERAL_ERR), "ocsp_general");
         iMessageTable = messageTable;
         return iMessageTable;
     }
@@ -80,39 +69,11 @@
     {
         if (iRes == null)
         {
-            // This method returns ResourceLoader only when Qt
-            // localisation is not in use. When Qt localisation
-            // is in use this method returns null and
-            // ResourceLoader is obtained with getResourceLoader(int)
-            // method variant.
-            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:
-            resFilename = "common_errors";
-            resPrefix = "txt_error_info_";
-            break;
-        }
-        return getResourceLoader(resFilename, resPrefix);
-    }
-
     /*** ----------------------------- PACKAGE ---------------------------- */
     /*** ----------------------------- PRIVATE ---------------------------- */
     /*** ----------------------------- NATIVE ----------------------------- */