Add missing indices to message format in ModelAssembler

The fallback logging mechanism in ModelAssembler uses:

java.text.MessageFormat.format(String, Object...)

Supplied message formats bind arguments without an index,
i.e. message formats use "{}" instead of "{n}".
This causes a NFE in MessageFormat.format(),
resulting in no log output in the fallback case.

In the usual case with an available logger, the indices are added by:

com.sun.org.slf4j.internal.Logger.addIndex(String)

This change likewise adds indices to the message format,
for the fallback case.

Fixes: #3873

Author: trancexpress

bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ModelAssembler.java

@@ -39,6 +39,8 @@
 import java.util.TreeSet;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.IExtension;
 import org.eclipse.core.runtime.IExtensionPoint;
@@ -209,6 +211,8 @@ public void removedBundle(Bundle bundle, BundleEvent event, List<FragmentWrapper
 
 	private final List<ServiceReference<IModelProcessorContribution>> processorContributions = new CopyOnWriteArrayList<>();
 
+	private static final Pattern MESSAGE_FORMAT_BRACKETS_PATTERN = Pattern.compile("\\{\\}"); //$NON-NLS-1$
+
 	private BundleContext bundleContext;
 
 	private BundleTracker<List<FragmentWrapperElementMapping>> tracker;
@@ -820,7 +824,7 @@ private void log(LogMethod logMethod, PrintStream stream, String message, Object
 			logMethod.invoke(log, message, args);
 		} else {
 			// fallback if no LogService is available
-			stream.println(MessageFormat.format(message, args));
+			stream.println(MessageFormat.format(addIndex(message), args));
 		}
 	}
 
@@ -845,4 +849,20 @@ public void unsetLogger(LoggerFactory loggerFactory) {
 			this.logger = null;
 		}
 	}
+
+	/**
+	 * Adds missing indices to {@code {}} sequences in {@code format}. See:
+	 * {@link com.sun.org.slf4j.internal.Logger#addIndex(String)}
+	 */
+	private static String addIndex(String format) {
+		Matcher matcher = MESSAGE_FORMAT_BRACKETS_PATTERN.matcher(format);
+		StringBuilder sb = new StringBuilder();
+		int index = 0;
+		while (matcher.find()) {
+			String r = "{" + Integer.toString(index++) + "}"; //$NON-NLS-1$ //$NON-NLS-2$
+			matcher.appendReplacement(sb, r);
+		}
+		matcher.appendTail(sb);
+		return sb.toString();
+	}
 }