implementation that fixes all formerly failing tests regarding quoting and parameter substitution

Change-Id: I44b9094afe393e7368a1ab21d247d901b5014d5c

java/com.sap.sse/src/com/sap/sse/i18n/impl/ResourceBundleStringMessagesImpl.java

@@ -4,14 +4,13 @@ import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 import java.util.ResourceBundle;
 import java.util.ResourceBundle.Control;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import com.sap.sse.i18n.ResourceBundleStringMessages;
 
 public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMessages {
     
-    private static final String MESSAGE_PARAMETER_START = "{";
-    private static final String MESSAGE_PARAMETER_END = "}";
-    
     private final String resourceBaseName;
     private final ClassLoader resourceClassLoader;
     private String encoding;
@@ -35,15 +34,58 @@ public class ResourceBundleStringMessagesImpl implements ResourceBundleStringMes
     
     @Override
     public String get(Locale locale, String messageKey, String... parameters) {
-        String result = getResourceBundle(locale).getString(messageKey);
-        for (int i = 0; i < parameters.length; i++) {
-            String target = MESSAGE_PARAMETER_START + i + MESSAGE_PARAMETER_END;
-            result = result.replace(target, parameters[i]);
+        final String message = getResourceBundle(locale).getString(messageKey);
+        final StringBuilder result = new StringBuilder();
+        boolean withinQuotedArea = false;
+        for (int i=0; i<message.length(); i++) {
+        	if (isSingleQuote(message, i) || (withinQuotedArea && message.charAt(i) == '\'')) {
+        		withinQuotedArea = !withinQuotedArea;
+        	} else if (isDoubleQuote(message, i)) {
+        		result.append('\''); // an escaped single quote
+        		i++; // skip the second one
+        	} else {
+        		if (withinQuotedArea) {
+        			result.append(message.charAt(i));
+        		} else {
+        			final int paramNumber = isParameterPlaceholder(message, i);
+        			if (paramNumber != -1) {
+        				result.append(parameters[paramNumber]);
+        				i += (""+paramNumber).length()+1; // skip the number plus one curly brace
+        			} else {
+        				result.append(message.charAt(i));
+        			}
+        		}
+        	}
         }
-        return result;
+        return result.toString();
     }
 
-    private ResourceBundle getResourceBundle(Locale locale) {
+    private boolean isDoubleQuote(String message, int i) {
+		return i < message.length()-1 && message.charAt(i) == '\'' && message.charAt(i+1) == '\'';
+	}
+
+	private static final Pattern placeholderMatcher = Pattern.compile("\\{([0-9]+)\\}.*$");
+    /**
+     * @return -1 if there is no placeholder starting at character {@code i} in {@code message},
+     * or the number of the parameter represented by the placeholder, such as {@code 4} for the placeholder
+     * 			<pre>{4}</pre>.
+     */
+	private int isParameterPlaceholder(String message, int i) {
+		final Matcher matcher = placeholderMatcher.matcher(message.substring(i));
+		final int result;
+		if (matcher.matches()) {
+			result = Integer.valueOf(matcher.group(1));
+		} else {
+			result = -1;
+		}
+		return result;
+	}
+
+	private boolean isSingleQuote(String message, int i) {
+		return i<message.length() && message.charAt(i) == '\'' && (i==message.length()-1 || message.charAt(i+1) != '\'');
+	}
+
+	private ResourceBundle getResourceBundle(Locale locale) {
         Control controller = Util.createControl(encoding);
         if (resourceClassLoader != null) {
             return ResourceBundle.getBundle(resourceBaseName, locale, resourceClassLoader, controller);