Bug 512378 - Removed java-specific preferences from SeaMonkey UI and hidden prefs and Help r=iann_bugzilla
authorEdmund Wong <ewong@pw-wspx.org>
Tue, 12 Jul 2011 14:51:58 +0100
changeset 8096 f7b16da534a15006605df6e519dfd5912673eaff
parent 8095 31ef6d0355618a585730c926ff16ce76c1a94573
child 8097 82bc524240a40fa84b31615508bdd25a70d16592
push id6225
push useriann_cvs@blueyonder.co.uk
push dateTue, 12 Jul 2011 13:52:48 +0000
treeherdercomm-central@f7b16da534a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersiann_bugzilla
bugs512378
Bug 512378 - Removed java-specific preferences from SeaMonkey UI and hidden prefs and Help r=iann_bugzilla
suite/common/pref/pref-advanced.xul
suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
suite/profile/migration/src/nsSeamonkeyProfileMigrator.cpp
suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
--- a/suite/common/pref/pref-advanced.xul
+++ b/suite/common/pref/pref-advanced.xul
@@ -45,35 +45,24 @@
 ]>
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <prefpane id="advanced_pane"
             label="&pref.advanced.title;"
             script="chrome://communicator/content/pref/pref-advanced.js">
 
     <preferences id="advanced_preferences">
-      <preference id="security.enable_java"
-                  name="security.enable_java"
-                  type="bool"/>
       <preference id="config.use_system_prefs"
                   name="config.use_system_prefs"
                   type="bool"/>
       <preference id="shell.checkDefaultClient"
                   name="shell.checkDefaultClient"
                   type="bool"/>
     </preferences>
 
-    <groupbox id="advancedSettings">
-      <caption label="&prefEnableJava.caption;"/>
-      <checkbox id="advancedJavaAllow"
-                label="&enbJavaCheck.label;"
-                accesskey="&enbJavaCheck.accesskey;"
-                preference="security.enable_java"/>
-    </groupbox>
-
     <groupbox id="systemPrefs">
       <caption id="systemPrefCaption" label="&systemPref.caption;"/>
       <description>&systemPref.desc;</description>
       <checkbox id="systemPrefCheck"
                 label="&systemPrefCheck.label;"
                 accesskey="&systemPrefCheck.accesskey;"
                 preference="config.use_system_prefs"/>
     </groupbox>
--- a/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
+++ b/suite/locales/en-US/chrome/common/help/cs_nav_prefs_advanced.xhtml
@@ -46,26 +46,22 @@
   you&apos;re not already viewing it, follow these steps:</p>
 
 <ol>
   <li>Open the <span class="mac">&brandShortName;</span>
     <span class="noMac">Edit</span> menu and choose Preferences.</li>
   <li>Click the Advanced category.</li>
 </ol>
 
-<p>The main Advanced preferences panel allows you to enable or disable
-  Java:</p>
+<p class="unix">The main Advanced preferences panel allows you to:</p>
 
 <ul>
-  <li><strong>Enable Java</strong>: Select this to allow &brandShortName; to
-    interpret pages containing Java. Java is used on some Web page to
-    incorporate interactive and multimedia content.</li>
-  <li class="unix"><strong>Use Preferences from System</strong>: Select this to
-    use the already set system preferences, overriding &brandShortName;&apos;
-    ones.
+  <li class="unix"><strong>Use Preferences from System</strong>: Select
+    this to use the already set system preferences, overriding 
+    &brandShortName;&apos; ones.
   </li>
 </ul>
 
 <p>[<a href="#advanced_preferences">Return to beginning of section</a>]</p>
 
 <h2 id="scripts_and_plugins">Advanced Preferences - Scripts &amp;
   Plugins</h2>
 
--- a/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-advanced.dtd
@@ -1,16 +1,11 @@
 <!--LOCALIZATION NOTE : FILE 'Advanced' prefs settings -->
 <!ENTITY pref.advanced.title        "Advanced">
 
-<!ENTITY prefEnableJava.caption     "Features that help interpret web pages">
-
-<!ENTITY enbJavaCheck.label         "Enable Java">
-<!ENTITY enbJavaCheck.accesskey     "J">
-
 <!ENTITY systemPref.caption         "System Preferences">
 <!ENTITY systemPrefCheck.label      "Use Preferences from System">
 <!ENTITY systemPrefCheck.accesskey  "U">
 <!ENTITY systemPref.desc            "With this option, &brandShortName; inherits preferences from the system. These system settings will override the &brandShortName; preferences.">
 
 <!ENTITY prefCheckDefault.caption   "System Integration">
 <!ENTITY prefCheckDefaultClient.label "Check default application settings on startup">
 <!ENTITY prefCheckDefaultClient.accesskey "C">
--- a/suite/profile/migration/src/nsSeamonkeyProfileMigrator.cpp
+++ b/suite/profile/migration/src/nsSeamonkeyProfileMigrator.cpp
@@ -541,17 +541,16 @@ nsSeamonkeyProfileMigrator::PrefTransfor
   MAKESAMETYPEPREFTRANSFORM("privacy.popups.sound_enabled",            Bool),
   MAKEPREFTRANSFORM("privacy.popups.sound_url", "privacy.popups.sound_type", String, File),
   MAKESAMETYPEPREFTRANSFORM("privacy.popups.statusbar_icon_enabled",   Bool),
 
   MAKESAMETYPEPREFTRANSFORM("security.default_personal_cert",          String),
   MAKESAMETYPEPREFTRANSFORM("security.enable_ssl2",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("security.enable_ssl3",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("security.enable_tls",                     Bool),
-  MAKESAMETYPEPREFTRANSFORM("security.enable_java",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("security.password_lifetime",              Int),
   MAKESAMETYPEPREFTRANSFORM("security.warn_entering_secure",           Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_entering_weak",             Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_leaving_secure",            Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_submit_insecure",           Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_viewing_mixed",             Bool),
 
   MAKESAMETYPEPREFTRANSFORM("signon.SignonFileName",                   String),
--- a/suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
+++ b/suite/profile/migration/src/nsThunderbirdProfileMigrator.cpp
@@ -506,17 +506,16 @@ nsThunderbirdProfileMigrator::PrefTransf
 
   MAKESAMETYPEPREFTRANSFORM("plugin.override_internal_types",          Bool),
   MAKESAMETYPEPREFTRANSFORM("plugin.expose_full_path",                 Bool),
 
   MAKESAMETYPEPREFTRANSFORM("security.default_personal_cert",          String),
   MAKESAMETYPEPREFTRANSFORM("security.enable_ssl2",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("security.enable_ssl3",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("security.enable_tls",                     Bool),
-  MAKESAMETYPEPREFTRANSFORM("security.enable_java",                    Bool),
   MAKESAMETYPEPREFTRANSFORM("security.password_lifetime",              Int),
   MAKESAMETYPEPREFTRANSFORM("security.warn_entering_secure",           Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_entering_weak",             Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_leaving_secure",            Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_submit_insecure",           Bool),
   MAKESAMETYPEPREFTRANSFORM("security.warn_viewing_mixed",             Bool),
 
   MAKESAMETYPEPREFTRANSFORM("signon.SignonFileName",                   String),