Index: swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties =================================================================== --- swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties (revision 502206) +++ swing/src/main/java/common/org/apache/harmony/x/swing/internal/nls/messages.properties (working copy) @@ -17,3 +17,6 @@ # messages for EN locale swing.00=Invalid axis: {0} swing.01=fromIndex must be <= toIndex +swing.02=invalid verticalScrollBarPolicy +swing.03=invalid horizontalScrollBarPolicy + Index: swing/src/main/java/common/javax/swing/ScrollPaneLayout.java =================================================================== --- swing/src/main/java/common/javax/swing/ScrollPaneLayout.java (revision 502206) +++ swing/src/main/java/common/javax/swing/ScrollPaneLayout.java (working copy) @@ -33,6 +33,8 @@ import javax.swing.ScrollPaneConstants; import javax.swing.border.Border; +import org.apache.harmony.x.swing.internal.nls.Messages; + public class ScrollPaneLayout implements Serializable, LayoutManager, ScrollPaneConstants { public static class UIResource extends ScrollPaneLayout implements javax.swing.plaf.UIResource { @@ -124,8 +126,7 @@ | (x == ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS) | (x == ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER)); if (!isVertical) { - throw new IllegalArgumentException( - "invalid verticalScrollBarPolicy"); + throw new IllegalArgumentException(Messages.getString("swing.02")); } vsbPolicy = x; } @@ -139,8 +140,7 @@ | (x == ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER) | (x == ScrollPaneConstants.HORIZONTAL_SCROLLBAR_ALWAYS)); if (!isHorisontal) { - throw new IllegalArgumentException( - "invalid horizontalScrollBarPolicy"); + throw new IllegalArgumentException(Messages.getString("swing.03")); } hsbPolicy = x; }