| /branches/v1.8-narince/src/org/tela_botanica/client/Mediateur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/Mediateur.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/configuration |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/configuration:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/ComposantClass.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/ComposantClass.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/util |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/util:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/http |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/http:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/Constantes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/ErrorMessages.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/Constantes.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/Constantes.properties:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n/ErrorMessages.properties |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n/ErrorMessages.properties:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/i18n |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/i18n:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/PopupChargement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/PopupChargement.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/EnteteVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/EnteteVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/StatutVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/StatutVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/Formulaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/Formulaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneFormPublication.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneListeVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneDetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/personne/PersonneForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/personne/PersonneForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionListeVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormGeneral.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionDetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormCommentaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormDescription.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormInventaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPersonne.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormPublication.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java |
|---|
| 133,7 → 133,7 |
| classementFieldSet.setLayout(Formulaire.creerFormLayout(largeurLabelDefaut, alignementLabelDefaut)); |
| etatClassementCombo = new ChampComboBoxListeValeurs(i18nC.etatClassementCollection(), "etatClassement", tabIndex++); |
| classementFieldSet.add(etatClassementCombo); |
| classementFieldSet.add(etatClassementCombo, new FormData(550, 0)); |
| annotationClassementChp = new TextArea(); |
| annotationClassementChp.setFieldLabel(i18nC.annotationClassementCollection()); |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionFormContenu.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection/CollectionVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection/CollectionVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/collection |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/collection:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FenetreForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FenetreForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FormulaireOnglet.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FormulaireOnglet.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureDetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure/StructureListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure/StructureListeVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/structure |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/structure:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/DetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/DetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FenetreJournal.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FenetreJournal.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireListeVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireDetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire/CommentaireForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/commentaire |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/commentaire:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/MenuVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/MenuVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/BarrePaginationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/BarrePaginationVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/accueil |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/accueil:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationListeVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationDetailVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication/PublicationForm.java |
|---|
| 52,7 → 52,9 |
| import com.extjs.gxt.ui.client.store.Store; |
| import com.extjs.gxt.ui.client.store.StoreEvent; |
| import com.extjs.gxt.ui.client.widget.ContentPanel; |
| import com.extjs.gxt.ui.client.widget.Html; |
| import com.extjs.gxt.ui.client.widget.Info; |
| import com.extjs.gxt.ui.client.widget.Label; |
| import com.extjs.gxt.ui.client.widget.LayoutContainer; |
| import com.extjs.gxt.ui.client.widget.MessageBox; |
| import com.extjs.gxt.ui.client.widget.Text; |
| 75,6 → 77,7 |
| import com.extjs.gxt.ui.client.widget.toolbar.SeparatorToolItem; |
| import com.extjs.gxt.ui.client.widget.toolbar.ToolBar; |
| import com.google.gwt.core.client.GWT; |
| import com.google.gwt.user.client.Window; |
| public class PublicationForm extends Formulaire implements Rafraichissable { |
| 125,7 → 128,10 |
| private String modeDeCreation = null; |
| boolean changeOrderMarker = false; |
| private Label infosAuteurFmt = null; |
| private ContentPanel infosAuteursNonPresentsPanel = null; |
| //+----------------------------------------------------------------------------------------------------------------+ |
| // Constructeurs |
| 149,7 → 155,6 |
| this.publicationId = publicationId; |
| auteursInitialListe = new PublicationAPersonneListe(); |
| initialiserAuteurs(); // Crée les listes d'auteurs ajoutés et supprimés |
| // Si 'publicationId' est vide alors on est en mode "AJOUTER", sinon on est en mode "MODIFIER" |
| modeDeCreation = (UtilString.isEmpty(publicationId) ? Formulaire.MODE_AJOUTER : Formulaire.MODE_MODIFIER); |
| initialiserFormulaire(mediateurCourrant, modeDeCreation, MenuApplicationId.PUBLICATION); |
| 625,6 → 630,8 |
| auteursInitialListe.put(pap.getId(), pap); |
| Log.debug("PublicationAPersonne ajoutée à la liste initiale avec l'id :"+pap.getId()+pap.toString()+selection.getProperties().toString()); |
| } |
| controlerCoherenceAuteurs(); |
| //zefgzf |
| Log.debug("Initialisation liste auteur :"+auteursInitialListe.size()); |
| } |
| }); |
| 679,7 → 686,8 |
| barreOutils = creerBarreOutilsGrille(); |
| auteursFieldset.setTopComponent(barreOutils); |
| grilleAuteurs = creerGrilleAuteurs(); |
| auteursFieldset.add(grilleAuteurs); |
| auteursFieldset.add(grilleAuteurs); |
| auteursFieldset.layout(); |
| } |
| 693,6 → 701,25 |
| generalitesFieldset.setCollapsible(true); |
| generalitesFieldset.setLayout(layout); |
| infosAuteursNonPresentsPanel = new ContentPanel(); |
| Label LabelAuteurFmt = new Label("Auteurs de la publication : "); |
| LabelAuteurFmt.setId("label-auteurs-non-presents"); |
| infosAuteurFmt = new Label(publication.getAuteur()); |
| Label avertissementAuteurs = new Label("Attention, Certains auteurs apparaissent ci-dessous mais pas dans la grille des auteurs. "+ |
| "Ceci signifie que la publication a été importée sans que tous les auteurs aient été créés auparavant.<br />"+ |
| "Si vous souhaitez modifier cette publication, nous vous invitons à y associer correctement les auteurs grâce à la grille ci-dessus.<br />"); |
| infosAuteursNonPresentsPanel.setHeaderVisible(false); |
| infosAuteursNonPresentsPanel.setId("infos-auteurs-non-presents"); |
| infosAuteursNonPresentsPanel.add(avertissementAuteurs); |
| infosAuteursNonPresentsPanel.add(LabelAuteurFmt); |
| infosAuteursNonPresentsPanel.add(infosAuteurFmt); |
| infosAuteursNonPresentsPanel.setVisible(false); |
| generalitesFieldset.add(infosAuteursNonPresentsPanel); |
| titreChp = new TextField<String>(); |
| titreChp.setName("cpu"); |
| titreChp.setFieldLabel("Titre de l'article ou de l'ouvrage"); |
| 1043,6 → 1070,36 |
| return nomComplet; |
| } |
| public void controlerCoherenceAuteurs() { |
| if(doitAfficherAvertissementAuteur()) { |
| infosAuteurFmt.setHtml(publication.getAuteur()); |
| infosAuteursNonPresentsPanel.setVisible(true); |
| infosAuteursNonPresentsPanel.setHeight(50); |
| } else { |
| infosAuteursNonPresentsPanel.setVisible(false); |
| infosAuteursNonPresentsPanel.setHeight(0); |
| } |
| } |
| private boolean doitAfficherAvertissementAuteur() { |
| // La construction du fmt nom complet des auteurs étant mal fichue |
| // il est plus simple de comparer le nombre d'item une fois les chaines |
| // splittées par virgules, ainsi que le nombre d'espace |
| String auteurFmtreconstruit = construireIntituleAuteur(); |
| String[] auteurFmtreconstruitParts = auteurFmtreconstruit.split(","); |
| String[] auteurParts = publication.getAuteur().split(","); |
| String[] auteurFmtreconstruitSpaces = auteurFmtreconstruit.split(" "); |
| String[] auteurPartsSpaces = publication.getAuteur().split(" "); |
| boolean unEstVideEtAutreNon = (auteurFmtreconstruit.trim().isEmpty() != publication.getAuteur().isEmpty()); |
| return (modeDeCreation == MODE_MODIFIER && |
| (unEstVideEtAutreNon || |
| auteurFmtreconstruitParts.length != auteurParts.length || |
| auteurFmtreconstruitSpaces.length != auteurPartsSpaces.length)); |
| } |
| //+----------------------------------------------------------------------------------------------------------------+ |
| // Méthodes publiques |
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication/PublicationForm.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/publication |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/publication:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/ContenuVue.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/ContenuVue.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/vues/FormulaireBarreValidation.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/interfaces |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/interfaces:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/Modele.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/Modele.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxRechercheTempsReelPaginable.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxListeValeurs.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/HashMapComposants.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/HashMapComposants.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampSliderPourcentage.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/InfoLogger.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/InfoLogger.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampComboBoxMultiSelect.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/AproposFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AproposFenetre.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/IdentificationFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/IdentificationFenetre.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypes.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeurs.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeurs.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursImage.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursMultiTypesPaginable.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampMultiValeursPaginable.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/ProxyValeur.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/ChargeurListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/Proxy.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/Proxy.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/pagination/TransformateurJSONaModelData.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ChampCaseACocher.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ChampCaseACocher.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/ConteneurMultiChamps.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/LicenceFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/LicenceFenetre.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/composants/AideFenetre.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/composants/AideFenetre.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Valeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Valeur.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Aide.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Aide.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Menu.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Menu.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/MenuApplicationId.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/MenuApplicationId.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonnee.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonnee.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/Personne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/Personne.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/personne/PersonneAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Utilisateur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Utilisateur.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/aDonneeListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/aDonneeListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/Collection.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/Collection.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionBotanique.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonne.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteBase.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteBase.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionACommentaireListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/UniteRangement.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/UniteRangement.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublication.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPublicationListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/collection/CollectionAPersonneAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/Structure.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/Structure.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonne.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureConservation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureConservation.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureValorisation.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/structure/StructureAPersonneAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/ValeurListeAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeur.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeur.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/Commentaire.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/commentaire/CommentaireAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/InterneValeurListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/InterneValeurListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/Information.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/Information.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonne.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAPersonneAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/Publication.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/Publication.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationListe.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationListe.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/publication/PublicationAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles/UtilisateurAsyncDao.java:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client/modeles |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client/modeles:r1878-1880 |
| /branches/v1.8-narince/src/org/tela_botanica/client |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src/org/tela_botanica/client:r1878-1880 |
| /branches/v1.8-narince/src |
|---|
| Property changes: |
| Modified: svn:mergeinfo |
| Merged /trunk/src:r1878-1880 |