[Castore-commits] Facade.java 1.17 1.18 IDocuments.java 1.17 1.18
Fonds.java 1.7 1.8 DocumentsProxy.java 1.17 1.18
Arnaud Thimel
thimel at adullact1.hosting.cri74.org
Lun 24 Avr 19:47:05 CEST 2006
Update of /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents
In directory adullact1:/tmp/cvs-serv19514/src/java/fr/emn/castor/documents
Modified Files:
Facade.java IDocuments.java Fonds.java DocumentsProxy.java
Log Message:
- Retrait des Iterator sur la facade des documents
- Rajout de generics par endroits
Index: DocumentsProxy.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/DocumentsProxy.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** DocumentsProxy.java 20 Apr 2006 08:41:23 -0000 1.17
--- DocumentsProxy.java 24 Apr 2006 17:47:03 -0000 1.18
***************
*** 43,48 ****
import java.io.OutputStream;
import java.util.ArrayList;
! import java.util.HashMap;
! import java.util.Iterator;
import java.util.Map;
--- 43,47 ----
import java.io.OutputStream;
import java.util.ArrayList;
! import java.util.List;
import java.util.Map;
***************
*** 97,101 ****
* allDocsInProgressValidation(java.lang.String)
*/
! public final Iterator allDocsInProgressValidation(final String username) {
return this.documentsFac.allDocsInProgressValidation(username);
}
--- 96,100 ----
* allDocsInProgressValidation(java.lang.String)
*/
! public final List<String> allDocsInProgressValidation(final String username) {
return this.documentsFac.allDocsInProgressValidation(username);
}
***************
*** 105,109 ****
* allDocsWaitingValidation(java.lang.String)
*/
! public final Iterator allDocsWaitingValidation(final String username) {
return this.documentsFac.allDocsWaitingValidation(username);
}
--- 104,108 ----
* allDocsWaitingValidation(java.lang.String)
*/
! public final List<String> allDocsWaitingValidation(final String username) {
return this.documentsFac.allDocsWaitingValidation(username);
}
***************
*** 241,245 ****
* @see fr.emn.castor.documents.IDocuments#getNoticeMap(java.lang.String)
*/
! public final Map getNoticeMap(final String ident) {
return this.documentsFac.getNoticeMap(ident);
}
--- 240,244 ----
* @see fr.emn.castor.documents.IDocuments#getNoticeMap(java.lang.String)
*/
! public final Map<String, String> getNoticeMap(final String ident) {
return this.documentsFac.getNoticeMap(ident);
}
***************
*** 379,383 ****
* @see fr.emn.castor.documents.IDocuments#getTransFiles()
*/
! public final Iterator getTransFiles() {
return this.documentsFac.getTransFiles();
}
--- 378,382 ----
* @see fr.emn.castor.documents.IDocuments#getTransFiles()
*/
! public final List<Map<String, Object>> getTransFiles() {
return this.documentsFac.getTransFiles();
}
***************
*** 513,517 ****
*/
public final void setMetaDatas(
! final String idDoc, final HashMap mdSubmitted, final String user) {
this.documentsFac.setMetaDatas(idDoc, mdSubmitted, user);
}
--- 512,516 ----
*/
public final void setMetaDatas(
! final String idDoc, final Map<String, List> mdSubmitted, final String user) {
this.documentsFac.setMetaDatas(idDoc, mdSubmitted, user);
}
Index: Fonds.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/Fonds.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Fonds.java 20 Apr 2006 08:41:23 -0000 1.7
--- Fonds.java 24 Apr 2006 17:47:03 -0000 1.8
***************
*** 856,860 ****
ParserNotice notice = new ParserNotice(getNoticeFile(idDoc));
// on recupere la valeur de l'identifiant des collections..
! ArrayList<HashMap<String, String>> values = new ArrayList<HashMap<String, String>>();
try {
for (Iterator iterColls = collections.iterator(); iterColls
--- 856,860 ----
ParserNotice notice = new ParserNotice(getNoticeFile(idDoc));
// on recupere la valeur de l'identifiant des collections..
! ArrayList<Map<String, String>> values = new ArrayList<Map<String, String>>();
try {
for (Iterator iterColls = collections.iterator(); iterColls
***************
*** 862,866 ****
String idColl = (String) iterColls.next();
String labelColl = Facade.getInstance().getNameColl(idColl);
! HashMap<String, String> mapColl = new HashMap<String, String>();
mapColl.put(DocumentsConstants.NOTICE_VALUE, idColl);
mapColl.put(DocumentsConstants.NOTICE_LABEL, labelColl);
--- 862,866 ----
String idColl = (String) iterColls.next();
String labelColl = Facade.getInstance().getNameColl(idColl);
! Map<String, String> mapColl = new HashMap<String, String>();
mapColl.put(DocumentsConstants.NOTICE_VALUE, idColl);
mapColl.put(DocumentsConstants.NOTICE_LABEL, labelColl);
***************
*** 870,874 ****
log.error("Erreur de recuperation du nom de la collection", ce);
}
! notice.setValues("collection", values.iterator(), author);
}
--- 870,874 ----
log.error("Erreur de recuperation du nom de la collection", ce);
}
! notice.setValues("collection", values, author);
}
***************
*** 887,891 ****
ParserNotice notice = new ParserNotice(getNoticeFile(idDoc));
// on recupere la valeur de l'identifiant des groupes..
! ArrayList<HashMap<String, String>> values = new ArrayList<HashMap<String, String>>();
for (Iterator iterGroupes = selectedGroups.iterator(); iterGroupes
.hasNext();) {
--- 887,891 ----
ParserNotice notice = new ParserNotice(getNoticeFile(idDoc));
// on recupere la valeur de l'identifiant des groupes..
! ArrayList<Map<String, String>> values = new ArrayList<Map<String, String>>();
for (Iterator iterGroupes = selectedGroups.iterator(); iterGroupes
.hasNext();) {
***************
*** 893,902 ****
String labelGrp = fr.emn.castor.groupes.Facade
.getInstance().getNomGroupeFromId(idGrp);
! HashMap<String, String> mapGrp = new HashMap<String, String>();
mapGrp.put(DocumentsConstants.NOTICE_VALUE, idGrp);
mapGrp.put(DocumentsConstants.NOTICE_LABEL, labelGrp);
values.add(mapGrp);
}
! notice.setValues("groupe", values.iterator(), author);
}
--- 893,902 ----
String labelGrp = fr.emn.castor.groupes.Facade
.getInstance().getNomGroupeFromId(idGrp);
! Map<String, String> mapGrp = new HashMap<String, String>();
mapGrp.put(DocumentsConstants.NOTICE_VALUE, idGrp);
mapGrp.put(DocumentsConstants.NOTICE_LABEL, labelGrp);
values.add(mapGrp);
}
! notice.setValues("groupe", values, author);
}
***************
*** 1009,1018 ****
*/
public void setMetaDatas(
! final String idDoc, final HashMap metadatas, final String author) {
ParserNotice notice = new ParserNotice(getNoticeFile(idDoc));
Iterator keys = metadatas.keySet().iterator();
while (keys.hasNext()) {
String key = (String) keys.next();
! Iterator values = (Iterator) metadatas.get(key);
if (values.hasNext()) {
// on doit faire la distinction entre les champs multiples
--- 1009,1018 ----
*/
public void setMetaDatas(
! final String idDoc, final Map<String, List> metadatas, final String author) {
ParserNotice notice = new ParserNotice(getNoticeFile(idDoc));
Iterator keys = metadatas.keySet().iterator();
while (keys.hasNext()) {
String key = (String) keys.next();
! Iterator values = metadatas.get(key).iterator();
if (values.hasNext()) {
// on doit faire la distinction entre les champs multiples
***************
*** 1020,1024 ****
try {
if (isMultipleMetadata(key, idDoc)) {
! ArrayList<HashMap<String, String>> valueList = new ArrayList<HashMap<String, String>>();
while (values.hasNext()) {
String idMeta = (String) values.next();
--- 1020,1025 ----
try {
if (isMultipleMetadata(key, idDoc)) {
! List<Map<String, String>> valueList =
! new ArrayList<Map<String, String>>();
while (values.hasNext()) {
String idMeta = (String) values.next();
***************
*** 1031,1035 ****
valueList.add(mapMeta);
}
! notice.setValues(key, valueList.iterator(), author);
} else {
String value = (String) values.next();
--- 1032,1036 ----
valueList.add(mapMeta);
}
! notice.setValues(key, valueList, author);
} else {
String value = (String) values.next();
***************
*** 1677,1681 ****
* transformation du systeme.
*/
! public Iterator getTransFiles() {
return DocTexte.getTransFiles();
}
--- 1678,1682 ----
* transformation du systeme.
*/
! public List<Map<String, Object>> getTransFiles() {
return DocTexte.getTransFiles();
}
Index: IDocuments.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/IDocuments.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** IDocuments.java 24 Apr 2006 12:40:40 -0000 1.17
--- IDocuments.java 24 Apr 2006 17:47:03 -0000 1.18
***************
*** 44,49 ****
import java.io.OutputStream;
import java.util.ArrayList;
! import java.util.HashMap;
! import java.util.Iterator;
import java.util.Map;
--- 44,48 ----
import java.io.OutputStream;
import java.util.ArrayList;
! import java.util.List;
import java.util.Map;
***************
*** 252,258 ****
*
* @param username l'utilisateur en ligne
! * @return Itarator d'Ids des documents dans l'état recherché
*/
! Iterator allDocsWaitingValidation(final String username);
/**
--- 251,257 ----
*
* @param username l'utilisateur en ligne
! * @return liste d'Ids des documents dans l'état recherché
*/
! List<String> allDocsWaitingValidation(final String username);
/**
***************
*** 381,385 ****
* @param user l'utilisateur
*/
! void setMetaDatas(String idDoc, HashMap mdSubmitted, String user);
/**
--- 380,384 ----
* @param user l'utilisateur
*/
! void setMetaDatas(String idDoc, Map<String, List> mdSubmitted, String user);
/**
***************
*** 442,446 ****
* document
*/
! Map getNoticeMap(String idDoc);
/**
--- 441,445 ----
* document
*/
! Map<String, String> getNoticeMap(String idDoc);
/**
***************
*** 485,489 ****
* @return une liste des documents en attente de validation
*/
! Iterator allDocsInProgressValidation(final String username);
/**
--- 484,488 ----
* @return une liste des documents en attente de validation
*/
! List<String> allDocsInProgressValidation(final String username);
/**
***************
*** 545,548 ****
--- 544,553 ----
void addAvis(String docId, String avis, String user);
+ /*
+ * ATTENTION ASPECT : un ou plusieurs aspect(s)sont associes a cette
+ * methode. Le changement de la signature ou la suppression de la methode
+ * entrainera le non fonctionnement du systeme.
+ * Aspect(s) associee : - GestionDocumentAspect.java
+ */
/**
* Renvoie la prochaine etape de validation.
***************
*** 580,584 ****
* transformation du systeme.
*/
! Iterator getTransFiles();
/**
--- 585,589 ----
* transformation du systeme.
*/
! List<Map<String, Object>> getTransFiles();
/**
Index: Facade.java
===================================================================
RCS file: /cvsroot/castore/castore-core/src/java/fr/emn/castor/documents/Facade.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Facade.java 20 Apr 2006 08:41:23 -0000 1.17
--- Facade.java 24 Apr 2006 17:47:03 -0000 1.18
***************
*** 44,50 ****
import java.io.OutputStream;
import java.util.ArrayList;
! import java.util.Collection;
! import java.util.HashMap;
! import java.util.Iterator;
import java.util.Map;
--- 44,48 ----
import java.io.OutputStream;
import java.util.ArrayList;
! import java.util.List;
import java.util.Map;
***************
*** 54,58 ****
import fr.emn.castor.collections.CollectionException;
import fr.emn.castor.common.Constants;
- import fr.emn.castor.documents.metier.docGenerique.DocumentException;
import fr.emn.castor.documents.metier.docGenerique.workflow.WorkflowException;
import fr.emn.castor.documents.metier.docGenerique.workflow.WorkflowManager;
--- 52,55 ----
***************
*** 143,149 ****
fr.emn.castor.collections.Facade facColl = fr.emn.castor.collections.Facade
.getInstance();
! Iterator iter = facColl.getAllCollectionsWithThisDoc(idDoc);
! while (iter.hasNext()) {
! String idColl = (String) iter.next();
try {
facColl.deleteDocumentOfCollection(idColl, idDoc);
--- 140,145 ----
fr.emn.castor.collections.Facade facColl = fr.emn.castor.collections.Facade
.getInstance();
! List<String> colls = facColl.getAllCollectionsWithThisDoc(idDoc);
! for (String idColl : colls) {
try {
facColl.deleteDocumentOfCollection(idColl, idDoc);
***************
*** 180,186 ****
fr.emn.castor.collections.Facade facColl = fr.emn.castor.collections.Facade
.getInstance();
! Iterator iter = facColl.getAllCollectionsWithThisDoc(idDoc);
! while (iter.hasNext()) {
! String idColl = (String) iter.next();
try {
facColl.deleteDocumentOfCollection(idColl, idDoc);
--- 176,181 ----
fr.emn.castor.collections.Facade facColl = fr.emn.castor.collections.Facade
.getInstance();
! List<String> colls = facColl.getAllCollectionsWithThisDoc(idDoc);
! for (String idColl : colls) {
try {
facColl.deleteDocumentOfCollection(idColl, idDoc);
***************
*** 346,353 ****
* allDocsWaitingValidation(java.lang.String)
*/
! public Iterator allDocsWaitingValidation(final String username) {
! Collection c = this.workflowManager
! .allDocsWaitingValidation(username);
! return c.iterator();
}
--- 341,346 ----
* allDocsWaitingValidation(java.lang.String)
*/
! public List<String> allDocsWaitingValidation(final String username) {
! return this.workflowManager.allDocsWaitingValidation(username);
}
***************
*** 473,480 ****
/**
* @see fr.emn.castor.documents.IDocuments#
! * setMetaDatas(java.lang.String, java.util.HashMap, java.lang.String)
*/
public void setMetaDatas(
! final String idDoc, final HashMap mdSubmitted, final String user) {
this.fonds.setMetaDatas(idDoc, mdSubmitted, user);
}
--- 466,473 ----
/**
* @see fr.emn.castor.documents.IDocuments#
! * setMetaDatas(java.lang.String, java.util.Map, java.lang.String)
*/
public void setMetaDatas(
! final String idDoc, final Map<String, List> mdSubmitted, final String user) {
this.fonds.setMetaDatas(idDoc, mdSubmitted, user);
}
***************
*** 587,594 ****
* allDocsInProgressValidation(java.lang.String)
*/
! public Iterator allDocsInProgressValidation(final String username) {
! Collection c = this.workflowManager
! .allDocsInProgressValidation(username);
! return c.iterator();
}
--- 580,585 ----
* allDocsInProgressValidation(java.lang.String)
*/
! public List<String> allDocsInProgressValidation(final String username) {
! return this.workflowManager.allDocsInProgressValidation(username);
}
***************
*** 689,693 ****
* @see fr.emn.castor.documents.IDocuments#getTransFiles()
*/
! public Iterator getTransFiles() {
return this.fonds.getTransFiles();
}
--- 680,684 ----
* @see fr.emn.castor.documents.IDocuments#getTransFiles()
*/
! public List<Map<String, Object>> getTransFiles() {
return this.fonds.getTransFiles();
}
Plus d'informations sur la liste de diffusion Castore-commits