--- /home/cpdev/src/classpath/javax/swing/JTextArea.java	2005-07-02 21:04:01.000000000 +0000
+++ javax/swing/JTextArea.java	2005-06-30 05:35:10.000000000 +0000
@@ -38,16 +38,13 @@
 
 package javax.swing;
 
-import java.awt.Dimension;
 import java.awt.FontMetrics;
-import java.awt.Rectangle;
 
 import javax.swing.text.BadLocationException;
 import javax.swing.text.Document;
 import javax.swing.text.Element;
 import javax.swing.text.JTextComponent;
 import javax.swing.text.PlainDocument;
-import javax.swing.text.View;
 
 /**
  * The <code>JTextArea</code> component provides a multi-line area for displaying
@@ -233,55 +230,6 @@
   }
 
   /**
-   * Returns the increment that is needed to expose exactly one new line
-   * of text. This is implemented here to return the values of
-   * {@link #getRowHeight} and {@link getColumnWidth}, depending on
-   * the value of the argument <code>direction</code>.
-   *
-   * @param visibleRect the view area that is visible in the viewport
-   * @param orientation either {@link SwingConstants.VERTICAL} or
-   *     {@link SwingConstants.HORIZONTAL}
-   * @param direction less than zero for up/left scrolling, greater
-   *     than zero for down/right scrolling
-   *
-   * @return the increment that is needed to expose exactly one new row
-   *     or column of text
-   *
-   * @throws IllegalArgumentException if <code>orientation</code> is invalid
-   */
-  public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation,
-                                        int direction)
-  {
-    if (orientation == SwingConstants.VERTICAL)
-      return getRowHeight();
-    else if (orientation == SwingConstants.HORIZONTAL)
-      return getColumnWidth();
-    else
-      throw new IllegalArgumentException("orientation must be either "
-                                     + "javax.swing.SwingConstants.VERTICAL "
-                                     + "or "
-                                     + "javax.swing.SwingConstants.HORIZONTAL"
-                                     );
-  }
-
-  /**
-   * Returns the preferred size of that text component in the case
-   * it is embedded within a JScrollPane. This uses the column and
-   * row settings if they are explicitly set, or fall back to
-   * the superclass's behaviour.
-   *
-   * @return the preferred size of that text component in the case
-   *     it is embedded within a JScrollPane
-   */
-  public Dimension getPreferredScrollableViewportSize()
-  {
-    if ((rows > 0) && (columns > 0))
-      return new Dimension(columns * getColumnWidth(), rows * getRowHeight());
-    else
-      return super.getPreferredScrollableViewportSize();
-  }
-
-  /**
    * Returns the UI class ID string.
    *
    * @return the string "TextAreaUI"
@@ -529,22 +477,4 @@
 	// This cannot happen as we check offset above.
       }
   }
-
-  /**
-   * Returns the preferred size for the JTextArea. This is the maximum of
-   * the size that is needed to display the content and the requested size
-   * as per {@link #getColumns} and {@link #getRows}.
-   *
-   * @return the preferred size of the JTextArea
-   */
-  public Dimension getPreferredSize()
-  {
-    int reqWidth = getColumns() * getColumnWidth();
-    int reqHeight = getRows() * getRowHeight();
-    View view = getUI().getRootView(this);
-    int neededWidth = (int) view.getPreferredSpan(View.HORIZONTAL);
-    int neededHeight = (int) view.getPreferredSpan(View.VERTICAL);
-    return new Dimension(Math.max(reqWidth, neededWidth),
-                          Math.max(reqHeight, neededHeight));
-  }
 }