[nobug] re-enable a limited Typing preference page for Client-side JavaScript
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 bb7f56e..5b197dd 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.1.101.qualifier +Bundle-Version: 2.1.200.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.xml b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml index d7d3a4b..b89fe5c 100755 --- a/bundles/org.eclipse.wst.jsdt.ui/plugin.xml +++ b/bundles/org.eclipse.wst.jsdt.ui/plugin.xml
@@ -639,6 +639,13 @@ <keywordReference id="org.eclipse.wst.jsdt.ui.syntaxcoloring"/> </page> <page + name="%editorTypingPage" + category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage" + class="org.eclipse.wst.jsdt.internal.ui.preferences.SmartTypingPreferencePage" + id="org.eclipse.wst.jsdt.ui.preferences.SmartTypingPreferencePage"> + <keywordReference id="org.eclipse.wst.jsdt.ui.smarttyping"/> + </page> + <page name="%codeTemplatePreferencePageName" category="org.eclipse.wst.jsdt.ui.preferences.JavaBasePreferencePage" class="org.eclipse.wst.jsdt.internal.ui.preferences.CodeTemplatePreferencePage"
diff --git a/bundles/org.eclipse.wst.jsdt.ui/pom.xml b/bundles/org.eclipse.wst.jsdt.ui/pom.xml index cbae56a..002ca68 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.1.101-SNAPSHOT</version> + <version>2.1.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> <build>
diff --git a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/SmartTypingConfigurationBlock.java b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/SmartTypingConfigurationBlock.java index 7fa87e5..636d1ed 100644 --- a/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/SmartTypingConfigurationBlock.java +++ b/bundles/org.eclipse.wst.jsdt.ui/src/org/eclipse/wst/jsdt/internal/ui/preferences/SmartTypingConfigurationBlock.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2008 IBM Corporation and others. + * Copyright (c) 2000, 2021 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -93,14 +93,14 @@ composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_automove_title); addAutopositionSection(composite); - composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_tabs_title); - addTabSection(composite); - - composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_pasting_title); - addPasteSection(composite); - - composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_strings_title); - addStringsSection(composite); +// composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_tabs_title); +// addTabSection(composite); +// +// composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_pasting_title); +// addPasteSection(composite); +// +// composite= createSubsection(control, null, PreferencesMessages.SmartTypingConfigurationBlock_strings_title); +// addStringsSection(composite); scrolled.setContent(control); final Point size= control.computeSize(SWT.DEFAULT, SWT.DEFAULT); @@ -108,7 +108,7 @@ return scrolled; } - private void addStringsSection(Composite composite) { + void addStringsSection(Composite composite) { GridLayout layout= new GridLayout(); composite.setLayout(layout); @@ -122,7 +122,7 @@ createDependency(master, slave); } - private void addPasteSection(Composite composite) { + void addPasteSection(Composite composite) { GridLayout layout= new GridLayout(); composite.setLayout(layout); @@ -134,7 +134,7 @@ addCheckBox(composite, label, PreferenceConstants.EDITOR_IMPORTS_ON_PASTE, 0); } - private void addTabSection(Composite composite) { + void addTabSection(Composite composite) { GridLayout layout= new GridLayout(); composite.setLayout(layout);
diff --git a/features/org.eclipse.wst.jsdt.feature/feature.xml b/features/org.eclipse.wst.jsdt.feature/feature.xml index d5dead4..5194b6a 100644 --- a/features/org.eclipse.wst.jsdt.feature/feature.xml +++ b/features/org.eclipse.wst.jsdt.feature/feature.xml
@@ -2,7 +2,7 @@ <feature id="org.eclipse.wst.jsdt.feature" label="%featureName" - version="2.3.300.qualifier" + version="2.3.400.qualifier" provider-name="%providerName" plugin="org.eclipse.wst.jsdt.ui" license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.wst.jsdt.feature/pom.xml b/features/org.eclipse.wst.jsdt.feature/pom.xml index cc6650a..80772bd 100644 --- a/features/org.eclipse.wst.jsdt.feature/pom.xml +++ b/features/org.eclipse.wst.jsdt.feature/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.jsdt.features</groupId> <artifactId>org.eclipse.wst.jsdt.feature</artifactId> - <version>2.3.300-SNAPSHOT</version> + <version>2.3.400-SNAPSHOT</version> <packaging>eclipse-feature</packaging> <build>