Support for xml.downloadExternalResources.enabled

Fixes #781

Signed-off-by: azerr <[email protected]>

Author: angelozerr

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/Messages.java

@@ -15,10 +15,13 @@
 
 public class Messages extends NLS {
 
-	// --------- XML Catalog preference page
-
+	// --------- XML Preference page
 	public static String XMLPreferencePage_XMLCatalogsLink;
+	public static String XMLPreferencePage_downloadExternalResources_enabled;
+	
+	// --------- XML Catalog preference page
 
+	
 	public static String XMLCatalogPreferencePage_Entries;
 	public static String XMLCatalogPreferencePage_Edit;
 	public static String XMLCatalogPreferencePage_OpenInEditorTitle;

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/messages.properties

@@ -12,6 +12,7 @@
 
 # Preference page
 XMLPreferencePage_XMLCatalogsLink=See <A>'XML Catalogs'</A> for XML catalogs preferences
+XMLPreferencePage_downloadExternalResources_enabled=Download external resources like referenced DTD, XSD
 
 # XML Catalog preference page
 XMLCatalogPreferencePage_Entries=Catalogs

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceConstants.java

@@ -61,6 +61,10 @@ public void storeToLemminxOptions(Object value, Map<String, Object> options) {
 		}
 	}
 
+
+	// General settings
+	public static final LemminxPreference XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES = new LemminxPreference("downloadExternalResources/enabled");
+
 	// Catalog settings
 	public static final LemminxPreference XML_PREFERENCES_CATAGLOGS = new LemminxPreference("catalogs");
 
@@ -82,13 +86,15 @@ public void storeToLemminxOptions(Object value, Map<String, Object> options) {
 
 	// Validation settings
 	public static final LemminxPreference XML_PREFERENCES_VALIDATION_ENABLED = new LemminxPreference("validation/enabled");
+
 	public static final LemminxPreference XML_PREFERENCES_VALIDATION_NAMESPACES_ENABLED = new LemminxPreference("validation/namespaces/enabled");
 	public static final LemminxPreference XML_PREFERENCES_VALIDATION_SCHEMA_ENABLED = new LemminxPreference("validation/schema/enabled");
 	public static final LemminxPreference XML_PREFERENCES_VALIDATION_DISALLOW_DOCTYPE_DECL = new LemminxPreference("validation/disallowDocTypeDecl");
 	public static final LemminxPreference XML_PREFERENCES_VALIDATION_RESOLVE_EXTERNAL_ENTITIES = new LemminxPreference("validation/resolveExternalEntities");
 	public static final LemminxPreference XML_PREFERENCES_VALIDATION_NO_GRAMMAR = new LemminxPreference("validation/noGrammar");
 
 	private static final LemminxPreference[] ALL_LEMMINX_PREFERENCES = {
+			XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES,
 			XML_PREFERENCES_CATAGLOGS,
 			XML_PREFERENCES_CODELENS_ENABLED,
 			XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD,
@@ -117,7 +123,10 @@ private XMLPreferenceConstants() {
 	}
 
 	public static void storePreferencesToLemminxOptions(IPreferenceStore store, Map<String, Object> xmlOpts) {
-		// Catalo settings
+		// General settings
+		XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.storeToLemminxOptions(store.getBoolean(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.preferenceId), xmlOpts);
+		
+		// Catalog settings
 		XML_PREFERENCES_CATAGLOGS.storeToLemminxOptions(
 				XMLCatalogs.getAllCatalogs(store).stream().map(File::getAbsolutePath).toArray(String[]::new),
 				xmlOpts);

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferenceInitializer.java

@@ -13,6 +13,7 @@
 
 import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_CATAGLOGS;
 import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_CODELENS_ENABLED;
+import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES;
 import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD;
 import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_FORMAT_CLOSING_BRACKET_NEW_LINE;
 import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_FORMAT_EMPTY_ELEMENTS;
@@ -38,6 +39,7 @@ public class XMLPreferenceInitializer extends AbstractPreferenceInitializer {
 
 	@Override
 	public void initializeDefaultPreferences() {
+		STORE.setDefault(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.preferenceId, true);
 		STORE.setDefault(XML_PREFERENCES_CATAGLOGS.preferenceId, "");
 		STORE.setDefault(XML_PREFERENCES_CODELENS_ENABLED.preferenceId, false);
 		STORE.setDefault(XML_PREFERENCES_FOLDING_INCLUDE_CLOSING_TAG_IN_FOLD.preferenceId, true);

org.eclipse.wildwebdeveloper.xml/src/org/eclipse/wildwebdeveloper/xml/internal/ui/preferences/XMLPreferencePage.java

@@ -12,7 +12,10 @@
  *******************************************************************************/
 package org.eclipse.wildwebdeveloper.xml.internal.ui.preferences;
 
-import org.eclipse.jface.preference.PreferencePage;
+import static org.eclipse.wildwebdeveloper.xml.internal.ui.preferences.XMLPreferenceConstants.XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES;
+
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
@@ -23,15 +26,15 @@
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
+import org.eclipse.wildwebdeveloper.xml.internal.Activator;
 import org.eclipse.wildwebdeveloper.xml.internal.ui.Messages;
 
-public class XMLPreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
+public class XMLPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
-	@Override
-	public void init(IWorkbench workbench) {
-		noDefaultAndApplyButton();
+	public XMLPreferencePage() {
+		super(GRID);
 	}
-
+	
 	@Override
 	protected Control createContents(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
@@ -50,7 +53,20 @@ public void widgetSelected(SelectionEvent e) {
 				}
 			}
 		});
-
+		super.createContents(composite);
 		return composite;
 	}
+	
+	@Override
+	public void init(IWorkbench workbench) {
+		setPreferenceStore(Activator.getDefault().getPreferenceStore());
+	}
+
+
+	@Override
+	protected void createFieldEditors() {
+		addField(new BooleanFieldEditor(XML_PREFERENCES_DOWNLOAD_EXTERNAL_RESOURCES.preferenceId,
+				Messages.XMLPreferencePage_downloadExternalResources_enabled, getFieldEditorParent()));
+		
+	}
 }