| /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java |
|---|
| 1,7 → 1,10 |
| package org.tela_botanica.client.modeles.collection; |
| import java.util.Iterator; |
| import java.util.LinkedList; |
| import java.util.List; |
| import java.util.Map; |
| import java.util.Set; |
| import org.tela_botanica.client.modeles.aDonnee; |
| import org.tela_botanica.client.util.Debug; |
| 20,16 → 23,24 |
| private CollectionACommentaireListe commentairesLiees = null; |
| public static String[] champsObligatoires = {"cc_id_collection","cc_ce_type"}; |
| public Collection(){ |
| public Collection() { |
| } |
| public Collection(ModelData model) |
| { |
| this.set("id_collection", model.get("cc_id_collection")); |
| this.set("nom", model.get("cc_nom")); |
| Map<String, Object> a = model.getProperties(); |
| Set<String> cles = a.keySet(); |
| Iterator<String> it = cles.iterator(); |
| while (it.hasNext()) { |
| String cle = it.next(); |
| if (a.get(cle) != null) { |
| String cleObjet = cle.replaceFirst("^"+getPrefixe()+"_", ""); |
| this.set(cleObjet, a.get(cle)); |
| } |
| } |
| } |
| public Collection(JSONObject collection){ |
| initialiserModele(collection); |
| } |
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/Collection.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1136-1368 |
| /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java |
|---|
| Property changes: |
| Added: svn:mergeinfo |
| Merged /branches/v1.0-syrah/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1136-1368 |