Merge pull request #564 in BA/design from ~PLOUGH/design:release to release

* commit '65f79d656478327be5542307ff5950f334f3fbea':
  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,25 +629,35 @@ public class PreferencePane extends BasicPane {
         return l;
     }
 
+    // 如果语言设置改变了，则显示重启对话框
+    public void showRestartDialog() {
+        if (!languageChanged) {
+            return;
+        }
+        int rv = JOptionPane.showOptionDialog(
+                null,
+                Inter.getLocText("FR-Designer_Language_Change_Successful"),
+                Inter.getLocText("FR-Designer-Plugin_Warning"),
+                JOptionPane.YES_NO_OPTION,
+                JOptionPane.INFORMATION_MESSAGE,
+                null,
+                new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")},
+                null
+        );
+        if (rv == JOptionPane.OK_OPTION) {
+            RestartHelper.restart();
+        }
+    }
+
     @Override
     public BasicDialog showWindow(Window window) {
         return showWindow(window, new DialogActionAdapter() {
             @Override
             public void doOk() {
                 if (languageComboBox.getSelectedIndex() != designerEnvLanguageIndex) {
-                    int rv = JOptionPane.showOptionDialog(
+                    languageChanged = true;
-                            null,
+                } else {
-                            Inter.getLocText("FR-Designer_Language_Change_Successful"),
+                    languageChanged = false;
-                            Inter.getLocText("FR-Designer-Plugin_Warning"),
-                            JOptionPane.YES_NO_OPTION,
-                            JOptionPane.INFORMATION_MESSAGE,
-                            null,
-                            new String[]{Inter.getLocText("FR-Designer-Basic_Restart_Designer"), Inter.getLocText("FR-Designer-Basic_Restart_Designer_Later")},
-                            null
-                    );
-                    if (rv == JOptionPane.OK_OPTION) {
-                        RestartHelper.restart();
-                    }
                 }
             }
         });