Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.56
diff -u -r1.56 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java	15 Sep 2005 13:19:10 -0000	1.56
+++ javax/swing/plaf/metal/MetalLookAndFeel.java	20 Sep 2005 09:31:16 -0000
@@ -835,6 +835,8 @@
       "EditorPane.selectionForeground", getHighlightedTextColor(),
       
       "FormattedTextField.background", getWindowBackground(),
+      "FormattedTextField.border",
+      new BorderUIResource(MetalBorders.getTextFieldBorder()),
       "FormattedTextField.caretForeground", getUserTextColor(),
       "FormattedTextField.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "FormattedTextField.foreground",  getUserTextColor(),
@@ -926,6 +928,8 @@
       "Panel.foreground", getUserTextColor(),
 
       "PasswordField.background", getWindowBackground(),
+      "PasswordField.border",
+      new BorderUIResource(MetalBorders.getTextFieldBorder()),
       "PasswordField.caretForeground", getUserTextColor(),
       "PasswordField.foreground", getUserTextColor(),
       "PasswordField.inactiveBackground", getControl(),
@@ -1048,7 +1052,7 @@
       "Table.foreground", getControlTextColor(),
       "Table.focusCellHighlightBorder", getControlShadow(),
       "Table.focusCellBackground", getWindowBackground(),
-      "Table.gridColor", getControlShadow(),
+      "Table.gridColor", getControlDarkShadow(),
 
       "TableHeader.background", getControl(),
       "TableHeader.cellBorder", new MetalBorders.TableHeaderBorder(),
@@ -1063,7 +1067,8 @@
       "TextArea.selectionForeground", getHighlightedTextColor(),
 
       "TextField.background", getWindowBackground(),
-      "TextField.border", MetalBorders.getTextFieldBorder(),
+      "TextField.border",
+      new BorderUIResource(MetalBorders.getTextFieldBorder()),
       "TextField.caretForeground", getUserTextColor(),
       "TextField.darkShadow", getControlDarkShadow(),
       "TextField.font", new FontUIResource("Dialog", Font.PLAIN, 12),