From c2bdd38246b31eafc0a763404b7beb92bcd99cc3 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Fri, 31 Mar 2023 01:39:38 +0200
Subject: [PATCH] Clean up method

---
 .../gui/main/DesignFileSaveAsFileChooser.java | 68 +++++++++++--------
 1 file changed, 41 insertions(+), 27 deletions(-)

diff --git a/swing/src/net/sf/openrocket/gui/main/DesignFileSaveAsFileChooser.java b/swing/src/net/sf/openrocket/gui/main/DesignFileSaveAsFileChooser.java
index 52a8d3c29..40547a092 100644
--- a/swing/src/net/sf/openrocket/gui/main/DesignFileSaveAsFileChooser.java
+++ b/swing/src/net/sf/openrocket/gui/main/DesignFileSaveAsFileChooser.java
@@ -5,6 +5,7 @@ import java.beans.PropertyChangeListener;
 import java.io.File;
 
 import javax.swing.JFileChooser;
+import javax.swing.filechooser.FileFilter;
 
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.document.StorageOptions;
@@ -83,40 +84,53 @@ public class DesignFileSaveAsFileChooser extends SaveFileChooser {
 }
 
 class RememberFilenamePropertyListener implements PropertyChangeListener {
-	private String oldFileName=null;
+	private String oldFileName = null;
 
 	@Override
-	public void propertyChange(PropertyChangeEvent event){
-		if( JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(event.getPropertyName())){
-			if(null != event.getOldValue()){
-				this.oldFileName = ((File)event.getOldValue()).getName();
+	public void propertyChange(PropertyChangeEvent event) {
+		String propertyName = event.getPropertyName();
+
+		if (JFileChooser.SELECTED_FILE_CHANGED_PROPERTY.equals(propertyName)) {
+			handleSelectedFileChanged(event);
+		} else if (JFileChooser.FILE_FILTER_CHANGED_PROPERTY.equals(propertyName)) {
+			handleFileFilterChanged(event);
+		}
+	}
+
+	private void handleSelectedFileChanged(PropertyChangeEvent event) {
+		if (event.getOldValue() != null) {
+			oldFileName = ((File) event.getOldValue()).getName();
+		}
+	}
+
+	private void handleFileFilterChanged(PropertyChangeEvent event) {
+		JFileChooser chooser = (JFileChooser) event.getSource();
+		FileFilter currentFilter = chooser.getFileFilter();
+
+		if (currentFilter instanceof SimpleFileFilter) {
+			SimpleFileFilter filter = (SimpleFileFilter) currentFilter;
+			String desiredExtension = filter.getExtensions()[0];
+
+			if (oldFileName == null) {
+				return;
 			}
-		}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;
-				}
+
+			String currentFileName = oldFileName;
+
+			if (!filter.accept(new File(currentFileName))) {
+				currentFileName = removeExtension(currentFileName);
+				chooser.setSelectedFile(new File(currentFileName + desiredExtension));
 			}
 		}
 	}
 
+	private String removeExtension(String fileName) {
+		String[] splitResults = fileName.split("\\.");
+		if (splitResults.length > 0) {
+			return splitResults[0];
+		}
+		return fileName;
+	}
 }