Add list of extensions to description.

cjmach · Jun 10, 2024 · a40befb · a40befb
1 parent 90964d5
commit a40befb
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/djns/src/pt/cjmach/netbeans/djns/dialog/NativeDialogBuilder.java b/djns/src/pt/cjmach/netbeans/djns/dialog/NativeDialogBuilder.java
@@ -209,10 +209,12 @@ private void setupFilters(JFileDialog dialog) {
         ArrayList<String> extensionFilterNames = new ArrayList<>();
         int selectedFilter = -1;
         for (int i = 0; i < filters.size(); i++) {
-            FileNameExtensionFilter extensionFilter = filters.get(i);
-            extensionFilters.add(getExtensionFilters(extensionFilter));
-            extensionFilterNames.add(extensionFilter.getDescription());
-            if (extensionFilter == filter) {
+            FileNameExtensionFilter fnef = filters.get(i);
+            String extensionFilter = getExtensionFilters(fnef);
+            String extensionFilterName = getExtensionFilterName(filter.getDescription(), extensionFilter);
+            extensionFilters.add(extensionFilter);
+            extensionFilterNames.add(extensionFilterName);
+            if (fnef == filter) {
                 selectedFilter = i;
             }
         }
@@ -221,7 +223,7 @@ private void setupFilters(JFileDialog dialog) {
                 selectedFilter = 0;
             } else { // filters list does not contain filter
                 String extensionFilter = getExtensionFilters(filter);
-                String extensionFilterName = filter.getDescription();
+                String extensionFilterName = getExtensionFilterName(filter.getDescription(), extensionFilter);
                 selectedFilter = filters.size();
                 extensionFilters.add(extensionFilter);
                 extensionFilterNames.add(extensionFilterName);
@@ -238,6 +240,10 @@ private void setupFilters(JFileDialog dialog) {
                     selectedFilter);
         }
     }
+
+    private String getExtensionFilterName(String description, String extensionFilters) {
+        return String.format("%s (%s)", description, extensionFilters.replace(";", ", "));
+    }
 
     private String getExtensionFilters(FileNameExtensionFilter extensionFilter) {
         String[] extensions = extensionFilter.getExtensions();