Subversion Repositories eFlore/Applications.del

Rev

Rev 981 | Rev 1014 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 981 Rev 1003
Line 197... Line 197...
197
				// intervention.setObservation(observation);
197
				// intervention.setObservation(observation);
198
				intervention.setEspece(nom_sel);
198
				intervention.setEspece(nom_sel);
Line 199... Line 199...
199
 
199
 
200
				if (!nbCommentaires.equals("")) {
200
				if (!nbCommentaires.equals("")) {
201
					int nbComm = Integer.parseInt(nbCommentaires);
201
					int nbComm = Integer.parseInt(nbCommentaires);
202
					if (!texte.equals("")) {
202
//					if (!texte.equals("")) {
203
						nbComm++;
203
//						nbComm++;
204
					}
204
//					}
205
					intervention.setNbCommentaires(nbComm);
205
					intervention.setNbCommentaires(nbComm);
Line 206... Line 206...
206
				}
206
				}
207
 
207
 
Line 230... Line 230...
230
		Iterator<String> itIntervention = interventionsNonTypees.keySet().iterator();
230
		Iterator<String> itIntervention = interventionsNonTypees.keySet().iterator();
231
		while (itIntervention.hasNext()) {
231
		while (itIntervention.hasNext()) {
232
			String id = itIntervention.next();
232
			String id = itIntervention.next();
233
			InterventionForum intervention = interventionsNonTypees.get(id);
233
			InterventionForum intervention = interventionsNonTypees.get(id);
234
			String idParent = intervention.getIdParent();
234
			String idParent = intervention.getIdParent();
235
			if (idParent != null && !idParent.equals("") && !idParent.equals("0")) {
235
			if (idParent != null && !idParent.equals("") && !idParent.equals("0") && interventionsNonTypees.containsKey(idParent)) {
236
				InterventionForum parent = interventionsNonTypees.get(idParent);
236
				InterventionForum parent = interventionsNonTypees.get(idParent);
237
				intervention.setParent(parent);
237
				intervention.setParent(parent);
238
				parent.ajouterCommentaire((Commentaire)intervention);
238
				parent.ajouterCommentaire((Commentaire)intervention);
239
			}
239
			}
-
 
240
			else{
-
 
241
				retour.add(intervention);
-
 
242
			}
240
		}
243
		}
Line 241... Line -...
241
 
-
 
242
		retour.addAll(interventionsNonTypees.values());
244
 
243
		return retour;
245
		return retour;
Line 244... Line 246...
244
	}
246
	}
245
 
247