0003998: DbExport dialog in SQLExplorer does not update file output type

after first export
JumpMind · Jun 12, 2019 · ec01a8f · ec01a8f
1 parent 63b397e
commit ec01a8f
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbExportDialog.java b/symmetric-sqlexplorer/src/main/java/org/jumpmind/vaadin/ui/sqlexplorer/DbExportDialog.java
@@ -43,7 +43,6 @@
 import com.vaadin.v7.data.Property.ValueChangeEvent;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.server.FileDownloader;
-import com.vaadin.server.Resource;
 import com.vaadin.server.StreamResource;
 import com.vaadin.server.StreamResource.StreamSource;
 import com.vaadin.v7.ui.AbstractSelect;
@@ -206,6 +205,7 @@ public void buttonClick(ClickEvent event) {
 
             public void buttonClick(ClickEvent event) {
                 exportFileButton.removeClickShortcut();
+                fileDownloader.setFileDownloadResource(createResource());
                 doneButton.setClickShortcut(KeyCode.ENTER);
                 doneButton.focus();
             }
@@ -466,12 +466,6 @@ protected void buildFileDownloader() {
         }
         fileDownloader = new FileDownloader(createResource()) {
             private static final long serialVersionUID = 1L;
-
-            @Override
-            public Resource getFileDownloadResource() {
-                /* recreate the resource so the file name is regenerated */
-                return createResource();
-            }
         };
         fileDownloader.extend(exportFileButton);
     }