Revision 1521
Added by Jing Tao over 21 years ago
src/edu/ucsb/nceas/metacat/PermissionController.java | ||
---|---|---|
367 | 367 |
}//if |
368 | 368 |
}//for |
369 | 369 |
// merge the subtree if a subtree is another subtree'subtree |
370 |
resultUnaccessableSubTree = mergeIntoBigSubtree(resultUnaccessableSubTree);
|
|
370 |
resultUnaccessableSubTree = mergeEquivalentSubtree(resultUnaccessableSubTree);
|
|
371 | 371 |
return resultUnaccessableSubTree; |
372 | 372 |
}//hasUnaccessableSubtree |
373 | 373 |
|
... | ... | |
377 | 377 |
* is a subtree of subtree a. And user doesn't have read permission for both |
378 | 378 |
* so we only use subtree a is enough. |
379 | 379 |
*/ |
380 |
private Hashtable mergeIntoBigSubtree(Hashtable unAccessSubTree)
|
|
380 |
private Hashtable mergeEquivalentSubtree(Hashtable unAccessSubTree)
|
|
381 | 381 |
{ |
382 | 382 |
Hashtable newSubTreeHash = new Hashtable(); |
383 | 383 |
boolean needDelete = false; |
Also available in: Unified diff
Change a method name to mergeEquivlentSubTree.