Author: chatellier Date: 2010-11-24 11:11:17 +0000 (Wed, 24 Nov 2010) New Revision: 262 Log: Ajout entre parenthese du nombre de fils. Selection correct des sous fils pour une Category Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-24 11:09:31 UTC (rev 261) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlValidationRenderer.java 2010-11-24 11:11:17 UTC (rev 262) @@ -69,16 +69,17 @@ boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { + GlobalValidationModel model = (GlobalValidationModel)tree.getModel(); JLabel component = (JLabel)super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); ImageIcon icon = null; String text = null; if (value instanceof String) { - text = _((String)value); + text = _((String)value) + " (" + model.getChildCount(value) + ")"; } else if (value instanceof Category) { - text = _(((Category)value).getTranslationKey()); + text = _(((Category)value).getTranslationKey()) + " (" + model.getChildCount(value) + ")"; } else if (value instanceof GlobalValidationGroup) { GlobalValidationGroup validationErrorGroup = (GlobalValidationGroup)value; @@ -99,7 +100,7 @@ } String message = validationErrorGroup.getMessage(); - text = _(message); + text = _(message) + " (" + model.getChildCount(value) + ")"; } else if (value instanceof ValidationError) { ValidationError validationError = (ValidationError)value; Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java 2010-11-24 11:09:31 UTC (rev 261) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/GlobalValidationModel.java 2010-11-24 11:11:17 UTC (rev 262) @@ -273,7 +273,7 @@ } // recursive check of sub errors - if (node instanceof String || node instanceof GlobalValidationGroup) { + if (node instanceof String || node instanceof Category || node instanceof GlobalValidationGroup) { int childCount = getChildCount(node); for (int i = 0 ; i < childCount; ++i) { Object child = getChild(node, i);