Merge pull request #1202 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0

* commit 'f8cf8a8a7a65d1fdee197e905ada3e91cb8c6eb5':
  修改命名
  修改命名
  继承AbstractProvider
  重命名
  接口调整
  无
  修改文件路径
  REPORT-21017【新引擎】增加cptx文件类型及相关适配

designer-base/src/main/java/com/fr/design/fun/ReportSupportedFileUIProvider.java

@@ -0,0 +1,47 @@
+package com.fr.design.fun;
+
+import com.fr.decision.extension.report.ReportSupportedFileProvider;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.file.FILEChooserPane;
+import com.fr.stable.fun.mark.Mutable;
+
+import javax.swing.Icon;
+
+/**
+ * Created by kerry on 2019-10-11
+ */
+public interface ReportSupportedFileUIProvider extends Mutable {
+
+    int CURRENT_LEVEL = 1;
+
+    String XML_TAG = "ReportSupportedFileUIProvider";
+
+    /**
+     * 向文件选择器中添加指定文件类型过滤器
+     * @param fileChooser 文件选择器
+     * @param suffix 文件后缀
+     */
+    void addChooseFileFilter(FILEChooserPane fileChooser, String suffix);
+
+
+    /**
+     * 获取对应的新增的支持文件类型
+     * @return ReportTemplateFileProvider
+     */
+    ReportSupportedFileProvider getSupportedFile();
+
+    /**
+     * 获取文件关联的icon
+     * @param path 文件路径
+     * @param isShowLock 是否显示被锁住
+     * @return 对应的图标
+     */
+    Icon getFileIcon(String path,boolean isShowLock);
+
+    /**
+     * 保存为新类型文件
+     * @param targetPath 目标路径
+     * @param jTemplate 模板对象
+     */
+    boolean saveToNewFile(String targetPath, JTemplate jTemplate);
+}

designer-base/src/main/java/com/fr/design/fun/impl/AbstractReportSupportedFileUIProvider.java

@@ -0,0 +1,46 @@
+package com.fr.design.fun.impl;
+
+import com.fr.decision.extension.report.ReportSupportedFileProvider;
+import com.fr.design.fun.ReportSupportedFileUIProvider;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.file.FILEChooserPane;
+import com.fr.stable.fun.impl.AbstractProvider;
+import com.fr.stable.fun.mark.API;
+
+import javax.swing.Icon;
+
+/**
+ * Created by kerry on 2019-10-14
+ */
+@API(level = ReportSupportedFileUIProvider.CURRENT_LEVEL)
+public abstract class AbstractReportSupportedFileUIProvider extends AbstractProvider implements ReportSupportedFileUIProvider {
+    @Override
+    public void addChooseFileFilter(FILEChooserPane fileChooser, String suffix) {
+
+    }
+
+    @Override
+    public ReportSupportedFileProvider getSupportedFile() {
+        return null;
+    }
+
+    @Override
+    public Icon getFileIcon(String path, boolean isShowLock) {
+        return null;
+    }
+
+    @Override
+    public boolean saveToNewFile(String targetPath, JTemplate jTemplate) {
+        return false;
+    }
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public String mark4Provider() {
+        return getClass().getName();
+    }
+}

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileNodeConstants.java

@@ -1,8 +1,9 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.FRContext;
+import com.fr.base.extension.FileExtension;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.mainframe.App;
+import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.general.GeneralContext;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.injectable.PluginModule;
@@ -44,10 +45,10 @@ public class FileNodeConstants {
         });
     }
 
-    private static void addAppExtensions(String[] extensions) {
+    private static void addAppExtensions(FileExtension[] extensions) {
         for (int i = 0, size = extensions.length; i < size; i++) {
-            if (!supportFileType.contains(extensions[i])) {
+            if (!supportFileType.contains(extensions[i].getExtension())) {
-                supportFileType.add(extensions[i]);
+                supportFileType.add(extensions[i].getExtension());
             }
         }
     }
@@ -55,12 +56,14 @@ public class FileNodeConstants {
     private static void initSupportedTypes() {
         try {
             rwl.writeLock().lock();
-            supportFileType = new ArrayList<>(Arrays.asList(FRContext.getFileNodes().getSupportedTypes()));
+            supportFileType = new ArrayList<String>();
             //通过插件扩展的
-            Set<App> apps = ExtraDesignClassManager.getInstance().getArray(App.MARK_STRING);
+            Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
-            for (App app : apps) {
+            for (ReportSupportedFileUIProvider provider : providers) {
-                addAppExtensions(app.defaultExtensions());
+                addAppExtensions(provider.getSupportedFile().getFileExtensions());
             }
+            supportFileType.addAll(Arrays.asList(FRContext.getFileNodes().getSupportedTypes()));
+
         } finally {
             rwl.writeLock().unlock();
         }

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java

@@ -1,7 +1,9 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.BaseUtils;
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.icon.LockIcon;
+import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
 import com.fr.stable.StableUtils;
@@ -11,6 +13,7 @@ import javax.swing.Icon;
 import javax.swing.UIManager;
 import javax.swing.filechooser.FileSystemView;
 import java.io.File;
+import java.util.Set;
 
 public class FileTreeIcon {
     private FileTreeIcon() {
@@ -146,16 +149,42 @@ public class FileTreeIcon {
                 if (node.isDirectory()) {
                     return FileTreeIcon.FOLDER_IMAGE_ICON;
                 }
-                return FileSystemView.getFileSystemView().getSystemIcon(new File(path));
+                return getLocalFileIcon(path);
             }
         }
         if (node.isDirectory()) {
             return FileTreeIcon.FOLDER_IMAGE_ICON;
         } else {
-            return FileTreeIcon.getIcon(FileTreeIcon.getFileType(node.getName()), isShowLock);
+            return getRemoteFileIcon(node, isShowLock);
         }
     }
 
+    private static Icon getLocalFileIcon(String path) {
+        Icon icon = getExtraIcon(path, false);
+        if (icon != null) {
+            return icon;
+        }
+        return FileSystemView.getFileSystemView().getSystemIcon(new File(path));
+    }
+
+    private static Icon getRemoteFileIcon(FileNode node, boolean isShowLock) {
+        Icon icon = getExtraIcon(node.getName(), isShowLock);
+        if (icon != null) {
+            return icon;
+        }
+        return FileTreeIcon.getIcon(FileTreeIcon.getFileType(node.getName()), isShowLock);
+    }
+
+    private static Icon getExtraIcon(String path, boolean isShowLock) {
+        Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
+        for (ReportSupportedFileUIProvider provider : providers) {
+            if (provider.getFileIcon(path, isShowLock) != null) {
+                return provider.getFileIcon(path, isShowLock);
+            }
+        }
+        return null;
+    }
+
     private static Icon getIcon(int fileType, boolean isLocked) {
         if (fileType == JAVA_FILE) {
             if (isLocked) {
@@ -293,4 +322,4 @@ public class FileTreeIcon {
             return TEXT_FILE;
         }
     }
-}
+}

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.FRContext;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
+import com.fr.base.extension.FileExtension;
 import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
@@ -12,7 +13,6 @@ import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.actions.AllowAuthorityEditAction;
 import com.fr.design.actions.TableDataSourceAction;
 import com.fr.design.actions.edit.RedoAction;
 import com.fr.design.actions.edit.UndoAction;
@@ -27,6 +27,7 @@ import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.TemplateTreePane;
 import com.fr.design.fun.DesignerFrameUpButtonProvider;
 import com.fr.design.fun.MenuHandler;
+import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.fun.PreviewProvider;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
@@ -49,6 +50,7 @@ import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
 import com.fr.file.MemFILE;
+import com.fr.file.filter.ChooseFileFilter;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
@@ -575,6 +577,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         String oldName = this.getPath();
         // alex:如果是SaveAs的话需要让用户来选择路径了
         FILEChooserPane fileChooser = getFILEChooserPane(isShowLoc);
+        addChooseFILEFilter(fileChooser);
         fileChooser.setFileNameTextField(fileName, this.suffix());
         int chooseResult = fileChooser.showSaveDialog(DesignerContext.getDesignerFrame(), this.suffix());
 
@@ -625,6 +628,16 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         }
     }
 
+    protected void addChooseFILEFilter(FILEChooserPane fileChooser){
+        String appName = ProductConstants.APP_NAME;
+        fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
+        if (FileExtension.FRM.matchExtension(this.suffix())) {
+            // richer:form文件 daniel 改成三个字
+            fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
+        }
+
+    }
+
     // 保存新模板时会进入此方法（新建模板直接保存，或者另存为）
     protected boolean saveNewFile(FILE editingFILE, String oldName) {
         String originID = StringUtils.EMPTY;
@@ -635,13 +648,25 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         initForCollect();
 
         this.editingFILE = editingFILE;
-        boolean result = this.saveFile();
+        boolean result = this.saveToNewFile(oldName);
         if (result) {
             DesignerFrameFileDealerPane.getInstance().refresh();
             collectInfo(originID);
         }
-        //更换最近打开
+        return result;
-        DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
+    }
+
+    protected boolean saveToNewFile(String oldName){
+        boolean result = false;
+        Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
+        for (ReportSupportedFileUIProvider provider : providers) {
+            result = result || provider.saveToNewFile(this.editingFILE.getPath(), this);
+        }
+        if(!result && FileExtension.CPT.matchExtension(this.editingFILE.getPath())){
+            result = result || this.saveFile();
+            //更换最近打开
+            DesignerEnvManager.getEnvManager().replaceRecentOpenedFilePath(oldName, this.getPath());
+        }
         return result;
     }
 

designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@@ -782,12 +782,7 @@ public class FILEChooserPane extends BasicPane {
             }
         }
         //jerry 26216 只保留.cpt .frm有用的格式，并且不可编辑
-        if (type == JFileChooser.OPEN_DIALOG) {
+        postfixComboBox.setEnabled(true);
-            postfixComboBox.setEnabled(true);
-        } else {
-            postfixComboBox.setEnabled(false);
-        }
-
         //只有一个类型时不可下拉
         if (filterList.size() == 1) {
             postfixComboBox.setEnabled(false);
@@ -841,14 +836,7 @@ public class FILEChooserPane extends BasicPane {
 
     private void saveDialog() {
         String filename = fileNameTextField.getText();
-        if (!filename.endsWith(suffix)) {
+        fileNameTextField.setText(calFileNameText(filename, (ChooseFileFilter) (postfixComboBox.getSelectedItem())));
-            ChooseFileFilter chooseFileFilter = (ChooseFileFilter) (postfixComboBox.getSelectedItem());
-            if (chooseFileFilter != null && StringUtils.isNotEmpty(chooseFileFilter.getExtensionString())) {
-                fileNameTextField.setText(filename + chooseFileFilter.getExtensionString());
-            } else {
-                fileNameTextField.setText(filename + this.suffix);
-            }
-        }
         option = OK_OPTION;
         FILE selectedFile = this.getSelectedFILE();
 
@@ -874,6 +862,15 @@ public class FILEChooserPane extends BasicPane {
         }
     }
 
+    private String calFileNameText(String currentValue, ChooseFileFilter selectFileFilter) {
+        if (selectFileFilter == null || StringUtils.isEmpty(selectFileFilter.getExtensionString())) {
+            return currentValue + this.suffix;
+        } else if (!currentValue.endsWith(selectFileFilter.getExtensionString())) {
+            return currentValue + selectFileFilter.getExtensionString();
+        }
+        return currentValue;
+    }
+
     private boolean access(FILE selectedFile) {
         boolean access = false;
         try {

designer-base/src/test/java/com/fr/design/gui/itree/filetree/FileNodeConstantsTest.java

@@ -1,51 +1,67 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.extension.FileExtension;
-import com.fr.base.io.BaseBook;
+import com.fr.decision.extension.report.ReportSupportedFileProvider;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.design.mainframe.AbstractAppProvider;
+import com.fr.design.fun.ReportSupportedFileUIProvider;
-import com.fr.design.mainframe.App;
+import com.fr.design.fun.impl.AbstractReportSupportedFileUIProvider;
-import com.fr.design.mainframe.JTemplate;
-import com.fr.file.FILE;
 import com.fr.stable.fun.mark.Mutable;
 import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Test;
-
+import org.junit.runner.RunWith;
+import org.powermock.api.easymock.PowerMock;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 import java.util.HashSet;
 import java.util.Set;
 
 /**
  * Created by alex sung on 2019/7/25.
  */
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(ExtraDesignClassManager.class)
 public class FileNodeConstantsTest {
     @Test
-    public void supportFileTypesTest(){
+    public void supportFileTypesTest() {
+        ExtraDesignClassManager extra = mockExtraDesignClassManager();
+        Assert.assertEquals(1, extra.getArray(ReportSupportedFileUIProvider.XML_TAG).size());
+        ReportSupportedFileUIProvider option = (ReportSupportedFileUIProvider) extra.getArray(ReportSupportedFileUIProvider.XML_TAG).iterator().next();
+        Assert.assertEquals(FileExtension.CPTX, option.getSupportedFile().getFileExtensions()[0]);
+    }
+
+    @Test
+    public void testSupportFileTypesOrder() {
+        ExtraDesignClassManager extra = mockExtraDesignClassManager();
+        PowerMock.mockStatic(ExtraDesignClassManager.class);
+        EasyMock.expect(ExtraDesignClassManager.getInstance()).andReturn(extra).once();
+        PowerMock.replayAll();
+        String[] fileTypes = FileNodeConstants.getSupportFileTypes();
+        Assert.assertEquals("cptx", fileTypes[0]);
+        Assert.assertEquals("cpt", fileTypes[1]);
+    }
+
+    private ExtraDesignClassManager mockExtraDesignClassManager() {
         ExtraDesignClassManager extra = EasyMock.mock(ExtraDesignClassManager.class);
-        Set<Mutable> apps = new HashSet<Mutable>(){{add(new MockCptxApp());}};
+        Set<Mutable> options = new HashSet<Mutable>() {{
-        EasyMock.expect(extra.getArray(App.MARK_STRING)).andReturn(apps).anyTimes();
+            add(new MockNewTemplateFileOption());
+        }};
+        EasyMock.expect(extra.getArray(ReportSupportedFileUIProvider.XML_TAG)).andReturn(options).anyTimes();
         EasyMock.replay(extra);
-
+        return extra;
-        Assert.assertEquals(1, extra.getArray(App.MARK_STRING).size());
-        App app = (App) extra.getArray(App.MARK_STRING).iterator().next();
-        Assert.assertEquals("cptx", app.defaultExtensions()[0]);
     }
 
-    private class MockCptxApp extends AbstractAppProvider{
+    private class MockNewTemplateFileOption extends AbstractReportSupportedFileUIProvider {
-        @Override
-        public String[] defaultExtensions() {
-            return new String[] {FileExtension.CPTX.getExtension()};
-        }
 
         @Override
-        public JTemplate openTemplate(FILE tplFile) {
+        public ReportSupportedFileProvider getSupportedFile() {
-            return null;
+            ReportSupportedFileProvider supportedFileProvider = EasyMock.mock(ReportSupportedFileProvider.class);
+            EasyMock.expect(supportedFileProvider.getFileExtensions()).andReturn(new FileExtension[]{FileExtension.CPTX}).anyTimes();
+            EasyMock.replay(supportedFileProvider);
+            return supportedFileProvider;
         }
 
-        @Override
+
-        public BaseBook asIOFile(FILE tplFile) {
-            return null;
-        }
     }
 
 }

designer-base/src/test/java/com/fr/file/FILEChooserPaneTest.java

@@ -0,0 +1,38 @@
+package com.fr.file;
+
+import com.fr.base.extension.FileExtension;
+import com.fr.file.filter.ChooseFileFilter;
+import com.fr.invoke.Reflect;
+import com.fr.stable.StringUtils;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Created by kerry on 2019-10-15
+ */
+
+public class FILEChooserPaneTest {
+    @Test
+    public void testAddChooseFileFilter() {
+        FILEChooserPane chooserPane = Reflect.on(FILEChooserPane.class).field("INSTANCE").get();
+        String result1 = Reflect.on(chooserPane).call("calFileNameText", "WorkBook1.cpt", null).get();
+        Assert.assertEquals("WorkBook1.cptnull", result1);
+
+        ChooseFileFilter chooseFileFilter1 = new ChooseFileFilter(FileExtension.CPT, StringUtils.EMPTY);
+        String result2 = Reflect.on(chooserPane).call("calFileNameText", "WorkBook1.cpt", chooseFileFilter1).get();
+        Assert.assertEquals("WorkBook1.cpt", result2);
+
+        ChooseFileFilter chooseFileFilter2 = new ChooseFileFilter(FileExtension.CPTX, StringUtils.EMPTY);
+        String result3 = Reflect.on(chooserPane).call("calFileNameText", "WorkBook1.cpt", chooseFileFilter2).get();
+        Assert.assertEquals("WorkBook1.cpt.cptx", result3);
+
+        ChooseFileFilter chooseFileFilter3 = new ChooseFileFilter(FileExtension.CPT, StringUtils.EMPTY);
+        String result4 = Reflect.on(chooserPane).call("calFileNameText", "WorkBook1.cptx", chooseFileFilter3).get();
+        Assert.assertEquals("WorkBook1.cptx.cpt", result4);
+
+        ChooseFileFilter chooseFileFilter5 = new ChooseFileFilter(FileExtension.CPTX, StringUtils.EMPTY);
+        String result5 = Reflect.on(chooserPane).call("calFileNameText", "WorkBook1.cptx", chooseFileFilter5).get();
+        Assert.assertEquals("WorkBook1.cptx", result5);
+    }
+
+}

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.BaseUtils;
 import com.fr.base.PaperSize;
 import com.fr.base.Parameter;
+import com.fr.base.extension.FileExtension;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
 import com.fr.design.actions.FormMobileAttrAction;
@@ -34,6 +35,7 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.imenu.UIMenuItem;
 import com.fr.design.gui.xpane.FormHyperlinkGroupPane;
 import com.fr.design.gui.xpane.FormHyperlinkGroupPaneNoPop;
+import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
 import com.fr.design.mainframe.form.FormECDesignerProvider;
@@ -52,6 +54,8 @@ import com.fr.design.report.fit.menupane.ReportFitAttrAction;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.file.FILE;
+import com.fr.file.FILEChooserPane;
+import com.fr.file.filter.ChooseFileFilter;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.main.Form;
@@ -66,6 +70,7 @@ import com.fr.report.cell.cellattr.CellImage;
 import com.fr.report.worksheet.FormElementCase;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
+import com.fr.stable.ProductConstants;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.web.controller.ViewRequestConstants;
 
@@ -949,4 +954,13 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     public String route() {
         return ViewRequestConstants.FORM_VIEW_PATH;
     }
+
+    protected void addChooseFILEFilter(FILEChooserPane fileChooser){
+        String appName = ProductConstants.APP_NAME;
+        if (FileExtension.FRM.matchExtension(this.suffix())) {
+            // richer:form文件 daniel 改成三个字
+            fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
+        }
+
+    }
 }

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -34,6 +34,7 @@ import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
 import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.file.MutilTempalteTabPane;
+import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.fun.PreviewProvider;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
@@ -65,6 +66,7 @@ import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.design.write.submit.SmartInsertDBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.SmartInsertDBManipulationPane;
 import com.fr.file.FILE;
+import com.fr.file.FILEChooserPane;
 import com.fr.file.FileNodeFILE;
 import com.fr.file.filetree.FileNode;
 import com.fr.general.ComparatorUtils;
@@ -1166,4 +1168,12 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
     public String route() {
         return ViewRequestConstants.REPORT_VIEW_PATH;
     }
+
+    protected void addChooseFILEFilter(FILEChooserPane fileChooser){
+        super.addChooseFILEFilter(fileChooser);
+        Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
+        for (ReportSupportedFileUIProvider provider : providers) {
+            provider.addChooseFileFilter(fileChooser, this.suffix());
+        }
+    }
 }