Changeset 288

Timestamp:

Apr 30, 2011, 1:39:32 AM (14 years ago)

Author:

dmik

Message:

jdk: Fixed: the dtdbuilder tool would write the binary DTD to stdout causing "\n" to "\r\n" expansion on OS/2 (Win32 too?) and thus breaking the resulting file which in turn would completely break support of HTML text in Swing components [vendor bug].

Location:

trunk/openjdk/jdk

Files:

• make/javax/swing/html32dtd/Makefile (modified) (1 diff)
• make/tools/src/build/tools/dtdbuilder/DTDBuilder.java (modified) (3 diffs)
• src/share/classes/javax/swing/text/html/parser/ParserDelegator.java (modified) (1 diff)

trunk/openjdk/jdk/make/javax/swing/html32dtd/Makefile

@@ -39 +39 @@
         @$(prep-target)
         ($(BOOT_JAVA_CMD) -Ddtd_home=$(DTDDATA) \
-                -jar $(DTDBUILDER_JARFILE) html32 > $@) || exit 1
+                -jar $(DTDBUILDER_JARFILE) html32 $@) || exit 1
         @$(java-vm-cleanup)
 

trunk/openjdk/jdk/make/tools/src/build/tools/dtdbuilder/DTDBuilder.java

@@ -30 +30 @@
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.FileNotFoundException;
@@ -289 +290 @@
         }
 
+        if (argv.length < 2) {
+            System.err.println("Must specify arguments: <dtd_file> <output_file>");
+            return;
+        }
+
         DTDBuilder dtd = null;
         try {
@@ -302 +308 @@
         }
         try {
-            DataOutputStream str = new DataOutputStream(System.out);
+            DataOutputStream str = new DataOutputStream(new FileOutputStream(argv[1]));
             dtd.save(str, argv[0]);
             str.close();
         } catch (IOException ex) {
-            ex.printStackTrace();
+            System.err.println("Could not save BDTD file "+argv[1]);
+            e.printStackTrace(System.err);
             System.exit(1);
         }

trunk/openjdk/jdk/src/share/classes/javax/swing/text/html/parser/ParserDelegator.java

@@ -82 +82 @@
             }
         } catch (Exception e) {
-            System.out.println(e);
+            e.printStackTrace();
         }
         return dtd;