Imported GNU Classpath gcj-import-20051117.

       * gnu/java/net/protocol/file/Connection.java: Removed, fully merged.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r107153

2 files changed, 13 insertions, 19 deletions

diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
index 2891a778ee9..ae8b99c2fe5 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellEditor.java
@@ -339,9 +339,8 @@ public class DefaultTreeCellEditor
     lastPath = tree.getLeadSelectionPath();
     tree.addTreeSelectionListener(this);
     editingContainer = createContainer();
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-    setFont(defaults.getFont("Tree.font"));
-    setBorderSelectionColor(defaults.getColor("Tree.selectionBorderColor"));
+    setFont(UIManager.getFont("Tree.font"));
+    setBorderSelectionColor(UIManager.getColor("Tree.selectionBorderColor"));
     editingIcon = renderer.getIcon();
     timer = new javax.swing.Timer(1200, this);
   }
@@ -735,9 +734,8 @@ public class DefaultTreeCellEditor
    */
   protected TreeCellEditor createTreeCellEditor()
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
     realEditor = new DefaultCellEditor(new DefaultTreeCellEditor.DefaultTextField(
-                                  defaults.getBorder("Tree.selectionBorder")));
+                                  UIManager.getBorder("Tree.selectionBorder")));
     return realEditor;
   }
 }
diff --git a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
index d1cb9c0e8b7..df70ba7fb9f 100644
--- a/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
+++ b/libjava/classpath/javax/swing/tree/DefaultTreeCellRenderer.java
@@ -51,7 +51,6 @@ import javax.swing.border.Border;
 import javax.swing.Icon;
 import javax.swing.JLabel;
 import javax.swing.JTree;
-import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.SwingUtilities;
 import javax.swing.plaf.UIResource;
@@ -133,17 +132,15 @@ public class DefaultTreeCellRenderer
    */
   public DefaultTreeCellRenderer()
   {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-
     setLeafIcon(getDefaultLeafIcon());
     setOpenIcon(getDefaultOpenIcon());
     setClosedIcon(getDefaultClosedIcon());
 
-    setTextNonSelectionColor(defaults.getColor("Tree.textForeground"));
-    setTextSelectionColor(defaults.getColor("Tree.selectionForeground"));
-    setBackgroundNonSelectionColor(defaults.getColor("Tree.nonSelectionBackground"));
-    setBackgroundSelectionColor(defaults.getColor("Tree.selectionBackground"));
-    setBorderSelectionColor(defaults.getColor("Tree.selectionBorderColor"));
+    setTextNonSelectionColor(UIManager.getColor("Tree.textForeground"));
+    setTextSelectionColor(UIManager.getColor("Tree.selectionForeground"));
+    setBackgroundNonSelectionColor(UIManager.getColor("Tree.nonSelectionBackground"));
+    setBackgroundSelectionColor(UIManager.getColor("Tree.selectionBackground"));
+    setBorderSelectionColor(UIManager.getColor("Tree.selectionBorderColor"));
   }
 
   // -------------------------------------------------------------
@@ -157,7 +154,7 @@ public class DefaultTreeCellRenderer
    */
   public Icon getDefaultOpenIcon()
   {
-    return UIManager.getLookAndFeelDefaults().getIcon("Tree.openIcon");
+    return UIManager.getIcon("Tree.openIcon");
   }
 
   /**
@@ -167,7 +164,7 @@ public class DefaultTreeCellRenderer
    */
   public Icon getDefaultClosedIcon()
   {
-    return UIManager.getLookAndFeelDefaults().getIcon("Tree.closedIcon");
+    return UIManager.getIcon("Tree.closedIcon");
   }
 
   /**
@@ -177,7 +174,7 @@ public class DefaultTreeCellRenderer
    */
   public Icon getDefaultLeafIcon()
   {
-    return UIManager.getLookAndFeelDefaults().getIcon("Tree.leafIcon");
+    return UIManager.getIcon("Tree.leafIcon");
   }
 
   /**
@@ -412,7 +409,7 @@ public class DefaultTreeCellRenderer
     setOpaque(false);
     setVerticalAlignment(TOP);
     setEnabled(true);
-    super.setFont(UIManager.getLookAndFeelDefaults().getFont("Tree.font"));
+    super.setFont(UIManager.getFont("Tree.font"));
 
     if (selected)
       {
@@ -459,8 +456,7 @@ public class DefaultTreeCellRenderer
     Rectangle tr = new Rectangle();
 
     Insets insets = new Insets(0, 0, 0, 0);
-    Border border = UIManager.getLookAndFeelDefaults().getBorder(
-                                                                 "Tree.selectionBorder");
+    Border border = UIManager.getBorder("Tree.selectionBorder");
     if (border != null)
       insets = border.getBorderInsets(this);