Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 38 insertions, 9 deletions

diff --git a/libjava/classpath/java/awt/ScrollPaneAdjustable.java b/libjava/classpath/java/awt/ScrollPaneAdjustable.java
index 21b58c36ede..ca61801bf51 100644
--- a/libjava/classpath/java/awt/ScrollPaneAdjustable.java
+++ b/libjava/classpath/java/awt/ScrollPaneAdjustable.java
@@ -145,14 +145,26 @@ public class ScrollPaneAdjustable
     this.blockIncrement = blockIncrement;
   }
     
-  public void setMaximum (int maximum)
+  /**
+   * This method should never be called.
+   * 
+   * @param maximum The maximum value to be set.
+   * @throws AWTError Always throws this error when called.
+   */
+  public void setMaximum (int maximum) throws AWTError
   {
-    this.maximum = maximum;
+    throw new AWTError("Can be set by scrollpane only");
   }
 
+  /**
+   * This method should never be called.
+   * 
+   * @param minimum The minimum value to be set.
+   * @throws AWTError Always throws this error when called.
+   */
   public void setMinimum (int minimum)
   {
-    this.minimum = minimum;
+    throw new AWTError("Can be set by scrollpane only");
   }
 
   public void setUnitIncrement (int unitIncrement)
@@ -171,20 +183,36 @@ public class ScrollPaneAdjustable
       maximum = value;
   }
   
+  /**
+   * This method should never be called.
+   * 
+   * @param visibleAmount The visible amount to be set.
+   * @throws AWTError Always throws this error when called.
+   */
   public void setVisibleAmount (int visibleAmount)
   {
-    this.visibleAmount = visibleAmount;
+    throw new AWTError("Can be set by scrollpane only");
   }
 
   public String paramString ()
   {
-    return ("scrollpane=" + sp + ", orientation=" + orientation
-            + ", value=" + value + ", minimum=" + minimum
-            + ", maximum=" + maximum + ", visibleAmount=" + visibleAmount
-            + ", unitIncrement=" + unitIncrement
-            + ", blockIncrement=" + blockIncrement);
+    return paramStringHelper() 
+         + ",[" + getMinimum() + ".." + getMaximum() 
+         + "],val=" + getValue() 
+         + ",vis=" + getVisibleAmount() 
+         + ",unit=" + getUnitIncrement()
+         + ",block=" + getBlockIncrement() 
+         + ",isAdjusting=" + valueIsAdjusting;
   }
 
+  private String paramStringHelper()
+  {
+    if (getOrientation() == HORIZONTAL)
+      return "horizontal";
+    else
+      return "vertical";
+  }
+  
   public String toString()
   {
     return getClass().getName() + "[" + paramString() + "]";
@@ -209,5 +237,6 @@ public class ScrollPaneAdjustable
   {
     this.valueIsAdjusting = valueIsAdjusting;
   }
+  
 } // class ScrollPaneAdjustable