8257810: Only First page are printed in JTable.scrollRectToVisible

Reviewed-by: aivanov
This commit is contained in:
Prasanta Sadhukhan 2022-05-26 06:32:28 +00:00
parent 704b9a66bb
commit f710393e35
2 changed files with 122 additions and 3 deletions

View File

@ -282,6 +282,9 @@ class TablePrintable implements Printable {
// dictated by the previous two assertions
assert sf > 0;
Rectangle bounds = table.getBounds();
bounds.x = bounds.y = 0;
// This is in a loop for two reasons:
// First, it allows us to catch up in case we're called starting
// with a non-zero pageIndex. Second, we know that we can be called
@ -303,9 +306,10 @@ class TablePrintable implements Printable {
// calculate the area of the table to be printed for this page
findNextClip(scaledWidth, scaledHeight);
if (!((table.getBounds()).intersects(clip))) {
if (!(bounds.intersects(clip))) {
return NO_SUCH_PAGE;
}
last++;
}
@ -395,8 +399,6 @@ class TablePrintable implements Printable {
// draw a box around the table
g2d.setColor(Color.BLACK);
Rectangle bounds = table.getBounds();
bounds.x = bounds.y = 0;
// compute the visible portion of table and draw the rect around it
Rectangle visibleBounds = clip.intersection(bounds);

View File

@ -0,0 +1,117 @@
/*
* Copyright (c) 2022, 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 8257810
* @library /java/awt/regtesthelpers
* @build PassFailJFrame
* @summary Verifies if all pages are printed if scrollRectToVisible is set.
* @run main/manual PrintAllPagesTest
*/
import java.awt.print.PrinterJob;
import java.awt.print.PrinterException;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableModel;
import javax.swing.WindowConstants;
public class PrintAllPagesTest {
static JFrame f;
static JTable table;
static volatile boolean ret = false;
static final String INSTRUCTIONS = """
Note: You must have a printer installed for this test.
If printer is not available, the test passes automatically.
A JTable with 1000 rows and a print dialog will be shown.
If only 1 page is printed,
then press fail else press pass.
""";
public static void main(String[] args) throws Exception {
PrinterJob pj = PrinterJob.getPrinterJob();
if (pj.getPrintService() == null) {
System.out.println("Printer not configured or available."
+ " Test cannot continue.");
PassFailJFrame.forcePass();
}
PassFailJFrame passFailJFrame = new PassFailJFrame(INSTRUCTIONS);
SwingUtilities.invokeAndWait(() -> {
printAllPagesTest();
});
// add the test frame to dispose
PassFailJFrame.addTestFrame(f);
// Arrange the test instruction frame and test frame side by side
PassFailJFrame.positionTestFrame(f, PassFailJFrame.Position.HORIZONTAL);
SwingUtilities.invokeAndWait(() -> {
try {
ret = table.print();
} catch (PrinterException ex) {
ret = false;
}
});
if (!ret) {
throw new RuntimeException("Printing cancelled/failed");
}
passFailJFrame.awaitAndCheck();
}
private static void printAllPagesTest() {
TableModel dataModel = new AbstractTableModel() {
@Override
public int getColumnCount() {
return 10;
}
@Override
public int getRowCount() {
return 1000;
}
@Override
public Object getValueAt(int row, int col) {
return Integer.valueOf(0 == col ? row + 1 : row * col);
}
};
table = new JTable(dataModel);
JScrollPane scrollpane = new JScrollPane(table);
table.scrollRectToVisible(table.getCellRect(table.getRowCount() - 1, 0, false));
f = new JFrame("Table test");
f.add(scrollpane);
f.setSize(1000, 800);
f.setVisible(true);
}
}