stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8078514: Nightly: api/javax_swing/DefaultRowSorter/index_ModelStructChanged failure

Browse Source 
Reviewed-by: alexsch
This commit is contained in:
Semyon Sadetsky 2016-03-25 11:29:32 +03:00
parent d8728764ca
commit 458f8d2597
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2016, 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
@ -30,7 +30,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javax.swing.SortOrder;
/**
* An implementation of <code>RowSorter</code> that provides sorting and
@ -495,7 +494,7 @@ public abstract class DefaultRowSorter<M, I> extends RowSorter<M> {
*/
public int convertRowIndexToView(int index) {
if (modelToView == null) {
if (index < 0 || index >= getModelWrapper().getRowCount()) {
if (index < 0 || index >= modelRowCount) {
throw new IndexOutOfBoundsException("Invalid index");
}
return index;
@ -510,7 +509,7 @@ public abstract class DefaultRowSorter<M, I> extends RowSorter<M> {
*/
public int convertRowIndexToModel(int index) {
if (viewToModel == null) {
if (index < 0 || index >= getModelWrapper().getRowCount()) {
if (index < 0 || index >= modelRowCount) {
throw new IndexOutOfBoundsException("Invalid index");
}
return index;
@ -814,7 +813,7 @@ public abstract class DefaultRowSorter<M, I> extends RowSorter<M> {
// When filtering this may differ from getModelWrapper().getRowCount()
return viewToModel.length;
}
return getModelWrapper().getRowCount();
return Math.max(getModelWrapper().getRowCount(), modelRowCount);
}
/**

11
jdk/src/java.desktop/share/classes/javax/swing/JTable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2016, 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
@ -4401,13 +4401,8 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
}
if (sortManager != null) {
List<? extends RowSorter.SortKey> sortKeys =
sortManager.sorter.getSortKeys();
if (sortKeys.size() != 0 &&
sortKeys.get(0).getSortOrder() != SortOrder.UNSORTED) {
sortedTableChanged(null, e);
return;
}
sortedTableChanged(null, e);
return;
}
// The totalRowHeight calculated below will be incorrect if

12
jdk/src/java.desktop/share/classes/sun/swing/FilePane.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2016, 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
@ -913,7 +913,15 @@ public class FilePane extends JPanel implements PropertyChangeListener {
private class DetailsTableRowSorter extends TableRowSorter<TableModel> {
public DetailsTableRowSorter() {
setModelWrapper(new SorterModelWrapper());
SorterModelWrapper modelWrapper = new SorterModelWrapper();
setModelWrapper(modelWrapper);
modelWrapper.getModel().addTableModelListener(
new TableModelListener() {
@Override
public void tableChanged(TableModelEvent e) {
modelStructureChanged();
}
});
}
public void updateComparators(ShellFolderColumnInfo [] columns) {