quick fix for invalid characters in MANIFEST header

Author: Neha Burnwal

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/JarManifestErrorReporter.java

@@ -19,6 +19,7 @@
 import java.util.Map;
 
 import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jface.text.BadLocationException;
@@ -61,6 +62,15 @@ private String getHeaderName(String line) {
 		return null;
 	}
 
+	private boolean isInvalidHeader(String line) {
+		int colonInd = line.indexOf(':');
+		if (colonInd > 0) {
+			String headerPart = line.substring(0, colonInd);
+			return headerPart != null && headerPart.matches(".*[^a-zA-Z0-9-_].*"); //$NON-NLS-1$
+		}
+		return false;
+	}
+
 	protected int getPackageLine(IHeader header, ManifestElement element) {
 		String packageName = element.getValue();
 		if (element.getDirectiveKeys() != null || element.getKeys() != null) {
@@ -172,9 +182,18 @@ protected void parseManifest(IDocument document, IProgressMonitor monitor) {
 					report(PDECoreMessages.BundleErrorReporter_noColon, lineNumber, CompilerFlags.ERROR, PDEMarkerFactory.CAT_FATAL);
 					return;
 				}
+
 				String headerName = getHeaderName(line);
 				if (headerName == null) {
-					report(PDECoreMessages.BundleErrorReporter_invalidHeaderName, lineNumber, CompilerFlags.ERROR, PDEMarkerFactory.CAT_FATAL);
+					boolean hasInvalidChars = isInvalidHeader(line);
+					if (hasInvalidChars) {
+						VirtualMarker marker = report(PDECoreMessages.BundleErrorReporter_invalidHeaderName, lineNumber,
+								CompilerFlags.ERROR, PDEMarkerFactory.M_HEADER_INCORRECT, PDEMarkerFactory.CAT_FATAL);
+						marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+						return;
+					}
+					report(PDECoreMessages.BundleErrorReporter_invalidHeaderName, lineNumber, CompilerFlags.ERROR,
+							PDEMarkerFactory.CAT_FATAL);
 					return;
 				}
 				if (line.length() < colon + 2 || line.charAt(colon + 1) != ' ') {

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/PDEMarkerFactory.java

@@ -76,6 +76,7 @@ public class PDEMarkerFactory {
 	public static final int M_EXEC_ENV_TOO_LOW = 0x1029; // other problem
 	public static final int M_CONFLICTING_AUTOMATIC_MODULE = 0x1030; // other
 																		// problem
+	public static final int M_HEADER_INCORRECT = 0x1031; // other problem
 
 	// build properties fixes
 	public static final int B_APPEND_SLASH_FOLDER_ENTRY = 0x2001;

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

@@ -693,6 +693,7 @@ public class PDEUIMessages extends NLS {
 
 	public static String UpdateClasspathResolution_label;
 	public static String UpdateExecutionEnvironment_label;
+	public static String RemoveInvalidCharacters;
 
 	//
 	// PDE resource strings

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/ResolutionGenerator.java

@@ -147,6 +147,9 @@ public IMarkerResolution[] getNonConfigSevResolutions(IMarker marker) {
 		case PDEMarkerFactory.M_CONFLICTING_AUTOMATIC_MODULE:
 			return new IMarkerResolution[] {
 					new RemoveRedundantAutomaticModuleHeader(AbstractPDEMarkerResolution.REMOVE_TYPE, marker) };
+		case PDEMarkerFactory.M_HEADER_INCORRECT:
+			return new IMarkerResolution[] {
+					new UpdateCorrectHeaderName(AbstractPDEMarkerResolution.RENAME_TYPE, marker) };
 		}
 		return NO_RESOLUTIONS;
 	}

ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/correction/UpdateCorrectHeaderName.java

@@ -0,0 +1,49 @@
+package org.eclipse.pde.internal.ui.correction;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.pde.internal.core.text.bundle.BundleModel;
+import org.eclipse.pde.internal.ui.PDEUIMessages;
+
+public class UpdateCorrectHeaderName extends AbstractManifestMarkerResolution {
+
+	public UpdateCorrectHeaderName(int type, IMarker marker) {
+		super(type, marker);
+	}
+
+	@Override
+	public String getLabel() {
+		return PDEUIMessages.RemoveInvalidCharacters;
+	}
+
+	private String removeInvalidChars(String userHeader) {
+		return userHeader.replaceAll("[^a-zA-Z0-9-_]", ""); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	@Override
+	protected void createChange(BundleModel model) {
+		model.getBundle();
+		IDocument doc = model.getDocument();
+		try {
+			int lineNum = (int) marker.getAttribute(IMarker.LINE_NUMBER);
+			IRegion lineInfo = doc.getLineInformation(lineNum - 1);
+			int offset = lineInfo.getOffset();
+			int length = lineInfo.getLength();
+
+			String getLine = doc.get(offset, length);
+			int colonInd = getLine.indexOf(':');
+
+			if (colonInd > 0) {
+				String userHeader = getLine.substring(0, colonInd);
+				String correctHeader = removeInvalidChars(userHeader);
+				doc.replace(offset, colonInd, correctHeader);
+			}
+
+		} catch (Exception e) {
+
+		}
+
+	}
+
+}

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

@@ -2422,6 +2422,7 @@ LocationSection_0=&Locations
 AppendSeperatorBuildEntryResolution_label=Append a trailing separator to {0}.
 AddExportPackageResolution_Label=Add missing packages
 AddExportPackageInternalDirectiveResolution_Label=Add missing packages with x-internal directive
+RemoveInvalidCharacters=Remove invalid characters from header
 
 DependencyManagementSection_jobName=Analyzing Code
 DescriptionSection_nameLabel=Name: