Feature Validation

Author: gian-benito

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/PDEUIMessages.java

@@ -247,6 +247,7 @@ public class PDEUIMessages extends NLS {
 	public static String ContainerRenameParticipant_renameBundleId;
 
 	public static String ControlValidationUtility_errorMsgFilterInvalidSyntax;
+	public static String ControlValidationUtility_errorMsgFeatureFilterInvalidSyntax;
 	public static String ControlValidationUtility_errorMsgKeyNotFound;
 	public static String ControlValidationUtility_errorMsgNotOnClasspath;
 	public static String ControlValidationUtility_errorMsgPluginUnresolved;

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/MatchSection.java

@@ -33,6 +33,8 @@
 import org.eclipse.pde.internal.ui.editor.FormLayoutFactory;
 import org.eclipse.pde.internal.ui.editor.PDEFormPage;
 import org.eclipse.pde.internal.ui.editor.PDESection;
+import org.eclipse.pde.internal.ui.editor.validation.ControlValidationUtility;
+import org.eclipse.pde.internal.ui.editor.validation.TextValidator;
 import org.eclipse.pde.internal.ui.parts.ComboPart;
 import org.eclipse.pde.internal.ui.parts.FormEntry;
 import org.eclipse.swt.SWT;
@@ -56,6 +58,7 @@ public class MatchSection extends PDESection implements IPartSelectionListener {
 
 	private FormEntry fVersionText;
 	private FormEntry fFilterText;
+	private TextValidator fFilterEntryValidator;
 
 	private ComboPart fMatchCombo;
 	protected IPluginReference fCurrentImport;
@@ -159,6 +162,12 @@ public void textDirty(FormEntry text) {
 						fBlockChanges = false;
 					}
 				});
+		fFilterEntryValidator = new TextValidator(getManagedForm(), fFilterText.getText(), getProject(), true) {
+			@Override
+			protected boolean validateControl() {
+				return validateFilter();
+			}
+		};
 		update((IPluginReference) null);
 
 		section.setClient(container);
@@ -168,6 +177,16 @@ public void textDirty(FormEntry text) {
 		section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING));
 	}
 
+	private boolean validateFilter() {
+		// No validation required for an optional field
+		if (fFilterText.getText().getText().length() == 0) {
+			return true;
+		}
+		// Value must match the current environment and contain valid syntax
+		return ControlValidationUtility.validateFilterField(fFilterText.getText().getText(),
+				fFilterEntryValidator);
+	}
+
 	private void createReexportButton(FormToolkit toolkit, Composite container) {
 		fReexportButton = toolkit.createButton(container, PDEUIMessages.ManifestEditor_MatchSection_reexport, SWT.CHECK);
 		fReexportButton.addSelectionListener(widgetSelectedAdapter(e -> {
@@ -236,7 +255,6 @@ private void applyFilter(String filter) {
 				((IFeatureImport) fCurrentImport).setFilter(filter);
 			}
 		} catch (InvalidSyntaxException e) {
-			PDEPlugin.logException(e);
 		} catch (CoreException e) {
 			PDEPlugin.logException(e);
 		}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/validation/ControlValidationUtility.java

@@ -95,6 +95,19 @@ public static boolean validatePlatformFilterField(String value, IValidatorMessag
 		return true;
 	}
 
+	public static boolean validateFilterField(String value, IValidatorMessageHandler validator) {
+		// Check to see if the platform filter syntax is valid
+		try {
+			PDECore.getDefault().getBundleContext().createFilter(value);
+		} catch (InvalidSyntaxException ise) {
+			validator.addMessage(PDEUIMessages.ControlValidationUtility_errorMsgFeatureFilterInvalidSyntax,
+					IMessageProvider.ERROR);
+			return false;
+		}
+
+		return true;
+	}
+
 	public static boolean validateActivatorField(String value, IValidatorMessageHandler validator, IProject project) {
 
 		// Check the compiler flag and translate it into a message type

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties

@@ -2524,6 +2524,7 @@ ControlValidationUtility_errorMsgValueMustBeSpecified=A value must be specified
 ControlValidationUtility_errorMsgValueNotExternalized=The specified value is not externalized
 ControlValidationUtility_errorMsgKeyNotFound=The specified key is not present in the plug-in's properties file
 ControlValidationUtility_errorMsgFilterInvalidSyntax=The specified platform filter contains invalid syntax
+ControlValidationUtility_errorMsgFeatureFilterInvalidSyntax=The specified feature filter contains invalid syntax
 PackageFinder_taskName=Searching class files for package references
 
 UpdateSingleton_dir_label=Update ''{0}'' to 'singleton' directive true