Makefile.in: Regenerate.
2007-05-03 Thomas Fitzsimmons <fitzsim@redhat.com> https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=237304 * Makefile.in: Regenerate. * scripts/makemake.tcl (scan_directory): Treat default.css as a property file. * classpath/javax/swing/text/html/default.css: Move to... * classpath/resource/javax/swing/text/html/default.css: New file. * classpath/javax/swing/text/html/HTMLEditorKit.java (getStyleSheet): Throw RuntimeException when style loading fails. * sources.am (property_files): Add classpath/resource/javax/swing/text/html/default.css. From-SVN: r124387
This commit is contained in:
parent
45b88fa2c4
commit
97797e00e7
6 changed files with 19 additions and 1 deletions
|
@ -1,3 +1,16 @@
|
|||
2007-05-03 Thomas Fitzsimmons <fitzsim@redhat.com>
|
||||
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=237304
|
||||
* Makefile.in: Regenerate.
|
||||
* scripts/makemake.tcl (scan_directory): Treat default.css as a
|
||||
property file.
|
||||
* classpath/javax/swing/text/html/default.css: Move to...
|
||||
* classpath/resource/javax/swing/text/html/default.css: New file.
|
||||
* classpath/javax/swing/text/html/HTMLEditorKit.java
|
||||
(getStyleSheet): Throw RuntimeException when style loading fails.
|
||||
* sources.am (property_files): Add
|
||||
classpath/resource/javax/swing/text/html/default.css.
|
||||
|
||||
2007-05-02 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238755
|
||||
|
|
|
@ -7786,6 +7786,7 @@ property_files = \
|
|||
classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
|
||||
classpath/resource/java/util/iso4217.properties \
|
||||
classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
|
||||
classpath/resource/javax/swing/text/html/default.css \
|
||||
classpath/resource/org/ietf/jgss/MessagesBundle.properties \
|
||||
classpath/resource/sun/rmi/rmic/messages.properties \
|
||||
classpath/resource/com/sun/tools/javac/messages.properties \
|
||||
|
|
|
@ -1462,7 +1462,7 @@ public class HTMLEditorKit
|
|||
}
|
||||
catch (IOException ex)
|
||||
{
|
||||
// No style available.
|
||||
throw new RuntimeException("No style available.", ex);
|
||||
}
|
||||
}
|
||||
return styleSheet;
|
||||
|
|
|
@ -228,6 +228,9 @@ proc scan_directory {basedir subdir} {
|
|||
# We assume there aren't any overrides.
|
||||
lappend properties_files $basedir/$subdir/$file
|
||||
}
|
||||
} elseif {[string match *.css $file]} {
|
||||
# Special case for default.css needed by javax.swing.text.html.
|
||||
lappend properties_files $basedir/$subdir/$file
|
||||
} elseif {[file isdirectory $file]} {
|
||||
lappend subdirs $subdir/$file
|
||||
} elseif {$subdir == "META-INF/services"} {
|
||||
|
|
|
@ -9005,6 +9005,7 @@ property_files = \
|
|||
classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
|
||||
classpath/resource/java/util/iso4217.properties \
|
||||
classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
|
||||
classpath/resource/javax/swing/text/html/default.css \
|
||||
classpath/resource/org/ietf/jgss/MessagesBundle.properties \
|
||||
classpath/resource/sun/rmi/rmic/messages.properties \
|
||||
classpath/resource/com/sun/tools/javac/messages.properties \
|
||||
|
|
Loading…
Add table
Reference in a new issue