No changes between revisions
/trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
438,7 → 438,7 |
return valeur; |
} |
private void setValeurComboStructures() { |
if (structuresCombo.getCombo().getStore() != null |
if (structuresCombo.getCombo().getStore() != null |
&& collection != null |
&& collection.getStructureNom() != null |
&& !UtilString.isEmpty(collection.getStructureNom())) { |
Property changes: |
Modified: svn:mergeinfo |
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1417-1511 |
Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r11-933 |