summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Balkissoon <abalkiss@redhat.com>2006-02-28 21:10:14 +0000
committerAnthony Balkissoon <abalkiss@redhat.com>2006-02-28 21:10:14 +0000
commit0dfbd6e8681e0f7135fe2b5af89d25be4f59407f (patch)
treebfe1bcbe3942a202823e25822f1827fd5e273006
parent9219af53f0b49666fb1e74e25d86e934ab5e3085 (diff)
downloadclasspath-0dfbd6e8681e0f7135fe2b5af89d25be4f59407f.tar.gz
2006-02-28 Anthony Balkissoon <abalkiss@redhat.com>
PR classpath/26434 * javax/swing/DefaultListSelectionModel.java: (addSelectionInterval): Return early if either of the arguments is -1. (removeSelectionInterval): Likewise. (setSelectionInterval): Likewise.
-rw-r--r--ChangeLog8
-rw-r--r--javax/swing/DefaultListSelectionModel.java9
2 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e1a8d67d2..2a981160a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-28 Anthony Balkissoon <abalkiss@redhat.com>
+
+ PR classpath/26434
+ * javax/swing/DefaultListSelectionModel.java:
+ (addSelectionInterval): Return early if either of the arguments is -1.
+ (removeSelectionInterval): Likewise.
+ (setSelectionInterval): Likewise.
+
2006-02-28 Lillian Angel <langel@redhat.com>
* javax/swing/text/DefaultFormatter.java
diff --git a/javax/swing/DefaultListSelectionModel.java b/javax/swing/DefaultListSelectionModel.java
index ce1dfdd79..7ec4e614c 100644
--- a/javax/swing/DefaultListSelectionModel.java
+++ b/javax/swing/DefaultListSelectionModel.java
@@ -447,6 +447,9 @@ public class DefaultListSelectionModel implements Cloneable,
*/
public void addSelectionInterval(int index0, int index1)
{
+ if (index0 == -1 || index1 == -1)
+ return;
+
int lo = Math.min(index0, index1);
int hi = Math.max(index0, index1);
oldSel = sel.clone();
@@ -508,6 +511,9 @@ public class DefaultListSelectionModel implements Cloneable,
public void removeSelectionInterval(int index0,
int index1)
{
+ if (index0 == -1 || index1 == -1)
+ return;
+
oldSel = sel.clone();
int lo = Math.min(index0, index1);
int hi = Math.max(index0, index1);
@@ -551,6 +557,9 @@ public class DefaultListSelectionModel implements Cloneable,
*/
public void setSelectionInterval(int index0, int index1)
{
+ if (index0 == -1 || index1 == -1)
+ return;
+
oldSel = sel.clone();
sel.clear();
if (selectionMode == SINGLE_SELECTION)