mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-24 09:10:08 +00:00
7027139: getFirstIndex() does not return the first index that has changed
Reviewed-by: alexp
This commit is contained in:
parent
76177f7a48
commit
089eea6bef
@ -252,6 +252,10 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
|
||||
|
||||
// Updates first and last change indices
|
||||
private void markAsDirty(int r) {
|
||||
if (r == -1) {
|
||||
return;
|
||||
}
|
||||
|
||||
firstAdjustedIndex = Math.min(firstAdjustedIndex, r);
|
||||
lastAdjustedIndex = Math.max(lastAdjustedIndex, r);
|
||||
}
|
||||
@ -358,16 +362,12 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
|
||||
private void updateLeadAnchorIndices(int anchorIndex, int leadIndex) {
|
||||
if (leadAnchorNotificationEnabled) {
|
||||
if (this.anchorIndex != anchorIndex) {
|
||||
if (this.anchorIndex != -1) { // The unassigned state.
|
||||
markAsDirty(this.anchorIndex);
|
||||
}
|
||||
markAsDirty(this.anchorIndex);
|
||||
markAsDirty(anchorIndex);
|
||||
}
|
||||
|
||||
if (this.leadIndex != leadIndex) {
|
||||
if (this.leadIndex != -1) { // The unassigned state.
|
||||
markAsDirty(this.leadIndex);
|
||||
}
|
||||
markAsDirty(this.leadIndex);
|
||||
markAsDirty(leadIndex);
|
||||
}
|
||||
}
|
||||
|
||||
66
jdk/test/javax/swing/JTable/7027139/bug7027139.java
Normal file
66
jdk/test/javax/swing/JTable/7027139/bug7027139.java
Normal file
@ -0,0 +1,66 @@
|
||||
/*
|
||||
* Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/* @test
|
||||
@bug 7027139
|
||||
@summary getFirstIndex() does not return the first index that has changed
|
||||
@author Pavel Porvatov
|
||||
*/
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.event.ListSelectionEvent;
|
||||
import javax.swing.event.ListSelectionListener;
|
||||
|
||||
public class bug7027139 {
|
||||
public static void main(String[] args) throws Exception {
|
||||
SwingUtilities.invokeAndWait(new Runnable() {
|
||||
public void run() {
|
||||
JTable orderTable = new JTable(new String[][]{
|
||||
{"Item 1 1", "Item 1 2"},
|
||||
{"Item 2 1", "Item 2 2"},
|
||||
{"Item 3 1", "Item 3 2"},
|
||||
{"Item 4 1", "Item 4 2"},
|
||||
},
|
||||
new String[]{"Col 1", "Col 2"});
|
||||
|
||||
ListSelectionModel selectionModel = orderTable.getSelectionModel();
|
||||
selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
|
||||
selectionModel.addListSelectionListener(new ListSelectionListener() {
|
||||
public void valueChanged(ListSelectionEvent e) {
|
||||
if (e.getValueIsAdjusting()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (e.getFirstIndex() < 0) {
|
||||
throw new RuntimeException("Test bug7027139 failed");
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
orderTable.selectAll();
|
||||
}
|
||||
});
|
||||
|
||||
System.out.println("Test bug7027139 passed");
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user