- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 14 Sep 2005 15:14:20 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/error
In directory hutz:/tmp/cvs-serv9389/org/w3c/css/error
Modified Files:
ErrorReportHTML.java ErrorReportSOAP12.java
Log Message:
>From Jean-Guilhem Rouel (again!)
Reformatting of code
Fix for bug 774 [1] (even more warnings)
Fix for bug 768 [2]
Modification of the soap output format (each warning list and error list has
the URI it refers to)
[1] http://www.w3.org/Bugs/Public/show_bug.cgi?id=774
[2] http://www.w3.org/Bugs/Public/show_bug.cgi?id=768
Index: ErrorReportSOAP12.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/error/ErrorReportSOAP12.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ErrorReportSOAP12.java 22 Jul 2005 09:45:01 -0000 1.1
+++ ErrorReportSOAP12.java 14 Sep 2005 15:14:18 -0000 1.2
@@ -21,47 +21,47 @@
* </ul>
*/
public class ErrorReportSOAP12 extends ErrorReport {
-
+
private String title;
private boolean validURI;
private Exception exception;
-
+
private ApplContext ac;
private static Utf8Properties messages;
-
+
private PrintWriter out;
-
+
ErrorReportSOAP12(ApplContext ac, String title, String output, Exception e,
- boolean validURI) {
+ boolean validURI) {
this.ac = ac;
this.exception = e;
this.validURI = validURI;
this.title = title;
}
-
+
/**
* @see org.w3c.css.error.ErrorReport#print(java.io.PrintWriter)
*/
public void print(PrintWriter out) {
this.out = out;
-
+
// the error message
String errorMessage = exception.getMessage();
// the string containing the soap response pattern
String report;
if(validURI) {
- report = messages.getProperty("receiver");
+ report = messages.getProperty("receiver");
if(exception instanceof UnknownHostException) {
errorMessage = "The host name " + errorMessage +
- " couldn't be resolved";
- }
+ " couldn't be resolved";
+ }
}
else {
report = messages.getProperty("sender");
}
processError(report, errorMessage , title + " " + exception);
}
-
+
/**
* Prints on the output the soap message str, where each entity<br/>
* has been replaced by it's value<br/>
@@ -83,26 +83,26 @@
while ((i = str.indexOf("<!-- #", i)) >= 0) {
int lastIndexOfEntity = str.indexOf("-->", i);
String entity = str.substring(i + 6, lastIndexOfEntity - 1)
- .toLowerCase();
+ .toLowerCase();
// reason entity
if (entity.equals("reason")) {
out.print(str.substring(0, i));
str = str.substring(lastIndexOfEntity + 3);
- i = 0;
+ i = 0;
out.print(errorMessage);
}
// details entity
- else if (entity.equals("details")) {
+ else if (entity.equals("details")) {
out.print(str.substring(0, i));
str = str.substring(lastIndexOfEntity + 3);
i = 0;
out.print(details);
}
//charset entity
- else if (entity.equals("charset")) {
+ else if (entity.equals("charset")) {
out.print(str.substring(0, i));
str = str.substring(lastIndexOfEntity + 3);
- i = 0;
+ i = 0;
out.print(ac.getContentEncoding());
}
else {
@@ -120,7 +120,7 @@
}
}
}
-
+
static {
// load the soaperror.properties
URL url;
@@ -135,5 +135,5 @@
+ "couldn't load soap error messages properties ");
System.err.println(" " + e.toString());
}
- }
+ }
}
Index: ErrorReportHTML.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/error/ErrorReportHTML.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ErrorReportHTML.java 8 Aug 2005 13:18:04 -0000 1.2
+++ ErrorReportHTML.java 14 Sep 2005 15:14:18 -0000 1.3
@@ -20,18 +20,18 @@
* This class is used to create an (x)html page when a URI error is thrown by the servlet
*/
public class ErrorReportHTML extends ErrorReport {
-
+
//ApplContext ac;
String title;
Exception e;
-
+
ErrorReportHTML(ApplContext ac, String title, String output, Exception e) {
// ac is not used for now, but may be useful
//this.ac = ac;
this.title = title;
this.e = e;
}
-
+
/**
* @see org.w3c.css.error.ErrorReport#print(java.io.PrintWriter)
*/
Received on Wednesday, 14 September 2005 15:16:11 UTC