[kaffe] CVS kaffe (mkoch): libraries/javalib/javax/swing/JTable.java,

[Kaffe CVS]

PatchSet 5650 
Date: 2004/12/16 19:13:15
Author: mkoch
Branch: HEAD
Tag: (none) 
Log:
2004-12-16  Michael Koch  <konqueror at gmx.de>

	* libraries/javalib/javax/swing/JTable.java,
	libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java,
	libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:
	Use fixed get/setIntercellSpacing() methods.

Members: 
	ChangeLog:1.3195->1.3196 
	libraries/javalib/javax/swing/JTable.java:1.9->1.10 
	libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java:1.5->1.6 
	libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3195 kaffe/ChangeLog:1.3196
--- kaffe/ChangeLog:1.3195	Thu Dec 16 16:09:58 2004
+++ kaffe/ChangeLog	Thu Dec 16 19:13:15 2004
@@ -1,5 +1,12 @@
 2004-12-16  Michael Koch  <konqueror at gmx.de>
 
+	* libraries/javalib/javax/swing/JTable.java,
+	libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java,
+	libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:
+	Use fixed get/setIntercellSpacing() methods.
+
+2004-12-16  Michael Koch  <konqueror at gmx.de>
+
 	* libraries/javalib/javax/swing/JTable.java
 	(getIntercellSpacing): Fixed typo in method name.
 	(setIntercellSpacing): Likewise.
Index: kaffe/libraries/javalib/javax/swing/JTable.java
diff -u kaffe/libraries/javalib/javax/swing/JTable.java:1.9 kaffe/libraries/javalib/javax/swing/JTable.java:1.10
--- kaffe/libraries/javalib/javax/swing/JTable.java:1.9	Thu Dec 16 16:10:02 2004
+++ kaffe/libraries/javalib/javax/swing/JTable.java	Thu Dec 16 19:13:18 2004
@@ -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: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java:1.5 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java:1.6
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java:1.5	Sun Nov 14 22:14:42 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableHeaderUI.java	Thu Dec 16 19:13:19 2004
@@ -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: kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java
diff -u kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:1.3 kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:1.4
--- kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java:1.3	Sun Oct 24 13:39:20 2004
+++ kaffe/libraries/javalib/javax/swing/plaf/basic/BasicTableUI.java	Thu Dec 16 19:13:19 2004
@@ -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;