Merge pull request #399 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit '9583cd515166a72eb5e0e2b2c78d56952a5bfc89':
  REPORT-10541
  REPORT-10541

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[]{