--- a/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/storagehandler/SuiteInfo.java	Wed Sep 15 12:05:25 2010 +0300
+++ b/javamanager/javainstaller/installer/javasrc/com/nokia/mj/impl/installer/storagehandler/SuiteInfo.java	Wed Oct 13 14:23:59 2010 +0300
@@ -73,9 +73,6 @@
     private String iAccessPoint = null;
     // Flag telling if application suite is trusted
     private boolean iTrusted = false;
-    // Flag telling if preinstallation state should be
-    // reseted in uninstallation.
-    private boolean iResetPreinstall = false;
 
     /** Flag telling if default icon should be used. */
     private boolean iUseDefaultIcon = false;
@@ -83,8 +80,6 @@
     private String iConvertedIconPath = null;
     /** Application installation group. This member is not saved into storage. */
     private String iInstallationGroup = null;
-    /** Protection domain name. This member is not saved into storage. */
-    private String iProtectionDomainName = null;
 
     /**
      * Combined Jad and Manifest attributes. Key is attribute name,
@@ -526,22 +521,6 @@
     }
 
     /**
-     * Get protection domain name.
-     */
-    public String getProtectionDomainName()
-    {
-        return iProtectionDomainName;
-    }
-
-    /**
-     * Set protection domain name.
-     */
-    public void setProtectionDomainName(String aProtectionDomainName)
-    {
-        iProtectionDomainName = aProtectionDomainName;
-    }
-
-    /**
      * Set suite uid.
      *
      * @param aUid suite uid
@@ -761,14 +740,6 @@
     }
 
     /**
-     * Returns true if this application suite is preinstalled, false otherwise.
-     */
-    public boolean isPreinstalled()
-    {
-        return (iPreinstallState == STATE_PREINSTALLED);
-    }
-
-    /**
      * Set flag telling if application suite is preinstalled.
      *
      * @param aTrusted true if suite is preinstalled, false otherwise
@@ -786,24 +757,6 @@
     }
 
     /**
-     * Get the flag telling if preinstallation state should be reset.
-     * Used only in uninstallation.
-     */
-    public boolean getResetPreinstall()
-    {
-        return iResetPreinstall;
-    }
-
-    /**
-     * Set the flag telling if preinstallation state should be reset.
-     * Used only in uninstallation.
-     */
-    public void setResetPreinstall(boolean aResetPreinstall)
-    {
-        iResetPreinstall = aResetPreinstall;
-    }
-
-    /**
      * Calculates initial size from MIDlet-Data-Size and
      * MIDlet-Jar-Size attributes, or if they are not present
      * from jar file size.
@@ -886,11 +839,9 @@
         buf.append("  MediaId: ").append(getMediaId()).append("\n");
         buf.append("  InitialSize: ").append(getInitialSize()).append("\n");
         buf.append("  PreinstallState: ").append(iPreinstallState).append("\n");
-        buf.append("  ResetPreinstall: ").append(getResetPreinstall()).append("\n");
         buf.append("  OnScreenKeypad: ").append(getOnScreenKeypad()).append("\n");
         buf.append("  ConvertedIcon: ").append(getConvertedIconPath()).append("\n");
         buf.append("  Group: ").append(getInstallationGroup()).append("\n");
-        buf.append("  Protection domain: ").append(getProtectionDomainName()).append("\n");
         if (iApplications != null)
         {
             buf.append("Applications:\n");