From 8b4c1ebb329e6a3f9c6041db4720a41cd3421618 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Fri, 9 Jun 2023 17:52:26 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-96808=20=E5=B1=8F=E8=94=BD=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E7=B3=BB=E7=BB=9F=E4=BF=A1=E6=81=AF=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E4=B8=AD=E7=9A=84jxbrowser=E7=9B=B8=E5=85=B3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=20=E5=90=8C=E6=AD=A510.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/actions/help/SystemInfoPane.java   | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
index 7fe26054f..f50bb703c 100644
--- a/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
+++ b/designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java
@@ -41,19 +41,15 @@ public class SystemInfoPane extends JPanel {
         for (int i = 0; i < keys.length; i++) {
             Object[] tableRowData = new Object[2];
             String keyValue = keys[i].toString();
-            // james:屏蔽掉exe4j的内容
-            if (keyValue.indexOf("exe4j") != -1) {
-            	continue;
+
+            if (needToShield(keyValue)) {
+                continue;
             }
-            // james：这个也是exe4j的东东
-            if ("install4j.exeDir".equals(keyValue)) {
-            	continue;
+
+            if(keyValue.contains("FineReport")){
+                keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME);
             }
-            
-        	if(keyValue.indexOf("FineReport") != -1){
-        		keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME);
-        	}
-            
+
             tableRowData[0] = keys[i];
             tableRowData[1] = properties.getProperty((String) keys[i]);
             tableModel.addRow(tableRowData);
@@ -66,4 +62,14 @@ public class SystemInfoPane extends JPanel {
 
         add(new JScrollPane(table), BorderLayout.CENTER);
     }
+
+    /**
+     * 是否属于需要屏蔽的内容(当前屏蔽掉exe4j与jxbrowser的内容)
+     *
+     * @param keyValue 对应的key值
+     * @return 需要屏蔽则返回true
+     */
+    private boolean needToShield(String keyValue) {
+        return keyValue.contains("exe4j") || keyValue.contains("jxbrowser") || "install4j.exeDir".equals(keyValue);
+    }
 }
\ No newline at end of file