Sonar

designer/src/com/fr/design/mainframe/AuthorityToolBarPane.java

@@ -242,14 +242,11 @@ public class AuthorityToolBarPane<T extends WebContent> extends BasicBeanPane<Re
         for (int i = 0; i < managers.length; i++) {
             ToolBar tb = managers[i].getToolBar();
             for (int j = 0; j < tb.getWidgetSize(); j++) {
-                if (widget instanceof Button && tb.getWidget(j) instanceof Button) {
+                if (widget instanceof Button && tb.getWidget(j) instanceof Button && ComparatorUtils.equals(((Button) widget).getIconName(), ((Button) tb.getWidget(j)).getIconName())) {
-                    if (ComparatorUtils.equals(((Button) widget).getIconName(),
+                    if (!isSelected) {
-                            ((Button) tb.getWidget(j)).getIconName())) {
+                        tb.getWidget(j).getWidgetPrivilegeControl().addInvisibleRole(selectedRole);
-                        if (!isSelected) {
+                    } else {
-                            tb.getWidget(j).getWidgetPrivilegeControl().addInvisibleRole(selectedRole);
+                        tb.getWidget(j).getWidgetPrivilegeControl().removeInvisibleRole(selectedRole);
-                        } else {
-                            tb.getWidget(j).getWidgetPrivilegeControl().removeInvisibleRole(selectedRole);
-                        }
                     }
                 }
             }