/ - Diff - Synnefo - Greek Research and Technology Network's projects

     			List<Folder> folders = dao.getFoldersPermittedForGroup(userId, groupId);
     			for (Folder f : folders){
     				f.getPermissions().removeAll(group.getPermissions());
     				touchFolder(f,owner,now);
     				touchFolder(f, now);
     				for(FileHeader file : f.getFiles()){
     					file.getPermissions().removeAll(group.getPermissions());
     					touchFile(file,owner,now);
     					touchFile(file, now);
+    				}
+    			}
     			List<FileHeader> files = dao.getSharedFilesNotInSharedFolders(userId);
     			List<FileHeader> files = dao.getFilesPermittedForGroup(userId, groupId);
     			for(FileHeader h : files){
     				h.getPermissions().removeAll(group.getPermissions());
     				touchFile(h,owner,now);
     				touchFile(h, now);
+    			}
     			owner.removeSpecifiedGroup(group);
     			dao.delete(group);
-...
     	/**
     	 * Mark the folder as modified from the specified user and change it's modification date.
     	 */
     	private void touchFolder(Folder f, User owner, Date now){
     		final AuditInfo auditInfo = new AuditInfo();
     		auditInfo.setCreatedBy(owner);
     		auditInfo.setCreationDate(now);
     		auditInfo.setModifiedBy(owner);
     	private void touchFolder(Folder f, Date now){
     		final AuditInfo auditInfo = f.getAuditInfo();
     		auditInfo.setModificationDate(now);
     		f.setAuditInfo(auditInfo);
+    	}
     	/**
     	 * Mark the file as modified from the specified user and change it's modification date.
     	 */
     	private void touchFile(FileHeader f, User owner, Date now){
     		final AuditInfo auditInfo = new AuditInfo();
     		auditInfo.setCreatedBy(owner);
     		auditInfo.setCreationDate(now);
     		auditInfo.setModifiedBy(owner);
     	private void touchFile(FileHeader f, Date now){
     		final AuditInfo auditInfo = f.getAuditInfo();
     		auditInfo.setModificationDate(now);
     		f.setAuditInfo(auditInfo);
+    	}
     	/**

     	public List<AccountingInfo> getAccountingInfo(User user);
     	public AccountingInfo getAccountingInfo(User user, Date date);
     	/**
     	 * Returns a list of files of user with permissions for specified group
+    	 *
     	 * @param userId the ID of the User
     	 * @return the list of shared root files
     	 * @param groupId
     	 * @throws ObjectNotFoundException if the user cannot be found
     	 */
     	public List<FileHeader> getFilesPermittedForGroup(Long userId, Long groupId) throws ObjectNotFoundException;
+    }

b/src/gr/ebs/gss/server/ejb/GSSDAOBean.java
697	697	}
698	698	return ai;
699	699	}
	700
	701	@Override
	702	public List<FileHeader> getFilesPermittedForGroup(Long userId, Long groupId) {
	703	return manager.createQuery("select distinct f from FileHeader f LEFT JOIN f.permissions p " +
	704	"where f.owner.id=:userId and f.deleted = false and p.group.id=:groupId ").
	705	setParameter("userId", userId).setParameter("groupId", groupId).getResultList();
	706	}
700	707	}

Synnefo

Revision b7565ade