Subversion Repositories eFlore/Applications.coel

Compare Revisions

No changes between revisions

Ignore whitespace Rev 1512 → Rev 1513

/trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java
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.personne.Personne;
import org.tela_botanica.client.modeles.publication.Publication;
import org.tela_botanica.client.util.Debug;
 
import com.extjs.gxt.ui.client.data.ModelData;
import com.google.gwt.json.client.JSONObject;
 
public class CollectionAPublication extends aDonnee {
10,6 → 17,7
private static final long serialVersionUID = 1L;
public static final String PREFIXE = "ccapu";
private boolean removePrefix = true;
private Publication publicationLiee = null;
public static String[] champsObligatoires = {"ccapu_id_collection", "ccapu_id_publication"};
16,11 → 24,44
public CollectionAPublication() {
initialiser(new JSONObject());
}
public CollectionAPublication(boolean removePrefix) {
this.removePrefix = removePrefix;
initialiser(new JSONObject());
}
public CollectionAPublication(JSONObject collectionAPublicationListe) {
initialiser(collectionAPublicationListe);
}
public CollectionAPublication(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("^"+Publication.PREFIXE+"_", "");
cleObjet = cle.replaceFirst("^"+Personne.PREFIXE+"_", "");
cleObjet = cleObjet.replaceFirst("^"+PREFIXE+"_", "");
}
else {
cleObjet = cle;
}
this.set(cleObjet, a.get(cle));
}
}
 
setPublication(new Publication(model, removePrefix));
this.set("_etat_", a.get("_etat_"));
}
@Override
protected String getPrefixe() {
return PREFIXE;
49,15 → 90,27
}
private void initialiserChampsPourGrille() {
set("fmt_auteur", getPublication().getAuteur());
set("titre", getPublication().getTitre());
set("collection", getPublication().getCollection());
set("_editeur_", "");
set("_annee_", "");
set("indication_nvt", getPublication().getIndicationNvt());
set("fascicule", getPublication().getFascicule());
set("truk_pages", getPublication().getPages());
set("_etat_", "");
if (removePrefix) {
set("fmt_auteur", getPublication().getAuteur());
set("titre", getPublication().getTitre());
set("collection", getPublication().getCollection());
set("_editeur_", "");
set("_annee_", "");
set("indication_nvt", getPublication().getIndicationNvt());
set("fascicule", getPublication().getFascicule());
set("truk_pages", getPublication().getPages());
set("_etat_", "");
} else {
set(Publication.PREFIXE+"_fmt_auteur", getPublication().getAuteur());
set(Publication.PREFIXE+"_titre", getPublication().getTitre());
set(Publication.PREFIXE+"_collection", getPublication().getCollection());
set("_editeur_", "");
set("_annee_", "");
set(Publication.PREFIXE+"_indication_nvt", getPublication().getIndicationNvt());
set(Publication.PREFIXE+"_fascicule", getPublication().getFascicule());
set(Publication.PREFIXE+"_truk_pages", getPublication().getPages());
set("_etat_", "");
}
}
// ID
82,18 → 135,22
// ID COLLECTION
public String getIdCollection() {
return renvoyerValeurCorrecte("id_collection");
if (removePrefix) return renvoyerValeurCorrecte("id_collection");
else return renvoyerValeurCorrecte(PREFIXE+"_id_collection");
}
public void setIdCollection(String idCollection) {
set("id_collection", idCollection);
if (removePrefix) set("id_collection", idCollection);
else set(PREFIXE+"_id_collection", idCollection);
}
// ID PUBLICATION
public String getIdPublication() {
return renvoyerValeurCorrecte("id_publication");
if (removePrefix) return renvoyerValeurCorrecte("id_publication");
else return renvoyerValeurCorrecte(PREFIXE+"_id_publication");
}
public void setIdPublication(String ip) {
set("id_publication", ip);
if (removePrefix) set("id_publication", ip);
else set(PREFIXE+"_id_publication", ip);
}
}
Property changes:
Modified: svn:mergeinfo
Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r11-934
Merged /branches/v1.1-aramon/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1417-1511