Index: javax/swing/plaf/metal/DefaultMetalTheme.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/metal/Attic/DefaultMetalTheme.java,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 DefaultMetalTheme.java
--- javax/swing/plaf/metal/DefaultMetalTheme.java	22 Dec 2004 20:48:32 -0000	1.1.2.1
+++ javax/swing/plaf/metal/DefaultMetalTheme.java	30 Dec 2004 15:43:21 -0000
@@ -38,16 +38,38 @@
 
 package javax.swing.plaf.metal;
 
+import java.awt.Font;
+
 import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.FontUIResource;
 
 public class DefaultMetalTheme extends MetalTheme
 {
-  private static final ColorUIResource PRIMARY1 = new ColorUIResource(102, 102, 153);
-  private static final ColorUIResource PRIMARY2 = new ColorUIResource(153, 153, 204);
-  private static final ColorUIResource PRIMARY3 = new ColorUIResource(204, 204, 255);
-  private static final ColorUIResource SECONDARY1 = new ColorUIResource(102, 102, 102);
-  private static final ColorUIResource SECONDARY2 = new ColorUIResource(153, 153, 153);
-  private static final ColorUIResource SECONDARY3 = new ColorUIResource(204, 204, 204);
+  private static final ColorUIResource PRIMARY1 =
+    new ColorUIResource(102, 102, 153);
+  private static final ColorUIResource PRIMARY2 =
+    new ColorUIResource(153, 153, 204);
+  private static final ColorUIResource PRIMARY3 = 
+    new ColorUIResource(204, 204, 255);
+  private static final ColorUIResource SECONDARY1 = 
+    new ColorUIResource(102, 102, 102);
+  private static final ColorUIResource SECONDARY2 = 
+    new ColorUIResource(153, 153, 153);
+  private static final ColorUIResource SECONDARY3 = 
+    new ColorUIResource(204, 204, 204);
+  
+  private static final FontUIResource CONTROL_TEXT_FONT =
+    new FontUIResource("Dialog", Font.BOLD, 12);
+  private static final FontUIResource MENU_TEXT_FONT =
+    new FontUIResource("Dialog", Font.BOLD, 12);
+  private static final FontUIResource SUB_TEXT_FONT =
+    new FontUIResource("Dialog", Font.PLAIN, 10);
+  private static final FontUIResource SYSTEM_TEXT_FONT =
+    new FontUIResource("Dialog", Font.PLAIN, 12);
+  private static final FontUIResource USER_TEXT_FONT =
+    new FontUIResource("Dialog", Font.PLAIN, 12);
+  private static final FontUIResource WINDOW_TITLE_FONT =
+    new FontUIResource("Dialog", Font.BOLD, 12);
   
   public DefaultMetalTheme()
   {
@@ -88,4 +110,34 @@
   {
     return SECONDARY3;
   }
+
+  public FontUIResource getControlTextFont()
+  {
+    return CONTROL_TEXT_FONT;
+  }
+
+  public FontUIResource getMenuTextFont()
+  {
+    return MENU_TEXT_FONT;
+  }
+  
+  public FontUIResource getSubTextFont()
+  {
+    return SUB_TEXT_FONT;
+  }
+  
+  public FontUIResource getSystemTextFont()
+  {
+    return SYSTEM_TEXT_FONT;
+  }
+  
+  public FontUIResource getUserTextFont()
+  {
+    return USER_TEXT_FONT;
+  }
+  
+  public FontUIResource getWindowTitleFont()
+  {
+    return WINDOW_TITLE_FONT;
+  }
 }
Index: javax/swing/plaf/metal/MetalTheme.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/metal/Attic/MetalTheme.java,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 MetalTheme.java
--- javax/swing/plaf/metal/MetalTheme.java	23 Dec 2004 10:49:23 -0000	1.1.2.2
+++ javax/swing/plaf/metal/MetalTheme.java	30 Dec 2004 15:43:21 -0000
@@ -39,13 +39,16 @@
 
 package javax.swing.plaf.metal;
 
+import java.awt.Color;
+
 import javax.swing.UIDefaults;
 import javax.swing.plaf.ColorUIResource;
+import javax.swing.plaf.FontUIResource;
 
 public abstract class MetalTheme
 {
-  private ColorUIResource BLACK = new ColorUIResource(0, 0, 0);
-  private ColorUIResource WHITE = new ColorUIResource(255, 255, 255);
+  private ColorUIResource BLACK = new ColorUIResource(Color.BLACK);
+  private ColorUIResource WHITE = new ColorUIResource(Color.WHITE);
 
   public MetalTheme()
   {
@@ -122,7 +125,7 @@
 
   public ColorUIResource getInactiveControlTextColor()
   {
-    return getSecondary2();
+    return getControlDisabled();
   }
 
   public ColorUIResource getInactiveSystemTextColor()
@@ -137,7 +140,7 @@
 
   public ColorUIResource getMenuDisabledForeground()
   {
-    return getSecondary2();
+    return getSecondary3();
   }
 
   public ColorUIResource getMenuForeground()
@@ -246,4 +249,11 @@
   protected abstract ColorUIResource getSecondary1();
   protected abstract ColorUIResource getSecondary2();
   protected abstract ColorUIResource getSecondary3();
+
+  public abstract FontUIResource getControlTextFont();
+  public abstract FontUIResource getMenuTextFont();
+  public abstract FontUIResource getSubTextFont();
+  public abstract FontUIResource getSystemTextFont();
+  public abstract FontUIResource getUserTextFont();
+  public abstract FontUIResource getWindowTitleFont();
 }