* Bug #12417 fixed - Set "All supported formats" as default selected on Xcos open.

Change-Id: Iece84197d03da751a454e9928b2ba3a6c535d0b8

diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index cba7bb6..7ccc6cd 100644 (file)
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -364,6 +364,7 @@ Bug Fixes
 * [#11959](http://bugzilla.scilab.org/show_bug.cgi?id=11959): Allow "Zoom Area" to be clicked out of axes
 * [#12017](http://bugzilla.scilab.org/show_bug.cgi?id=12017): `figure.pixel_drawing_mode` is ignored for filled regular polygons and other shapes, still does not work for vectorial export (eps, pdf, etc).
 * [#12110](http://bugzilla.scilab.org/show_bug.cgi?id=12110): Unable to zoom multiple axes at once
+* [#12417](http://bugzilla.scilab.org/show_bug.cgi?id=12417): Set "All supported formats" as default selected on Xcos open.
 * [#12431](http://bugzilla.scilab.org/show_bug.cgi?id=12431): The page describing the `%helps` variable needed clarification.
 * [#12453](http://bugzilla.scilab.org/show_bug.cgi?id=12453): The left panel of the palette browser keeps its size when some category is enabled or disabled.
 * [#12897](http://bugzilla.scilab.org/show_bug.cgi?id=12897): Renamed optim's "imp" argument to "iprint".

diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java
index 57b0e55..ca4ed39 100644 (file)
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/OpenAction.java
@@ -122,7 +122,9 @@ public final class OpenAction extends DefaultAction {
         for (FileFilter fileFilter : filters) {
             fc.addChoosableFileFilter(fileFilter);
         }
-        fc.setFileFilter(fc.getAcceptAllFileFilter());
+
+        // the first valid filter is the "All valid files" one
+        fc.setFileFilter(filters[0]);
     }
 
     protected static void displayAndOpen(final SwingScilabFileChooser fc, final java.awt.Component component) throws IOException {