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

* commit '187b0240952d0a8230e96f550e79ad57de0ecd10':
  REPORT-11831
  无JIRA任务 findbugs问题

designer-base/src/main/java/com/fr/design/onlineupdate/domain/UpdateConstants.java

@@ -4,11 +4,11 @@ package com.fr.design.onlineupdate.domain;
  * Created by XINZAI on 2018/8/21.
  */
 
-import com.fr.third.org.apache.commons.collections4.collection.UnmodifiableCollection;
-import com.fr.third.org.apache.commons.collections4.list.UnmodifiableList;
 
 import java.awt.Color;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 更新升级的常量
@@ -32,7 +32,7 @@ public interface UpdateConstants {
 
     int BYTE = 153600;
 
-    UnmodifiableList JARS_FOR_SERVER_X = new UnmodifiableList(Arrays.asList(new String[]{
+    List<String> JARS_FOR_SERVER_X = Collections.unmodifiableList(Arrays.asList(new String[]{
             "fine-activator-10.0.jar",
             "fine-core-10.0.jar",
             "fine-report-engine-10.0.jar",
@@ -47,13 +47,13 @@ public interface UpdateConstants {
             "fine-accumulator-10.0.jar"
     }));
 
-    UnmodifiableList  JARS_FOR_DESIGNER_X = new UnmodifiableList(Arrays.asList(new String[]{
+    List<String> JARS_FOR_DESIGNER_X = Collections.unmodifiableList(Arrays.asList(new String[]{
             "fine-report-designer-10.0.jar",
             "aspectjrt.jar"
     }));
 
 
-    UnmodifiableList  LOG_TYPE = new UnmodifiableList(Arrays.asList(new String[]{
+    List<String> LOG_TYPE = Collections.unmodifiableList(Arrays.asList(new String[]{
             "REPORT", "MOBILE", "CHART", "PFC", "BI"
     }));
 

designer-base/src/main/java/com/fr/design/onlineupdate/ui/dialog/UpdateMainDialog.java

@@ -23,11 +23,7 @@ import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableCellRender;
 import com.fr.design.onlineupdate.ui.widget.UpdateInfoTableModel;
 import com.fr.design.onlineupdate.ui.widget.UpdateInfoTextAreaCellRender;
 import com.fr.design.utils.gui.GUICoreUtils;
-import com.fr.general.ComparatorUtils;
+import com.fr.general.*;
-import com.fr.general.DateUtils;
-import com.fr.general.GeneralUtils;
-import com.fr.general.IOUtils;
-import com.fr.general.SiteCenter;
 import com.fr.general.http.HttpClient;
 import com.fr.json.JSONArray;
 import com.fr.json.JSONObject;
@@ -341,8 +337,14 @@ public class UpdateMainDialog extends UIDialog {
         initUpdateActionPane();
 
         add(jarVersionInfoPane, BorderLayout.NORTH);
-        add(jarUpdateInfoPane, BorderLayout.CENTER);
+
-        add(updateActionPane, BorderLayout.SOUTH);
+        //海外版本不显示更新信息
+        if (GeneralContext.getLocale().equals(Locale.CHINA) || GeneralContext.getLocale().equals(Locale.TAIWAN)){
+            add(jarUpdateInfoPane, BorderLayout.CENTER);
+            add(updateActionPane, BorderLayout.SOUTH);
+        }else {
+            add(updateActionPane, BorderLayout.CENTER);
+        }
 
         addActionListenerForUpdateBtn();