提交 5e830977 编写于 作者: A alexsch

8031696: [macosx] TwentyThousandTest test failed with OOM

Reviewed-by: serb, pchelko
上级 9ca9f290
......@@ -1280,12 +1280,12 @@ public class AquaFileChooserUI extends FileChooserUI {
filters = (FileFilter[]) e.getNewValue();
fireContentsChanged(this, -1, -1);
} else if (prop == JFileChooser.FILE_FILTER_CHANGED_PROPERTY) {
fireContentsChanged(this, -1, -1);
setSelectedItem(e.getNewValue());
}
}
public void setSelectedItem(Object filter) {
if(filter != null) {
if (filter != null && !containsFileFilter(filter)) {
getFileChooser().setFileFilter((FileFilter) filter);
fireContentsChanged(this, -1, -1);
}
......@@ -1333,6 +1333,10 @@ public class AquaFileChooserUI extends FileChooserUI {
}
}
private boolean containsFileFilter(Object fileFilter) {
return Objects.equals(fileFilter, getFileChooser().getFileFilter());
}
/**
* Acts when FilterComboBox has changed the selected item.
*/
......@@ -1342,7 +1346,10 @@ public class AquaFileChooserUI extends FileChooserUI {
}
public void actionPerformed(final ActionEvent e) {
getFileChooser().setFileFilter((FileFilter)filterComboBox.getSelectedItem());
Object selectedFilter = filterComboBox.getSelectedItem();
if (!containsFileFilter(selectedFilter)) {
getFileChooser().setFileFilter((FileFilter) selectedFilter);
}
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册