2002/css-validator/org/w3c/css/css StyleSheetCom.java,1.18,1.19

• From: Julien Grand-Mourcel via cvs-syncmail <cvsmail@w3.org>
• Date: Mon, 30 Jul 2007 11:48:02 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1IFTjG-0003bh-GH@lionel-hutz.w3.org>

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

Modified Files:
	StyleSheetCom.java 
Log Message:
Changing this file using the only StyleSheetGenerator

Index: StyleSheetCom.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetCom.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- StyleSheetCom.java	13 Jul 2007 13:32:19 -0000	1.18
+++ StyleSheetCom.java	30 Jul 2007 11:48:00 -0000	1.19
@@ -59,20 +59,12 @@
 	}
 	if (style != null) {
 	    style.findConflicts(ac);
-	    if (documentBase.startsWith("html")) {
-		StyleSheetGeneratorHTML output =
-		    new StyleSheetGeneratorHTML(ac, file,
+	    StyleSheetGenerator output =
+		    new StyleSheetGenerator(ac, file,
 						 style,
 						 documentBase,
 						 warningLevel);
 		output.print(out);
-	    } else {
-		StyleSheetGenerator style2 = new StyleSheetGenerator(file,
-								       style,
-								       documentBase,
-								       warningLevel);
-		style2.print(out);
-	    }
 	} else {
 	    System.err.println("No style sheet found in your HTML document");
 	}
@@ -87,26 +79,16 @@
 	style = handler.getStyleSheet();
 	if (style != null) {
 	    style.setType("text/xml");
-	}
-	if (style != null) {
 	    style.findConflicts(ac);
-	    if (documentBase.startsWith("html")) {
-		StyleSheetGeneratorHTML output =
-		    new StyleSheetGeneratorHTML(ac, file,
-						 style,
-						 documentBase,
-						 warningLevel);
-		output.print(out);
-	    } else {
-		StyleSheetGenerator style2 = new StyleSheetGenerator(file,
-								       style,
-								       documentBase,
-								       warningLevel);
-		style2.print(out);
-	    }
 	} else {
 	    System.err.println("No style sheet found in your HTML document");
 	}
+	StyleSheetGenerator output =
+	    new StyleSheetGenerator(ac, file,
+					 style,
+					 documentBase,
+					 warningLevel);
+	output.print(out);
 	ac.setInput("text/xml");
     }
 
@@ -139,16 +121,9 @@
 			System.out.println(';');
 		    }
 		});
-	} else if (documentBase.startsWith("html")) {
-	    StyleSheetGeneratorHTML output =
-		new StyleSheetGeneratorHTML(ac, file,
-					     parser.getStyleSheet(),
-					     documentBase,
-					     warningLevel);
-	    output.print(out);
 	} else {
 	    StyleSheetGenerator output =
-		new StyleSheetGenerator(file,
+		new StyleSheetGenerator(ac, file,
 					 parser.getStyleSheet(),
 					 documentBase,
 					 warningLevel);

Received on Monday, 30 July 2007 11:48:10 UTC