Bug 562357 - Remove JavaScript preferences
Renaming and moving the preferences to Web -> HTML Files
Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com>
diff --git a/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
index 34de1a1..933eade 100755
--- a/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.wst.jsdt.ui/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.wst.jsdt.ui; singleton:=true
-Bundle-Version: 2.0.403.qualifier
+Bundle-Version: 2.0.404.qualifier
Bundle-Activator: org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin
Import-Package: com.ibm.icu.text,
com.ibm.icu.util,
diff --git a/bundles/org.eclipse.wst.jsdt.ui/plugin.properties b/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
index 73d4818..1b90a34 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
+++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.properties
@@ -140,7 +140,7 @@
coloredLabels.inherited.label=Inherited members
coloredLabels.inherited.description=The color used to render to inherited members.
-javaPrefName=JavaScript
+javaPrefName=Embedded JavaScript
organizeImportsPrefName=Organize Imports
typeFilterPrefName=Type Filters
cleanUpPrefName=Clean Up
diff --git a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
index 9a0f28c..346c96d 100755
--- a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
@@ -1202,6 +1202,7 @@
point="org.eclipse.ui.preferencePages">
<page
name="%javaPrefName"
+ category="org.eclipse.wst.html.ui.preferences.html"
class="org.eclipse.wst.jsdt.internal.ui.preferences.JavaBasePreferencePage"
id="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage">
<keywordReference id="org.eclipse.wst.jsdt.ui.general"/>
diff --git a/bundles/org.eclipse.wst.jsdt.ui/pom.xml b/bundles/org.eclipse.wst.jsdt.ui/pom.xml
index 4d0341b..1e16425 100644
--- a/bundles/org.eclipse.wst.jsdt.ui/pom.xml
+++ b/bundles/org.eclipse.wst.jsdt.ui/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.jsdt.bundles</groupId>
<artifactId>org.eclipse.wst.jsdt.ui</artifactId>
- <version>2.0.403-SNAPSHOT</version>
+ <version>2.0.404-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<build>