--- a/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,4 @@
8294c99e685a1f6d1d37c45cd97854cf74be771e jdk7-b145
dca1e8a87e8f756f95b99bac8fe795750d42e1b0 jdk7-b146
a2a589fc29543ed32919c78a1810ad93a6fcf5bc jdk7-b147
+de9223c94f9c710b3eebb599cd3586f36c8b94a9 jdk8-b01
--- a/.hgtags-top-repo Mon Aug 29 12:23:54 2011 -0400
+++ b/.hgtags-top-repo Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,4 @@
55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+f42e3d9394b40a423d345b8da22687b5462e5f25 jdk8-b01
--- a/README Mon Aug 29 12:23:54 2011 -0400
+++ b/README Mon Aug 29 14:29:23 2011 -0700
@@ -9,11 +9,14 @@
will be needed.
This one root repository can be obtained with something like:
- hg clone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7
- To make sure you have all the nested repositories, you can run:
- cd openjdk7 && sh ./get_source.sh
- (This is identical to using the Mercurial Forest Extension command
- 'hg fclone http://hg.openjdk.java.net/jdk7/jdk7 openjdk7').
+
+ hg clone http://hg.openjdk.java.net/jdk8/jdk8 openjdk8
+
+ To make sure you have all the nested repositories, you can run the
+ get_source.sh script located in the same respository as this file:
+
+ cd openjdk8 && sh ./get_source.sh
+
People unfamiliar with Mercurial should read the first few chapters of
the Mercurial book: http://hgbook.red-bean.com/read/
@@ -22,7 +25,7 @@
Simple Build Instructions:
0. Get the necessary system software/packages installed on your system, see
- http://hg.openjdk.java.net/jdk7/build/raw-file/tip/README-builds.html
+ http://hg.openjdk.java.net/jdk8/build/raw-file/tip/README-builds.html
1. If you don't have a jdk6 installed, download and install a JDK 6 from
http://java.sun.com/javase/downloads/index.jsp
--- a/README-builds.html Mon Aug 29 12:23:54 2011 -0400
+++ b/README-builds.html Mon Aug 29 14:29:23 2011 -0700
@@ -126,38 +126,15 @@
<a href="http://openjdk.java.net/guide/repositories.html#installConfig">
Developer Guide: Installing and Configuring Mercurial</a>
section for more information.
- The Forest Extension is not part of the Mercurial install,
- and is optional,
- but can be obtained with the following commands:
- <blockquote>
- <tt>
- hg clone https://bitbucket.org/pmezard/hgforest-crew/overview/ <i>YourHgForest</i>
- </tt>
- </blockquote>
- Once you have the file <tt>forest.py</tt>, you need to add these
- lines to your <tt>${HOME}/.hgrc</tt> file:
- <blockquote>
- <tt>
- [extensions]
- <br>forest = <i>YourHgForest</i>/forest.py
- </tt>
- </blockquote>
<!-- ------------------------------------------------------ -->
<h3><a name="get_source">Getting the Source</a></h3>
<blockquote>
To get the entire set of OpenJDK Mercurial repositories
- using the Forest Extension:
+ use the script <code>get_source.sh</code> located in the root repository:
<blockquote>
<tt>
- hg fclone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
- </tt>
- </blockquote>
- To get the entire set of OpenJDK Mercurial repositories
- without using the Forest Extension:
- <blockquote>
- <tt>
- hg clone http://hg.openjdk.java.net/jdk7/jdk7 <i>YourOpenJDK</i>
+ hg clone http://hg.openjdk.java.net/jdk8/jdk8 <i>YourOpenJDK</i>
<br>cd <i>YourOpenJDK</i>
<br>sh ./get_source.sh
</tt>
@@ -172,9 +149,6 @@
<br>sh ./make/scripts/hgforest.sh pull -u
</tt>
</blockquote>
- You may find this script <tt>make/scripts/hgforest.sh</tt> faster
- than the <tt>hg</tt> forest commands provided by the
- Forest Extension.
</blockquote>
</blockquote>
@@ -558,7 +532,7 @@
understood that this is not ideal for the open source community.
It is possible this process could change in the future.
<br>
- <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk7/">
+ <b>NOTE:</b> The <a href="http://download.java.net/openjdk/jdk8/">
Complete OpenJDK Source Bundles</a> <u>will</u> contain the JAXP and
JAX-WS sources.
</p>
@@ -578,7 +552,7 @@
</li>
<li>
The OpenJDK team copies this new bundle into shared
- area (e.g. <tt>/java/devtools/share/jdk7-drops</tt>).
+ area (e.g. <tt>/java/devtools/share/jdk8-drops</tt>).
Older bundles are never deleted so we retain the history.
</li>
<li>
@@ -1726,7 +1700,7 @@
The location of any source drop bundles
(see <a href="#drops">Managing the Source Drops</a>).
The default will be
- <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk7-drops</tt>.
+ <tt>$(ALT_JDK_DEVTOOLS_PATH)/share/jdk8-drops</tt>.
</dd>
<dt><a name="ALT_UNIXCCS_PATH"><tt>ALT_UNIXCCS_PATH</tt></a></dt>
<dd>
@@ -1931,7 +1905,7 @@
PATH, INCLUDE, LIB, LIBPATH, and WINDOWSSDKDIR
variables set in your shell environment.
These bat files are not easy to use from a shell environment.
- However, there is a script placed in the root jdk7 repository called
+ However, there is a script placed in the root jdk8 repository called
vsvars.sh that can help, it should only be done once in a shell
that will be doing the build, e.g.<br>
<tt>sh ./make/scripts/vsvars.sh -v10 > settings<br>
--- a/corba/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/corba/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,4 @@
77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
+949fb60ca830364571e7c4c9964e6b351ca929ec jdk8-b01
--- a/hotspot/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/hotspot/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -174,3 +174,4 @@
9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
+0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01
--- a/jaxp/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/jaxp/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,4 @@
10ca7570f47f2ae4132648f7e8da1a05f1a98a15 jdk7-b145
bcd31fa1e3c6f51b4fdd427ef905188cdac57164 jdk7-b146
fc268cd1dd5d2e903ccd4b0275e1f9c2461ed30c jdk7-b147
+4f0fcb812767594fe9de509f946b56942db5a2f0 jdk8-b01
--- a/jaxws/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/jaxws/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,4 @@
42bfba80beb7d3260b7b135b9a39202b512eb8c2 jdk7-b145
05469dd4c3662c454f8a019e492543add60795cc jdk7-b146
d13b1f877bb5ed8dceb2f7ec10365d1db5f70b2d jdk7-b147
+64df57a1edeca74388bd62f0a87d056db981fbdf jdk8-b01
--- a/jdk/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,5 @@
1e04b38b3824a4a1d197ef681a302e6813e53f8b jdk7-b145
539e576793a8e64aaf160e0d6ab0b9723cd0bef0 jdk7-b146
f097ca2434b1412b12ab4a5c2397ce271bf681e7 jdk7-b147
+2cdbbc4a63592be7f1556fffe37b1253a77bd481 jdk8-b01
+13e70aa1398eb959c54bc68b783ca0eef1286ad2 jdk8-b02
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Look In:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Save In:
FileChooser.fileNameLabelText=File Name:
-FileChooser.folderNameLabelText=Folder name:
+FileChooser.fileNameLabelMnemonic=78
+FileChooser.folderNameLabelText=Folder Name:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Files of Type:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Up One Level
FileChooser.upFolderAccessibleName=Up
FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_de.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Suchen in:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Speichern in:
FileChooser.fileNameLabelText=Dateiname:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=Ordnername:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Dateityp:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Eine Ebene h\u00F6her
FileChooser.upFolderAccessibleName=Nach oben
FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_es.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Buscar en:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Guardar en:
FileChooser.fileNameLabelText=Nombre de Archivo:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=Nombre de la Carpeta:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Archivos de Tipo:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Subir un Nivel
FileChooser.upFolderAccessibleName=Arriba
FileChooser.homeFolderToolTipText=Inicio
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_fr.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Rechercher dans :
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Enregistrer dans :
FileChooser.fileNameLabelText=Nom du fichier :
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=Nom du dossier :
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Fichiers de type :
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Remonte d'un niveau.
FileChooser.upFolderAccessibleName=Monter
FileChooser.homeFolderToolTipText=R\u00E9pertoire d'origine
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_it.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Cerca in:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Salva in:
FileChooser.fileNameLabelText=Nome file:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=Nome della cartella:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Tipo file:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Cartella superiore
FileChooser.upFolderAccessibleName=Superiore
FileChooser.homeFolderToolTipText=Home
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ja.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=\u53C2\u7167:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=\u4FDD\u5B58:
FileChooser.fileNameLabelText=\u30D5\u30A1\u30A4\u30EB\u540D:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=\u30D5\u30A9\u30EB\u30C0\u540D:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=\u30D5\u30A1\u30A4\u30EB\u306E\u30BF\u30A4\u30D7:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=1\u30EC\u30D9\u30EB\u4E0A\u3078
FileChooser.upFolderAccessibleName=\u4E0A\u3078
FileChooser.homeFolderToolTipText=\u30DB\u30FC\u30E0
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_ko.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=\uAC80\uC0C9 \uC704\uCE58:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=\uC800\uC7A5 \uC704\uCE58:
FileChooser.fileNameLabelText=\uD30C\uC77C \uC774\uB984:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=\uD3F4\uB354 \uC774\uB984:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=\uD30C\uC77C \uC720\uD615:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=\uD55C \uB808\uBCA8 \uC704\uB85C
FileChooser.upFolderAccessibleName=\uC704\uB85C
FileChooser.homeFolderToolTipText=\uD648
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_pt_BR.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Consultar Em:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Salvar Em:
FileChooser.fileNameLabelText=Nome do Arquivo:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=Nome da pasta:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Arquivos do Tipo:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Um N\u00EDvel Acima
FileChooser.upFolderAccessibleName=Acima
FileChooser.homeFolderToolTipText=In\u00EDcio
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_sv.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=Leta i:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=Spara i:
FileChooser.fileNameLabelText=Filnamn:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=Mapp:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=Filformat:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=Upp en niv\u00E5
FileChooser.upFolderAccessibleName=Upp
FileChooser.homeFolderToolTipText=Hem
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_CN.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=\u67E5\u770B:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=\u4FDD\u5B58:
FileChooser.fileNameLabelText=\u6587\u4EF6\u540D:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=\u6587\u4EF6\u5939\u540D:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=\u6587\u4EF6\u7C7B\u578B:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=\u5411\u4E0A\u4E00\u7EA7
FileChooser.upFolderAccessibleName=\u5411\u4E0A
FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u5F55
--- a/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/com/sun/swing/internal/plaf/synth/resources/synth_zh_TW.properties Mon Aug 29 14:29:23 2011 -0700
@@ -19,10 +19,14 @@
############ FILE CHOOSER STRINGS #############
FileChooser.lookInLabelText=\u67E5\u8A62:
+FileChooser.lookInLabelMnemonic=73
FileChooser.saveInLabelText=\u5132\u5B58\u65BC:
FileChooser.fileNameLabelText=\u6A94\u6848\u540D\u7A31:
+FileChooser.fileNameLabelMnemonic=78
FileChooser.folderNameLabelText=\u8CC7\u6599\u593E\u540D\u7A31:
+FileChooser.folderNameLabelMnemonic=78
FileChooser.filesOfTypeLabelText=\u6A94\u6848\u985E\u578B:
+FileChooser.filesOfTypeLabelMnemonic=84
FileChooser.upFolderToolTipText=\u5F80\u4E0A\u4E00\u5C64
FileChooser.upFolderAccessibleName=\u5F80\u4E0A
FileChooser.homeFolderToolTipText=\u4E3B\u76EE\u9304
--- a/jdk/src/share/classes/javax/swing/SwingUtilities.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/SwingUtilities.java Mon Aug 29 14:29:23 2011 -0700
@@ -1274,8 +1274,7 @@
* <p>
* Additional documentation and examples for this method can be
* found in
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How to Use Threads</a>,
- * in <em>The Java Tutorial</em>.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>.
* <p>
* As of 1.3 this method is just a cover for <code>java.awt.EventQueue.invokeLater()</code>.
* <p>
@@ -1326,8 +1325,7 @@
* <p>
* Additional documentation and examples for this method can be
* found in
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How to Use Threads</a>,
- * in <em>The Java Tutorial</em>.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>.
* <p>
* As of 1.3 this method is just a cover for
* <code>java.awt.EventQueue.invokeAndWait()</code>.
--- a/jdk/src/share/classes/javax/swing/SwingWorker.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/SwingWorker.java Mon Aug 29 14:29:23 2011 -0700
@@ -50,8 +50,8 @@
* When writing a multi-threaded application using Swing, there are
* two constraints to keep in mind:
* (refer to
- * <a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">
- * How to Use Threads
+ * <a href="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">
+ * Concurrency in Swing
* </a> for more details):
* <ul>
* <li> Time-consuming tasks should not be run on the <i>Event
--- a/jdk/src/share/classes/javax/swing/package.html Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/package.html Mon Aug 29 14:29:23 2011 -0700
@@ -119,9 +119,9 @@
processing when working with Swing.
<p>
More information on this topic can be found in the
-<a href="http://java.sun.com/docs/books/tutorial/uiswing/">Swing tutorial</a>,
+<a href="http://download.oracle.com/javase/tutorial/uiswing/">Swing tutorial</a>,
in particular the section on
-<a href="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How to Use Threads</a>.
+<a href="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency in Swing</a>.
<H2>
--- a/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/AbstractDocument.java Mon Aug 29 14:29:23 2011 -0700
@@ -409,8 +409,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param r the renderer to execute
*/
@@ -570,8 +570,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offs the starting offset >= 0
* @param len the number of characters to remove >= 0
@@ -683,8 +683,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offs the starting offset >= 0
* @param str the string to insert; does nothing with null/empty strings
@@ -818,8 +818,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offs the position in the model >= 0
* @return the position
--- a/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/DefaultCaret.java Mon Aug 29 14:29:23 2011 -0700
@@ -237,8 +237,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*/
protected final synchronized void repaint() {
if (component != null) {
--- a/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/DefaultStyledDocument.java Mon Aug 29 14:29:23 2011 -0700
@@ -173,8 +173,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offset the starting offset >= 0
* @param data the element data
@@ -426,8 +426,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param pos the offset from the start of the document >= 0
* @param s the logical style to assign to the paragraph, null if none
@@ -483,8 +483,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offset the offset in the document >= 0
* @param length the length >= 0
@@ -536,8 +536,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offset the offset into the paragraph >= 0
* @param length the number of characters affected >= 0
--- a/jdk/src/share/classes/javax/swing/text/JTextComponent.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/JTextComponent.java Mon Aug 29 14:29:23 2011 -0700
@@ -2213,8 +2213,8 @@
* <p>
* This method is thread-safe, although most Swing methods are not. Please
* see <A
- * HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">
- * How to Use Threads</A> for more information.
+ * HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">
+ * Concurrency in Swing</A> for more information.
*
* <p>
* <b>Sample Usage</b>. This code snippet shows a cross-platform print
@@ -2471,8 +2471,8 @@
* <p>
* This method is thread-safe, although most Swing methods are not. Please
* see <A
- * HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">
- * How to Use Threads</A> for more information.
+ * HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">
+ * Concurrency in Swing</A> for more information.
*
* <p>
* The returned {@code Printable} can be printed on any thread.
--- a/jdk/src/share/classes/javax/swing/text/PlainDocument.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/PlainDocument.java Mon Aug 29 14:29:23 2011 -0700
@@ -100,8 +100,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offs the starting offset >= 0
* @param str the string to insert; does nothing with null/empty strings
--- a/jdk/src/share/classes/javax/swing/text/StyleContext.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/StyleContext.java Mon Aug 29 14:29:23 2011 -0700
@@ -292,8 +292,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param old the old attribute set
* @param name the non-null attribute name
@@ -321,8 +321,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param old the old attribute set
* @param attr the attributes to add
@@ -349,8 +349,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param old the old set of attributes
* @param name the non-null attribute name
@@ -377,8 +377,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param old the old attribute set
* @param names the attribute names
@@ -405,8 +405,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param old the old attribute set
* @param attrs the attributes
@@ -445,8 +445,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param a the set to reclaim
*/
--- a/jdk/src/share/classes/javax/swing/text/html/CSS.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/html/CSS.java Mon Aug 29 14:29:23 2011 -0700
@@ -806,15 +806,11 @@
// translate border width into the cells, if it has non-zero value.
AttributeSet tableAttr = elem.getParentElement().
getParentElement().getAttributes();
- int borderWidth;
- try {
- borderWidth = Integer.parseInt(
- (String) tableAttr.getAttribute(HTML.Attribute.BORDER));
- } catch (NumberFormatException e) {
- borderWidth = 0;
- }
+
+ int borderWidth = getTableBorder(tableAttr);
if (borderWidth > 0) {
- translateAttribute(HTML.Attribute.BORDER, tableAttr, cssAttrSet);
+ // If table contains the BORDER attribute cells should have border width equals 1
+ translateAttribute(HTML.Attribute.BORDER, "1", cssAttrSet);
}
String pad = (String)tableAttr.getAttribute(HTML.Attribute.CELLPADDING);
if (pad != null) {
@@ -850,6 +846,21 @@
return cssAttrSet;
}
+ private static int getTableBorder(AttributeSet tableAttr) {
+ String borderValue = (String) tableAttr.getAttribute(HTML.Attribute.BORDER);
+
+ if (borderValue == HTML.NULL_ATTRIBUTE_VALUE || "".equals(borderValue)) {
+ // Some browsers accept <TABLE BORDER> and <TABLE BORDER=""> with the same semantics as BORDER=1
+ return 1;
+ }
+
+ try {
+ return Integer.parseInt(borderValue);
+ } catch (NumberFormatException e) {
+ return 0;
+ }
+ }
+
private static final Hashtable<String, Attribute> attributeMap = new Hashtable<String, Attribute>();
private static final Hashtable<String, Value> valueMap = new Hashtable<String, Value>();
@@ -1400,17 +1411,20 @@
}
}
} else {
-
- /*
- * The html size attribute has a mapping in the CSS world only
- * if it is par of a font or base font tag.
- */
-
if (key == HTML.Attribute.SIZE && !isHTMLFontTag(tag)) {
- continue;
+ /*
+ * The html size attribute has a mapping in the CSS world only
+ * if it is par of a font or base font tag.
+ */
+ } else if (tag == HTML.Tag.TABLE && key == HTML.Attribute.BORDER) {
+ int borderWidth = getTableBorder(htmlAttrSet);
+
+ if (borderWidth > 0) {
+ translateAttribute(HTML.Attribute.BORDER, Integer.toString(borderWidth), cssAttrSet);
+ }
+ } else {
+ translateAttribute(key, (String) htmlAttrSet.getAttribute(key), cssAttrSet);
}
-
- translateAttribute(key, htmlAttrSet, cssAttrSet);
}
} else if (name instanceof CSS.Attribute) {
cssAttrSet.addAttribute(name, htmlAttrSet.getAttribute(name));
@@ -1419,7 +1433,7 @@
}
private void translateAttribute(HTML.Attribute key,
- AttributeSet htmlAttrSet,
+ String htmlAttrValue,
MutableAttributeSet cssAttrSet) {
/*
* In the case of all remaining HTML.Attribute's they
@@ -1427,8 +1441,6 @@
*/
CSS.Attribute[] cssAttrList = getCssAttribute(key);
- String htmlAttrValue = (String)htmlAttrSet.getAttribute(key);
-
if (cssAttrList == null || htmlAttrValue == null) {
return;
}
--- a/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/html/HTMLDocument.java Mon Aug 29 14:29:23 2011 -0700
@@ -474,8 +474,8 @@
* <p>
* This method is thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @param offset the offset into the paragraph (must be at least 0)
* @param length the number of characters affected (must be at least 0)
--- a/jdk/src/share/classes/javax/swing/text/html/TableView.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/javax/swing/text/html/TableView.java Mon Aug 29 14:29:23 2011 -0700
@@ -242,7 +242,8 @@
if (lv != null) {
cellSpacing = (int) lv.getValue();
} else {
- cellSpacing = 0;
+ // Default cell spacing equals 2
+ cellSpacing = 2;
}
lv = (CSS.LengthValue)
attr.getAttribute(CSS.Attribute.BORDER_TOP_WIDTH);
@@ -251,8 +252,7 @@
} else {
borderWidth = 0;
}
-
- }
+ }
}
/**
--- a/jdk/src/share/classes/sun/swing/PrintingStatus.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/share/classes/sun/swing/PrintingStatus.java Mon Aug 29 14:29:23 2011 -0700
@@ -43,8 +43,8 @@
* <p/>
* Methods of these class are thread safe, although most Swing methods
* are not. Please see
- * <A HREF="http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html">How
- * to Use Threads</A> for more information.
+ * <A HREF="http://download.oracle.com/javase/tutorial/uiswing/concurrency/index.html">Concurrency
+ * in Swing</A> for more information.
*
* @author Alexander Potochkin
* @since 1.6
--- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Mon Aug 29 14:29:23 2011 -0700
@@ -1532,6 +1532,10 @@
}
public synchronized void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
+ if (name == null) {
+ // See JavaDoc for the Toolkit.addPropertyChangeListener() method
+ return;
+ }
initXSettingsIfNeeded(name);
super.addPropertyChangeListener(name, pcl);
}
--- a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java Mon Aug 29 14:29:23 2011 -0700
@@ -95,11 +95,11 @@
}
// Now check for XRender system property
- boolean xRenderRequested = false;
+ boolean xRenderRequested = true;
String xProp = System.getProperty("sun.java2d.xrender");
if (xProp != null) {
- if (xProp.equals("true") || xProp.equals("t")) {
- xRenderRequested = true;
+ if (xProp.equals("false") || xProp.equals("f")) {
+ xRenderRequested = false;
} else if (xProp.equals("True") || xProp.equals("T")) {
xRenderRequested = true;
xRenderVerbose = true;
--- a/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/src/windows/classes/sun/awt/windows/WToolkit.java Mon Aug 29 14:29:23 2011 -0700
@@ -879,6 +879,10 @@
}
public synchronized void addPropertyChangeListener(String name, PropertyChangeListener pcl) {
+ if (name == null) {
+ // See JavaDoc for the Toolkit.addPropertyChangeListener() method
+ return;
+ }
if ( WDesktopProperties.isWindowsProperty(name)
|| name.startsWith(awtPrefix)
|| name.startsWith(dndPrefix))
--- a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java Mon Aug 29 12:23:54 2011 -0400
+++ b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java Mon Aug 29 14:29:23 2011 -0700
@@ -69,7 +69,12 @@
toolkit.realSync();
System.out.println("Test passed!");
- frame.dispose();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ frame.dispose();
+ }
+ });
}
private static void createGui() {
@@ -88,30 +93,44 @@
frame.setSize(200, 200);
}
- private static void showPopup(final boolean shouldBeShifted) {
- SwingUtilities.invokeLater(new Runnable() {
+ private static void showPopup(final boolean shouldBeShifted) throws Exception {
+ SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
// Place frame just above the task bar
Dimension screenSize = toolkit.getScreenSize();
frame.setLocation(screenSize.width / 2,
screenSize.height - frame.getHeight() - screenInsets.bottom);
frame.setVisible(true);
+ }
+ });
+ // Ensure frame is visible
+ toolkit.realSync();
+
+ final Point point = new Point();
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
// Place popup over the task bar
+ point.x = 0;
+ point.y = frame.getHeight() - popup.getPreferredSize().height + screenInsets.bottom;
+ popup.show(frame, point.x, point.y);
+ }
+ });
+
+ // Ensure popup is visible
+ toolkit.realSync();
+
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
Point frameLoc = frame.getLocationOnScreen();
- int x = 0;
- int y = frame.getHeight()
- - popup.getPreferredSize().height + screenInsets.bottom;
- popup.show(frame, x, y);
-
if (shouldBeShifted) {
if (popup.getLocationOnScreen()
- .equals(new Point(frameLoc.x, frameLoc.y + y))) {
+ .equals(new Point(frameLoc.x, frameLoc.y + point.y))) {
throw new RuntimeException("Popup is not shifted");
}
} else {
if (!popup.getLocationOnScreen()
- .equals(new Point(frameLoc.x, frameLoc.y + y))) {
+ .equals(new Point(frameLoc.x, frameLoc.y + point.y))) {
throw new RuntimeException("Popup is unexpectedly shifted");
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.html Mon Aug 29 14:29:23 2011 -0700
@@ -0,0 +1,12 @@
+<html>
+<body>
+<applet code="bug7030332.class" width=600 height=400></applet>
+
+Compare Golden Images with rendered JEditorPane.
+They should looks simalar in each line. Pay attention to:
+
+1. Border width around tables
+2. Border width around cells
+
+</body>
+</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/swing/text/html/TableView/7030332/bug7030332.java Mon Aug 29 14:29:23 2011 -0700
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/* @test
+ @bug 7030332
+ @summary Default borders in tables looks incorrect JEditorPane
+ @author Pavel Porvatov
+ * @run applet/manual=yesno bug7030332.html
+*/
+
+import javax.swing.*;
+import java.awt.*;
+import java.net.URL;
+
+public class bug7030332 extends JApplet {
+ public static final String[] HTML_SAMPLES = new String[]{
+ "<table border><tr><th>Column1</th><th>Column2</th></tr></table>",
+ "<table border=\"\"><tr><th>Column1</th><th>Column2</th></tr></table>",
+ "<table border=\"1\"><tr><th>Column1</th><th>Column2</th></tr></table>",
+ "<table border=\"2\"><tr><th>Column1</th><th>Column2</th></tr></table>",
+ };
+
+ public static void main(String[] args) throws Exception {
+ SwingUtilities.invokeLater(new Runnable() {
+ public void run() {
+ JFrame frame = new JFrame();
+
+ frame.setContentPane(createContentPane());
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ frame.setSize(600, 400);
+ frame.setLocationRelativeTo(null);
+
+ frame.setVisible(true);
+
+ }
+ });
+ }
+
+ public void init() {
+ try {
+ SwingUtilities.invokeAndWait(new Runnable() {
+ public void run() {
+ setContentPane(createContentPane());
+ }
+ });
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static Container createContentPane() {
+ JPanel result = new JPanel(new GridLayout(HTML_SAMPLES.length + 1, 3, 10, 10));
+
+ result.add(new JLabel("Html code"));
+ result.add(new JLabel("Golden image"));
+ result.add(new JLabel("JEditorPane"));
+
+ for (int i = 0; i < HTML_SAMPLES.length; i++) {
+ String htmlSample = HTML_SAMPLES[i];
+
+ JTextArea textArea = new JTextArea(htmlSample);
+
+ textArea.setLineWrap(true);
+
+ result.add(textArea);
+
+ String imageName = "sample" + i + ".png";
+ URL resource = bug7030332.class.getResource(imageName);
+
+ result.add(resource == null ? new JLabel(imageName + " not found") :
+ new JLabel(new ImageIcon(resource), SwingConstants.LEFT));
+
+ result.add(new JEditorPane("text/html", htmlSample));
+ }
+
+ return result;
+ }
+}
Binary file jdk/test/javax/swing/text/html/TableView/7030332/sample0.png has changed
Binary file jdk/test/javax/swing/text/html/TableView/7030332/sample1.png has changed
Binary file jdk/test/javax/swing/text/html/TableView/7030332/sample2.png has changed
Binary file jdk/test/javax/swing/text/html/TableView/7030332/sample3.png has changed
Binary file jdk/test/javax/swing/text/html/TableView/7030332/sample4.png has changed
--- a/langtools/.hgtags Mon Aug 29 12:23:54 2011 -0400
+++ b/langtools/.hgtags Mon Aug 29 14:29:23 2011 -0700
@@ -122,3 +122,4 @@
c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
+e9f118c2bd3c4690d8d2e6b108b5bad7e226634c jdk8-b01