76245 Help System in Turkish locale appears differently

3 files changed, 20 insertions, 18 deletions

diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java
index 9baaba968..20b2f87c6 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ServletResources.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.help.internal.webapp.data;
 
+import java.util.*;
+
 import javax.servlet.http.*;
 
 import org.eclipse.help.internal.webapp.*;
@@ -115,7 +117,7 @@ public class ServletResources {
 		if (amp <0 || amp >= property.length() - 1) {
             return null;
         }
-		return ("" + property.charAt(amp +1)).toLowerCase(); //$NON-NLS-1$
+		return ("" + property.charAt(amp +1)).toLowerCase(Locale.ENGLISH); //$NON-NLS-1$
 	}
 
 }
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
index 24e5f6da5..b1c37d896 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/UrlUtil.java
@@ -124,7 +124,7 @@ public class UrlUtil {
         String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
         if (agent==null)
 		    return false;
-        agent=agent.toLowerCase();
+        agent=agent.toLowerCase(Locale.ENGLISH);
 		// sample substring Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)
 		return agent.indexOf("bot") >= 0 || agent.indexOf("crawl") >= 0//$NON-NLS-1$ //$NON-NLS-2$
                 || request.getParameter("bot") != null;//$NON-NLS-1$
@@ -134,7 +134,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return false;
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		// sample substring Gecko/20020508
 		// search for "gecko/" not to react to "like Gecko"
 		return agent.indexOf("gecko/") >= 0; //$NON-NLS-1$
@@ -144,7 +144,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return false;
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 
 		// When accessing with Bobby identified Bobby return 5.5 to allow
 		// testing advanced UI as bobby cannot identifiy as IE >=5.5
@@ -161,7 +161,7 @@ public class UrlUtil {
 		if (agent==null)
 		    return "0";
 
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		// When accessing with Bobby identified Bobby return 5.5 to allow
 		// testing advanced UI as bobby cannot identifiy as IE >=5.5
 		if (agent.startsWith("bobby/")) { //$NON-NLS-1$
@@ -182,7 +182,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return false;
-		agent=agent.toLowerCase(); 
+		agent=agent.toLowerCase(Locale.ENGLISH); 
 		return agent.indexOf("konqueror") >= 0; //$NON-NLS-1$
 	}
 
@@ -190,7 +190,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return false;
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		return agent.indexOf("mozilla/5") >= 0; //$NON-NLS-1$
 	}
 
@@ -198,7 +198,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return "0";
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		if (agent.indexOf("mozilla/5") < 0) //$NON-NLS-1$
 			return "0"; //$NON-NLS-1$
 		int start = agent.indexOf("rv:") + "rv:".length(); //$NON-NLS-1$ //$NON-NLS-2$
@@ -214,7 +214,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return false;
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		return agent.indexOf("opera") >= 0; //$NON-NLS-1$
 	}
 
@@ -222,7 +222,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return false;
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		return agent.indexOf("safari/") >= 0; //$NON-NLS-1$
 	}
 
@@ -231,7 +231,7 @@ public class UrlUtil {
 		String agent = request.getHeader("User-Agent"); //$NON-NLS-1$
 		if (agent==null)
 		    return version;
-		agent=agent.toLowerCase();
+		agent=agent.toLowerCase(Locale.ENGLISH);
 		Matcher m = safariPatern.matcher(agent);
 		boolean matched = m.find();
 		if (matched) {
@@ -433,11 +433,11 @@ public class UrlUtil {
 			for (Iterator it = infocenterLocales.iterator(); it.hasNext();) {
 				String locale = (String) it.next();
 				if (locale.length() >= 5) {
-					locales.add(locale.substring(0, 2).toLowerCase() + "_" //$NON-NLS-1$
-							+ locale.substring(3, 5).toUpperCase());
+					locales.add(locale.substring(0, 2).toLowerCase(Locale.ENGLISH) + "_" //$NON-NLS-1$
+							+ locale.substring(3, 5).toUpperCase(Locale.ENGLISH));
 
 				} else if (locale.length() >= 2) {
-					locales.add(locale.substring(0, 2).toLowerCase());
+					locales.add(locale.substring(0, 2).toLowerCase(Locale.ENGLISH));
 				}
 			}
 		}
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
index c77a9c435..2c6f1523d 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/EclipseConnector.java
@@ -50,8 +50,8 @@ public class EclipseConnector {
 			String url = getURL(req);
 			if (url == null)
 				return;
-			if (url.toLowerCase().startsWith("file:/") //$NON-NLS-1$
-					|| url.toLowerCase().startsWith("jar:file:/")) { //$NON-NLS-1$
+			if (url.toLowerCase(Locale.ENGLISH).startsWith("file:/") //$NON-NLS-1$
+					|| url.toLowerCase(Locale.ENGLISH).startsWith("jar:file:/")) { //$NON-NLS-1$
 				int i = url.indexOf('?');
 				if (i != -1)
 					url = url.substring(0, i);
@@ -86,8 +86,8 @@ public class EclipseConnector {
 			try {
 				is = con.getInputStream();
 			} catch (IOException ioe) {
-				if (url.toLowerCase().endsWith("htm") //$NON-NLS-1$
-						|| url.toLowerCase().endsWith("html")) { //$NON-NLS-1$
+				if (url.toLowerCase(Locale.ENGLISH).endsWith("htm") //$NON-NLS-1$
+						|| url.toLowerCase(Locale.ENGLISH).endsWith("html")) { //$NON-NLS-1$
 					String error = errorPageBegin
 							+ ServletResources.getString("noTopic", req) //$NON-NLS-1$
 							+ errorPageEnd;