← Back to branch summary

~stian-sandvold/dhis2/UserSettingFallback

« back to all changes in this revision

Viewing changes to dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java

  • Committer: Stian Sandvold
  • Date: 2016-03-14 12:16:33 UTC
  • mfrom: (21871.1.422 dhis2)
  • Revision ID: stian.sandvold@gmail.com-20160314121633-ojggeaoszdunzltj
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java
573
573
    }
574
574
 
575
575
    @Override
576
 
    public void mergeWith( IdentifiableObject other, MergeStrategy strategy )
 
576
    public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
577
577
    {
578
578
        Validate.notNull( other );
579
579
 
580
 
        if ( strategy.isReplace() )
 
580
        if ( mergeMode.isReplace() )
581
581
        {
582
582
            uid = other.getUid();
583
583
            name = other.getName();
586
586
            created = other.getCreated();
587
587
            user = other.getUser();
588
588
        }
589
 
        else if ( strategy.isMerge() )
 
589
        else if ( mergeMode.isMerge() )
590
590
        {
591
591
            uid = other.getUid() == null ? uid : other.getUid();
592
592
            name = other.getName() == null ? name : other.getName();