Index: javax/swing/JTable.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTable.java,v retrieving revision 1.4.18.10 diff -u -r1.4.18.10 JTable.java --- javax/swing/JTable.java 16 Dec 2004 16:09:15 -0000 1.4.18.10 +++ javax/swing/JTable.java 16 Dec 2004 19:11:22 -0000 @@ -410,7 +410,7 @@ this.preferredScrollableViewportSize = new Dimension(450,400); this.showHorizontalLines = true; this.showVerticalLines = true; - setInterCellSpacing(new Dimension(1,1)); + setIntercellSpacing(new Dimension(1,1)); setTableHeader(new JTableHeader(columnModel)); updateUI(); } Index: javax/swing/plaf/basic/BasicTableHeaderUI.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTableHeaderUI.java,v retrieving revision 1.1.2.4 diff -u -r1.1.2.4 BasicTableHeaderUI.java --- javax/swing/plaf/basic/BasicTableHeaderUI.java 10 Nov 2004 07:19:48 -0000 1.1.2.4 +++ javax/swing/plaf/basic/BasicTableHeaderUI.java 16 Dec 2004 19:11:22 -0000 @@ -191,8 +191,8 @@ int spacing = 0; if (header.getTable() != null - && header.getTable().getInterCellSpacing() != null) - spacing = header.getTable().getInterCellSpacing().width; + && header.getTable().getIntercellSpacing() != null) + spacing = header.getTable().getIntercellSpacing().width; for (int i = 0; i < ncols; ++i) { Index: javax/swing/plaf/basic/BasicTableUI.java =================================================================== RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicTableUI.java,v retrieving revision 1.1.2.3 diff -u -r1.1.2.3 BasicTableUI.java --- javax/swing/plaf/basic/BasicTableUI.java 22 Oct 2004 12:41:25 -0000 1.1.2.3 +++ javax/swing/plaf/basic/BasicTableUI.java 16 Dec 2004 19:11:22 -0000 @@ -108,7 +108,7 @@ { int y0 = table.getLocation().y; int nrows = table.getRowCount(); - Dimension gap = table.getInterCellSpacing(); + Dimension gap = table.getIntercellSpacing(); int height = table.getRowHeight() + (gap == null ? 0 : gap.height); int y = p.y; for (int i = 0; i < nrows; ++i) @@ -124,7 +124,7 @@ { int x0 = table.getLocation().x; int ncols = table.getColumnCount(); - Dimension gap = table.getInterCellSpacing(); + Dimension gap = table.getIntercellSpacing(); TableColumnModel cols = table.getColumnModel(); int x = p.x; for (int i = 0; i < ncols; ++i) @@ -294,7 +294,7 @@ int x = x0; int y = y0; - Dimension gap = table.getInterCellSpacing(); + Dimension gap = table.getIntercellSpacing(); int ymax = clip.y + clip.height; int xmax = clip.x + clip.width;