Major merge with Classpath.

	Removed many duplicate files.
	* HACKING: Updated.x
	* classpath: Imported new directory.
	* standard.omit: New file.
	* Makefile.in, aclocal.m4, configure: Rebuilt.
	* sources.am: New file.
	* configure.ac: Run Classpath configure script.  Moved code around
	to support.  Disable xlib AWT peers (temporarily).
	* Makefile.am (SUBDIRS): Added 'classpath'
	(JAVAC): Removed.
	(AM_CPPFLAGS): Added more -I options.
	(BOOTCLASSPATH): Simplified.
	Completely redid how sources are built.
	Include sources.am.
	* include/Makefile.am (tool_include__HEADERS): Removed jni.h.
	* include/jni.h: Removed (in Classpath).
	* scripts/classes.pl: Updated to look at built classes.
	* scripts/makemake.tcl: New file.
	* testsuite/libjava.jni/jni.exp (gcj_jni_compile_c_to_so): Added
	-I options.
	(gcj_jni_invocation_compile_c_to_binary): Likewise.

From-SVN: r102082

1 files changed, 0 insertions, 398 deletions

diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI.java b/libjava/javax/swing/plaf/basic/BasicTreeUI.java
deleted file mode 100644
index fd18d2c..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/* BasicTreeUI.java --
-   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.swing.plaf.basic;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-
-import javax.swing.JComponent;
-import javax.swing.JTree;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
-import javax.swing.plaf.ComponentUI;
-import javax.swing.plaf.TreeUI;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-/**
- * A delegate providing the user interface for <code>JTree</code>
- * according to the Basic look and feel. The current implementation
- * of GNU Classpath does really work; it is just a stub that allows
- * compiling the code.
- *
- * @see javax.swing.JTree
- *
- * @author Sascha Brawer (brawer@dandelis.ch)
- */
-public class BasicTreeUI
-  extends TreeUI
-{
-
-  /**
-   * Determines the geometric extent of the label that is
-   * drawn for a path.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @param path the path whose label extent is requested.
-   *
-   * @return a rectangle enclosing the label, or <code>null</code>
-   *         if <code>path</code> contains invalid nodes.
-   */
-  public Rectangle getPathBounds(JTree tree, TreePath path)
-  {
-    return null;   // FIXME: not implemented
-  }
-
-
-  /**
-   * Creates a <code>TreePath</code> for the specified row.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @param row the index of the row, which should be a number
-   *        in the range <code>[0, getRowCount(tree) - 1]</code>.
-   *
-   * @return a <code>TreePath</code> for the specified row, or
-   *         <code>null</code> if <code>row</code> is outside
-   *         the valid range.
-   */
-  public TreePath getPathForRow(JTree tree, int row)
-  {
-    return null;  // FIXME: not implemented
-  }
-
-
-  /**
-   * Determines in which row a <code>TreePath</code> is currently
-   * being displayed.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @param path the path for which the caller wants to know
-   *        in which row it is being displayed.
-   *
-   * @return a number in the range <code>[0, getRowCount(tree)
-   *         - 1]</code> if the path is currently on display;
-   *         <code>-1</code> if the path is not shown to the
-   *        user.
-   */
-  public int getRowForPath(JTree tree, TreePath path)
-  {
-    return -1;  // FIXME: not implemented
-  }
-
-
-  /**
-   * Counts how many rows are currently displayed.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @return the number of visible rows.
-   */
-  public int getRowCount(JTree tree)
-  {
-    return 0;  // FIXME: not implemented
-  }
-
-
-  /**
-   * Finds the path that is closest to the specified position.
-   *
-   * <p><img src="../doc-files/TreeUI-1.png" width="300" height="250"
-   * alt="[A screen shot of a JTree]" />
-   *
-   * <p>As shown by the above illustration, the bounds of the
-   * closest path do not necessarily need to contain the passed
-   * location.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @param x the horizontal location, relative to the origin
-   *        of <code>tree</code>.
-   *
-   * @param y the vertical location, relative to the origin
-   *        of <code>tree</code>.
-   *
-   * @return the closest path, or <code>null</code> if the
-   *         tree is currenlty not displaying any paths at all.
-   */
-  public TreePath getClosestPathForLocation(JTree tree,
-                                            int x, int y)
-  {
-    return null;  // FIXME: not implemented
-  }
-
-
-  /**
-   * Determines whether the user is currently editing a tree cell.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @see #getEditingPath
-   */
-  public boolean isEditing(JTree tree)
-  {
-    return false;  // FIXME: not implemented
-  }
-
-
-  /**
-   * Stops editing a tree cell, committing the entered value into the
-   * tree&#x2019;s model. If no editing session is active, or if the
-   * active editor does not agree to stopping, nothing happens.  In
-   * some look and feels, this action happens when the user has
-   * pressed the enter key.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @return <code>false</code> if the editing still goes on because
-   *         the cell editor has objected to stopping the session;
-   *         <code>true</code> if editing has been stopped.
-   */
-  public boolean stopEditing(JTree tree)
-  {
-    return true;  // FIXME: not implemented
-  }
-
-  /**
-   * Cancels editing a tree cell, discarding any entered value.
-   * If no editing session is active, nothing happens. The cell
-   * editor is not given an opportunity to veto the canceling.
-   * In some look and feels, this action happens when the user has
-   * pressed the escape key.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   */
-  public void cancelEditing(JTree tree)
-  {
-    // FIXME: not implemented
-  }
-
-
-  /**
-   * Starts a session to edit a tree cell. If the cell editor
-   * rejects editing the cell, it will just be selected.
-   *
-   * @param tree the <code>JTree</code> for which this delegate
-   *        object provides the user interface.
-   *
-   * @param path the cell to edit.
-   */
-  public void startEditingAtPath(JTree tree, TreePath path)
-  {
-    // FIXME: not implemented
-  }
-
-
-  /**
-   * Retrieves the tree cell that is currently being edited.
-   *
-   * @return the currently edited path, or <code>null</code>
-   *         if no editing session is currently active.
-   */
-  public TreePath getEditingPath(JTree tree)
-  {
-    return null;  // FIXME: not implemented
-  }
-
-  public static ComponentUI createUI(JComponent c)
-  {
-    return new BasicTreeUI();
-  }
-
-  int rightChildIndent;
-  int leftChildIndent;
-  int rowHeight;
-  Color hashColor;
-
-  protected void installDefaults(JTree tree) 
-  {
-    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
-
-    tree.setFont(defaults.getFont("Tree.font"));
-    tree.setForeground(defaults.getColor("Tree.foreground"));
-    tree.setBackground(defaults.getColor("Tree.background"));
-    tree.setOpaque(true);
-
-    hashColor = defaults.getColor("Tree.hash");
-    rightChildIndent = defaults.getInt("Tree.rightChildIndent");
-    leftChildIndent = defaults.getInt("Tree.leftChildIndent");
-    rowHeight = defaults.getInt("Tree.rowHeight");
-  }
-
-  protected void installKeyboardActions() 
-  {
-  }
-
-  protected void installListeners() 
-  {
-  }
-
-  public void installUI(JComponent c)
-  {
-    installDefaults((JTree) c);
-  }
-
-
-  protected void uninstallDefaults(JTree tree) 
-  {
-    tree.setFont(null);
-    tree.setForeground(null);
-    tree.setBackground(null);
-
-    tree.setCellRenderer(null);
-  }
-
-  public void uninstallUI(JComponent c)
-  {
-    uninstallDefaults((JTree) c);
-  }
-
-  public Dimension getPreferredSize(JComponent c)
-  {
-    return new Dimension(200,200);
-  }
-
-  protected void paintLeaf(Graphics g, int x, int y, JTree tree, Object leaf)
-  {
-    Component c = tree.getCellRenderer().getTreeCellRendererComponent(tree, 
-                                                                      leaf, 
-                                                                      false, // selected
-                                                                      false, // expanded
-                                                                      true,  // leaf
-                                                                      0,     // row
-                                                                      false  // hasFocus
-                                                                      );
-    g.translate(x, y);
-    c.paint(g);
-    g.translate(-x, -y);
-  }
-
-  protected void paintNonLeaf(Graphics g, int x, int y, JTree tree, Object nonLeaf)
-  {
-    Component c = tree.getCellRenderer().getTreeCellRendererComponent(tree, 
-                                                                      nonLeaf, 
-                                                                      false, // selected
-                                                                      false, // expanded
-                                                                      false, // leaf
-                                                                      0,     // row
-                                                                      false  // hasFocus
-                                                                      );
-    g.translate(x, y);
-    c.paint(g);
-    g.translate(-x, -y);
-  }
-
-  protected int paintRecursive(Graphics g, 
-                               int indentation,
-                               int descent,
-                               int childNumber,
-                               int depth,
-                               JTree tree,
-                               TreeModel mod, 
-                               Object curr)
-  {
-    Rectangle clip = g.getClipBounds();
-    if (indentation > clip.x + clip.width + rightChildIndent ||
-        descent > clip.y + clip.height + rowHeight)
-      return descent;
-
-
-    int halfHeight = rowHeight / 2;
-    int halfWidth = rightChildIndent / 2;
-    int y0 = descent + halfHeight;
-        
-    if (mod.isLeaf(curr))
-      {
-        paintLeaf(g, indentation, descent, tree, curr);
-        descent += rowHeight;
-      }
-    else
-      {
-        if (depth > 0 || tree.isRootVisible())
-          {
-            paintNonLeaf(g, indentation, descent, tree, curr);
-            descent += rowHeight;
-            y0 += halfHeight;
-          }
-        int max = mod.getChildCount(curr);
-        for (int i = 0; i < max; ++i)
-          {
-            g.setColor(hashColor);
-            g.drawLine(indentation + halfWidth,        descent + halfHeight, 
-                       indentation + rightChildIndent, descent + halfHeight);
-            descent = paintRecursive(g, 
-                                     indentation + rightChildIndent, descent,
-                                     i, depth+1,
-                                     tree, mod, mod.getChild(curr, i));
-          }
-      }
-
-    int y1 = descent - halfHeight;
-    if (y0 != y1)
-      {
-        g.setColor(hashColor);
-        g.drawLine(indentation + halfWidth, y0, 
-                   indentation + halfWidth, y1);
-      }
-
-    return descent;
-  }
-
-  public void paint(Graphics g, JComponent c)
-  {
-    JTree tree = (JTree) c;
-    TreeModel mod = tree.getModel();
-    g.translate(10, 10);
-    paintRecursive(g, 0, 0, 0, 0, tree, mod, mod.getRoot());
-    g.translate(-10, -10);
-  }
-}