hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fixes #810] Selecting 'Save As...' > 'All Files' no longer throws an unneccessary exception

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-11-07 10:19:01 -05:00
parent 4b9070f124
commit eceaff6408
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
swing/src/net/sf/openrocket/gui/main/SaveAsFileChooser.java
View File

@ -79,31 +79,32 @@ class RememberFilenamePropertyListener implements PropertyChangeListener {
@Override
public void propertyChange(PropertyChangeEvent event){
if( JFileChooser.SELECTED_FILE_CHANGED_PROPERTY == event.getPropertyName()){
if( JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(event.getPropertyName())){
if(null != event.getOldValue()){
this.oldFileName = ((File)event.getOldValue()).getName();
}
return;
}else if(JFileChooser.FILE_FILTER_CHANGED_PROPERTY == event.getPropertyName()){
JFileChooser chooser = (JFileChooser)event.getSource();
SimpleFileFilter filter = (SimpleFileFilter)(chooser.getFileFilter());
String desiredExtension = filter.getExtensions()[0];
if( null == this.oldFileName){
return;
}
String thisFileName = this.oldFileName;
if ( filter.accept( new File(thisFileName))){
// nop
return;
}else{
String[] splitResults = thisFileName.split("\\.");
if(0 < splitResults.length){
thisFileName = splitResults[0];
}else if(JFileChooser.FILE_FILTER_CHANGED_PROPERTY.equals(event.getPropertyName())) {
JFileChooser chooser = (JFileChooser)event.getSource();
if( chooser.getFileFilter() instanceof SimpleFileFilter) {
SimpleFileFilter filter = (SimpleFileFilter) (chooser.getFileFilter());
String desiredExtension = filter.getExtensions()[0];
if (null == this.oldFileName) {
return;
}
String thisFileName = this.oldFileName;
if (filter.accept(new File(thisFileName))) {
// nop
return;
} else {
String[] splitResults = thisFileName.split("\\.");
if (0 < splitResults.length) {
thisFileName = splitResults[0];
}
chooser.setSelectedFile(new File(thisFileName + desiredExtension));
return;
}
chooser.setSelectedFile(new File( thisFileName+desiredExtension));
return;
}
}
}