Merge pull request #316 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0

* commit 'd709e47789233575592e1c6ec79c9b23031bd451':
  REPORT-10375 【10.0冒烟】激活码需要重复输入
  REPORT-10374 【10.0冒烟】激活码启动界面的control提示可以删掉了

designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java

@@ -56,6 +56,7 @@ public class CollectUserInformationDialog extends UIDialog {
                 message = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Activate_Activated_Successfully");
                 JOptionPane.showMessageDialog(CollectUserInformationDialog.this, message);
                 DesignerEnvManager.getEnvManager().setActivationKey(keyValue);
+                DesignerEnvManager.getEnvManager().saveXMLFile();
                 doOK();
             } else {
                 message = com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Activate_Activation_Code_Invalid");
@@ -95,7 +96,6 @@ public class CollectUserInformationDialog extends UIDialog {
         keyTextField = new UITextField();
         keyPane.add(keyTextField, BorderLayout.CENTER);
         keyTextField.setMaximumSize(new Dimension(keyTextField.getPreferredSize().width, 25));
-        macSystemHit(keyPane);
 
         UIButton getKeyButton = new UIButton(
                 com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Activate_Get_FR_Activation_Code"));
@@ -119,15 +119,6 @@ public class CollectUserInformationDialog extends UIDialog {
         GUICoreUtils.centerWindow(this);
     }
 
-    private void macSystemHit(JPanel keyPane) {
-        if (OperatingSystem.isMacOS()) {
-            UITextArea macHit = new UITextArea();
-            macHit.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Collect_OSXTips"));
-            macHit.setEditable(false);
-            keyPane.add(macHit, BorderLayout.SOUTH);
-        }
-    }
-
     @Override
     protected void applyClosingAction() {
         addWindowListener(new WindowAdapter() {