Merge pull request #1464 in DESIGN/design from ~MAKSIM/design:release/10.0 to release/10.0

* commit '3886e76bbd0c1653d7c085a20394dcd0a1e63090':
  通过当前环境来处理不再依赖于传入对象
  回滚
  回滚
  服务检测增加本月不再提醒
  日志输出错误
  return
  建立socket增加重试机制

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -43,7 +43,11 @@ import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import java.lang.reflect.Method;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
@@ -249,12 +253,29 @@ public class EnvChangeEntrance {
     /**
      * 判断是否需要做版本验证，判断依据为
      * 1、选择的环境为远程环境
-     * 2、一个月内不弹出是否勾选（这里预留，还未实际增加）
+     * 2、一个月内不弹出是否勾选
      * @param selectedEnv 选择的环境
      * @return
      */
     private  boolean needCheckBranch(DesignerWorkspaceInfo selectedEnv){
-        return selectedEnv.getType() == DesignerWorkspaceType.Remote;
+        if(selectedEnv.getType() == DesignerWorkspaceType.Remote){
+            try {
+                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+                Calendar calendar = Calendar.getInstance();
+                //获取记录的时间
+                Date remindTime = format.parse(selectedEnv.getRemindTime());
+                calendar.setTime(remindTime);
+                //获取一个月后的时间
+                calendar.add(Calendar.MONTH,1);
+                //与当前时间作对比，然后判断是否提示
+                if(new Date().after(calendar.getTime())){
+                    return true;
+                }
+            } catch (ParseException e) {
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceInfo.java

@@ -10,6 +10,9 @@ public interface DesignerWorkspaceInfo extends XMLable {
 
     String getPath();
 
+    //获取提醒时间，用于判断是否做服务检测
+    String getRemindTime();
+
     WorkspaceConnectionInfo getConnection();
 
     boolean checkValid();

designer-base/src/main/java/com/fr/design/env/LocalDesignerWorkspaceInfo.java

@@ -43,6 +43,11 @@ public class LocalDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
         return path;
     }
 
+    @Override
+    public String getRemindTime() {
+        return null;
+    }
+
     @Override
     public WorkspaceConnectionInfo getConnection() {
         return null;

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -13,6 +13,8 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
 
     private String name;
 
+    private String remindTime;
+
     private WorkspaceConnectionInfo connection;
 
     public static RemoteDesignerWorkspaceInfo create(WorkspaceConnectionInfo connection) {
@@ -45,11 +47,21 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
         return connection;
     }
 
+    public void setRemindTime(String remindTime){
+        this.remindTime = remindTime;
+    }
+
+    @Override
+    public String getRemindTime(){
+        return remindTime;
+    }
+
     @Override
     public void readXML(XMLableReader reader) {
 
         if (reader.isAttr()) {
             this.name = reader.getAttrAsString("name", StringUtils.EMPTY);
+            this.remindTime = reader.getAttrAsString("remindTime", StringUtils.EMPTY);
         }
         if (reader.isChildNode()) {
             String tagName = reader.getTagName();
@@ -69,6 +81,7 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     public void writeXML(XMLPrintWriter writer) {
 
         writer.attr("name", name);
+        writer.attr("remindTime", remindTime);
         if (this.connection != null) {
             writer.startTAG("Connection");
             writer.attr("url", connection.getUrl());

designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java

@@ -1,10 +1,14 @@
 package com.fr.design.write.submit;
 
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.gui.ibutton.UIButton;
+import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
+import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 
 import javax.swing.BorderFactory;
@@ -18,6 +22,9 @@ import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
 
 /**
  * @author: Maksim
@@ -28,30 +35,31 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
     private JPanel topPanel;
     private JPanel centerPanel;
     private JPanel bottomPanel;
+    private UICheckBox remindBox;
 
     public CheckServiceDialog(Frame parent, String areaText, String localBranch, String remoteBranch){
         super(parent,true);
         //上面的标签面板
         topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         JPanel imagePanel = new JPanel();
-        Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/warning4.png");
+        Icon icon = IOUtils.readIcon("com/fr/design/images/warnings/warning5.png");
 
         JLabel imageLabel = new JLabel();
         imageLabel.setIcon(icon);
         imagePanel.add(imageLabel);
-        imagePanel.setPreferredSize(new Dimension(100,80));
+        imagePanel.setPreferredSize(new Dimension(110,80));
 
         JPanel verticalPanel = FRGUIPaneFactory.createVerticalFlowLayout_S_Pane(true);
         FRFont font = FRFont.getInstance();
         font = font.applySize(15).applyStyle(1);
         JLabel label = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Inconsistency"));
         label.setFont(font);
-        label.setPreferredSize(new Dimension(500,30));
+        label.setPreferredSize(new Dimension(600,30));
-        JLabel label2 = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Local_Designer")
+        JLabel label2 = new JLabel("<html>"+Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Local_Designer")
-                + localBranch + "/" + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remote_Server") + remoteBranch);
+                + localBranch + "/" + Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remote_Server") + remoteBranch+"</html>");
-        label2.setPreferredSize(new Dimension(500,20));
+        label2.setPreferredSize(new Dimension(600,30));
         JLabel label3 = new JLabel(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Branch_Need_Update"));
-        label3.setPreferredSize(new Dimension(500,20));
+        label3.setPreferredSize(new Dimension(500,30));
 
         verticalPanel.add(label);
         verticalPanel.add(label2);
@@ -73,9 +81,13 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         centerPanel.add(checkArea,BorderLayout.CENTER);
 
         //下面的按钮面板
+        remindBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Remind_Show"));
+        remindBox.addActionListener(remindCheckboxListener);
         UIButton okButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Button_Confirm"));
-        JPanel buttonPanel = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
+        JPanel buttonPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
-        buttonPanel.add(okButton);
+        buttonPanel.setBorder(BorderFactory.createEmptyBorder(0,10,10,10));
+        buttonPanel.add(remindBox, BorderLayout.WEST);
+        buttonPanel.add(okButton,BorderLayout.EAST);
         okButton.addActionListener(this );
         bottomPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         bottomPanel.add(buttonPanel);
@@ -86,7 +98,7 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
         this.add(topPanel,BorderLayout.NORTH);
         this.add(centerPanel, BorderLayout.CENTER);
         this.add(buttonPanel,BorderLayout.SOUTH);
-        this.setSize(new Dimension(600, 500));
+        this.setSize(new Dimension(GeneralContext.getLocale().equals(Locale.US)? 700:600, 500));
 
         GUICoreUtils.centerWindow(this);
     }
@@ -94,4 +106,19 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
     public void actionPerformed(ActionEvent e) {
         this.dispose();
     }
+
+
+    private ActionListener remindCheckboxListener = new ActionListener() {
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            String remindTime = format.format(new Date());
+            //环境已切换，通过当前环境获取，一定是远程环境
+            String currentEnvName = DesignerEnvManager.getEnvManager().getCurEnvName();
+            RemoteDesignerWorkspaceInfo currentEnv = (RemoteDesignerWorkspaceInfo)DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentEnvName);
+            currentEnv.setRemindTime(remindBox.isSelected()? remindTime : "");
+        }
+    };
+
 }