Merge pull request #563 in BA/design from ~PLOUGH/design:dev to dev

* commit 'c5f8285eab974a6a7994476f8652f1ad30edf3ec':
  REPORT-875 修复立即重启时，没有正常保存xml文件的问题

designer_base/src/com/fr/design/actions/file/PreferenceAction.java

@@ -38,6 +38,7 @@ public class PreferenceAction extends UpdateAction {
 				DesignerEnvManager.getEnvManager().saveXMLFile();
 				JTemplate jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
 				jt.refreshToolArea();
+				preferencePane.showRestartDialog();
 			}
 		});	
 		

designer_base/src/com/fr/design/actions/file/PreferencePane.java

@@ -83,6 +83,8 @@ public class PreferencePane extends BasicPane {
     };
     private static int designerEnvLanguageIndex; // 打开设置对话框时，设计器使用的语言
 
+    private boolean languageChanged; // 是否修改了设计器语言设置
+
     //设置是否支持undo
     private UICheckBox supportUndoCheckBox;
     //设置最大撤销次数
@@ -627,12 +629,11 @@ public class PreferencePane extends BasicPane {
         return l;
     }
 
-    @Override
-    public BasicDialog showWindow(Window window) {
-        return showWindow(window, new DialogActionAdapter() {
-            @Override
-            public void doOk() {
-                if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) {
+    // 如果语言设置改变了，则显示重启对话框
+    public void showRestartDialog() {
+        if (!languageChanged) {
+            return;
+        }
         int rv = JOptionPane.showOptionDialog(
             null,
             Inter.getLocText("FR-Designer_Language_Change_Successful"),
@@ -644,10 +645,20 @@ public class PreferencePane extends BasicPane {
             null
         );
         if (rv == JOptionPane.OK_OPTION) {
-                        DesignerEnvManager.getEnvManager().saveXMLFile();
             RestartHelper.restart();
         }
     }
+
+    @Override
+    public BasicDialog showWindow(Window window) {
+        return showWindow(window, new DialogActionAdapter() {
+            @Override
+            public void doOk() {
+                if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) {
+                    languageChanged = true;
+                } else {
+                    languageChanged = false;
+                }
             }
         });
     }