Browse Source

Merge pull request #1118 in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0

* commit 'f2d15d039e6a6343c97a53d2705cfb2c87117e41':
  sonar问题修复,无jira任务
research/11.0
pengda 5 years ago
parent
commit
61f9967c29
  1. 2
      designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java
  2. 2
      designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

2
designer-realize/src/main/java/com/fr/design/webattr/FToolBar.java

@ -17,7 +17,7 @@ public class FToolBar {
} }
public void setButtonlist(List<ToolBarButton> buttonlist) { public void setButtonlist(List<ToolBarButton> buttonlist) {
if (buttonlist == null || buttonlist.size() < 0) { if (buttonlist == null ) {
this.buttonlist = new ArrayList<ToolBarButton>(); this.buttonlist = new ArrayList<ToolBarButton>();
} else { } else {
this.buttonlist = buttonlist; this.buttonlist = buttonlist;

2
designer-realize/src/main/java/com/fr/design/webattr/ToolBarPane.java

@ -124,7 +124,7 @@ public class ToolBarPane extends BasicBeanPane<ToolBar> {
} }
private void setToolBar(List<ToolBarButton> list) { private void setToolBar(List<ToolBarButton> list) {
if (list == null || list.size() < 0) { if (list == null ) {
return; return;
} }
this.removeAll(); this.removeAll();

Loading…
Cancel
Save