Revision a784f00f
Added by Katja Luther over 14 years ago
| cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategy.java | ||
|---|---|---|
| 320 | 320 |
if (Set.class.isAssignableFrom(fieldType) || List.class.isAssignableFrom(fieldType)){
|
| 321 | 321 |
Collection<ICdmBase> secondCollection = (Collection<ICdmBase>)field.get(mergeSecond); |
| 322 | 322 |
List<ICdmBase> removeList = new ArrayList<ICdmBase>(); |
| 323 |
if(secondCollection != null) {
|
|
| 323 | 324 |
for (ICdmBase obj : secondCollection){
|
| 324 | 325 |
Object objectToAdd; |
| 325 | 326 |
if (mergeMode == MergeMode.ADD){
|
| ... | ... | |
| 334 | 335 |
addMethod.invoke(mergeFirst, objectToAdd); |
| 335 | 336 |
removeList.add(obj); |
| 336 | 337 |
} |
| 338 |
} |
|
| 337 | 339 |
for (ICdmBase removeObj : removeList ){
|
| 338 | 340 |
//removeMethod.invoke(mergeSecond, removeObj); |
| 339 | 341 |
if ((removeObj instanceof CdmBase)&& mergeMode == MergeMode.ADD_CLONE) {
|
Also available in: Unified diff
merge cate-development2 branch with trunk