- From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
- Date: Thu, 23 Aug 2007 08:58:17 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/util
In directory hutz:/tmp/cvs-serv21374/org/w3c/css/util
Modified Files:
Messages.java
Log Message:
A strange bug appear on the qa-dev machine...
"file:///localhost" is added at the begin of the translation files names.
This patch will make it work in this case as well.
Index: Messages.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Messages.java 31 Jul 2007 14:18:59 -0000 1.11
+++ Messages.java 23 Aug 2007 08:58:14 -0000 1.12
@@ -7,6 +7,7 @@
package org.w3c.css.util;
+import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Hashtable;
@@ -162,7 +163,7 @@
static {
Utf8Properties tmp;
try {
- URL url = Messages.class.getResource("Messages.properties.de");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.de"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -183,7 +184,7 @@
// ------------------------------------------------
try {
- URL url = Messages.class.getResource("Messages.properties.en");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.en"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -201,7 +202,7 @@
// ------------------------------------------------
try {
- URL url = Messages.class.getResource("Messages.properties.es");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.es"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -220,7 +221,7 @@
// -----------------------
try {
- URL url = Messages.class.getResource("Messages.properties.fr");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.fr"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -239,7 +240,7 @@
// -----------------------
try {
- URL url = Messages.class.getResource("Messages.properties.it");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.it"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -257,7 +258,7 @@
// -----------------------
try {
- URL url = Messages.class.getResource("Messages.properties.nl");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.nl"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -275,7 +276,7 @@
// -----------------------
try {
- URL url = Messages.class.getResource("Messages.properties.ja");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.ja"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -293,7 +294,7 @@
// -----------------------
try {
- URL url = Messages.class.getResource("Messages.properties.pl-PL");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.pl-PL"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -313,7 +314,7 @@
// -----------------------
try {
- URL url = Messages.class.getResource("Messages.properties.zh-cn");
+ URL url = adjustURL(Messages.class.getResource("Messages.properties.zh-cn"));
java.io.InputStream f = url.openStream();
try {
tmp = new Utf8Properties();
@@ -330,4 +331,15 @@
System.err.println(" " + e.toString());
}
}
+
+ private static URL adjustURL(URL resource) throws MalformedURLException {
+ String urlStr = resource.getFile();
+ System.err.println(urlStr);
+ if (urlStr.startsWith("file://"))
+ urlStr.replaceFirst("file://localhost", "file://");
+ else
+ urlStr = "file:///" + urlStr;
+ System.err.println(urlStr);
+ return new URL(urlStr);
+ }
}
Received on Thursday, 23 August 2007 08:58:36 UTC