WebSVN – eFlore/Applications.coel – Path Comparison – / – /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java Rev 1694 and /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java Rev 1695

Ignore whitespace Rev 1694 → Rev 1695

 /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java
 ,17 → 267,17
                                 "&csc_truk_stockage_local=" + URL.encodeComponent(conservation.getStockageLocal()) +
                                 "&csc_truk_stockage_meuble=" + URL.encodeComponent(conservation.getStockageMeuble()) +
                                 "&csc_truk_stockage_parametre=" + URL.encodeComponent(conservation.getStockageParametre()) +
-                                "&csc_mark_collection_commune=" + URL.encodeComponent(conservation.getCollectionCommune()) +
+                                "&csc_mark_collection_commune=" + (conservation.getCollectionCommune() != null ? conservation.getCollectionCommune() : "") +
                                 "&csc_truk_collection_autre=" + URL.encodeComponent(conservation.getCollectionAutre()) +
-                                "&csc_mark_acces_controle=" + URL.encodeComponent(conservation.getAccesControle()) +
-                                "&csc_mark_restauration=" + URL.encodeComponent(conservation.getRestauration()) +
+                                "&csc_mark_acces_controle=" + (conservation.getAccesControle() != null ? conservation.getAccesControle() : "") +
+                                "&csc_mark_restauration=" + (conservation.getRestauration() != null ? conservation.getRestauration() : "") +
                                 "&csc_truk_restauration_operation=" + URL.encodeComponent(conservation.getRestaurationOperation()) +
                                 "&csc_ce_materiel_conservation=" + URL.encodeComponent(conservation.getMaterielConservation()) +
                                 "&csc_truk_materiel_autre=" + URL.encodeComponent(conservation.getMaterielAutre()) +
-                                "&csc_mark_traitement=" + URL.encodeComponent(conservation.getTraitement()) +
+                                "&csc_mark_traitement=" + (conservation.getTraitement() != null ? conservation.getTraitement() : "") +
                                 "&csc_truk_traitement=" + URL.encodeComponent(conservation.getTraitements()) +
-                                "&csc_mark_acquisition_collection=" + URL.encodeComponent(conservation.getAcquisitionCollection()) +
-                                "&csc_mark_acquisition_echantillon=" + URL.encodeComponent(conservation.getAcquisitionEchantillon()) +
+                                "&csc_mark_acquisition_collection=" + (conservation.getAcquisitionCollection() != null ? conservation.getAcquisitionCollection() : "") +
+                                "&csc_mark_acquisition_echantillon=" + (conservation.getAcquisitionEchantillon() != null ? conservation.getAcquisitionEchantillon() : "") +
                                 "&csc_mark_acquisition_traitement=" + URL.encodeComponent(conservation.getAcquisitionTraitement()) +
                                 "&csc_truk_acquisition_traitement_poison=" + URL.encodeComponent(conservation.getAcquisitionTraitementPoison()) +
                                 "&csc_truk_acquisition_traitement_insecte=" + URL.encodeComponent(conservation.getAcquisitionTraitementInsecte());

Subversion Repositories eFlore/Applications.coel

Compare Revisions

Ignore whitespace Rev 1694 → Rev 1695