Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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

@@ -34,6 +34,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     private UIButton cancelButton;
     private JDialog dialog;
     private UILabel uiLabel;
+    private String oirginalCharSet = null;
+    private String newCharSet = null;
 
     // Database pane
     public DatabaseConnectionPane() {
@@ -67,6 +69,8 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
 
     @Override
     public void populateBean(com.fr.data.impl.Connection ob) {
+        this.oirginalCharSet = ob.getOriginalCharsetName();
+        this.newCharSet = ob.getNewCharsetName();
 
         populateSubDatabaseConnectionBean((E) ob);
     }
@@ -77,6 +81,9 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
     public com.fr.data.impl.Connection updateBean() {
         E ob = updateSubDatabaseConnectionBean();
 
+        ob.setOriginalCharsetName(this.oirginalCharSet);
+        ob.setNewCharsetName(this.newCharSet);
+
         return ob;
     }
 

designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java

@@ -39,7 +39,8 @@ public interface UpdateConstants {
             "fine-swift-log-adaptor-10.0.jar",
             "fine-webui-10.0.jar",
             "fine-datasource-10.0.jar",
-            "fine-third-10.0.jar"
+            "fine-third-10.0.jar",
+            "fine-accumulator-10.0.jar"
     };
 
     String[] JARS_FOR_DESIGNER_X = new String[]{

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

@@ -6,7 +6,6 @@ import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.TemplatePane;
 import com.fr.design.mainframe.loghandler.DesignerLogHandler;
 import com.fr.event.EventDispatcher;
-
 import com.fr.log.FineLoggerFactory;
 import com.fr.serialization.SerializerHelper;
 import com.fr.stable.ArrayUtils;
@@ -21,7 +20,9 @@ import io.socket.client.IO;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
 
-import javax.swing.*;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URL;
@@ -80,9 +81,17 @@ public class DesignerSocketIO {
                 @Override
                 public void call(Object... objects) {
                     if (status != Status.Disconnecting) {
-                        JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"),
-                                null, 0, UIManager.getIcon("OptionPane.errorIcon"));
-                        TemplatePane.getInstance().editItems();
+                        try {
+                            SwingUtilities.invokeAndWait(new Runnable() {
+                                public void run() {
+                                    JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"),
+                                            null, 0, UIManager.getIcon("OptionPane.errorIcon"));
+                                    TemplatePane.getInstance().editItems();
+                                }
+                            });
+                        } catch (Exception e) {
+                            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                        }
                     }
                     status = Status.Disconnected;
                 }