代码修改

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

@@ -1,6 +1,6 @@
 package com.fr.design.fun;
 
-import com.fr.decision.extension.report.ReportSupportedFileProvider;
+import com.fr.base.extension.FileExtension;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.file.FILEChooserPane;
 import com.fr.stable.fun.mark.Mutable;
@@ -25,10 +25,11 @@ public interface ReportSupportedFileUIProvider extends Mutable {
 
 
     /**
-     * 获取对应的新增的支持文件类型
+     * 获取可支持的文件类型
-     * @return ReportTemplateFileProvider
+     * @return 文件扩展
      */
-    ReportSupportedFileProvider getSupportedFile();
+    FileExtension[] getFileExtensions();
+
 
     /**
      * 获取文件关联的icon

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

@@ -1,6 +1,6 @@
 package com.fr.design.fun.impl;
 
-import com.fr.decision.extension.report.ReportSupportedFileProvider;
+import com.fr.base.extension.FileExtension;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.file.FILEChooserPane;
@@ -20,10 +20,11 @@ public abstract class AbstractReportSupportedFileUIProvider extends AbstractProv
     }
 
     @Override
-    public ReportSupportedFileProvider getSupportedFile() {
+    public FileExtension[] getFileExtensions() {
-        return null;
+        return new FileExtension[0];
     }
 
+
     @Override
     public Icon getFileIcon(String path, boolean isShowLock) {
         return null;

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

@@ -60,7 +60,7 @@ public class FileNodeConstants {
             //通过插件扩展的
             Set<ReportSupportedFileUIProvider> providers = ExtraDesignClassManager.getInstance().getArray(ReportSupportedFileUIProvider.XML_TAG);
             for (ReportSupportedFileUIProvider provider : providers) {
-                addAppExtensions(provider.getSupportedFile().getFileExtensions());
+                addAppExtensions(provider.getFileExtensions());
             }
             supportFileType.addAll(Arrays.asList(FRContext.getFileNodes().getSupportedTypes()));
 

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

@@ -1,7 +1,6 @@
 package com.fr.design.gui.itree.filetree;
 
 import com.fr.base.extension.FileExtension;
-import com.fr.decision.extension.report.ReportSupportedFileProvider;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.fun.ReportSupportedFileUIProvider;
 import com.fr.design.fun.impl.AbstractReportSupportedFileUIProvider;
@@ -27,7 +26,7 @@ public class FileNodeConstantsTest {
         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]);
+        Assert.assertEquals(FileExtension.CPTX, option.getFileExtensions()[0]);
     }
 
     @Test
@@ -54,14 +53,11 @@ public class FileNodeConstantsTest {
     private class MockNewTemplateFileOption extends AbstractReportSupportedFileUIProvider {
 
         @Override
-        public ReportSupportedFileProvider getSupportedFile() {
+        public FileExtension[] getFileExtensions() {
-            ReportSupportedFileProvider supportedFileProvider = EasyMock.mock(ReportSupportedFileProvider.class);
+            return new FileExtension[]{FileExtension.CPTX
-            EasyMock.expect(supportedFileProvider.getFileExtensions()).andReturn(new FileExtension[]{FileExtension.CPTX}).anyTimes();
+            };
-            EasyMock.replay(supportedFileProvider);
-            return supportedFileProvider;
         }
 
-
     }
 
 }