| 1,8 → 1,15 |
|---|
| package org.tela_botanica.client.modeles.collection; |
| |
| import java.util.Iterator; |
| import java.util.Map; |
| import java.util.Set; |
| |
| import org.tela_botanica.client.modeles.aDonnee; |
| import org.tela_botanica.client.modeles.commentaire.Commentaire; |
| import org.tela_botanica.client.modeles.personne.Personne; |
| import org.tela_botanica.client.modeles.publication.Publication; |
| |
| import com.extjs.gxt.ui.client.data.ModelData; |
| import com.google.gwt.json.client.JSONObject; |
| |
| public class CollectionACommentaire extends aDonnee { |
| 9,6 → 16,7 |
|---|
| |
| private static final long serialVersionUID = 8751553802444398035L; |
| public static final String PREFIXE = "ccac"; |
| private boolean removePrefix = true; |
| private Commentaire commentaireLiee = null; |
| public static String[] champsObligatoires = {"cc_id_collection", "ccac_id_commentaire"}; |
| |
| 24,6 → 32,34 |
|---|
| initialiser(collectionACommentaireListe, chargerCommentaire); |
| } |
| |
| public CollectionACommentaire(ModelData model, boolean removePrefix) |
| { |
| this.removePrefix = removePrefix; |
| |
| 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 = ""; |
| if (removePrefix) { |
| cleObjet = cle.replaceFirst("^"+CollectionACommentaire.PREFIXE+"_", ""); |
| cleObjet = cleObjet.replaceFirst("^"+Commentaire.PREFIXE+"_", ""); |
| } |
| else { |
| cleObjet = cle; |
| } |
| this.set(cleObjet, a.get(cle)); |
| } |
| } |
| |
| setCommentaire(new Commentaire(model)); |
| this.set("_etat_", a.get("_etat_")); |
| this.set("_type_", a.get("_type_")); |
| } |
| |
| @Override |
| protected String getPrefixe() { |
| return PREFIXE; |
| Property changes: |
|---|
| Modified: svn:mergeinfo |
|---|
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r11-984 |
|---|
| Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1417-1511 |
|---|