Browse Source

Merge pull request #12259 in DESIGN/design from release/10.0 to bugfix/10.0

* commit 'f1d0d2f491ad4974cf8aed42ab9df531ea93773e':
  REPORT-96808 屏蔽设计器系统信息面板中的jxbrowser相关参数 同步10.0
bugfix/10.0
superman 1 year ago
parent
commit
a22c2d887e
  1. 20
      designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java

20
designer-base/src/main/java/com/fr/design/actions/help/SystemInfoPane.java

@ -41,16 +41,12 @@ public class SystemInfoPane extends JPanel {
for (int i = 0; i < keys.length; i++) { for (int i = 0; i < keys.length; i++) {
Object[] tableRowData = new Object[2]; Object[] tableRowData = new Object[2];
String keyValue = keys[i].toString(); String keyValue = keys[i].toString();
// james:屏蔽掉exe4j的内容
if (keyValue.indexOf("exe4j") != -1) { if (needToShield(keyValue)) {
continue;
}
// james:这个也是exe4j的东东
if ("install4j.exeDir".equals(keyValue)) {
continue; continue;
} }
if(keyValue.indexOf("FineReport") != -1){ if(keyValue.contains("FineReport")){
keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME); keys[i] = keyValue.replaceAll("FineReport", ProductConstants.APP_NAME);
} }
@ -66,4 +62,14 @@ public class SystemInfoPane extends JPanel {
add(new JScrollPane(table), BorderLayout.CENTER); 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);
}
} }
Loading…
Cancel
Save