From: Thomas Fitzsimmons Date: Thu, 3 May 2007 19:02:52 +0000 (+0000) Subject: Makefile.in: Regenerate. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97797e00e784d263526d88a3949e6bd7fa838101;p=gcc.git Makefile.in: Regenerate. 2007-05-03 Thomas Fitzsimmons 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 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5c6ad81e1b3..9607a3dcd89 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,16 @@ +2007-05-03 Thomas Fitzsimmons + + 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 https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238755 diff --git a/libjava/Makefile.in b/libjava/Makefile.in index b454a4ae7bc..369c1913222 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -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 \ diff --git a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java index 0ede1c74ed9..cc61889d76f 100644 --- a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java +++ b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java @@ -1462,7 +1462,7 @@ public class HTMLEditorKit } catch (IOException ex) { - // No style available. + throw new RuntimeException("No style available.", ex); } } return styleSheet; diff --git a/libjava/classpath/javax/swing/text/html/default.css b/libjava/classpath/javax/swing/text/html/default.css deleted file mode 100644 index f2a44f8c8bf..00000000000 --- a/libjava/classpath/javax/swing/text/html/default.css +++ /dev/null @@ -1,378 +0,0 @@ -/* default.css -- - Copyright (C) 2005 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - -nobr { - white-space: nowrap; -} - -ol { - margin-right: 50px; - margin-top: 10px; - margin-left: 50px; - margin-bottom: 10px; - list-style-type: decimal; -} - -u { - text-decoration: underline; -} - -s { - text-decoration: line-through; -} - -p { - margin-top: 15px; -} - -dd p { - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -ol li p { - margin-top: 0px; - margin-bottom: 0px; -} - - -address { - font-style: italic; - color: blue; -} - -i { - font-style: italic; -} - -h6 { - margin-top: 10px; - font-size: xx-small; - font-weight: bold; - margin-bottom: 10px; -} - -h5 { - margin-top: 10px; - font-size: x-small; - font-weight: bold; - margin-bottom: 10px; -} - -h4 { - margin-top: 10px; - font-size: small; - font-weight: bold; - margin-bottom: 10px; -} - -h3 { - margin-top: 10px; - font-size: medium; - font-weight: bold; - margin-bottom: 10px; -} - -dir li p { - margin-top: 0px; - margin-bottom: 0px; -} - -h2 { - margin-top: 10px; - font-size: large; - font-weight: bold; - margin-bottom: 10px; -} - -b { - font-weight: bold; -} - -h1 { - margin-top: 10px; - font-size: x-large; - font-weight: bold; - margin-bottom: 10px; -} - -caption { - text-align: center; - caption-side: top; -} - -a { - text-decoration: underline; - color: blue; -} - -ul li ul li ul li { - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -menu { - margin-right: 40px; - margin-top: 10px; - margin-left: 40px; - margin-bottom: 10px; -} - -menu li p { - margin-top: 0px; - margin-bottom: 0px; -} - -sup { - vertical-align: super; -} - -body { - margin-right: 0px; - margin-left: 0px; - font-family: Serif; - font-size: 14pt; - font-weight: normal; - color: black; -} - -ul li ul li ul { - margin-right: 25px; - margin-left: 25px; - list-style-type: square; -} - -blockquote { - margin-right: 35px; - margin-left: 35px; - margin-top: 5px; - margin-bottom: 5px; -} - -samp { - font-family: Monospaced; - font-size: small; -} - -cite { - font-style: italic; -} - -sub { - vertical-align: sub; -} - -em { - font-style: italic; -} - -ul li p { - margin-top: 0px; - margin-bottom: 0px; -} - -ul li ul li { - margin-right: 0px; - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -var { - font-style: italic; - font-weight: bold; -} - -table { - border-color: Gray; - border-style: outset; -} - -dfn { - font-style: italic; -} - -menu li { - margin-right: 0px; - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -strong { - font-weight: bold; -} - -ul { - margin-right: 50px; - margin-top: 10px; - margin-left: 50px; - margin-bottom: 10px; - list-style-type: disc; -} - -center { - text-align: center; -} - -ul li ul { - margin-right: 25px; - margin-left: 25px; - list-style-type: circle; -} - -kbd { - font-family: Monospaced; - font-size: small; -} - -dir li { - margin-right: 0px; - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -ul li menu { - margin-right: 25px; - margin-left: 25px; - list-style-type: circle; -} - -dt { - margin-top: 0px; - margin-bottom: 0px; -} - -ol li { - margin-right: 0px; - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -li p { - margin-top: 0px; - margin-bottom: 0px; -} - -default { -} - -strike { - text-decoration: line-through; -} - -dl { - margin-left: 0px; - margin-top: 10px; - margin-bottom: 10px; -} - -tt { - font-family: Monospaced; -} - -ul li { - margin-right: 0px; - margin-left: 0px; - margin-top: 0px; - margin-bottom: 0px; -} - -dir { - margin-right: 40px; - margin-top: 10px; - margin-left: 40px; - margin-bottom: 10px; -} - -tr { - text-align: left; -} - -pre p { - margin-top: 0px; -} - -dd { - margin-right: 40px; - margin-top: 0px; - margin-left: 40px; - margin-bottom: 0px; -} - -th { - padding-bottom: 3px; - text-align: center; - padding-top: 3px; - padding-right: 3px; - padding-left: 3px; - font-weight: bold; - border-color: Gray; - border-style: inset; -} - -pre { - margin-top: 5px; - font-family: Monospaced; - margin-bottom: 5px; -} - -td { - padding-bottom: 3px; - padding-top: 3px; - padding-right: 3px; - padding-left: 3px; - border-color: Gray; - border-style: inset; -} - -code { - font-family: Monospaced; - font-size: small; -} - -small { - font-size: x-small; -} - -big { - font-size: x-large; -} diff --git a/libjava/classpath/resource/javax/swing/text/html/default.css b/libjava/classpath/resource/javax/swing/text/html/default.css new file mode 100644 index 00000000000..f2a44f8c8bf --- /dev/null +++ b/libjava/classpath/resource/javax/swing/text/html/default.css @@ -0,0 +1,378 @@ +/* default.css -- + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +nobr { + white-space: nowrap; +} + +ol { + margin-right: 50px; + margin-top: 10px; + margin-left: 50px; + margin-bottom: 10px; + list-style-type: decimal; +} + +u { + text-decoration: underline; +} + +s { + text-decoration: line-through; +} + +p { + margin-top: 15px; +} + +dd p { + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +ol li p { + margin-top: 0px; + margin-bottom: 0px; +} + + +address { + font-style: italic; + color: blue; +} + +i { + font-style: italic; +} + +h6 { + margin-top: 10px; + font-size: xx-small; + font-weight: bold; + margin-bottom: 10px; +} + +h5 { + margin-top: 10px; + font-size: x-small; + font-weight: bold; + margin-bottom: 10px; +} + +h4 { + margin-top: 10px; + font-size: small; + font-weight: bold; + margin-bottom: 10px; +} + +h3 { + margin-top: 10px; + font-size: medium; + font-weight: bold; + margin-bottom: 10px; +} + +dir li p { + margin-top: 0px; + margin-bottom: 0px; +} + +h2 { + margin-top: 10px; + font-size: large; + font-weight: bold; + margin-bottom: 10px; +} + +b { + font-weight: bold; +} + +h1 { + margin-top: 10px; + font-size: x-large; + font-weight: bold; + margin-bottom: 10px; +} + +caption { + text-align: center; + caption-side: top; +} + +a { + text-decoration: underline; + color: blue; +} + +ul li ul li ul li { + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +menu { + margin-right: 40px; + margin-top: 10px; + margin-left: 40px; + margin-bottom: 10px; +} + +menu li p { + margin-top: 0px; + margin-bottom: 0px; +} + +sup { + vertical-align: super; +} + +body { + margin-right: 0px; + margin-left: 0px; + font-family: Serif; + font-size: 14pt; + font-weight: normal; + color: black; +} + +ul li ul li ul { + margin-right: 25px; + margin-left: 25px; + list-style-type: square; +} + +blockquote { + margin-right: 35px; + margin-left: 35px; + margin-top: 5px; + margin-bottom: 5px; +} + +samp { + font-family: Monospaced; + font-size: small; +} + +cite { + font-style: italic; +} + +sub { + vertical-align: sub; +} + +em { + font-style: italic; +} + +ul li p { + margin-top: 0px; + margin-bottom: 0px; +} + +ul li ul li { + margin-right: 0px; + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +var { + font-style: italic; + font-weight: bold; +} + +table { + border-color: Gray; + border-style: outset; +} + +dfn { + font-style: italic; +} + +menu li { + margin-right: 0px; + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +strong { + font-weight: bold; +} + +ul { + margin-right: 50px; + margin-top: 10px; + margin-left: 50px; + margin-bottom: 10px; + list-style-type: disc; +} + +center { + text-align: center; +} + +ul li ul { + margin-right: 25px; + margin-left: 25px; + list-style-type: circle; +} + +kbd { + font-family: Monospaced; + font-size: small; +} + +dir li { + margin-right: 0px; + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +ul li menu { + margin-right: 25px; + margin-left: 25px; + list-style-type: circle; +} + +dt { + margin-top: 0px; + margin-bottom: 0px; +} + +ol li { + margin-right: 0px; + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +li p { + margin-top: 0px; + margin-bottom: 0px; +} + +default { +} + +strike { + text-decoration: line-through; +} + +dl { + margin-left: 0px; + margin-top: 10px; + margin-bottom: 10px; +} + +tt { + font-family: Monospaced; +} + +ul li { + margin-right: 0px; + margin-left: 0px; + margin-top: 0px; + margin-bottom: 0px; +} + +dir { + margin-right: 40px; + margin-top: 10px; + margin-left: 40px; + margin-bottom: 10px; +} + +tr { + text-align: left; +} + +pre p { + margin-top: 0px; +} + +dd { + margin-right: 40px; + margin-top: 0px; + margin-left: 40px; + margin-bottom: 0px; +} + +th { + padding-bottom: 3px; + text-align: center; + padding-top: 3px; + padding-right: 3px; + padding-left: 3px; + font-weight: bold; + border-color: Gray; + border-style: inset; +} + +pre { + margin-top: 5px; + font-family: Monospaced; + margin-bottom: 5px; +} + +td { + padding-bottom: 3px; + padding-top: 3px; + padding-right: 3px; + padding-left: 3px; + border-color: Gray; + border-style: inset; +} + +code { + font-family: Monospaced; + font-size: small; +} + +small { + font-size: x-small; +} + +big { + font-size: x-large; +} diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl index 0fc06fce15d..ab8a85d2c29 100755 --- a/libjava/scripts/makemake.tcl +++ b/libjava/scripts/makemake.tcl @@ -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"} { diff --git a/libjava/sources.am b/libjava/sources.am index de98ee6ce10..b02dfb709dc 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -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 \