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

6554743: JFileChooser dn't close after pressing escape key after changing the views

Browse Source 
Restore focus after changing the views in JFileChooser

Reviewed-by: loneid
This commit is contained in:
Pavel Porvatov 2008-08-30 17:29:59 +04:00
parent 7861fdb862
commit 5f00e2cd20
1 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,44 +308,80 @@ public class FilePane extends JPanel implements PropertyChangeListener {
} }
public void setViewType(int viewType) { public void setViewType(int viewType) {
int oldValue = this.viewType; if (viewType == this.viewType) {
if (viewType == oldValue) {
return; return;
} }
int oldValue = this.viewType;
this.viewType = viewType; this.viewType = viewType;
JPanel createdViewPanel = null;
Component newFocusOwner = null;
switch (viewType) { switch (viewType) {
case VIEWTYPE_LIST: case VIEWTYPE_LIST:
if (viewPanels[viewType] == null) { if (viewPanels[viewType] == null) {
JPanel p = fileChooserUIAccessor.createList(); createdViewPanel = fileChooserUIAccessor.createList();
if (p == null) { if (createdViewPanel == null) {
p = createList(); createdViewPanel = createList();
}
list = (JList) findChildComponent(createdViewPanel, JList.class);
if (listSelectionModel == null) {
listSelectionModel = list.getSelectionModel();
if (detailsTable != null) {
detailsTable.setSelectionModel(listSelectionModel);
}
} else {
list.setSelectionModel(listSelectionModel);
} }
setViewPanel(viewType, p);
} }
list.setLayoutOrientation(JList.VERTICAL_WRAP); list.setLayoutOrientation(JList.VERTICAL_WRAP);
newFocusOwner = list;
break; break;
case VIEWTYPE_DETAILS: case VIEWTYPE_DETAILS:
if (viewPanels[viewType] == null) { if (viewPanels[viewType] == null) {
JPanel p = fileChooserUIAccessor.createDetailsView(); createdViewPanel = fileChooserUIAccessor.createDetailsView();
if (p == null) { if (createdViewPanel == null) {
p = createDetailsView(); createdViewPanel = createDetailsView();
}
detailsTable = (JTable) findChildComponent(createdViewPanel, JTable.class);
detailsTable.setRowHeight(Math.max(detailsTable.getFont().getSize() + 4, 16 + 1));
if (listSelectionModel != null) {
detailsTable.setSelectionModel(listSelectionModel);
} }
setViewPanel(viewType, p);
} }
newFocusOwner = detailsTable;
break; break;
} }
JPanel oldViewPanel = currentViewPanel;
currentViewPanel = viewPanels[viewType]; if (createdViewPanel != null) {
if (currentViewPanel != oldViewPanel) { viewPanels[viewType] = createdViewPanel;
if (oldViewPanel != null) { recursivelySetInheritsPopupMenu(createdViewPanel, true);
remove(oldViewPanel);
}
add(currentViewPanel, BorderLayout.CENTER);
revalidate();
repaint();
} }
boolean isFocusOwner = false;
if (currentViewPanel != null) {
Component owner = DefaultKeyboardFocusManager.
getCurrentKeyboardFocusManager().getPermanentFocusOwner();
isFocusOwner = owner == detailsTable || owner == list;
remove(currentViewPanel);
}
currentViewPanel = viewPanels[viewType];
add(currentViewPanel, BorderLayout.CENTER);
if (isFocusOwner && newFocusOwner != null) {
newFocusOwner.requestFocusInWindow();
}
revalidate();
repaint();
updateViewMenu(); updateViewMenu();
firePropertyChange("viewType", oldValue, viewType); firePropertyChange("viewType", oldValue, viewType);
} }
@ -385,42 +421,6 @@ public class FilePane extends JPanel implements PropertyChangeListener {
} }
} }
public void setViewPanel(int viewType, JPanel viewPanel) {
viewPanels[viewType] = viewPanel;
recursivelySetInheritsPopupMenu(viewPanel, true);
switch (viewType) {
case VIEWTYPE_LIST:
list = (JList)findChildComponent(viewPanels[viewType], JList.class);
if (listSelectionModel == null) {
listSelectionModel = list.getSelectionModel();
if (detailsTable != null) {
detailsTable.setSelectionModel(listSelectionModel);
}
} else {
list.setSelectionModel(listSelectionModel);
}
break;
case VIEWTYPE_DETAILS:
detailsTable = (JTable)findChildComponent(viewPanels[viewType], JTable.class);
detailsTable.setRowHeight(Math.max(detailsTable.getFont().getSize() + 4, 16+1));
if (listSelectionModel != null) {
detailsTable.setSelectionModel(listSelectionModel);
}
break;
}
if (this.viewType == viewType) {
if (currentViewPanel != null) {
remove(currentViewPanel);
}
currentViewPanel = viewPanel;
add(currentViewPanel, BorderLayout.CENTER);
revalidate();
repaint();
}
}
protected void installDefaults() { protected void installDefaults() {
Locale l = getFileChooser().getLocale(); Locale l = getFileChooser().getLocale();