2002/css-validator/org/w3c/css/util Messages.java,1.22,1.23

Update of /sources/public/2002/css-validator/org/w3c/css/util
In directory hutz:/tmp/cvs-serv29415/org/w3c/css/util

Modified Files:
	Messages.java 
Log Message:
jar should now work as expected; reindented some files; fixed velocity paths (not very beautiful though, would need some more work)

Index: Messages.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- Messages.java	10 Dec 2008 15:25:52 -0000	1.22
+++ Messages.java	20 Jan 2009 13:58:53 -0000	1.23
@@ -163,8 +163,7 @@
 	static {
 		Utf8Properties tmp;
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.de"));
-			java.io.InputStream f = url.openStream();
+      java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.de");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -184,8 +183,7 @@
 		// ------------------------------------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.en"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.en");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -202,8 +200,7 @@
 		// ------------------------------------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.es"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.es");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -221,8 +218,7 @@
 		// -----------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.fr"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.fr");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -240,8 +236,7 @@
 		// -----------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.ko"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ko");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -258,8 +253,7 @@
 		// -----------------------
 		
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.it"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.it");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -276,8 +270,7 @@
 		// -----------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.nl"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.nl");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -294,8 +287,7 @@
 		// -----------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.ja"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ja");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -312,8 +304,7 @@
 		// -----------------------
 		
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.pl-PL"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.pl-PL");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -332,8 +323,7 @@
 		// -----------------------
 		
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.pt-BR"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.pt-BR");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -351,8 +341,7 @@
 		}
 		// -----------------------
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.ru"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ru");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -368,8 +357,7 @@
 
 		// -----------------------
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.sv"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.sv");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);
@@ -386,8 +374,7 @@
 		// -----------------------
 
 		try {
-			URL url = adjustURL(Messages.class.getResource("Messages.properties.zh-cn"));
-			java.io.InputStream f = url.openStream();
+			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.zh-cn");
 			try {
 				tmp = new Utf8Properties();
 				tmp.load(f);

Received on Tuesday, 20 January 2009 13:59:05 UTC