dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17923
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-01-09 10:42:04 +0700
message:
  minor fix
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java
  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-api/src/main/java/org/hisp/dhis/node/AbstractNode.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java	2015-01-09 03:27:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/AbstractNode.java	2015-01-09 03:42:04 +0000
@@ -158,6 +158,7 @@
         this.property = property;
     }
 
+    @Override
     public boolean haveProperty()
     {
         return property != null;

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java	2015-01-09 03:27:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/Node.java	2015-01-09 03:42:04 +0000
@@ -115,6 +115,11 @@
     Property getProperty();
 
     /**
+     * Is there a property associated with this Node.
+     */
+    boolean haveProperty();
+
+    /**
      * Adds a child to this node.
      *
      * @param child Child node to add

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java	2015-01-09 03:27:44 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/node/types/SimpleNode.java	2015-01-09 03:42:04 +0000
@@ -32,7 +32,6 @@
 import org.hisp.dhis.node.Node;
 import org.hisp.dhis.node.NodeType;
 import org.hisp.dhis.node.exception.InvalidTypeException;
-import org.hisp.dhis.schema.Property;
 
 /**
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>

=== 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:39:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/node/serializers/ExcelNodeSerializer.java	2015-01-09 03:42:04 +0000
@@ -155,24 +155,21 @@
                             XSSFCell cell = row.createCell( cellIdx++ );
                             cell.setCellValue( getValue( (SimpleNode) property ) );
 
-                            if ( property.getProperty() != null )
-                            {
-                                if ( PropertyType.URL.equals( property.getProperty().getPropertyType() ) )
-                                {
-                                    XSSFHyperlink hyperlink = creationHelper.createHyperlink( Hyperlink.LINK_URL );
-                                    hyperlink.setAddress( getValue( (SimpleNode) property ) );
-                                    hyperlink.setLabel( getValue( (SimpleNode) property ) );
-
-                                    cell.setHyperlink( hyperlink );
-                                }
-                                else if ( PropertyType.EMAIL.equals( property.getProperty().getPropertyType() ) )
-                                {
-                                    XSSFHyperlink hyperlink = creationHelper.createHyperlink( Hyperlink.LINK_EMAIL );
-                                    hyperlink.setAddress( getValue( (SimpleNode) property ) );
-                                    hyperlink.setLabel( getValue( (SimpleNode) property ) );
-
-                                    cell.setHyperlink( hyperlink );
-                                }
+                            if ( property.haveProperty() && PropertyType.URL.equals( property.getProperty().getPropertyType() ) )
+                            {
+                                XSSFHyperlink hyperlink = creationHelper.createHyperlink( Hyperlink.LINK_URL );
+                                hyperlink.setAddress( getValue( (SimpleNode) property ) );
+                                hyperlink.setLabel( getValue( (SimpleNode) property ) );
+
+                                cell.setHyperlink( hyperlink );
+                            }
+                            else if ( property.haveProperty() && PropertyType.EMAIL.equals( property.getProperty().getPropertyType() ) )
+                            {
+                                XSSFHyperlink hyperlink = creationHelper.createHyperlink( Hyperlink.LINK_EMAIL );
+                                hyperlink.setAddress( getValue( (SimpleNode) property ) );
+                                hyperlink.setLabel( getValue( (SimpleNode) property ) );
+
+                                cell.setHyperlink( hyperlink );
                             }
                         }
                     }