dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17924
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-01-09 10:45:28 +0700
message:
  minor, rename confusing property names
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/ExcelNodeSerializer.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-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/ExcelNodeSerializer.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/ExcelNodeSerializer.java	2015-01-09 03:42:04 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/ExcelNodeSerializer.java	2015-01-09 03:45:28 +0000
@@ -139,35 +139,35 @@
 
         int rowIdx = 1;
 
-        for ( Node child : rootNode.getChildren() )
+        for ( Node collectionNode : rootNode.getChildren() )
         {
-            if ( child.isCollection() )
+            if ( collectionNode.isCollection() )
             {
-                for ( Node node : child.getChildren() )
+                for ( Node complexNode : collectionNode.getChildren() )
                 {
                     XSSFRow row = sheet.createRow( rowIdx++ );
                     int cellIdx = 0;
 
-                    for ( Node property : node.getChildren() )
+                    for ( Node node : complexNode.getChildren() )
                     {
-                        if ( property.isSimple() )
+                        if ( node.isSimple() )
                         {
                             XSSFCell cell = row.createCell( cellIdx++ );
-                            cell.setCellValue( getValue( (SimpleNode) property ) );
+                            cell.setCellValue( getValue( (SimpleNode) node ) );
 
-                            if ( property.haveProperty() && PropertyType.URL.equals( property.getProperty().getPropertyType() ) )
+                            if ( node.haveProperty() && PropertyType.URL.equals( node.getProperty().getPropertyType() ) )
                             {
                                 XSSFHyperlink hyperlink = creationHelper.createHyperlink( Hyperlink.LINK_URL );
-                                hyperlink.setAddress( getValue( (SimpleNode) property ) );
-                                hyperlink.setLabel( getValue( (SimpleNode) property ) );
+                                hyperlink.setAddress( getValue( (SimpleNode) node ) );
+                                hyperlink.setLabel( getValue( (SimpleNode) node ) );
 
                                 cell.setHyperlink( hyperlink );
                             }
-                            else if ( property.haveProperty() && PropertyType.EMAIL.equals( property.getProperty().getPropertyType() ) )
+                            else if ( node.haveProperty() && PropertyType.EMAIL.equals( node.getProperty().getPropertyType() ) )
                             {
                                 XSSFHyperlink hyperlink = creationHelper.createHyperlink( Hyperlink.LINK_EMAIL );
-                                hyperlink.setAddress( getValue( (SimpleNode) property ) );
-                                hyperlink.setLabel( getValue( (SimpleNode) property ) );
+                                hyperlink.setAddress( getValue( (SimpleNode) node ) );
+                                hyperlink.setLabel( getValue( (SimpleNode) node ) );
 
                                 cell.setHyperlink( hyperlink );
                             }