← Back to branch summary

~dhis2-devs-core/dhis2/dhis2-sms

« back to all changes in this revision

Viewing changes to dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java

  • Committer: Zubair Asghar
  • Date: 2016-02-11 11:25:34 UTC
  • mfrom: (21489.1.458 dhis2)
  • Revision ID: rajazubair.asghar@gmail.com-20160211112534-v75few91kgt4r78n
MWT

Show diffs side-by-side

added added

removed removed

Lines of Context:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java
39
39
import org.hisp.dhis.common.BaseIdentifiableObject;
40
40
import org.hisp.dhis.common.DxfNamespaces;
41
41
import org.hisp.dhis.common.IdentifiableObject;
42
 
import org.hisp.dhis.common.MergeStrategy;
 
42
import org.hisp.dhis.common.MergeMode;
43
43
import org.hisp.dhis.common.ValueType;
44
44
import org.hisp.dhis.common.annotation.Scanned;
45
45
import org.hisp.dhis.common.view.DetailedView;
77
77
    // -------------------------------------------------------------------------
78
78
    // Logic
79
79
    // -------------------------------------------------------------------------
80
 
    
 
80
 
81
81
    public void addDataElement( DataElement dataElement )
82
82
    {
83
83
        members.add( dataElement );
177
177
    }
178
178
 
179
179
    @Override
180
 
    public void mergeWith( IdentifiableObject other, MergeStrategy strategy )
 
180
    public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
181
181
    {
182
 
        super.mergeWith( other, strategy );
 
182
        super.mergeWith( other, mergeMode );
183
183
 
184
184
        if ( other.getClass().isInstance( this ) )
185
185
        {
186
186
            DataElementGroup dataElementGroup = (DataElementGroup) other;
187
187
 
188
 
            if ( strategy.isReplace() )
 
188
            if ( mergeMode.isReplace() )
189
189
            {
190
190
                groupSet = dataElementGroup.getGroupSet();
191
191
            }
192
 
            else if ( strategy.isMerge() )
 
192
            else if ( mergeMode.isMerge() )
193
193
            {
194
194
                groupSet = dataElementGroup.getGroupSet() == null ? groupSet : dataElementGroup.getGroupSet();
195
195
            }