67872 TVT3.0: Translated error messages appear in log filev20040823

4 files changed, 35 insertions, 17 deletions

diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
index 7a9e873cd..a2f289c8e 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/RequestData.java
@@ -43,9 +43,9 @@ public class RequestData {
 		preferences = new WebappPreferences();
 
 		locale = UrlUtil.getLocale(request, response);
-		advancedUI = (isIE() && "5.5".compareTo(getIEVersion()) <= 0)
+		advancedUI = (isIE() && "5.5".compareTo(getIEVersion()) <= 0) //$NON-NLS-1$
 				|| (isMozilla() && isGecko())
-				|| (isSafari() && "120".compareTo(getSafariVersion()) <= 0);
+				|| (isSafari() && "120".compareTo(getSafariVersion()) <= 0); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
index 5c30bf7e1..3d3bd9579 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/SearchData.java
@@ -9,6 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.help.internal.webapp.data;
+
 import java.text.*;
 import java.util.*;
 
@@ -30,8 +31,11 @@ public class SearchData extends ActivitiesData {
 
 	// Request parameters
 	private String topicHref;
+
 	private String selectedTopicId = ""; //$NON-NLS-1$
+
 	private String searchWord;
+
 	private String workingSetName;
 
 	// search results
@@ -39,6 +43,7 @@ public class SearchData extends ActivitiesData {
 
 	// percentage of indexing completion
 	private int indexCompletion = 100;
+
 	// QueryException if any
 	private QueryTooComplexException queryException = null;
 
@@ -241,6 +246,7 @@ public class SearchData extends ActivitiesData {
 			wsmgr.setCurrentWorkingSet(""); //$NON-NLS-1$
 		}
 	}
+
 	/**
 	 * Call the search engine, and get results or the percentage of indexed
 	 * documents.
@@ -256,9 +262,8 @@ public class SearchData extends ActivitiesData {
 						results, pm);
 				hits = results.getSearchHits();
 				if (hits == null) {
-					HelpWebappPlugin.logError(HelpBaseResources
-							.getString("index_is_busy"), //$NON-NLS-1$
-							null);
+					HelpWebappPlugin
+							.logWarning("No search results returned.  Help index is in use."); //$NON-NLS-1$
 				}
 				return;
 			} else {
@@ -277,6 +282,7 @@ public class SearchData extends ActivitiesData {
 		}
 
 	}
+
 	private ISearchQuery createSearchQuery() {
 		String fieldSearchStr = request.getParameter("fieldSearch"); //$NON-NLS-1$
 		boolean fieldSearch = fieldSearchStr != null ? new Boolean(
@@ -284,6 +290,7 @@ public class SearchData extends ActivitiesData {
 		return new SearchQuery(searchWord, fieldSearch, new ArrayList(),
 				getLocale());
 	}
+
 	private SearchResults createHitCollector() {
 		WorkingSet[] workingSets;
 		if (request.getParameterValues("scopedSearch") == null) { //$NON-NLS-1$
@@ -307,6 +314,7 @@ public class SearchData extends ActivitiesData {
 		}
 		return new SearchResults(workingSets, maxHits, getLocale());
 	}
+
 	/**
 	 * @return WorkingSet[] or null
 	 */
@@ -358,6 +366,7 @@ public class SearchData extends ActivitiesData {
 		workingSets[0] = wsmgr.createWorkingSet("temp", adaptableTocs); //$NON-NLS-1$
 		return workingSets;
 	}
+
 	public String getQueryExceptionMessage() {
 		if (queryException == null) {
 			return null;
@@ -365,4 +374,4 @@ public class SearchData extends ActivitiesData {
 		return ServletResources.getString("searchTooComplex", request); //$NON-NLS-1$
 	}
 
-}
+}
\ No newline at end of file
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java
index 3a281bfd1..ecf32ae0a 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/data/ToolbarData.java
@@ -61,7 +61,7 @@ public class ToolbarData extends RequestData {
 		}
 		// add implicit maximize/restore button on all toolbars
 		if (isIE() || isMozilla()
-				&& "1.2.1".compareTo(getMozillaVersion()) <= 0
+				&& "1.2.1".compareTo(getMozillaVersion()) <= 0 //$NON-NLS-1$
 				|| (isSafari() && "120".compareTo(getSafariVersion()) <= 0)) { //$NON-NLS-1$
 			buttonList.add(new ToolbarButton("maximize_restore", //$NON-NLS-1$
 					getMaximizeTooltip(), preferences.getImagesDirectory()
diff --git a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
index fad184b6b..4a5beed17 100644
--- a/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
+++ b/org.eclipse.help.webapp/src_servlets/org/eclipse/help/internal/webapp/servlet/XMLGenerator.java
@@ -9,22 +9,28 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
 package org.eclipse.help.internal.webapp.servlet;
+
 import java.io.*;
 
-import org.eclipse.help.internal.base.*;
 import org.eclipse.help.internal.base.util.*;
 import org.eclipse.help.internal.webapp.*;
+
 /**
  * Helper class to generate xml files.
  */
 public class XMLGenerator {
 	private File outFile = null;
+
 	private PrintWriter out = null;
+
 	public int pad = 0;
+
 	// XML escaped characters mapping
-	private static final String invalidXML[] = {"&", ">", "<", "\"", "\'"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+	private static final String invalidXML[] = { "&", ">", "<", "\"", "\'" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+
 	private static final String escapedXML[] = {
-			"&amp;", "&gt;", "&lt;", "&quot;", "&apos;"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+			"&amp;", "&gt;", "&lt;", "&quot;", "&apos;" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+
 	/**
 	 * Constructor.
 	 */
@@ -34,6 +40,7 @@ public class XMLGenerator {
 		else
 			this.out = new PrintWriter(writer);
 	}
+
 	/**
 	 * Constructor.
 	 */
@@ -47,9 +54,8 @@ public class XMLGenerator {
 			);
 			println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$
 		} catch (IOException ioe) {
-			HelpWebappPlugin.logError(HelpBaseResources.getString(
-					"E014", outFile.getAbsolutePath()), //$NON-NLS-1$
-					ioe);
+			HelpWebappPlugin.logError("Error accessing file: " //$NON-NLS-1$
+					+ outFile.getAbsolutePath() + "", ioe); //$NON-NLS-1$
 		}
 	}
 
@@ -60,26 +66,29 @@ public class XMLGenerator {
 			cdata = TString.change(cdata, invalidXML[i], escapedXML[i]);
 		return cdata;
 	}
+
 	public void close() {
 		out.flush();
 		out.close();
 		if (out.checkError())
 			if (outFile != null)
-				HelpWebappPlugin.logError(HelpBaseResources.getString(
-						"E015", outFile.getAbsolutePath()), //$NON-NLS-1$
-						null);
+				HelpWebappPlugin.logError("Errors occurred generating file: " //$NON-NLS-1$
+						+ outFile.getAbsolutePath() + "", null); //$NON-NLS-1$
 		out = null;
 	}
+
 	public void print(Object o) {
 		if (out != null)
 			out.print(o);
 	}
+
 	public void println(Object o) {
 		print(o);
 		print("\n"); //$NON-NLS-1$
 	}
+
 	public void printPad() {
 		for (int i = 0; i < pad; i++)
 			print(" "); //$NON-NLS-1$
 	}
-}
+}
\ No newline at end of file