From ec9f5edf2ffc128e326fe56b056c6bfa45c7532e Mon Sep 17 00:00:00 2001
From: Pavel Porvatov <rupashka@openjdk.org>
Date: Tue, 6 Nov 2012 15:30:34 +0400
Subject: [PATCH] 7200491: Tighten up JTable layout code

Reviewed-by: art, skoivu
---
 jdk/src/share/classes/javax/swing/JTable.java      | 14 +++++---------
 .../javax/swing/plaf/nimbus/NimbusLookAndFeel.java |  7 ++++++-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jdk/src/share/classes/javax/swing/JTable.java b/jdk/src/share/classes/javax/swing/JTable.java
index fbd61d9a9fc..05fc918e9eb 100644
--- a/jdk/src/share/classes/javax/swing/JTable.java
+++ b/jdk/src/share/classes/javax/swing/JTable.java
@@ -781,15 +781,11 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
                         scrollPane.getCorner(JScrollPane.UPPER_TRAILING_CORNER);
                 if (corner == null || corner instanceof UIResource){
                     corner = null;
-                    Object componentClass = UIManager.get(
-                            "Table.scrollPaneCornerComponent");
-                    if (componentClass instanceof Class){
-                        try {
-                            corner = (Component)
-                                    ((Class)componentClass).newInstance();
-                        } catch (Exception e) {
-                            // just ignore and don't set corner
-                        }
+                    try {
+                        corner = (Component) UIManager.get(
+                                "Table.scrollPaneCornerComponent");
+                    } catch (Exception e) {
+                        // just ignore and don't set corner
                     }
                     scrollPane.setCorner(JScrollPane.UPPER_TRAILING_CORNER,
                             corner);
diff --git a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
index b03bf653fc5..402a6885982 100644
--- a/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
+++ b/jdk/src/share/classes/javax/swing/plaf/nimbus/NimbusLookAndFeel.java
@@ -159,7 +159,12 @@ public class NimbusLookAndFeel extends SynthLookAndFeel {
 
             // Store Table ScrollPane Corner Component
             uiDefaults.put("Table.scrollPaneCornerComponent",
-                    TableScrollPaneCorner.class);
+                    new UIDefaults.ActiveValue() {
+                        @Override
+                        public Object createValue(UIDefaults table) {
+                            return new TableScrollPaneCorner();
+                        }
+                    });
 
             // Setup the settings for ToolBarSeparator which is custom
             // installed for Nimbus