From 795c0e5f6cdcd4b0b8e1ce394ea71a8a59a7ab6e Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 26 May 2023 11:14:54 +0800 Subject: [PATCH 1/4] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/help/SystemInfoPane.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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..5f05dbffa 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 @@ -42,7 +42,8 @@ public class SystemInfoPane extends JPanel { Object[] tableRowData = new Object[2]; String keyValue = keys[i].toString(); // james:屏蔽掉exe4j的内容 - if (keyValue.indexOf("exe4j") != -1) { + // jxbrowser的也得屏蔽 + if (keyValue.indexOf("exe4j") != -1 || keyValue.indexOf("jxbrowser") != -1) { continue; } // james：这个也是exe4j的东东 From 0c906a483139947fd40a3d8862e6cb737cbc3e56 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 26 May 2023 11:23:30 +0800 Subject: [PATCH 2/4] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/help/SystemInfoPane.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 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 5f05dbffa..4d76f52da 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 @@ -43,11 +43,7 @@ public class SystemInfoPane extends JPanel { String keyValue = keys[i].toString(); // james:屏蔽掉exe4j的内容 // jxbrowser的也得屏蔽 - if (keyValue.indexOf("exe4j") != -1 || keyValue.indexOf("jxbrowser") != -1) { - continue; - } - // james：这个也是exe4j的东东 - if ("install4j.exeDir".equals(keyValue)) { + if (needToShield(keyValue)) { continue; } @@ -67,4 +63,14 @@ public class SystemInfoPane extends JPanel { add(new JScrollPane(table), BorderLayout.CENTER); } + + /** + * 是否属于需要屏蔽的内容 + * + * @param keyValue 对应的key值 + * @return 需要屏蔽则返回true + */ + private boolean needToShield(String keyValue) { + return keyValue.indexOf("exe4j") != -1 || keyValue.indexOf("jxbrowser") != -1 || "install4j.exeDir".equals(keyValue); + } } \ No newline at end of file From 81bf0f081e55b361df5b7dfc18049c54f3e35d13 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 26 May 2023 11:28:06 +0800 Subject: [PATCH 3/4] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/help/SystemInfoPane.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4d76f52da..8df91e7cc 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 @@ -47,7 +47,7 @@ public class SystemInfoPane extends JPanel { continue; } - if(keyValue.indexOf("FineReport") != -1){ + if(keyValue.contains("FineReport")){ keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME); } @@ -71,6 +71,6 @@ public class SystemInfoPane extends JPanel { * @return 需要屏蔽则返回true */ private boolean needToShield(String keyValue) { - return keyValue.indexOf("exe4j") != -1 || keyValue.indexOf("jxbrowser") != -1 || "install4j.exeDir".equals(keyValue); + return keyValue.contains("exe4j") || keyValue.contains("jxbrowser") || "install4j.exeDir".equals(keyValue); } } \ No newline at end of file From db6b2ceb18e01029682d01f6b367a437ffc0f9a7 Mon Sep 17 00:00:00 2001 From: "Destiny.Lin" Date: Fri, 26 May 2023 11:40:08 +0800 Subject: [PATCH 4/4] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/fr/design/actions/help/SystemInfoPane.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 8df91e7cc..db5c21e69 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,8 +41,7 @@ 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的内容 - // jxbrowser的也得屏蔽 + if (needToShield(keyValue)) { continue; } @@ -65,7 +64,7 @@ public class SystemInfoPane extends JPanel { } /** - * 是否属于需要屏蔽的内容 + * 是否属于需要屏蔽的内容(当前屏蔽掉exe4j与jxbrowser的内容) * * @param keyValue 对应的key值 * @return 需要屏蔽则返回true