Fix regression on marker updates from #984

bundles/org.eclipse.ui.editors/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.ui.editors; singleton:=true
-Bundle-Version: 3.16.100.qualifier
+Bundle-Version: 3.17.0.qualifier
 Bundle-Activator: org.eclipse.ui.internal.editors.text.EditorsPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/BasicMarkerUpdater.java

@@ -16,16 +16,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.core.runtime.CoreException;
-
 import org.eclipse.core.resources.IMarker;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
 
-import org.eclipse.ui.internal.editors.text.EditorsPlugin;
-
 
 /**
  * Updates a marker's positional attributes which are
@@ -99,11 +95,7 @@ public boolean updateMarker(IMarker marker, IDocument document, Position positio
 		}
 
 		if (!attributeChanges.isEmpty()) {
-			try {
-				marker.setAttributes(attributeChanges);
-			} catch (CoreException e) {
-				EditorsPlugin.log(e);
-			}
+			MarkerUtilities.changeAttributes(marker, attributeChanges);
 		}
 
 		return true;

bundles/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerUtilities.java

@@ -17,6 +17,8 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 import org.osgi.framework.Bundle;
 
@@ -402,4 +404,50 @@ public static String[] getSuperTypes(String markerType) {
 			fgMarkerTypeHierarchy= new MarkerTypeHierarchy();
 		return fgMarkerTypeHierarchy.getSuperTypes(markerType);
 	}
+
+	/**
+	 * Changes the given attribute key-value pairs of the map on this marker. The values must be
+	 * <code>null</code> or an instance of one of the following classes: <code>String</code>,
+	 * <code>Integer</code>, or <code>Boolean</code>. If a value is <code>null</code>, the new value
+	 * of the attribute is considered to be undefined.
+	 *
+	 * <p>
+	 * The values of the attributes cannot be <code>String</code> whose UTF encoding exceeds 65535
+	 * bytes. On persistent markers this limit is enforced by an assertion.
+	 * </p>
+	 *
+	 * <p>
+	 * This method changes resources; these changes will be reported in a subsequent resource change
+	 * event, including an indication that this marker has been modified.
+	 * </p>
+	 * 
+	 * @param marker the marker
+	 * @param attributeChanges map with to be executed attribute changes
+	 * @see IMarker#setAttributes(String[], Object[])
+	 * @since 3.17
+	 */
+	public static void changeAttributes(IMarker marker, Map<String, Object> attributeChanges) {
+
+		Set<Entry<String, Object>> entries= attributeChanges.entrySet();
+		int size= entries.size();
+
+		String[] keys= new String[size];
+		Object[] values= new Object[size];
+
+		int i= 0;
+		for (Entry<String, Object> e : entries) {
+			keys[i]= e.getKey();
+			values[i]= e.getValue();
+			i++;
+		}
+
+		try {
+			if (marker.exists()) {
+				marker.setAttributes(keys, values);
+			}
+		} catch (CoreException e) {
+			handleCoreException(e);
+		}
+
+	}
 }