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 7fe26054f6..f50bb703ce 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