2006-05-02 Robert Schuster <robertschuster@fsfe.org>

        * javax/swing/text/JTextComponent.java:
        (setText): Throw InternalError from catch-block.
        * javax/swing/text/GapContent.java:
        (removed): Removed if-expression, changed '>' to '>='.

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index eac1f8940..931eff362 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-02  Robert Schuster  <robertschuster@fsfe.org>
+
+	* javax/swing/text/JTextComponent.java:
+	(setText): Throw InternalError from catch-block.
+	* javax/swing/text/GapContent.java:
+	(removed): Removed if-expression, changed '>' to '>='.
+
 2006-05-02  Roman Kennke <kennke@aicas.com>
 
 	* gnu/java/awt/java2d/AbstractGraphics2D.java
diff --git a/javax/swing/text/GapContent.java b/javax/swing/text/GapContent.java
index 40a014ad1..219accb40 100644
--- a/javax/swing/text/GapContent.java
+++ b/javax/swing/text/GapContent.java
@@ -376,14 +376,11 @@ public class GapContent
   {
     // check arguments
     int length = length();
-
-    if (where >= length - 1)
-      throw new BadLocationException("the where argument cannot be greater"
-          + " or equal than the content length - 1", where);
-    if ((where + nitems) > length)
+    
+    if ((where + nitems) >= length)
       throw new BadLocationException("where + nitems cannot be greater"
           + " than the content length", where + nitems);
-
+    
     String removedText = getString(where, nitems);
     replace(where, nitems, null, 0);
 
diff --git a/javax/swing/text/JTextComponent.java b/javax/swing/text/JTextComponent.java
index 8492d8b90..1103de9b4 100644
--- a/javax/swing/text/JTextComponent.java
+++ b/javax/swing/text/JTextComponent.java
@@ -1191,6 +1191,7 @@ public abstract class JTextComponent extends JComponent
     catch (BadLocationException e)
       {
         // This can never happen.
+        throw (InternalError) new InternalError().initCause(e);
       }
   }