← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #23450

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 11411: Upgraded jasperreports and jfreechart versions

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 11411
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-07-16 16:06:13 +0200
message:
  Upgraded jasperreports and jfreechart versions
modified:
  dhis-2/dhis-api/pom.xml
  dhis-2/dhis-dxf2/pom.xml
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFieldCell.java
  dhis-2/dhis-services/dhis-service-reporting/pom.xml
  dhis-2/dhis-support/dhis-support-system/pom.xml
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/PDFFormController.java
  dhis-2/dhis-web/dhis-web-commons/pom.xml
  dhis-2/pom.xml


--
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/pom.xml'
--- dhis-2/dhis-api/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-api/pom.xml	2013-07-16 14:06:13 +0000
@@ -32,7 +32,7 @@
       <artifactId>commons-collections</artifactId>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
+      <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-dxf2/pom.xml'
--- dhis-2/dhis-dxf2/pom.xml	2013-06-26 15:48:29 +0000
+++ dhis-2/dhis-dxf2/pom.xml	2013-07-16 14:06:13 +0000
@@ -49,6 +49,10 @@
       <artifactId>javacsv</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.lowagie</groupId>
+      <artifactId>itext</artifactId>
+    </dependency>
+    <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
     </dependency>

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java	2013-07-13 04:26:58 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfDataEntryFormUtil.java	2013-07-16 14:06:13 +0000
@@ -53,7 +53,6 @@
 /**
  * @author James Chang
  */
-
 public class PdfDataEntryFormUtil
 {
     public static final int DATATYPE_DATASET = 0;
@@ -145,11 +144,6 @@
         }
     }
 
-//  public static PdfPCell getPdfPCell( float minHeight )
-//  {
-//      return getPdfPCell( minHeight, CELL_COLUMN_TYPE_LABEL );
-//  }
-
     public static PdfPCell getPdfPCell( boolean hasBorder )
     {
         return getPdfPCell( CELL_MIN_HEIGHT_DEFAULT, CELL_COLUMN_TYPE_ENTRYFIELD, hasBorder );
@@ -174,24 +168,24 @@
 
         switch ( cellContentType )
         {
-        case CELL_COLUMN_TYPE_ENTRYFIELD:
-            cell.setHorizontalAlignment( Element.ALIGN_CENTER );
-            cell.setVerticalAlignment( Element.ALIGN_MIDDLE );
-
-            break;
-
-        case CELL_COLUMN_TYPE_HEADER:
-            cell.setHorizontalAlignment( Element.ALIGN_CENTER );
-            cell.setVerticalAlignment( Element.ALIGN_MIDDLE );
-
-            break;
-
-        case CELL_COLUMN_TYPE_LABEL:
-            cell.setHorizontalAlignment( Element.ALIGN_RIGHT );
-            cell.setVerticalAlignment( Element.ALIGN_TOP );
-
-        default:
-            break;
+            case CELL_COLUMN_TYPE_ENTRYFIELD:
+                cell.setHorizontalAlignment( Element.ALIGN_CENTER );
+                cell.setVerticalAlignment( Element.ALIGN_MIDDLE );
+    
+                break;
+    
+            case CELL_COLUMN_TYPE_HEADER:
+                cell.setHorizontalAlignment( Element.ALIGN_CENTER );
+                cell.setVerticalAlignment( Element.ALIGN_MIDDLE );
+    
+                break;
+    
+            case CELL_COLUMN_TYPE_LABEL:
+                cell.setHorizontalAlignment( Element.ALIGN_RIGHT );
+                cell.setVerticalAlignment( Element.ALIGN_TOP );
+    
+            default:
+                break;
         }
 
         return cell;

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFieldCell.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFieldCell.java	2013-07-13 04:26:58 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/pdfform/PdfFieldCell.java	2013-07-16 14:06:13 +0000
@@ -27,8 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Locale;
-
 import com.lowagie.text.Element;
 import com.lowagie.text.Phrase;
 import com.lowagie.text.Rectangle;

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/pom.xml'
--- dhis-2/dhis-services/dhis-service-reporting/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/pom.xml	2013-07-16 14:06:13 +0000
@@ -49,11 +49,11 @@
       <artifactId>jasperreports-fonts</artifactId>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
+      <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
+      <groupId>org.jfree</groupId>
       <artifactId>jcommon</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-support/dhis-support-system/pom.xml'
--- dhis-2/dhis-support/dhis-support-system/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-support/dhis-support-system/pom.xml	2013-07-16 14:06:13 +0000
@@ -45,7 +45,7 @@
       <artifactId>jasperreports-fonts</artifactId>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
+      <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
     </dependency>
     <dependency>

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/PDFFormController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/PDFFormController.java	2013-06-26 08:56:44 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/PDFFormController.java	2013-07-16 14:06:13 +0000
@@ -43,7 +43,6 @@
 import org.hisp.dhis.api.utils.ContextUtils.CacheStrategy;
 import org.hisp.dhis.api.utils.PdfDataEntryFormImportUtil;
 import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty;
-import org.hisp.dhis.dataset.DataSet;
 import org.hisp.dhis.dataset.DataSetService;
 import org.hisp.dhis.dxf2.datavalueset.DataValueSetService;
 import org.hisp.dhis.dxf2.metadata.ImportOptions;
@@ -54,7 +53,6 @@
 import org.hisp.dhis.i18n.I18nManagerException;
 import org.hisp.dhis.importexport.ImportStrategy;
 import org.hisp.dhis.period.Period;
-import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.program.ProgramStageService;
 import org.hisp.dhis.scheduling.TaskCategory;
 import org.hisp.dhis.scheduling.TaskId;

=== modified file 'dhis-2/dhis-web/dhis-web-commons/pom.xml'
--- dhis-2/dhis-web/dhis-web-commons/pom.xml	2013-05-31 08:27:38 +0000
+++ dhis-2/dhis-web/dhis-web-commons/pom.xml	2013-07-16 14:06:13 +0000
@@ -110,13 +110,9 @@
       <artifactId>jasperreports-fonts</artifactId>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
+      <groupId>org.jfree</groupId>
       <artifactId>jfreechart</artifactId>
     </dependency>
-    <dependency>
-      <groupId>jfree</groupId>
-      <artifactId>jcommon</artifactId>
-    </dependency>
   </dependencies>
   <properties>
     <rootDir>../../</rootDir>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2013-07-06 13:23:55 +0000
+++ dhis-2/pom.xml	2013-07-16 14:06:13 +0000
@@ -720,7 +720,7 @@
       <dependency>
         <groupId>net.sf.jasperreports</groupId>
         <artifactId>jasperreports</artifactId>
-        <version>4.7.1</version>
+        <version>5.2.0</version>
         <exclusions>
           <exclusion>
             <groupId>xalan</groupId>
@@ -738,9 +738,9 @@
         <version>4.0.0</version>
       </dependency>
       <dependency>
-        <groupId>jfree</groupId>
+        <groupId>org.jfree</groupId>
         <artifactId>jfreechart</artifactId>
-        <version>1.0.13</version>
+        <version>1.0.15</version>
         <exclusions>
           <exclusion>
             <groupId>gnujaxp</groupId>
@@ -749,9 +749,9 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>jfree</groupId>
+        <groupId>org.jfree</groupId>
         <artifactId>jcommon</artifactId>
-        <version>1.0.16</version>
+        <version>1.0.17</version>
         <exclusions>
           <exclusion>
             <groupId>gnujaxp</groupId>
  Thread Previous • Date Previous • • Thread Next