Set up file extensions correctly.

jfree · Apr 6, 2016 · 3ee5e7e · 3ee5e7e
1 parent 2aec935
commit 3ee5e7e
Showing 1 changed file with 24 additions and 20 deletions.
diff --git a/src/main/java/org/jfree/chart/fx/ChartViewer.java b/src/main/java/org/jfree/chart/fx/ChartViewer.java
@@ -50,6 +50,7 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.Skinnable;
 import javafx.stage.FileChooser;
+import javafx.stage.FileChooser.ExtensionFilter;
 import org.jfree.chart.ChartMouseEvent;
 import org.jfree.chart.ChartRenderingInfo;
 import org.jfree.chart.JFreeChart;
@@ -283,11 +284,12 @@ private ContextMenu createContextMenu() {
      * A handler for the export to PDF option in the context menu.
      */
     private void handleExportToPDF() {
-        FileChooser fileChooser = new FileChooser();
+        FileChooser chooser = new FileChooser();
-        fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(
+        chooser.setTitle("Export to PDF");
-                "Portable Document Format (PDF)", "pdf"));
+        ExtensionFilter filter = new FileChooser.ExtensionFilter(
-        fileChooser.setTitle("Export to PDF");
+                "Portable Document Format (PDF)", "pdf");
-        File file = fileChooser.showSaveDialog(this.getScene().getWindow());
+        chooser.getExtensionFilters().add(filter);
+        File file = chooser.showSaveDialog(getScene().getWindow());
         if (file != null) {
             ExportUtils.writeAsPDF(this.chart, (int) getWidth(), 
                     (int) getHeight(), file);
@@ -298,11 +300,12 @@ private void handleExportToPDF() {
      * A handler for the export to SVG option in the context menu.
      */
     private void handleExportToSVG() {
-        FileChooser fileChooser = new FileChooser();
+        FileChooser chooser = new FileChooser();
-        fileChooser.setTitle("Export to SVG");
+        chooser.setTitle("Export to SVG");
-        fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(
+        ExtensionFilter filter = new FileChooser.ExtensionFilter(
-                "Scalable Vector Graphics (SVG)", "svg"));
+                "Scalable Vector Graphics (SVG)", "svg");
-        File file = fileChooser.showSaveDialog(this.getScene().getWindow());
+        chooser.getExtensionFilters().add(filter);
+        File file = chooser.showSaveDialog(getScene().getWindow());
         if (file != null) {
             ExportUtils.writeAsSVG(this.chart, (int) getWidth(), 
                     (int) getHeight(), file);
@@ -313,11 +316,12 @@ private void handleExportToSVG() {
      * A handler for the export to PNG option in the context menu.
      */
     private void handleExportToPNG() {
-        FileChooser fileChooser = new FileChooser();
+        FileChooser chooser = new FileChooser();
-        fileChooser.setTitle("Export to PNG");
+        chooser.setTitle("Export to PNG");
-        fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(
+        ExtensionFilter filter = new FileChooser.ExtensionFilter(
-                "Portable Network Graphics (PNG)", "png"));
+                "Portable Network Graphics (PNG)", "png");
-        File file = fileChooser.showSaveDialog(this.getScene().getWindow());
+        chooser.getExtensionFilters().add(filter);
+        File file = chooser.showSaveDialog(getScene().getWindow());
         if (file != null) {
             try {
                 ExportUtils.writeAsPNG(this.chart, (int) getWidth(),
@@ -332,11 +336,11 @@ private void handleExportToPNG() {
      * A handler for the export to JPEG option in the context menu.
      */
     private void handleExportToJPEG() {
-        FileChooser fileChooser = new FileChooser();
+        FileChooser chooser = new FileChooser();
-        fileChooser.setTitle("Export to JPEG");
+        chooser.setTitle("Export to JPEG");
-        fileChooser.setSelectedExtensionFilter(new FileChooser.ExtensionFilter(
+        ExtensionFilter filter = new FileChooser.ExtensionFilter("JPEG", "jpg");
-                "JPEG", "jpg"));
+        chooser.getExtensionFilters().add(filter);
-        File file = fileChooser.showSaveDialog(this.getScene().getWindow());
+        File file = chooser.showSaveDialog(getScene().getWindow());
         if (file != null) {
             try {
                 ExportUtils.writeAsJPEG(this.chart, (int) getWidth(),