dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14873
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-04-15 15:22:03 +0200
message:
  Fixed issue with merge methods in Chart, Map, MapView
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.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/MapView.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/chart/Chart.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2014-04-15 12:43:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/Chart.java	2014-04-15 13:22:03 +0000
@@ -597,20 +597,20 @@
         {
             Chart chart = (Chart) other;
 
-            domainAxisLabel = chart.getDomainAxisLabel() == null ? domainAxisLabel : chart.getDomainAxisLabel();
-            rangeAxisLabel = chart.getRangeAxisLabel() == null ? rangeAxisLabel : chart.getRangeAxisLabel();
-            type = chart.getType() == null ? type : chart.getType();
-            series = chart.getSeries() == null ? series : chart.getSeries();
-            category = chart.getCategory() == null ? category : chart.getCategory();
+            domainAxisLabel = chart.getDomainAxisLabel();
+            rangeAxisLabel = chart.getRangeAxisLabel();
+            type = chart.getType();
+            series = chart.getSeries();
+            category = chart.getCategory();
             hideLegend = chart.isHideLegend();
             regression = chart.isRegression();
             hideTitle = chart.isHideTitle();
             hideSubtitle = chart.isHideSubtitle();
-            title = chart.getTitle() == null ? title : chart.getTitle();
-            targetLineValue = chart.getTargetLineValue() == null ? targetLineValue : chart.getTargetLineValue();
-            targetLineLabel = chart.getTargetLineLabel() == null ? targetLineLabel : chart.getTargetLineLabel();
-            baseLineValue = chart.getBaseLineValue() == null ? baseLineValue : chart.getBaseLineValue();
-            baseLineLabel = chart.getBaseLineLabel() == null ? baseLineLabel : chart.getBaseLineLabel();
+            title = chart.getTitle();
+            targetLineValue = chart.getTargetLineValue();
+            targetLineLabel = chart.getTargetLineLabel();
+            baseLineValue = chart.getBaseLineValue();
+            baseLineLabel = chart.getBaseLineLabel();
             showData = chart.isShowData();
             hideEmptyRows = chart.isHideEmptyRows();
             rewindRelativePeriods = chart.isRewindRelativePeriods();

=== 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	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java	2014-04-15 13:22:03 +0000
@@ -145,10 +145,10 @@
         {
             Map map = (Map) other;
             
-            user = map.getUser() == null ? user : map.getUser();
-            longitude = map.getLongitude() == null ? longitude : map.getLongitude();
-            latitude = map.getLatitude() == null ? latitude : map.getLatitude();
-            zoom = map.getZoom() == null ? zoom : map.getZoom();
+            user = map.getUser();
+            longitude = map.getLongitude();
+            latitude = map.getLatitude();
+            zoom = map.getZoom();
             
             mapViews.clear();
             mapViews.addAll( map.getMapViews() );

=== 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	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/MapView.java	2014-04-15 13:22:03 +0000
@@ -392,18 +392,18 @@
         {
             MapView mapView = (MapView) other;
 
-            layer = mapView.getLayer() == null ? layer : mapView.getLayer();
-            method = mapView.getMethod() == null ? method : mapView.getMethod();
-            classes = mapView.getClasses() == null ? classes : mapView.getClasses();
-            colorLow = mapView.getColorLow() == null ? colorLow : mapView.getColorLow();
-            colorHigh = mapView.getColorHigh() == null ? colorHigh : mapView.getColorHigh();
-            legendSet = mapView.getLegendSet() == null ? legendSet : mapView.getLegendSet();
-            radiusLow = mapView.getRadiusLow() == null ? radiusLow : mapView.getRadiusLow();
-            radiusHigh = mapView.getRadiusHigh() == null ? radiusHigh : mapView.getRadiusHigh();
-            opacity = mapView.getOpacity() == null ? opacity : mapView.getOpacity();
-            organisationUnitGroupSet = mapView.getOrganisationUnitGroupSet() == null ? organisationUnitGroupSet : mapView.getOrganisationUnitGroupSet();
-            areaRadius = mapView.getAreaRadius() == null ? areaRadius : mapView.getAreaRadius();
-            hidden = mapView.getHidden() == null ? hidden : mapView.getHidden();
+            layer = mapView.getLayer();
+            method = mapView.getMethod();
+            classes = mapView.getClasses();
+            colorLow = mapView.getColorLow();
+            colorHigh = mapView.getColorHigh();
+            legendSet = mapView.getLegendSet();
+            radiusLow = mapView.getRadiusLow();
+            radiusHigh = mapView.getRadiusHigh();
+            opacity = mapView.getOpacity();
+            organisationUnitGroupSet = mapView.getOrganisationUnitGroupSet();
+            areaRadius = mapView.getAreaRadius();
+            hidden = mapView.getHidden();
         }
     }
 }