Merge pull request #7360 in DESIGN/design from feature/10.0 to feature/big-screen

* commit 'd7781312bcd28bcb56f7f446bde3e350833fe959':
  REPORT-64811 保持设计器商城下载reu文件名中的版本信息
  REPORT-64741 【组件可更新提醒】组件复用-设计器端安装设计器版本高于当前设计器版本的组件的情况
  REPORT-64609 磁盘空间满时 保存模板造成模板丢失
  REPORT-64920 复制粘贴接口报错处理

designer-base/src/main/java/com/fr/common/exception/ThrowableHandler.java

@@ -0,0 +1,12 @@
+package com.fr.common.exception;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/27
+ */
+public interface ThrowableHandler {
+
+    boolean process(Throwable e);
+
+}

designer-base/src/main/java/com/fr/design/base/clipboard/ClipboardFilter.java

@@ -27,11 +27,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T cut(T selection) {
-
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).cut(selection);
             }
@@ -40,10 +36,7 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T copy(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-        for (ClipboardHandlerProvider provider : providers) {
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).copy(selection);
             }
@@ -52,15 +45,27 @@ public abstract class ClipboardFilter {
     }
     
     public static <T> T paste(T selection) {
-        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
-        Set<ClipboardHandlerProvider> providers = manager.getArray(ClipboardHandlerProvider.XML_TAG);
-        providers.addAll(clipboardHandlerProviders);
-
-        for (ClipboardHandlerProvider provider : providers) {
+        for (ClipboardHandlerProvider provider : getClipboardHandlerProviders()) {
             if (provider.support(selection)) {
                 selection = ((ClipboardHandlerProvider<T>) provider).paste(selection);
             }
         }
         return selection;
     }
+
+    private static Set<ClipboardHandlerProvider> getClipboardHandlerProviders() {
+        Set<ClipboardHandlerProvider> providers = new HashSet<>();
+
+        for (ClipboardHandlerProvider clipboardHandlerProvider : clipboardHandlerProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        ExtraDesignClassManager manager = PluginModule.getAgent(PluginModule.ExtraDesign);
+        Set<ClipboardHandlerProvider> pluginProviders = manager.getArray(ClipboardHandlerProvider.XML_TAG);
+        for (ClipboardHandlerProvider clipboardHandlerProvider : pluginProviders) {
+            providers.add(clipboardHandlerProvider);
+        }
+
+        return providers;
+    }
 }

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

@@ -50,6 +50,7 @@ import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.DesignUtils;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.design.worker.save.EmptyCallBackSaveWorker;
+import com.fr.design.worker.save.SaveFailureHandler;
 import com.fr.design.write.submit.DBManipulationInWidgetEventPane;
 import com.fr.design.write.submit.DBManipulationPane;
 import com.fr.event.EventDispatcher;
@@ -882,7 +883,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             export();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), e.getMessage(), "Save Error", JOptionPane.ERROR_MESSAGE);
+            SaveFailureHandler.getInstance().process(e);
             return false;
         }
         this.editingFILE = editingFILE;

designer-base/src/main/java/com/fr/design/worker/save/SaveFailureHandler.java

@@ -0,0 +1,70 @@
+package com.fr.design.worker.save;
+
+import com.fr.common.exception.ThrowableHandler;
+import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.i18n.Toolkit;
+import com.fr.design.mainframe.DesignerContext;
+import com.fr.general.IOUtils;
+import com.fr.workspace.exception.DiskSpaceFullException;
+import java.awt.Frame;
+import javax.swing.JOptionPane;
+
+/**
+ * @author hades
+ * @version 10.0
+ * Created by hades on 2021/12/7
+ */
+public class SaveFailureHandler implements ThrowableHandler {
+
+    private static final SaveFailureHandler INSTANCE = new SaveFailureHandler();
+
+    public static SaveFailureHandler getInstance() {
+        return INSTANCE;
+    }
+
+    @Override
+    public boolean process(Throwable e) {
+        for (Handler handler : Handler.values()) {
+            if (handler.process(e)) {
+                break;
+            }
+        }
+        return true;
+    }
+
+    public enum Handler implements ThrowableHandler {
+
+        FullDisk {
+            @Override
+            public boolean process(Throwable e) {
+                if (e.getCause() instanceof DiskSpaceFullException
+                        || e instanceof DiskSpaceFullException
+                        || e.getCause().getCause() instanceof DiskSpaceFullException) {
+                    FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                                      Toolkit.i18nText("Fine_Design_Template_Save_Failed_By_Full_Disk"),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Alert"),
+                                                      JOptionPane.WARNING_MESSAGE,
+                                                      IOUtils.readIcon("/com/fr/design/images/warnings/warning32.png"));
+                    return true;
+                }
+                return false;
+            }
+        },
+
+        Other {
+            @Override
+            public boolean process(Throwable e) {
+                boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
+                FineJOptionPane.showMessageDialog(
+                        minimized ? null : DesignerContext.getDesignerFrame(),
+                        Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
+                        Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                        JOptionPane.ERROR_MESSAGE);
+                return true;
+            }
+        };
+
+
+
+    }
+}

designer-base/src/main/java/com/fr/design/worker/save/SaveWorker.java

@@ -55,12 +55,7 @@ public class SaveWorker extends SwingWorker<Boolean, Void> {
         } catch (Exception e) {
             processResult();
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            boolean minimized = (DesignerContext.getDesignerFrame().getExtendedState() & Frame.ICONIFIED ) != 0;
-            FineJOptionPane.showMessageDialog(
-                    minimized ? null : DesignerContext.getDesignerFrame(),
-                    Toolkit.i18nText("Fine-Design-Basic_Save_Failure"),
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                    JOptionPane.ERROR_MESSAGE);
+            SaveFailureHandler.getInstance().process(e);
             return;
         }
         processResult();