Browse Source

REPORT-27647 模板组件的安装下载-模板组件复用插件

处理下可能的 npe
feature/big-screen
Harrison 5 years ago
parent
commit
655c147802
  1. 29
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

29
designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@ -200,21 +200,14 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
String key = provider.key(); String key = provider.key();
PropertyItemBean itemBean = provider.getItem(); PropertyItemBean itemBean = provider.getItem();
String btnIconBaseDir = itemBean.getBtnIconBaseDir(); PropertyItem propertyItem = new PropertyItem(itemBean.getName(),
PropertyItem propertyItem;
if (StringUtils.isEmpty(btnIconBaseDir)) {
propertyItem = new PropertyItem(itemBean.getName(),
itemBean.getTitle(),
itemBean.getBtnIconName(),
itemBean.getVisibleModes(),
itemBean.getEnableModes());
} else{
propertyItem = new PropertyItem(itemBean.getName(),
itemBean.getTitle(), itemBean.getTitle(),
itemBean.getBtnIconName(), itemBean.getBtnIconName(),
btnIconBaseDir,
itemBean.getVisibleModes(), itemBean.getVisibleModes(),
itemBean.getEnableModes()); itemBean.getEnableModes());
String btnIconBaseDir = itemBean.getBtnIconBaseDir();
if (StringUtils.isNotEmpty(btnIconBaseDir)) {
propertyItem.setIconBaseDir(btnIconBaseDir);
} }
UIButton button = propertyItem.getButton(); UIButton button = propertyItem.getButton();
List<ActionListener> buttonListeners = itemBean.getButtonListeners(); List<ActionListener> buttonListeners = itemBean.getButtonListeners();
@ -730,7 +723,16 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
this.isEnabled = isEnabled; this.isEnabled = isEnabled;
button.setEnabled(isEnabled); button.setEnabled(isEnabled);
} }
public void setIconBaseDir(String iconBaseDir) {
this.iconBaseDir = iconBaseDir;
}
private String getIconBaseDir() {
return StringUtils.isEmpty(iconBaseDir) ? ICON_BASE_DIR : iconBaseDir;
}
private void initPropertyPanel() { private void initPropertyPanel() {
propertyPanel = new JPanel(); propertyPanel = new JPanel();
propertyPanel.setBackground(Color.pink); propertyPanel.setBackground(Color.pink);
@ -811,7 +813,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
} }
private String getBtnIconUrl() { private String getBtnIconUrl() {
return iconBaseDir + btnIconName + iconSuffix;
return getIconBaseDir() + btnIconName + iconSuffix;
} }
public void resetButtonIcon() { public void resetButtonIcon() {

Loading…
Cancel
Save