Index: javax/swing/plaf/basic/BasicLookAndFeel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v retrieving revision 1.31 diff -u -r1.31 BasicLookAndFeel.java --- javax/swing/plaf/basic/BasicLookAndFeel.java 12 Jul 2005 16:01:31 -0000 1.31 +++ javax/swing/plaf/basic/BasicLookAndFeel.java 12 Jul 2005 18:52:29 -0000 @@ -47,7 +47,6 @@ import java.util.Enumeration; import java.util.ResourceBundle; -import javax.swing.ImageIcon; import javax.swing.KeyStroke; import javax.swing.LookAndFeel; import javax.swing.UIDefaults; @@ -55,7 +54,6 @@ import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.DimensionUIResource; import javax.swing.plaf.FontUIResource; -import javax.swing.plaf.IconUIResource; import javax.swing.plaf.InsetsUIResource; import javax.swing.text.JTextComponent; @@ -1019,18 +1017,9 @@ "ctrl PAGE_DOWN", "scrollDownChangeLead" }), "Tree.font", new FontUIResource("Dialog", Font.PLAIN, 12), - "Tree.closedIcon", - new IconUIResource(new ImageIcon(getClass().getResource( - "/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png"))), "Tree.foreground", new ColorUIResource(Color.black), "Tree.hash", new ColorUIResource(Color.gray), - "Tree.leafIcon", - new IconUIResource(new ImageIcon(getClass().getResource( - "/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png"))), "Tree.leftChildIndent", new Integer(7), - "Tree.openIcon", - new IconUIResource(new ImageIcon(getClass().getResource( - "/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png"))), "Tree.rightChildIndent", new Integer(13), "Tree.rowHeight", new Integer(19), "Tree.scrollsOnExpand", Boolean.TRUE, Index: javax/swing/plaf/basic/BasicTreeUI.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTreeUI.java,v retrieving revision 1.26 diff -u -r1.26 BasicTreeUI.java --- javax/swing/plaf/basic/BasicTreeUI.java 12 Jul 2005 15:23:11 -0000 1.26 +++ javax/swing/plaf/basic/BasicTreeUI.java 12 Jul 2005 18:52:29 -0000 @@ -1218,6 +1218,7 @@ installDefaults((JTree) c); tree = (JTree) c; setModel(tree.getModel()); + tree.setRootVisible(true); treeSelectionModel = tree.getSelectionModel(); installListeners(); installKeyboardActions(); @@ -1942,7 +1943,7 @@ BasicTreeUI.this.tree.fireTreeExpanded(path); } } - + BasicTreeUI.this.selectPath(BasicTreeUI.this.tree, path); } } @@ -2489,8 +2490,8 @@ Font f = tree.getFont(); FontMetrics fm = tree.getToolkit().getFontMetrics(tree.getFont()); - return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s) - + 22, fm.getHeight()); + return new Rectangle(x, y, SwingUtilities.computeStringWidth(fm, s), + fm.getHeight()); } return null; } Index: javax/swing/plaf/metal/MetalLookAndFeel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v retrieving revision 1.25 diff -u -r1.25 MetalLookAndFeel.java --- javax/swing/plaf/metal/MetalLookAndFeel.java 8 Jul 2005 11:37:54 -0000 1.25 +++ javax/swing/plaf/metal/MetalLookAndFeel.java 12 Jul 2005 18:52:29 -0000 @@ -41,9 +41,11 @@ import java.awt.Color; import java.awt.Insets; +import javax.swing.ImageIcon; import javax.swing.UIDefaults; import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.FontUIResource; +import javax.swing.plaf.IconUIResource; import javax.swing.plaf.basic.BasicLookAndFeel; public class MetalLookAndFeel extends BasicLookAndFeel @@ -503,12 +505,19 @@ new ColorUIResource(getPrimaryControlDarkShadow()), "ScrollBar.thumbHighlight", new ColorUIResource(getPrimaryControl()), - "SplitPane.darkShadow", new ColorUIResource(getControlDarkShadow()), "SplitPane.highlight", new ColorUIResource(getControlHighlight()), - + "Tree.openIcon", + new IconUIResource(new ImageIcon(getClass().getResource( + "/gnu/javax/swing/plaf/gtk/icons/TreeOpen.png"))), + "Tree.leafIcon", + new IconUIResource(new ImageIcon(getClass().getResource( + "/gnu/javax/swing/plaf/gtk/icons/TreeLeaf.png"))), + "Tree.closedIcon", + new IconUIResource(new ImageIcon(getClass().getResource( + "/gnu/javax/swing/plaf/gtk/icons/TreeClosed.png"))), "PopupMenu.border", new MetalBorders.PopupMenuBorder() }; defaults.putDefaults(myDefaults); Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v retrieving revision 1.93 diff -u -r1.93 Makefile.am --- lib/Makefile.am 11 Jul 2005 15:49:09 -0000 1.93 +++ lib/Makefile.am 12 Jul 2005 18:52:29 -0000 @@ -8,7 +8,7 @@ propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org META-INF -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java org -name \*\.properties -print) metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -path \*/CVS -prune -o -type f -print) -iconfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu -name *.png -type f -print) +iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:.:$(USER_CLASSLIB) @@ -58,7 +58,6 @@ cp -R javax $(DESTDIR)$(pkgdatadir) cp -R org $(DESTDIR)$(pkgdatadir) cp -R META-INF $(DESTDIR)$(pkgdatadir) - cp -R icons $(DESTDIR)$(pkgdatadir) # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: @@ -67,7 +66,6 @@ rm -rf $(DESTDIR)$(pkgdatadir)/javax rm -rf $(DESTDIR)$(pkgdatadir)/org rm -rf $(DESTDIR)$(pkgdatadir)/META-INF - rm -rf $(DESTDIR)$(pkgdatadir)/icons endif # INSTALL_CLASS_FILES @@ -80,7 +78,7 @@ if ! [ -e gnu ]; then mkdir gnu; fi if ! [ -e gnu/java ]; then mkdir gnu/java; fi if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi - if ! [ -e gnu/icons ]; then mkdir gnu/icons; fi + if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi @list='$(propertydirs)'; for p in $$list; do \ if ! [ -e $$p ]; then mkdir $$p; fi; \ done @@ -91,7 +89,7 @@ cp $(top_srcdir)/resource/$$p $$p; \ done @list='$(iconfiles)'; for p in $$list; do \ - cp $(top_srcdir)/resource/$$p $$p; \ + cp $(top_srcdir)/$$p $$p; \ done touch resources