/hg/icedtea6: S6768387, PR670: REGRESSION: JTable no longer seri...
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Thu Mar 24 08:29:21 PDT 2011
changeset f2b14c2da1ee in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=f2b14c2da1ee
author: Omair Majid <omajid at redhat.com>
date: Thu Mar 24 11:27:32 2011 -0400
S6768387, PR670: REGRESSION: JTable no longer serializable
2011-03-24 Omair Majid <omajid at redhat.com>
S6768387, PR670: REGRESSION: JTable no longer serializable
* NEWS: Add backport.
* Makefile.am (ICEDTEA_PATCHES): Add new patch.
* patches/openjdk/6768387-jtable_not_serializable.patch: New file.
diffstat:
ChangeLog | 7 +
Makefile.am | 3 +-
NEWS | 1 +
patches/openjdk/6768387-jtable_not_serializable.patch | 104 ++++++++++++++++++
4 files changed, 114 insertions(+), 1 deletions(-)
diffs (148 lines):
diff -r d80b12e57e10 -r f2b14c2da1ee ChangeLog
--- a/ChangeLog Thu Mar 24 13:05:27 2011 +0100
+++ b/ChangeLog Thu Mar 24 11:27:32 2011 -0400
@@ -1,3 +1,10 @@
+2011-03-24 Omair Majid <omajid at redhat.com>
+
+ S6768387, PR670: REGRESSION: JTable no longer serializable
+ * NEWS: Add backport.
+ * Makefile.am (ICEDTEA_PATCHES): Add new patch.
+ * patches/openjdk/6768387-jtable_not_serializable.patch: New file.
+
2011-03-24 Xerxes Ranby <xerxes at zafena.se>
JamVM: Base default min and max heap size on physical memory.
diff -r d80b12e57e10 -r f2b14c2da1ee Makefile.am
--- a/Makefile.am Thu Mar 24 13:05:27 2011 +0100
+++ b/Makefile.am Thu Mar 24 11:27:32 2011 -0400
@@ -329,7 +329,8 @@
patches/jtreg-double-to-string.patch \
patches/openjdk/7023591-AAShapePipe.patch \
patches/openjdk/7027667-AAShapePipeRegTest.patch \
- patches/openjdk/7019861-AA-regression-fix.patch
+ patches/openjdk/7019861-AA-regression-fix.patch \
+ patches/openjdk/6768387-jtable_not_serializable.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r d80b12e57e10 -r f2b14c2da1ee NEWS
--- a/NEWS Thu Mar 24 13:05:27 2011 +0100
+++ b/NEWS Thu Mar 24 11:27:32 2011 -0400
@@ -45,6 +45,7 @@
* Backports
- S7023591, S7027667: Clipped antialiased rectangles are filled, not drawn.
- S7019861: Last scanline skpped when doing AA.
+ - S6768387, PR670: REGRESSION: JTable no longer serializable
New in release 1.10 (2011-XX-XX):
diff -r d80b12e57e10 -r f2b14c2da1ee patches/openjdk/6768387-jtable_not_serializable.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6768387-jtable_not_serializable.patch Thu Mar 24 11:27:32 2011 -0400
@@ -0,0 +1,106 @@
+# HG changeset patch
+# User alexp
+# Date 1274805592 -14400
+# Node ID 8d59b361635f12e378b41b44c4b953849de0d9fa
+# Parent 1297a41dbb47e58e89f7f639cee933a677998318
+6768387: REGRESSION: JTable no longer serializable
+Reviewed-by: rupashka
+
+diff -r 1297a41dbb47 -r 8d59b361635f src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
+--- openjdk/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java Tue May 25 20:30:54 2010 +0400
++++ openjdk/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java Tue May 25 20:39:52 2010 +0400
+@@ -24,6 +24,8 @@
+ */
+ package sun.swing.table;
+
++import sun.swing.DefaultLookup;
++
+ import java.awt.Component;
+ import java.awt.Color;
+ import java.awt.FontMetrics;
+@@ -31,12 +33,11 @@
+ import java.awt.Insets;
+ import java.awt.Point;
+ import java.awt.Rectangle;
++import java.io.Serializable;
+ import javax.swing.*;
+ import javax.swing.plaf.UIResource;
+ import javax.swing.border.Border;
+ import javax.swing.table.*;
+-import sun.swing.DefaultLookup;
+-
+
+ public class DefaultTableCellHeaderRenderer extends DefaultTableCellRenderer
+ implements UIResource {
+@@ -186,7 +187,7 @@
+ return new Point(x, y);
+ }
+
+- private class EmptyIcon implements Icon {
++ private class EmptyIcon implements Icon, Serializable {
+ int width = 0;
+ int height = 0;
+ public void paintIcon(Component c, Graphics g, int x, int y) {}
+diff -r 1297a41dbb47 -r 8d59b361635f test/javax/swing/JTable/6768387/bug6768387.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ b/test/javax/swing/JTable/6768387/bug6768387.java Tue May 25 20:39:52 2010 +0400
+@@ -0,0 +1,59 @@
++/*
++ * Copyright (c) 2010, 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 6768387
++ @summary REGRESSION: JTable no longer serializable
++ @author Alexander Potochkin
++ @run main bug6768387
++*/
++
++import javax.swing.*;
++import javax.swing.table.AbstractTableModel;
++import java.io.*;
++
++public class bug6768387 {
++
++ private static void createGui() {
++ JTable table = new JTable();
++ OutputStream os;
++ ObjectOutputStream out;
++ try {
++ os = new ByteArrayOutputStream();
++ out = new ObjectOutputStream(os);
++ out.writeObject(table);
++ out.close();
++ }
++ catch (Exception ex) {
++ throw new RuntimeException(ex);
++ }
++ }
++
++ public static void main(String[] args) throws Exception {
++ SwingUtilities.invokeAndWait(new Runnable() {
++ public void run() {
++ bug6768387.createGui();
++ }
++ });
++ }
++}
More information about the distro-pkg-dev
mailing list