Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design.git into release/10.0

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -117,7 +117,7 @@ public class EnvChangeEntrance {
                     @Override
                     public void show() {
                         FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
+                                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"), ERROR_MESSAGE, UIManager.getIcon("OptionPane.errorIcon"));
                     }
                 });
                 return false;
@@ -155,7 +155,7 @@ public class EnvChangeEntrance {
                 public void show() {
                     FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                       Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                      Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                      Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                       ERROR_MESSAGE,
                                                       UIManager.getIcon("OptionPane.errorIcon"));
                 }
@@ -171,7 +171,7 @@ public class EnvChangeEntrance {
                 FineLoggerFactory.getLogger().error(exception.getMessage(), exception);
                 strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                                          Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                                         Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                         Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                                          ERROR_MESSAGE,
                                                                          UIManager.getIcon("OptionPane.errorIcon")));
             }
@@ -191,7 +191,7 @@ public class EnvChangeEntrance {
         if (ComparatorUtils.equals(result, TestConnectionResult.AUTH_FAILED)) {
             strategy.showTip(() -> FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
                                                                      Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Failed"),
-                                                                     Toolkit.i18nText("Fine-Design_Basic_Error"),
+                                                                     Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
                                                                      ERROR_MESSAGE,
                                                                      UIManager.getIcon("OptionPane.errorIcon")));
         } else {
@@ -553,4 +553,14 @@ public class EnvChangeEntrance {
     interface PopTip {
         void show();
     }
+
+    private static class SuccessPopTip implements PopTip {
+        @Override
+        public void show() {
+            FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                                              Toolkit.i18nText("Fine-Design_Basic_Switch_Workspace_Success"),
+                                              Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                                              FineJOptionPane.INFORMATION_MESSAGE);
+        }
+    }
 }

designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java

@@ -497,8 +497,10 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
     }
 
     public void refreshToolBar() {
+        if (toolbarDef != null) {
             toolbarDef.refreshToolBar(FORBIDDEN_SET);
         }
+    }
 
     public void checkEnable() {
 

designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java

@@ -74,6 +74,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private String originalCharSet = null;
 
     private JPanel mainPanel;
+
     // Database pane
     public DatabaseConnectionPane() {
         this.initComponents();
@@ -122,7 +123,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
                             driverTips.setText(Toolkit.i18nText("Fine_Designer_Not_Found_Driver"));
                             gridJpanel.add(driverTips);
                             UILabel deatail = new UILabel();
-                            String content = Toolkit.i18nText("Fine_Designer_Not_Found") + select.getResultException().getDetailMessage() + Toolkit.i18nText("Fine_Designer_Driver");
+                            String content = Toolkit.i18nText("Fine_Designer_Not_Found") + " " + select.getResultException().getDetailMessage() + " " + Toolkit.i18nText("Fine_Designer_Driver");
                             deatail.setText(content);
                             deatail.setToolTipText(content);
                             gridJpanel.add(deatail);

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -19,6 +19,7 @@ import com.fr.design.worker.WorkerManager;
 import com.fr.design.worker.save.CallbackSaveWorker;
 import com.fr.file.FILE;
 import com.fr.general.ComparatorUtils;
+import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.third.javax.annotation.Nonnull;
@@ -70,8 +71,8 @@ public class MutilTempalteTabPane extends JComponent {
     private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
     private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
     private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
-    private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(MutilTempalteTabPane.class.getResource("/com/fr/design/images/file/white_saving_close.gif"));
-    private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(MutilTempalteTabPane.class.getResource("/com/fr/design/images/file/grey_saving_close.gif"));
+    private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif"));
+    private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/grey_saving_close.gif"));
     private static final String ELLIPSIS = "...";
     private static final int GAP = 5;
     private static final int SMALLGAP = 3;

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

@@ -12,7 +12,6 @@ import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.constants.UIConstants;
-import com.fr.design.data.BasicTableDataTreePane;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.dialog.FineJOptionPane;
@@ -706,9 +705,9 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
                     combineUp.add(jComponent);
                 }
             }
-        }
             //添加检测按钮
             addCheckButton();
+        }
         //添加分享按钮
         addShareButton();
         //添加插件中的按钮

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

@@ -1,6 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.design.gui.ilable.UILabel;
+import com.fr.general.IOUtils;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -16,7 +17,7 @@ import javax.swing.JPanel;
  */
 public class OpenLoadingPane extends JPanel {
 
-    private static final ImageIcon LOADING_ICON = new ImageIcon(OpenLoadingPane.class.getResource("/com/fr/design/images/mainframe/loading.gif"));
+    private static final ImageIcon LOADING_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/mainframe/loading.gif"));
 
     private UILabel loadingLabel;
 

designer-base/src/main/java/com/fr/design/style/color/ColorButton.java

@@ -126,6 +126,11 @@ public class ColorButton extends AbstractSelectBox<Color> {
             public void setVisible(boolean b) {
                 super.setVisible(b);
             }
+
+            @Override
+            protected boolean selectRealTime() {
+                return false;
+            }
         };
         colorPane.addChangeListener(new ChangeListener() {
             public void stateChanged(ChangeEvent e) {

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

@@ -10,6 +10,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.worker.WorkerManager;
 import com.fr.general.ComparatorUtils;
 import com.fr.log.FineLoggerFactory;
+import java.awt.Frame;
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -54,8 +55,9 @@ 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(
-                    DesignerContext.getDesignerFrame(),
+                    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);

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

@@ -44,6 +44,17 @@ class FormApp extends AbstractAppProvider {
         HashMap<String, Class> classType = new HashMap<String, Class>();
         classType.put(Constants.ARG_0, Form.class);
         classType.put(Constants.ARG_1, FILE.class);
+        FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", tplFile.getName()) + "...");
+        return compatibleForm(tplFile, classType);
+    }
+
+    /**
+     * 兼容外部注册的frm类型
+     *
+     * @return
+     */
+    private JTemplate<Form, ?> compatibleForm(FILE tplFile, HashMap<String, Class> classType) {
+        if (ComparatorUtils.equals(StableFactory.getRegisteredClass(BaseJForm.XML_TAG), JForm.class)) {
             classType.put(Constants.ARG_2, Parameter[].class);
             JForm emptyForm = new JForm(new Form(new WBorderLayout("form")), tplFile);
             OpenWorker<OpenResult<Form, Parameter[]>> worker = new OpenWorker<>(
@@ -58,30 +69,20 @@ class FormApp extends AbstractAppProvider {
                 @Override
                 public JTemplate<?, ?> call() throws Exception {
                     OpenResult<Form, Parameter[]> result = worker.getResult();
-                return compatibleForm(result.getBaseBook(), result.getRef(), tplFile, classType);
+                    return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
+                                                                                               new Object[]{result.getBaseBook(), tplFile, result.getRef()}, classType, BaseJForm.class);
                 }
             });
-        FineLoggerFactory.getLogger().info(Toolkit.i18nText("Fine-Design_Report_Template_Opening_And_Waiting", tplFile.getName()) + "...");
             worker.start(tplFile.getPath());
             OpenResult<Form, Parameter[]> result = worker.getResult();
             if (result != null) {
-            return compatibleForm(result.getBaseBook(), new Parameter[0], tplFile, classType);
+                return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
+                                                                                           new Object[]{result.getBaseBook(), tplFile, new Parameter[0]}, classType, BaseJForm.class);
             }
             return emptyForm;
-    }
-
-    /**
-     * 兼容外部注册的frm类型
-     *
-     * @return
-     */
-    private JTemplate<Form, ?> compatibleForm(Form form, Parameter[] parameters, FILE tplFile, HashMap<String, Class> classType) {
-        if (ComparatorUtils.equals(StableFactory.getRegisteredClass(BaseJForm.XML_TAG).getName(), JForm.class)) {
-            return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
-                                                                                       new Object[]{form, tplFile, parameters}, classType, BaseJForm.class);
         } else {
             return (JTemplate<Form, ?>) StableFactory.getMarkedInstanceObjectFromClass(BaseJForm.XML_TAG,
-                                                                                       new Object[]{form, tplFile}, classType, BaseJForm.class);
+                                                                                       new Object[]{asIOFile(tplFile), tplFile}, classType, BaseJForm.class);
         }
     }
 

designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceActivator.java

@@ -2,7 +2,6 @@ package com.fr.start.module;
 
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.PluginClassRefreshManager;
-import com.fr.design.env.WorkspaceChangeLoadingDialog;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.event.Event;
 import com.fr.event.Listener;
@@ -52,7 +51,6 @@ public class DesignerWorkspaceActivator extends Activator {
 
             @Override
             public void on(Event event, Workspace workspace) {
-                WorkspaceChangeLoadingDialog.showDialog();
                 PluginClassRefreshManager.getInstance().removePluginListener();
                 HistoryTemplateListCache.getInstance().stash();
             }
@@ -63,10 +61,8 @@ public class DesignerWorkspaceActivator extends Activator {
 
             @Override
             public void on(Event event, Workspace workspace) {
-
                 HistoryTemplateListCache.getInstance().load();
                 PluginClassRefreshManager.getInstance().addPluginListener();
-                WorkspaceChangeLoadingDialog.hideDialog();
             }
         });
     }