dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 37
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Tue 2009-03-10 15:47:17 +0100
message:
  Fixed bug leading to nullpointerexception in PDF export.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/util/PDFPrintUtil.java
  dhis-2/dhis-web/dhis-web-portal/pom.xml

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/util/PDFPrintUtil.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/util/PDFPrintUtil.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/util/PDFPrintUtil.java	2009-03-10 14:47:17 +0000
@@ -50,7 +50,7 @@
     
     public static void printDataElementFrontPage( Document document, ExportParams exportParams )
     {
-        if ( exportParams.getDataElements().size() > 0 )
+        if ( exportParams.getDataElements() == null || exportParams.getDataElements().size() > 0 )
         {
             I18n i18n = exportParams.getI18n();
             
@@ -62,7 +62,7 @@
     
     public static void printIndicatorFrontPage( Document document, ExportParams exportParams )
     {
-        if ( exportParams.getIndicators().size() > 0 )
+        if ( exportParams.getIndicators() == null || exportParams.getIndicators().size() > 0 )
         {
             I18n i18n = exportParams.getI18n();
             
@@ -74,7 +74,7 @@
 
     public static void printDataElementConceptFrontPage( Document document, ExportParams exportParams )
     {
-        if ( exportParams.getIndicators().size() > 0 )
+        if ( exportParams.getIndicators() == null || exportParams.getIndicators().size() > 0 )
         {
             I18n i18n = exportParams.getI18n();
             
@@ -86,7 +86,7 @@
 
     public static void printOrganisationUnitHierarchyFrontPage( Document document, ExportParams exportParams )
     {
-        if ( exportParams.getOrganisationUnits().size() > 0 )
+        if ( exportParams.getOrganisationUnits() == null || exportParams.getOrganisationUnits().size() > 0 )
         {
             I18n i18n = exportParams.getI18n();
             
@@ -98,7 +98,7 @@
     
     public static void printOrganisationUnitFrontPage( Document document, ExportParams exportParams )
     {
-        if ( exportParams.getOrganisationUnits().size() > 0 )
+        if ( exportParams.getOrganisationUnits() == null || exportParams.getOrganisationUnits().size() > 0 )
         {
             I18n i18n = exportParams.getI18n();
             

=== modified file 'dhis-2/dhis-web/dhis-web-portal/pom.xml'
--- dhis-2/dhis-web/dhis-web-portal/pom.xml	2009-03-10 06:34:55 +0000
+++ dhis-2/dhis-web/dhis-web-portal/pom.xml	2009-03-10 14:47:17 +0000
@@ -146,38 +146,33 @@
       <version>${version}</version>
       <type>war</type>
     </dependency>
-    <!--
+    
+    <!-- India modules -->
+    
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-dashboard</artifactId>
       <version>${version}</version>
       <type>war</type>
     </dependency>
-    -->
-    <!--
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-dataentry-national</artifactId>
       <version>${version}</version>
       <type>war</type>
     </dependency>
-    -->
-    <!--
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-reports-national</artifactId>
       <version>${version}</version>
       <type>war</type>
     </dependency>
-    -->
-    <!--
     <dependency>
       <groupId>org.hisp.dhis</groupId>
       <artifactId>dhis-web-validationrule-local-in</artifactId>
       <version>${version}</version>
       <type>war</type>
     </dependency>
-    -->
     
     <!-- Other -->
     



--

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.