Skip to content

Commit

Permalink
Cleanup unused methods from BaseFilePicker class
Browse files Browse the repository at this point in the history
  • Loading branch information
besidev committed Feb 18, 2025
1 parent b17cb4e commit 8025a98
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 99 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,14 @@
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import javafx.beans.property.StringProperty;
import javafx.beans.value.ChangeListener;
import javafx.collections.FXCollections;
import javafx.collections.ListChangeListener;
import javafx.collections.ObservableList;
import javafx.scene.Node;
import javafx.stage.FileChooser;
import one.jpro.platform.file.ExtensionFilter;
import org.jetbrains.annotations.NotNull;

import java.io.File;
import java.util.Objects;

import static one.jpro.platform.file.ExtensionFilter.toJavaFXExtensionFilter;

/**
* Base file picker implementation.
*
Expand All @@ -27,10 +21,6 @@ abstract class BaseFilePicker implements FilePicker {

private final Node node;

// Flags to prevent infinite synchronization loops
private boolean updatingFromFileChooser = false;
private boolean updatingFromProperty = false;

/**
* Constructs a new instance with the specified Node.
*
Expand Down Expand Up @@ -149,93 +139,4 @@ final ExtensionFilter findSelectedFilter() {
return selectedFilter;
}
}

/**
* Creates a {@link ChangeListener} that listens for changes in the native {@link FileChooser}'s
* selected extension filter and updates the corresponding property in this file picker.
*
* @return a change listener for the native file chooser's selected extension filter
*/
@NotNull
final ChangeListener<FileChooser.ExtensionFilter> getNativeSelectedExtensionFilterChangeListener() {
return (observable, oldFilter, newFilter) -> {
if (updatingFromProperty) {
return;
}
updatingFromFileChooser = true;
try {
ExtensionFilter extensionFilter = null;
if (newFilter != null) {
for (ExtensionFilter ef : extensionFilters) {
if (newFilter.getDescription().equals(ef.description())) {
extensionFilter = ef;
break;
}
}
}
setSelectedExtensionFilter(extensionFilter);
} finally {
updatingFromFileChooser = false;
}
};
}

/**
* Creates a {@link ChangeListener} that listens for changes in the native {@link FileChooser}'s
* selected extension filter and updates the corresponding property in this file picker.
*
* @return a change listener for the native file chooser's selected extension filter
*/
@NotNull
final ChangeListener<ExtensionFilter> getSelectedExtensionFilterChangeListener(FileChooser fileChooser) {
return (observable, oldFilter, newFilter) -> {
if (updatingFromFileChooser) {
return;
}

updatingFromProperty = true;
try {
FileChooser.ExtensionFilter extensionFilter = null;
if (newFilter != null) {
for (FileChooser.ExtensionFilter ef : fileChooser.getExtensionFilters()) {
if (newFilter.description().equals(ef.getDescription())) {
extensionFilter = ef;
break;
}
}
}
fileChooser.setSelectedExtensionFilter(extensionFilter);
} finally {
updatingFromProperty = false;
}
};
}

/**
* Creates a {@link ListChangeListener} that listens for changes in the list of {@link ExtensionFilter}
* instances and updates the native {@link FileChooser}'s extension filters accordingly.
* <p>
* This listener handles both additions and removals of extension filters.
* </p>
*
* @param fileChooser the native file chooser whose extension filters will be updated; must not be {@code null}
* @return a list change listener for updating the native file chooser's extension filters
*/
@NotNull
final ListChangeListener<ExtensionFilter> getNativeExtensionFilterListChangeListener(FileChooser fileChooser) {
return change -> {
while (change.next()) {
if (change.wasAdded()) {
for (ExtensionFilter extensionFilter : change.getAddedSubList()) {
fileChooser.getExtensionFilters().add(toJavaFXExtensionFilter(extensionFilter));
}
} else if (change.wasRemoved()) {
for (ExtensionFilter extensionFilter : change.getRemoved()) {
fileChooser.getExtensionFilters().removeIf(filter ->
filter.getDescription().equals(extensionFilter.description()));
}
}
}
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
* the native file system. Depending on the configuration (e.g. extension filters and
* selection mode), it will display either a {@link FileChooser} or a {@link DirectoryChooser}.
*
* @see FileChooser
* @see DirectoryChooser
* @see NativeFileSource
*
* @author Besmir Beqiri
* @author Indrit Beqiri
* @author Florian Kirmaier
Expand Down

0 comments on commit 8025a98

Please sign in to comment.