dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43201
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21947: finished rename of MergeStrategy => MergeMode
------------------------------------------------------------
revno: 21947
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2016-02-11 16:27:02 +0700
message:
finished rename of MergeStrategy => MergeMode
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalItemObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Mergeable.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MergeService.java
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/Attribute.java 2016-02-11 09:27:02 +0000
@@ -493,7 +493,6 @@
}
-
public List<Class<? extends IdentifiableObject>> getSupportedClasses()
{
List<Class<? extends IdentifiableObject>> klasses = new ArrayList<>();
@@ -522,9 +521,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -551,12 +550,12 @@
optionSetAttribute = attribute.isOptionSetAttribute();
mandatory = attribute.isMandatory();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
valueType = attribute.getValueType();
sortOrder = attribute.getSortOrder();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
valueType = attribute.getValueType() == null ? valueType : attribute.getValueType();
sortOrder = attribute.getSortOrder() == null ? sortOrder : attribute.getSortOrder();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/BaseChart.java 2016-02-11 09:27:02 +0000
@@ -493,9 +493,9 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -508,7 +508,7 @@
showData = chart.isShowData();
hideEmptyRows = chart.isHideEmptyRows();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
domainAxisLabel = chart.getDomainAxisLabel();
rangeAxisLabel = chart.getRangeAxisLabel();
@@ -523,7 +523,7 @@
rangeAxisSteps = chart.getRangeAxisSteps();
rangeAxisDecimals = chart.getRangeAxisDecimals();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
domainAxisLabel = chart.getDomainAxisLabel() == null ? domainAxisLabel : chart.getDomainAxisLabel();
rangeAxisLabel = chart.getRangeAxisLabel() == null ? rangeAxisLabel : chart.getRangeAxisLabel();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java 2016-02-11 09:27:02 +0000
@@ -28,10 +28,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import org.hisp.dhis.common.AnalyticsType;
import org.hisp.dhis.common.DimensionalItemObject;
import org.hisp.dhis.common.DimensionalObject;
@@ -45,10 +45,9 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.user.User;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
/**
* @author Lars Helge Overland
@@ -228,20 +227,20 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Chart chart = (Chart) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
series = chart.getSeries();
category = chart.getCategory();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
series = chart.getSeries() == null ? series : chart.getSeries();
category = chart.getCategory() == null ? category : chart.getCategory();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/Color.java 2016-02-11 09:27:02 +0000
@@ -80,19 +80,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Color colorObj = (Color) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
color = colorObj.getColor();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
color = colorObj.getColor() == null ? color : colorObj.getColor();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/color/ColorSet.java 2016-02-11 09:27:02 +0000
@@ -91,9 +91,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseAnalyticalObject.java 2016-02-11 09:27:02 +0000
@@ -28,29 +28,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.hisp.dhis.common.DimensionalObject.CATEGORYOPTIONCOMBO_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.DATA_COLLAPSED_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.DATA_X_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.DIMENSION_SEP;
-import static org.hisp.dhis.common.DimensionalObject.ORGUNIT_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID;
-import static org.hisp.dhis.common.DimensionalObject.STATIC_DIMS;
-import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_LEVEL;
-import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_ORGUNIT_GROUP;
-import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT;
-import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT_CHILDREN;
-import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT_GRANDCHILDREN;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Maps;
import org.apache.commons.lang3.StringUtils;
import org.hisp.dhis.analytics.AggregationType;
import org.hisp.dhis.common.adapter.JacksonPeriodDeserializer;
@@ -79,21 +66,23 @@
import org.hisp.dhis.trackedentity.TrackedEntityProgramIndicatorDimension;
import org.hisp.dhis.user.User;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import static org.hisp.dhis.common.DimensionalObject.*;
+import static org.hisp.dhis.organisationunit.OrganisationUnit.*;
/**
* This class contains associations to dimensional meta-data. Should typically
* be sub-classed by analytical objects like tables, maps and charts.
- * <p/>
+ * <p>
* Implementation note: Objects currently managing this class are AnalyticsService,
* DefaultDimensionService and the getDimensionalObject and getDimensionalObjectList
* methods of this class.
@@ -112,9 +101,9 @@
// -------------------------------------------------------------------------
// Persisted properties
// -------------------------------------------------------------------------
-
+
protected List<DataDimensionItem> dataDimensionItems = new ArrayList<>();
-
+
@Scanned
protected List<OrganisationUnit> organisationUnits = new ArrayList<>();
@@ -131,7 +120,7 @@
@Scanned
protected List<Integer> organisationUnitLevels = new ArrayList<>();
-
+
@Scanned
protected List<DataElementCategoryDimension> categoryDimensions = new ArrayList<>();
@@ -143,10 +132,10 @@
@Scanned
protected List<TrackedEntityDataElementDimension> dataElementDimensions = new ArrayList<>();
-
+
@Scanned
protected List<TrackedEntityProgramIndicatorDimension> programIndicatorDimensions = new ArrayList<>();
-
+
private Program program;
protected boolean userOrganisationUnit;
@@ -165,9 +154,9 @@
protected int topLimit;
protected AggregationType aggregationType;
-
+
protected boolean completedOnly;
-
+
// -------------------------------------------------------------------------
// Analytical properties
// -------------------------------------------------------------------------
@@ -179,7 +168,7 @@
protected transient List<DimensionalObject> filters = new ArrayList<>();
protected transient Map<String, String> parentGraphMap = new HashMap<>();
-
+
// -------------------------------------------------------------------------
// Transient properties
// -------------------------------------------------------------------------
@@ -211,7 +200,7 @@
{
return relatives != null && !relatives.isEmpty();
}
-
+
public boolean hasOrganisationUnitLevels()
{
return organisationUnitLevels != null && !organisationUnitLevels.isEmpty();
@@ -221,7 +210,7 @@
{
return itemOrganisationUnitGroups != null && !itemOrganisationUnitGroups.isEmpty();
}
-
+
public boolean hasSortOrder()
{
return sortOrder != 0;
@@ -241,7 +230,7 @@
{
this.transientOrganisationUnits.add( organisationUnit );
}
- }
+ }
/**
* Returns dimension items for data dimensions.
@@ -250,10 +239,10 @@
{
return dataDimensionItems.stream().map( DataDimensionItem::getDimensionalItemObject ).collect( Collectors.toList() );
}
-
+
/**
* Adds a data dimension object.
- *
+ *
* @return true if a data dimension was added, false if not.
*/
public boolean addDataDimensionItem( DimensionalItemObject object )
@@ -262,13 +251,13 @@
{
return dataDimensionItems.add( DataDimensionItem.create( object ) );
}
-
+
return false;
}
/**
* Removes a data dimension object.
- *
+ *
* @return true if a data dimension was removed, false if not.
*/
public boolean removeDataDimensionItem( DimensionalItemObject object )
@@ -277,7 +266,7 @@
{
return dataDimensionItems.remove( DataDimensionItem.create( object ) );
}
-
+
return false;
}
@@ -291,7 +280,7 @@
addDataDimensionItem( object );
}
}
-
+
/**
* Returns all data elements in the data dimensions. The returned list is
* immutable.
@@ -320,7 +309,7 @@
* Assembles a DimensionalObject based on the persisted properties of this
* AnalyticalObject. Collapses indicators, data elements, data element
* operands and data sets into the dx dimension.
- * <p/>
+ * <p>
* Collapses fixed and relative periods into the pe dimension. Collapses
* fixed and user organisation units into the ou dimension.
*
@@ -491,15 +480,15 @@
}
// Tracked entity program indicator
-
+
Map<String, TrackedEntityProgramIndicatorDimension> programIndicators = Maps.uniqueIndex( programIndicatorDimensions, TrackedEntityProgramIndicatorDimension::getUid );
-
+
if ( programIndicators.containsKey( dimension ) )
{
TrackedEntityProgramIndicatorDimension teid = programIndicators.get( dimension );
-
+
return new BaseDimensionalObject( dimension, DimensionType.PROGRAM_INDICATOR, null, teid.getDisplayName(), teid.getLegendSet(), teid.getFilter() );
- }
+ }
}
IdentifiableObjectUtils.removeDuplicates( items );
@@ -510,12 +499,12 @@
/**
* Assembles a list of DimensionalObjects based on the concrete objects in
* this BaseAnalyticalObject.
- * <p/>
+ * <p>
* Merges fixed and relative periods into the pe dimension, where the
* RelativePeriods object is represented by enums (e.g. LAST_MONTH). Merges
* fixed and user organisation units into the ou dimension, where user
* organisation units properties are represented by enums (e.g. USER_ORG_UNIT).
- * <p/>
+ * <p>
* This method is useful when serializing the AnalyticalObject.
*
* @param dimension the dimension identifier.
@@ -592,7 +581,7 @@
}
else if ( CATEGORYOPTIONCOMBO_DIM_ID.equals( dimension ) )
{
- return new BaseDimensionalObject( dimension, DimensionType.CATEGORY_OPTION_COMBO, new ArrayList<DimensionalItemObject>() ) ;
+ return new BaseDimensionalObject( dimension, DimensionType.CATEGORY_OPTION_COMBO, new ArrayList<DimensionalItemObject>() );
}
else if ( categoryDims.contains( dimension ) )
{
@@ -684,13 +673,13 @@
}
// Tracked entity program indicator
-
+
Map<String, TrackedEntityProgramIndicatorDimension> programIndicators = Maps.uniqueIndex( programIndicatorDimensions, TrackedEntityProgramIndicatorDimension::getUid );
-
+
if ( programIndicators.containsKey( dimension ) )
{
TrackedEntityProgramIndicatorDimension teid = programIndicators.get( dimension );
-
+
return new BaseDimensionalObject( dimension, DimensionType.PROGRAM_INDICATOR, null, teid.getDisplayName(), teid.getLegendSet(), teid.getFilter() );
}
}
@@ -746,7 +735,7 @@
* Sorts the given key by splitting on the '-' character and sorting the
* components alphabetically.
*
- * @param valueMap the mapping of keys and values.
+ * @param key the mapping of keys and values.
*/
public static String sortKey( String key )
{
@@ -834,9 +823,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -844,13 +833,13 @@
this.clear();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
relatives = object.getRelatives();
program = object.getProgram();
aggregationType = object.getAggregationType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
relatives = object.getRelatives() == null ? relatives : object.getRelatives();
program = object.getProgram() == null ? program : object.getProgram();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalItemObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalItemObject.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalItemObject.java 2016-02-11 09:27:02 +0000
@@ -28,23 +28,22 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import org.hisp.dhis.analytics.AggregationType;
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.DimensionalView;
import org.hisp.dhis.common.view.ExportView;
import org.hisp.dhis.legend.LegendSet;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-
/**
* @author Lars Helge Overland
*/
public class BaseDimensionalItemObject
- extends BaseNameableObject
- implements DimensionalItemObject
+ extends BaseNameableObject
+ implements DimensionalItemObject
{
/**
* The dimension type.
@@ -55,12 +54,12 @@
* The legend set for this dimension.
*/
protected LegendSet legendSet;
-
+
/**
* The aggregation type for this dimension.
*/
protected AggregationType aggregationType;
-
+
// -------------------------------------------------------------------------
// Constructors
// -------------------------------------------------------------------------
@@ -85,7 +84,7 @@
{
return getLegendSet() != null;
}
-
+
@Override
public boolean hasAggregationType()
{
@@ -158,20 +157,20 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DimensionalItemObject object = (DimensionalItemObject) other;
-
- if ( strategy.isReplace() )
+
+ if ( mergeMode.isReplace() )
{
legendSet = object.getLegendSet();
aggregationType = object.getAggregationType();
}
- else if ( strategy.isReplace() )
+ else if ( mergeMode.isMerge() )
{
legendSet = object.getLegendSet() == null ? legendSet : object.getLegendSet();
aggregationType = object.getAggregationType() == null ? aggregationType : object.getAggregationType();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseDimensionalObject.java 2016-02-11 09:27:02 +0000
@@ -330,9 +330,9 @@
//--------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -340,7 +340,7 @@
dataDimension = dimensionalObject.isDataDimension();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dimensionType = dimensionalObject.getDimensionType();
dimensionName = dimensionalObject.getDimensionName();
@@ -348,7 +348,7 @@
aggregationType = dimensionalObject.getAggregationType();
filter = dimensionalObject.getFilter();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dimensionType = dimensionalObject.getDimensionType() == null ? dimensionType : dimensionalObject.getDimensionType();
dimensionName = dimensionalObject.getDimensionName() == null ? dimensionName : dimensionalObject.getDimensionName();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java 2016-02-11 09:27:02 +0000
@@ -573,11 +573,11 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
Validate.notNull( other );
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
uid = other.getUid();
name = other.getName();
@@ -586,7 +586,7 @@
created = other.getCreated();
user = other.getUser();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
uid = other.getUid() == null ? uid : other.getUid();
name = other.getName() == null ? name : other.getName();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseNameableObject.java 2016-02-11 09:27:02 +0000
@@ -239,20 +239,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
NameableObject nameableObject = (NameableObject) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
this.shortName = nameableObject.getShortName();
this.description = nameableObject.getDescription();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
this.shortName = nameableObject.getShortName() == null ? this.shortName : nameableObject.getShortName();
this.description = nameableObject.getDescription() == null ? this.description : nameableObject.getDescription();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Mergeable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Mergeable.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/Mergeable.java 2016-02-11 09:27:02 +0000
@@ -36,7 +36,7 @@
*/
public interface Mergeable<T>
{
- void mergeWith( T other, MergeMode strategy );
+ void mergeWith( T other, MergeMode mergeMode );
void mergeSharingWith( T other );
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/constant/Constant.java 2016-02-11 09:27:02 +0000
@@ -90,9 +90,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/Dashboard.java 2016-02-11 09:27:02 +0000
@@ -178,9 +178,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItem.java 2016-02-11 09:27:02 +0000
@@ -410,15 +410,15 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DashboardItem dashboardItem = (DashboardItem) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
chart = dashboardItem.getChart();
map = dashboardItem.getMap();
@@ -429,7 +429,7 @@
messages = dashboardItem.getMessages();
shape = dashboardItem.getShape();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
chart = dashboardItem.getChart() == null ? chart : dashboardItem.getChart();
map = dashboardItem.getMap() == null ? map : dashboardItem.getMap();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataapproval/DataApprovalWorkflow.java 2016-02-11 09:27:02 +0000
@@ -157,19 +157,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DataApprovalWorkflow dataApprovalWorkflow = (DataApprovalWorkflow) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
periodType = dataApprovalWorkflow.getPeriodType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
periodType = dataApprovalWorkflow.getPeriodType() == null ? periodType : dataApprovalWorkflow.getPeriodType();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroup.java 2016-02-11 09:27:02 +0000
@@ -140,20 +140,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
CategoryOptionGroup categoryOptionGroup = (CategoryOptionGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
groupSet = categoryOptionGroup.getGroupSet();
dataDimensionType = categoryOptionGroup.getDataDimensionType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
groupSet = categoryOptionGroup.getGroupSet() == null ? groupSet : categoryOptionGroup.getGroupSet();
dataDimensionType = categoryOptionGroup.getDataDimensionType() == null ? dataDimensionType : categoryOptionGroup.getDataDimensionType();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/CategoryOptionGroupSet.java 2016-02-11 09:27:02 +0000
@@ -185,19 +185,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
CategoryOptionGroupSet categoryOptionGroupSet = (CategoryOptionGroupSet) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dataDimensionType = categoryOptionGroupSet.getDataDimensionType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dataDimensionType = categoryOptionGroupSet.getDataDimensionType() == null ? dataDimensionType : categoryOptionGroupSet.getDataDimensionType();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2016-02-11 09:27:02 +0000
@@ -662,9 +662,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -672,7 +672,7 @@
zeroIsSignificant = dataElement.isZeroIsSignificant();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
formName = dataElement.getFormName();
domainType = dataElement.getDomainType();
@@ -682,7 +682,7 @@
optionSet = dataElement.getOptionSet();
commentOptionSet = dataElement.getCommentOptionSet();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
formName = dataElement.getFormName() == null ? formName : dataElement.getFormName();
domainType = dataElement.getDomainType() == null ? domainType : dataElement.getDomainType();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java 2016-02-11 09:27:02 +0000
@@ -251,19 +251,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DataElementCategory category = (DataElementCategory) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dataDimensionType = category.getDataDimensionType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dataDimensionType = category.getDataDimensionType() == null ? dataDimensionType : category.getDataDimensionType();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java 2016-02-11 09:27:02 +0000
@@ -331,9 +331,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -341,11 +341,11 @@
skipTotal = categoryCombo.isSkipTotal();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dataDimensionType = categoryCombo.getDataDimensionType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dataDimensionType = categoryCombo.getDataDimensionType() == null ? dataDimensionType : categoryCombo.getDataDimensionType();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOption.java 2016-02-11 09:27:02 +0000
@@ -250,20 +250,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DataElementCategoryOption categoryOption = (DataElementCategoryOption) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
startDate = categoryOption.getStartDate();
endDate = categoryOption.getEndDate();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
startDate = categoryOption.getStartDate() == null ? startDate : categoryOption.getStartDate();
endDate = categoryOption.getEndDate() == null ? endDate : categoryOption.getEndDate();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java 2016-02-11 09:27:02 +0000
@@ -379,19 +379,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DataElementCategoryOptionCombo categoryOptionCombo = (DataElementCategoryOptionCombo) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
categoryCombo = categoryOptionCombo.getCategoryCombo();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
categoryCombo = categoryOptionCombo.getCategoryCombo() == null ? categoryCombo : categoryOptionCombo.getCategoryCombo();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroup.java 2016-02-11 09:27:02 +0000
@@ -77,7 +77,7 @@
// -------------------------------------------------------------------------
// Logic
// -------------------------------------------------------------------------
-
+
public void addDataElement( DataElement dataElement )
{
members.add( dataElement );
@@ -177,19 +177,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
DataElementGroup dataElementGroup = (DataElementGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
groupSet = dataElementGroup.getGroupSet();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
groupSet = dataElementGroup.getGroupSet() == null ? groupSet : dataElementGroup.getGroupSet();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementGroupSet.java 2016-02-11 09:27:02 +0000
@@ -257,20 +257,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mode );
if ( other.getClass().isInstance( this ) )
{
DataElementGroupSet dataElementGroupSet = (DataElementGroupSet) other;
- if ( strategy.isReplace() )
+ if ( mode.isReplace() )
{
description = dataElementGroupSet.getDescription();
compulsory = dataElementGroupSet.isCompulsory();
}
- else if ( strategy.isMerge() )
+ else if ( mode.isMerge() )
{
description = dataElementGroupSet.getDescription() == null ? description : dataElementGroupSet.getDescription();
compulsory = dataElementGroupSet.isCompulsory() == null ? compulsory : dataElementGroupSet.isCompulsory();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2016-02-11 09:27:02 +0000
@@ -751,9 +751,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -770,13 +770,13 @@
validCompleteOnly = dataSet.isValidCompleteOnly();
version = dataSet.getVersion();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
periodType = dataSet.getPeriodType();
dataEntryForm = dataSet.getDataEntryForm();
notificationRecipients = dataSet.getNotificationRecipients();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
periodType = dataSet.getPeriodType() == null ? periodType : dataSet.getPeriodType();
dataEntryForm = dataSet.getDataEntryForm() == null ? dataEntryForm : dataSet.getDataEntryForm();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/Section.java 2016-02-11 09:27:02 +0000
@@ -267,20 +267,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Section section = (Section) other;
sortOrder = section.getSortOrder();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dataSet = section.getDataSet();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dataSet = section.getDataSet() == null ? dataSet : section.getDataSet();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/document/Document.java 2016-02-11 09:27:02 +0000
@@ -128,9 +128,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -138,12 +138,12 @@
external = document.isExternal();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
url = document.getUrl();
contentType = document.getContentType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
url = document.getUrl() == null ? url : document.getUrl();
contentType = document.getContentType() == null ? contentType : document.getContentType();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventchart/EventChart.java 2016-02-11 09:27:02 +0000
@@ -402,15 +402,15 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
EventChart chart = (EventChart) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dataElementValueDimension = chart.getDataElementValueDimension();
attributeValueDimension = chart.getAttributeValueDimension();
@@ -420,7 +420,7 @@
endDate = chart.getEndDate();
outputType = chart.getOutputType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dataElementValueDimension = chart.getDataElementValueDimension() == null ? dataElementValueDimension : chart.getDataElementValueDimension();
attributeValueDimension = chart.getAttributeValueDimension() == null ? attributeValueDimension : chart.getAttributeValueDimension();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/eventreport/EventReport.java 2016-02-11 09:27:02 +0000
@@ -570,9 +570,9 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -587,7 +587,7 @@
showHierarchy = report.isShowHierarchy();
showDimensionLabels = report.isShowDimensionLabels();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
dataElementValueDimension = report.getDataElementValueDimension();
attributeValueDimension = report.getAttributeValueDimension();
@@ -600,7 +600,7 @@
displayDensity = report.getDisplayDensity();
fontSize = report.getFontSize();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
dataElementValueDimension = report.getDataElementValueDimension() == null ? dataElementValueDimension : report.getDataElementValueDimension();
attributeValueDimension = report.getAttributeValueDimension() == null ? attributeValueDimension : report.getAttributeValueDimension();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/Indicator.java 2016-02-11 09:27:02 +0000
@@ -321,9 +321,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -331,7 +331,7 @@
annualized = indicator.isAnnualized();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
denominator = indicator.getDenominator();
denominatorDescription = indicator.getDenominatorDescription();
@@ -341,7 +341,7 @@
explodedDenominator = indicator.getExplodedDenominator();
indicatorType = indicator.getIndicatorType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
denominator = indicator.getDenominator() == null ? denominator : indicator.getDenominator();
denominatorDescription = indicator.getDenominatorDescription() == null ? denominatorDescription : indicator.getDenominatorDescription();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroup.java 2016-02-11 09:27:02 +0000
@@ -153,19 +153,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
IndicatorGroup indicatorGroup = (IndicatorGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
groupSet = indicatorGroup.getGroupSet();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
groupSet = indicatorGroup.getGroupSet() == null ? groupSet : indicatorGroup.getGroupSet();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorGroupSet.java 2016-02-11 09:27:02 +0000
@@ -229,20 +229,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
IndicatorGroupSet indicatorGroupSet = (IndicatorGroupSet) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
compulsory = indicatorGroupSet.isCompulsory();
description = indicatorGroupSet.getDescription();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
compulsory = indicatorGroupSet.isCompulsory() == null ? compulsory : indicatorGroupSet.isCompulsory();
description = indicatorGroupSet.getDescription() == null ? description : indicatorGroupSet.getDescription();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorType.java 2016-02-11 09:27:02 +0000
@@ -98,9 +98,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/Legend.java 2016-02-11 09:27:02 +0000
@@ -28,6 +28,10 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.IdentifiableObject;
@@ -35,11 +39,6 @@
import org.hisp.dhis.common.view.DetailedView;
import org.hisp.dhis.common.view.ExportView;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
/**
* @author Jan Henrik Overland
*/
@@ -52,7 +51,7 @@
private Double endValue;
private String color;
-
+
private String image;
public Legend()
@@ -115,7 +114,7 @@
public void setColor( String color )
{
this.color = color;
- }
+ }
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@@ -131,22 +130,22 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Legend legend = (Legend) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
startValue = legend.getStartValue();
endValue = legend.getEndValue();
color = legend.getColor();
image = legend.getImage();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
startValue = legend.getStartValue() == null ? startValue : legend.getStartValue();
endValue = legend.getEndValue() == null ? endValue : legend.getEndValue();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/legend/LegendSet.java 2016-02-11 09:27:02 +0000
@@ -121,19 +121,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
LegendSet legendSet = (LegendSet) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
symbolizer = legendSet.getSymbolizer();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
symbolizer = legendSet.getSymbolizer() == null ? symbolizer : legendSet.getSymbolizer();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java 2016-02-11 09:27:02 +0000
@@ -140,22 +140,22 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Map map = (Map) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
user = map.getUser();
longitude = map.getLongitude();
latitude = map.getLatitude();
zoom = map.getZoom();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
user = map.getUser() == null ? user : map.getUser();
longitude = map.getLongitude() == null ? longitude : map.getLongitude();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapLayer.java 2016-02-11 09:27:02 +0000
@@ -194,9 +194,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -205,7 +205,7 @@
strokeWidth = mapLayer.getStrokeWidth();
fillOpacity = mapLayer.getFillOpacity();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
type = mapLayer.getType();
url = mapLayer.getUrl();
@@ -214,7 +214,7 @@
fillColor = mapLayer.getFillColor();
strokeColor = mapLayer.getStrokeColor();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
type = mapLayer.getType() == null ? type : mapLayer.getType();
url = mapLayer.getUrl() == null ? url : mapLayer.getUrl();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java 2016-02-11 09:27:02 +0000
@@ -462,15 +462,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
MapView mapView = (MapView) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
layer = mapView.getLayer();
method = mapView.getMethod();
@@ -490,7 +490,7 @@
labelFontStyle = mapView.getLabelFontStyle();
labelFontColor = mapView.getLabelFontColor();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
layer = mapView.getLayer() == null ? layer : mapView.getLayer();
method = mapView.getMethod() == null ? method : mapView.getMethod();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java 2016-02-11 09:27:02 +0000
@@ -485,21 +485,21 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
MessageConversation messageConversation = (MessageConversation) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
subject = messageConversation.getSubject();
lastSender = messageConversation.getLastSender();
lastMessage = messageConversation.getLastMessage();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
subject = messageConversation.getSubject() == null ? subject : messageConversation.getSubject();
lastSender = messageConversation.getLastSender() == null ? lastSender : messageConversation.getLastSender();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/option/OptionSet.java 2016-02-11 09:27:02 +0000
@@ -170,19 +170,19 @@
// -------------------------------------------------------------------------
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
OptionSet optionSet = (OptionSet) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
valueType = optionSet.getValueType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
valueType = optionSet.getValueType() == null ? valueType : optionSet.getValueType();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnit.java 2016-02-11 09:27:02 +0000
@@ -1153,15 +1153,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
OrganisationUnit organisationUnit = (OrganisationUnit) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
openingDate = organisationUnit.getOpeningDate();
closedDate = organisationUnit.getClosedDate();
@@ -1175,7 +1175,7 @@
phoneNumber = organisationUnit.getPhoneNumber();
parent = organisationUnit.getParent();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
openingDate = organisationUnit.getOpeningDate() == null ? openingDate : organisationUnit.getOpeningDate();
closedDate = organisationUnit.getClosedDate() == null ? closedDate : organisationUnit.getClosedDate();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java 2016-02-11 09:27:02 +0000
@@ -169,20 +169,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
OrganisationUnitGroup organisationUnitGroup = (OrganisationUnitGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
groupSet = organisationUnitGroup.getGroupSet();
symbol = organisationUnitGroup.getSymbol();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
groupSet = organisationUnitGroup.getGroupSet() == null ? groupSet : organisationUnitGroup.getGroupSet();
symbol = organisationUnitGroup.getSymbol() == null ? symbol : organisationUnitGroup.getSymbol();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupSet.java 2016-02-11 09:27:02 +0000
@@ -241,9 +241,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -251,11 +251,11 @@
compulsory = organisationUnitGroupSet.isCompulsory();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = organisationUnitGroupSet.getDescription();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = organisationUnitGroupSet.getDescription() == null ? description : organisationUnitGroupSet.getDescription();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitLevel.java 2016-02-11 09:27:02 +0000
@@ -150,9 +150,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java 2016-02-11 09:27:02 +0000
@@ -121,7 +121,7 @@
private Program relatedProgram;
private Boolean dataEntryMethod = false;
-
+
private TrackedEntity trackedEntity;
private DataEntryForm dataEntryForm;
@@ -141,7 +141,7 @@
* The approval workflow (if any) for this program.
*/
private DataApprovalWorkflow workflow;
-
+
private Boolean displayFrontPageList = false;
// -------------------------------------------------------------------------
@@ -681,7 +681,7 @@
{
this.skipOffline = skipOffline;
}
-
+
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -696,9 +696,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -706,7 +706,7 @@
version = program.getVersion();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = program.getDescription();
enrollmentDateLabel = program.getEnrollmentDateLabel();
@@ -724,7 +724,7 @@
dataEntryMethod = program.getDataEntryMethod();
trackedEntity = program.getTrackedEntity();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = program.getDescription() == null ? description : program.getDescription();
enrollmentDateLabel = program.getEnrollmentDateLabel() == null ? enrollmentDateLabel : program.getEnrollmentDateLabel();
@@ -766,5 +766,5 @@
instanceReminders.clear();
instanceReminders.addAll( program.getInstanceReminders() );
}
- }
+ }
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramIndicator.java 2016-02-11 09:27:02 +0000
@@ -229,15 +229,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramIndicator programIndicator = (ProgramIndicator) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
program = programIndicator.getProgram();
expression = programIndicator.getExpression();
@@ -245,7 +245,7 @@
decimals = programIndicator.getDecimals();
displayInForm = programIndicator.getDisplayInForm();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
program = programIndicator.getProgram() == null ? program : programIndicator.getProgram();
expression = programIndicator.getExpression() == null ? expression : programIndicator.getExpression();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStage.java 2016-02-11 09:27:02 +0000
@@ -117,7 +117,7 @@
private Integer sortOrder;
private PeriodType periodType;
-
+
private Boolean hideDueDate = false;
// -------------------------------------------------------------------------
@@ -486,7 +486,7 @@
{
this.periodType = periodType;
}
-
+
@JsonProperty
@JsonView( { DetailedView.class, ExportView.class } )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -501,9 +501,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -513,7 +513,7 @@
autoGenerateEvent = programStage.isAutoGenerated();
repeatable = programStage.getRepeatable();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = programStage.getDescription();
repeatable = programStage.getRepeatable();
@@ -533,7 +533,7 @@
preGenerateUID = programStage.getPreGenerateUID();
hideDueDate = programStage.getHideDueDate();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = programStage.getDescription() == null ? description : programStage.getDescription();
program = programStage.getProgram() == null ? program : programStage.getProgram();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageDataElement.java 2016-02-11 09:27:02 +0000
@@ -230,9 +230,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -240,7 +240,7 @@
compulsory = programStageDataElement.isCompulsory();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
programStage = programStageDataElement.getProgramStage();
dataElement = programStageDataElement.getDataElement();
@@ -249,7 +249,7 @@
displayInReports = programStageDataElement.getDisplayInReports();
sortOrder = programStageDataElement.getSortOrder();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
programStage = programStageDataElement.getProgramStage() == null ? programStage : programStageDataElement.getProgramStage();
dataElement = programStageDataElement.getDataElement() == null ? dataElement : programStageDataElement.getDataElement();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSection.java 2016-02-11 09:27:02 +0000
@@ -154,20 +154,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramStageSection programStageSection = (ProgramStageSection) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
programStage = programStageSection.getProgramStage();
sortOrder = programStageSection.getSortOrder();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
programStage = programStageSection.getProgramStage() == null ? programStage : programStageSection.getProgramStage();
sortOrder = programStageSection.getSortOrder() == null ? sortOrder : programStageSection.getSortOrder();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramTrackedEntityAttribute.java 2016-02-11 09:27:02 +0000
@@ -233,23 +233,23 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramTrackedEntityAttribute programTrackedEntityAttribute = (ProgramTrackedEntityAttribute) other;
displayInList = programTrackedEntityAttribute.isDisplayInList();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
program = programTrackedEntityAttribute.getProgram();
attribute = programTrackedEntityAttribute.getAttribute();
mandatory = programTrackedEntityAttribute.isMandatory();
allowFutureDate = programTrackedEntityAttribute.getAllowFutureDate();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
program = programTrackedEntityAttribute.getProgram() == null ? program : programTrackedEntityAttribute.getProgram();
attribute = programTrackedEntityAttribute.getAttribute() == null ? attribute : programTrackedEntityAttribute.getAttribute();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramValidation.java 2016-02-11 09:27:02 +0000
@@ -140,22 +140,22 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramValidation programValidation = (ProgramValidation) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
leftSide = programValidation.getLeftSide();
operator = programValidation.getOperator();
rightSide = programValidation.getRightSide();
program = programValidation.getProgram();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
leftSide = programValidation.getLeftSide() == null ? leftSide : programValidation.getLeftSide();
rightSide = programValidation.getRightSide() == null ? rightSide : programValidation.getRightSide();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRule.java 2016-02-11 09:27:02 +0000
@@ -194,15 +194,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramRule programRule = (ProgramRule) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = programRule.getDescription();
priority = programRule.getPriority();
@@ -210,7 +210,7 @@
program = programRule.getProgram();
programStage = programRule.getProgramStage();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = programRule.getDescription() == null ? description : programRule.getDescription();
priority = programRule.getPriority() == null ? priority : programRule.getPriority();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleAction.java 2016-02-11 09:27:02 +0000
@@ -33,7 +33,6 @@
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
import org.hisp.dhis.common.BaseIdentifiableObject;
import org.hisp.dhis.common.DxfNamespaces;
import org.hisp.dhis.common.IdentifiableObject;
@@ -61,7 +60,7 @@
/**
* The type of action that is performed when the action is effectuated
- * <p/>
+ * <p>
* The actual action the ruleaction row is performing. Allowed values are:
* displaytext
* Shows a text in the rulebound widget with the matching location string.
@@ -94,7 +93,7 @@
/**
* The data element that is affected by the rule action.
* Used for:
- * <p/>
+ * <p>
* <ul>
* <li>hidefield</li>
* <li>showwarning</li>
@@ -102,11 +101,11 @@
* </ul>
*/
private DataElement dataElement;
-
+
/**
* The data element that is affected by the rule action.
* Used for:
- * <p/>
+ * <p>
* <ul>
* <li>hidefield</li>
* <li>showwarning</li>
@@ -128,7 +127,7 @@
* The program stage section that is affected by the rule action.
*/
private ProgramStageSection programStageSection;
-
+
/**
* The program stage that is affected by the rule action.
*/
@@ -136,7 +135,7 @@
/**
* Used to determine which widget to display data for the two action types:
- * <p/>
+ * <p>
* <ul>
* <li>displaytext</li>
* <li>displaykeydata</li>
@@ -163,8 +162,8 @@
}
- public ProgramRuleAction( String name, ProgramRule programRule, ProgramRuleActionType programRuleActionType,
- DataElement dataElement, TrackedEntityAttribute attribute,
+ public ProgramRuleAction( String name, ProgramRule programRule, ProgramRuleActionType programRuleActionType,
+ DataElement dataElement, TrackedEntityAttribute attribute,
ProgramStageSection programStageSection, ProgramStage programStage,
ProgramIndicator programIndicator, String location, String content, String data )
{
@@ -223,7 +222,7 @@
{
this.dataElement = dataElement;
}
-
+
@JsonProperty( "trackedEntityAttribute" )
@JsonSerialize( as = BaseIdentifiableObject.class )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -262,7 +261,7 @@
{
this.programStage = programStage;
}
-
+
@JsonProperty
@JsonSerialize( as = BaseIdentifiableObject.class )
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
@@ -313,15 +312,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramRuleAction programRuleAction = (ProgramRuleAction) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
programRule = programRuleAction.getProgramRule();
programRuleActionType = programRuleAction.getProgramRuleActionType();
@@ -332,7 +331,7 @@
data = programRuleAction.getData();
attribute = programRuleAction.getAttribute();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
programRule = programRuleAction.getProgramRule() == null ? programRule : programRuleAction.getProgramRule();
programRuleActionType = programRuleAction.getProgramRuleActionType() == null ? programRuleActionType : programRuleAction.getProgramRuleActionType();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/programrule/ProgramRuleVariable.java 2016-02-11 09:27:02 +0000
@@ -194,22 +194,22 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ProgramRuleVariable programRuleVariable = (ProgramRuleVariable) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
this.sourceType = programRuleVariable.getSourceType();
this.attribute = programRuleVariable.getAttribute();
this.dataElement = programRuleVariable.getDataElement();
this.programStage = programRuleVariable.getProgramStage();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
this.sourceType = programRuleVariable.getSourceType() == null ? sourceType : programRuleVariable.getSourceType();
this.attribute = programRuleVariable.getAttribute() == null ? attribute : programRuleVariable.getAttribute();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/relationship/RelationshipType.java 2016-02-11 09:27:02 +0000
@@ -115,20 +115,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
RelationshipType relationshipType = (RelationshipType) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
aIsToB = relationshipType.getaIsToB();
bIsToA = relationshipType.getbIsToA();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
aIsToB = relationshipType.getaIsToB() == null ? aIsToB : relationshipType.getaIsToB();
bIsToA = relationshipType.getbIsToA() == null ? bIsToA : relationshipType.getbIsToA();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/Report.java 2016-02-11 09:27:02 +0000
@@ -223,21 +223,21 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Report report = (Report) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
designContent = report.getDesignContent();
reportTable = report.getReportTable();
cacheStrategy = report.getCacheStrategy();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
designContent = report.getDesignContent() == null ? designContent : report.getDesignContent();
reportTable = report.getReportTable() == null ? reportTable : report.getReportTable();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTable.java 2016-02-11 09:27:02 +0000
@@ -1028,9 +1028,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -1050,14 +1050,14 @@
topLimit = reportTable.getTopLimit();
sortOrder = reportTable.getSortOrder();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
reportParams = reportTable.getReportParams();
displayDensity = reportTable.getDisplayDensity();
fontSize = reportTable.getFontSize();
legendSet = reportTable.getLegendSet();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
reportParams = reportTable.getReportParams() == null ? reportParams : reportTable.getReportParams();
displayDensity = reportTable.getDisplayDensity() == null ? displayDensity : reportTable.getDisplayDensity();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/security/oauth2/OAuth2Client.java 2016-02-11 09:27:02 +0000
@@ -158,20 +158,20 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
OAuth2Client oAuth2Client = (OAuth2Client) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
cid = oAuth2Client.getCid();
secret = oAuth2Client.getSecret();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
cid = oAuth2Client.getCid() == null ? cid : oAuth2Client.getCid();
secret = oAuth2Client.getSecret() == null ? secret : oAuth2Client.getSecret();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/sqlview/SqlView.java 2016-02-11 09:27:02 +0000
@@ -293,22 +293,22 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
SqlView sqlView = (SqlView) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = sqlView.getDescription();
sqlQuery = sqlView.getSqlQuery();
type = sqlView.getType();
cacheStrategy = sqlView.getCacheStrategy();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = sqlView.getDescription() == null ? description : sqlView.getDescription();
sqlQuery = sqlView.getSqlQuery() == null ? sqlQuery : sqlView.getSqlQuery();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttribute.java 2016-02-11 09:27:02 +0000
@@ -1,6 +1,23 @@
package org.hisp.dhis.trackedentity;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonView;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import org.hisp.dhis.common.BaseDimensionalItemObject;
+import org.hisp.dhis.common.BaseIdentifiableObject;
+import org.hisp.dhis.common.DimensionType;
+import org.hisp.dhis.common.DxfNamespaces;
+import org.hisp.dhis.common.IdentifiableObject;
+import org.hisp.dhis.common.MergeMode;
+import org.hisp.dhis.common.ValueType;
+import org.hisp.dhis.common.view.DetailedView;
+import org.hisp.dhis.common.view.ExportView;
+import org.hisp.dhis.option.Option;
+import org.hisp.dhis.option.OptionSet;
+import org.hisp.dhis.schema.annotation.PropertyRange;
/*
* Copyright (c) 2004-2016, University of Oslo
@@ -30,25 +47,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonView;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
-import org.hisp.dhis.common.BaseDimensionalItemObject;
-import org.hisp.dhis.common.BaseIdentifiableObject;
-import org.hisp.dhis.common.DimensionType;
-import org.hisp.dhis.common.DxfNamespaces;
-import org.hisp.dhis.common.IdentifiableObject;
-import org.hisp.dhis.common.MergeMode;
-import org.hisp.dhis.common.ValueType;
-import org.hisp.dhis.common.view.DetailedView;
-import org.hisp.dhis.common.view.ExportView;
-import org.hisp.dhis.option.Option;
-import org.hisp.dhis.option.OptionSet;
-import org.hisp.dhis.schema.annotation.PropertyRange;
-
/**
* @author Abyot Asalefew
*/
@@ -124,7 +122,7 @@
{
return valueType.isDate();
}
-
+
/**
* Indicates whether this attribute has confidential information.
*/
@@ -397,15 +395,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
TrackedEntityAttribute trackedEntityAttribute = (TrackedEntityAttribute) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = trackedEntityAttribute.getDescription();
valueType = trackedEntityAttribute.getValueType();
@@ -421,7 +419,7 @@
programScope = trackedEntityAttribute.getProgramScope();
optionSet = trackedEntityAttribute.getOptionSet();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = trackedEntityAttribute.getDescription() == null ? description : trackedEntityAttribute.getDescription();
valueType = trackedEntityAttribute.getValueType() == null ? valueType : trackedEntityAttribute.getValueType();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroup.java 2016-02-11 09:27:02 +0000
@@ -112,19 +112,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
TrackedEntityAttributeGroup trackedEntityAttributeGroup = (TrackedEntityAttributeGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = trackedEntityAttributeGroup.getDescription();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = trackedEntityAttributeGroup.getDescription() == null ? description : trackedEntityAttributeGroup.getDescription();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstance.java 2016-02-11 09:27:02 +0000
@@ -180,22 +180,22 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
TrackedEntityInstance trackedEntityInstance = (TrackedEntityInstance) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
organisationUnit = trackedEntityInstance.getOrganisationUnit();
inactive = trackedEntityInstance.isInactive();
trackedEntity = trackedEntityInstance.getTrackedEntity();
representative = trackedEntityInstance.getRepresentative();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
organisationUnit = trackedEntityInstance.getOrganisationUnit() == null ? organisationUnit : trackedEntityInstance.getOrganisationUnit();
inactive = trackedEntityInstance.isInactive() == null ? inactive : trackedEntityInstance.isInactive();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminder.java 2016-02-11 09:27:02 +0000
@@ -239,15 +239,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
TrackedEntityInstanceReminder trackedEntityInstanceReminder = (TrackedEntityInstanceReminder) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
daysAllowedSendMessage = trackedEntityInstanceReminder.getDaysAllowedSendMessage();
templateMessage = trackedEntityInstanceReminder.getTemplateMessage();
@@ -257,7 +257,7 @@
messageType = trackedEntityInstanceReminder.getMessageType();
userGroup = trackedEntityInstanceReminder.getUserGroup();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
daysAllowedSendMessage = trackedEntityInstanceReminder.getDaysAllowedSendMessage() == null ? daysAllowedSendMessage : trackedEntityInstanceReminder.getDaysAllowedSendMessage();
templateMessage = trackedEntityInstanceReminder.getTemplateMessage() == null ? templateMessage : trackedEntityInstanceReminder.getTemplateMessage();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/translation/Translation.java 2016-02-11 09:27:02 +0000
@@ -207,15 +207,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
Translation translation = (Translation) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
objectUid = translation.getObjectUid();
className = translation.getClassName();
@@ -223,7 +223,7 @@
property = translation.getProperty();
value = translation.getValue();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
objectUid = translation.getObjectUid() == null ? objectUid : translation.getObjectUid();
className = translation.getClassName() == null ? className : translation.getClassName();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/User.java 2016-02-11 09:27:02 +0000
@@ -622,15 +622,15 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
User user = (User) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
surname = user.getSurname();
firstName = user.getFirstName();
@@ -648,7 +648,7 @@
lastCheckedInterpretations = user.getLastCheckedInterpretations();
userCredentials = user.getUserCredentials();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
surname = user.getSurname() == null ? surname : user.getSurname();
firstName = user.getFirstName() == null ? firstName : user.getFirstName();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java 2016-02-11 09:27:02 +0000
@@ -243,19 +243,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
UserAuthorityGroup userAuthorityGroup = (UserAuthorityGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = userAuthorityGroup.getDescription();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = userAuthorityGroup.getDescription() == null ? description : userAuthorityGroup.getDescription();
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserCredentials.java 2016-02-11 09:27:02 +0000
@@ -762,9 +762,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
@@ -780,13 +780,13 @@
selfRegistered = userCredentials.isSelfRegistered();
disabled = userCredentials.isDisabled();
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
openId = userCredentials.getOpenId();
ldapId = userCredentials.getLdapId();
userInfo = userCredentials.getUserInfo();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
openId = userCredentials.getOpenId() == null ? openId : userCredentials.getOpenId();
ldapId = userCredentials.getLdapId() == null ? ldapId : userCredentials.getLdapId();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserGroup.java 2016-02-11 09:27:02 +0000
@@ -214,9 +214,9 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRule.java 2016-02-11 09:27:02 +0000
@@ -435,21 +435,21 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ValidationRule validationRule = (ValidationRule) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = validationRule.getDescription();
operator = validationRule.getOperator();
periodType = validationRule.getPeriodType();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = validationRule.getDescription() == null ? description : validationRule.getDescription();
operator = validationRule.getOperator() == null ? operator : validationRule.getOperator();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleGroup.java 2016-02-11 09:27:02 +0000
@@ -171,19 +171,19 @@
}
@Override
- public void mergeWith( IdentifiableObject other, MergeMode strategy )
+ public void mergeWith( IdentifiableObject other, MergeMode mergeMode )
{
- super.mergeWith( other, strategy );
+ super.mergeWith( other, mergeMode );
if ( other.getClass().isInstance( this ) )
{
ValidationRuleGroup validationRuleGroup = (ValidationRuleGroup) other;
- if ( strategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
description = validationRuleGroup.getDescription();
}
- else if ( strategy.isMerge() )
+ else if ( mergeMode.isMerge() )
{
description = validationRuleGroup.getDescription() == null ? description : validationRuleGroup.getDescription();
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java 2016-02-11 09:27:02 +0000
@@ -54,7 +54,7 @@
private ImportStrategy importStrategy = ImportStrategy.CREATE_AND_UPDATE;
- private MergeMode mergeStrategy = MergeMode.MERGE_IF_NOT_NULL;
+ private MergeMode mergeMode = MergeMode.MERGE_IF_NOT_NULL;
private boolean skipExistingCheck;
@@ -118,14 +118,14 @@
return importStrategy != null ? importStrategy : ImportStrategy.NEW_AND_UPDATES;
}
- public MergeMode getMergeStrategy()
+ public MergeMode getMergeMode()
{
- return mergeStrategy;
+ return mergeMode;
}
- public void setMergeStrategy( MergeMode mergeStrategy )
+ public void setMergeMode( MergeMode mergeMode )
{
- this.mergeStrategy = mergeStrategy;
+ this.mergeMode = mergeMode;
}
public boolean isSkipExistingCheck()
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/TrackedEntityInstance.java 2016-02-11 09:27:02 +0000
@@ -32,7 +32,6 @@
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
import org.apache.commons.lang3.StringUtils;
import org.hisp.dhis.common.DxfNamespaces;
@@ -50,7 +49,7 @@
private String trackedEntityInstance;
private String orgUnit;
-
+
private String created;
private String lastUpdated;
@@ -58,7 +57,7 @@
private List<Relationship> relationships = new ArrayList<>();
private List<Attribute> attributes = new ArrayList<>();
-
+
private Boolean inactive;
public TrackedEntityInstance()
@@ -114,7 +113,7 @@
{
this.orgUnit = orgUnit;
}
-
+
@JsonProperty( required = true )
@JacksonXmlProperty( isAttribute = true )
public String getCreated()
@@ -163,17 +162,19 @@
{
this.attributes = attributes;
}
-
+
@JsonProperty
@JacksonXmlElementWrapper( localName = "inactive", namespace = DxfNamespaces.DXF_2_0 )
@JacksonXmlProperty( localName = "inactive", namespace = DxfNamespaces.DXF_2_0 )
- public Boolean isInactive() {
- return inactive;
- }
+ public Boolean isInactive()
+ {
+ return inactive;
+ }
- public void setInactive(Boolean inactive) {
- this.inactive = inactive;
- }
+ public void setInactive( Boolean inactive )
+ {
+ this.inactive = inactive;
+ }
@Override
public boolean equals( Object o )
@@ -218,5 +219,5 @@
", attributes=" + attributes +
", inactive=" + inactive +
'}';
- }
+ }
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultMergeService.java 2016-02-11 09:27:02 +0000
@@ -47,7 +47,7 @@
@Override
@SuppressWarnings( { "rawtypes", "unchecked" } )
- public <T> void merge( T source, T target, MergeMode mergeStrategy )
+ public <T> void merge( T source, T target, MergeMode mergeMode )
{
if ( source == null || target == null )
{
@@ -82,11 +82,11 @@
{
Object sourceObject = ReflectionUtils.invokeMethod( source, property.getGetterMethod() );
- if ( mergeStrategy.isReplace() )
+ if ( mergeMode.isReplace() )
{
ReflectionUtils.invokeMethod( target, property.getSetterMethod(), sourceObject );
}
- else if ( mergeStrategy.isMerge() && sourceObject != null )
+ else if ( mergeMode.isMerge() && sourceObject != null )
{
ReflectionUtils.invokeMethod( target, property.getSetterMethod(), sourceObject );
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MergeService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MergeService.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/MergeService.java 2016-02-11 09:27:02 +0000
@@ -38,9 +38,9 @@
/**
* Merges source object into target object, requires a "schema friendly" class.
*
- * @param source Source object to merge from
- * @param target Target object to merge into
- * @param mergeStrategy Strategy to use
+ * @param source Source object to merge from
+ * @param target Target object to merge into
+ * @param mergeMode MergeMode to use
*/
- <T> void merge( T source, T target, MergeMode mergeStrategy );
+ <T> void merge( T source, T target, MergeMode mergeMode );
}
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2016-02-05 08:11:14 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2016-02-11 09:27:02 +0000
@@ -454,13 +454,13 @@
if ( !options.isSharing() )
{
User persistedObjectUser = persistedObject.getUser();
- persistedObject.mergeWith( object, options.getMergeStrategy() );
+ persistedObject.mergeWith( object, options.getMergeMode() );
// mergeService.merge( persistedObject, object, options.getMergeStrategy() );
persistedObject.setUser( persistedObjectUser );
}
else
{
- persistedObject.mergeWith( object, options.getMergeStrategy() );
+ persistedObject.mergeWith( object, options.getMergeMode() );
// mergeService.merge( persistedObject, object, options.getMergeStrategy() );
persistedObject.mergeSharingWith( object );
}
@@ -486,7 +486,7 @@
userService.encodeAndSetPassword( userCredentials, userCredentials.getPassword() );
}
- ((User) persistedObject).getUserCredentials().mergeWith( userCredentials, options.getMergeStrategy() );
+ ((User) persistedObject).getUserCredentials().mergeWith( userCredentials, options.getMergeMode() );
// mergeService.merge( ((User) persistedObject).getUserCredentials(), userCredentials, options.getMergeStrategy() );
reattachFields( ((User) persistedObject).getUserCredentials(), fieldsUserCredentials, user );
reattachCollectionFields( ((User) persistedObject).getUserCredentials(), collectionFieldsUserCredentials, user );
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2016-02-11 09:27:02 +0000
@@ -314,7 +314,7 @@
ImportOptions importOptions = new ImportOptions();
importOptions.setStrategy( ImportStrategy.UPDATE );
- importOptions.setMergeStrategy( MergeMode.MERGE );
+ importOptions.setMergeMode( MergeMode.MERGE );
ImportTypeSummary importTypeSummary = importService.importObject( currentUserService.getCurrentUser().getUid(), persistedObject, importOptions );
@@ -389,7 +389,7 @@
ImportOptions importOptions = new ImportOptions();
importOptions.setStrategy( ImportStrategy.UPDATE );
- importOptions.setMergeStrategy( MergeMode.MERGE );
+ importOptions.setMergeMode( MergeMode.MERGE );
ImportTypeSummary importTypeSummary = importService.importObject( currentUserService.getCurrentUser().getUid(), persistedObject, importOptions );
webMessageService.send( WebMessageUtils.importTypeSummary( importTypeSummary ), response, request );
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2016-02-11 09:27:02 +0000
@@ -134,7 +134,7 @@
mergeChart( newChart );
- chart.mergeWith( newChart, importOptions.getMergeStrategy() );
+ chart.mergeWith( newChart, importOptions.getMergeMode() );
chartService.updateChart( chart );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2016-02-11 09:27:02 +0000
@@ -129,7 +129,7 @@
mergeEventChart( newEventChart );
- eventChart.mergeWith( newEventChart, importOptions.getMergeStrategy() );
+ eventChart.mergeWith( newEventChart, importOptions.getMergeMode() );
eventChartService.updateEventChart( eventChart );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2016-02-11 09:27:02 +0000
@@ -110,7 +110,7 @@
mergeEventReport( newReport );
- report.mergeWith( newReport, importOptions.getMergeStrategy() );
+ report.mergeWith( newReport, importOptions.getMergeMode() );
eventReportService.updateEventReport( report );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/legend/LegendSetController.java 2016-02-11 09:27:02 +0000
@@ -96,7 +96,7 @@
LegendSet newLegendSet = renderService.fromJson( request.getInputStream(), LegendSet.class );
newLegendSet.getLegends().forEach( legendService::addLegend );
- legendSet.mergeWith( newLegendSet, importOptions.getMergeStrategy() );
+ legendSet.mergeWith( newLegendSet, importOptions.getMergeMode() );
legendService.updateLegendSet( legendSet );
}
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java 2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java 2016-02-11 09:27:02 +0000
@@ -158,7 +158,7 @@
mappingService.addMapView( view );
}
- map.mergeWith( newMap, importOptions.getMergeStrategy() );
+ map.mergeWith( newMap, importOptions.getMergeMode() );
if ( newMap.getUser() == null )
{
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java 2016-02-11 09:13:07 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java 2016-02-11 09:27:02 +0000
@@ -509,7 +509,7 @@
ImportOptions importOptions = new ImportOptions();
importOptions.setStrategy( ImportStrategy.CREATE );
- importOptions.setMergeStrategy( MergeMode.MERGE );
+ importOptions.setMergeMode( MergeMode.MERGE );
ImportTypeSummary importTypeSummary = importService.importObject( currentUserService.getCurrentUser().getUid(), user, importOptions );
if ( importTypeSummary.isStatus( ImportStatus.SUCCESS ) && importTypeSummary.getImportCount().getImported() == 1 )
