dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13884
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-01-28 14:20:49 +0200
message:
  Reduced title font size for PNG maps and charts
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java
  dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/Legend.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.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-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java	2013-08-23 16:00:30 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/dataintegrity/DefaultDataIntegrityService.java	2014-01-28 12:20:49 +0000
@@ -440,7 +440,7 @@
         {
             parent = unit;
 
-            while ( (parent = parent.getParent()) != null )
+            while ( ( parent = parent.getParent() ) != null )
             {
                 if ( parent.equals( unit ) ) // Cyclic reference
                 {

=== modified file 'dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/Legend.java'
--- dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/Legend.java	2013-10-16 09:44:07 +0000
+++ dhis-2/dhis-services/dhis-service-mapgeneration/src/main/java/org/hisp/dhis/mapgeneration/Legend.java	2014-01-28 12:20:49 +0000
@@ -45,7 +45,7 @@
  */
 public class Legend
 {
-    public static final Font TITLE_FONT = new Font( "title", Font.BOLD, 14 );
+    public static final Font TITLE_FONT = new Font( "title", Font.BOLD, 12 );
     public static final Font PLAIN_FONT = new Font( "plain", Font.PLAIN, 10 );
 
     private InternalMapLayer mapLayer;

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-12-19 18:12:57 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2014-01-28 12:20:49 +0000
@@ -105,9 +105,9 @@
 public class DefaultChartService
     implements ChartService
 {
-    private static final Font titleFont = new Font( Font.SANS_SERIF, Font.BOLD, 15 );
+    private static final Font titleFont = new Font( Font.SANS_SERIF, Font.BOLD, 12 );
 
-    private static final Font subTitleFont = new Font( Font.SANS_SERIF, Font.PLAIN, 12 );
+    private static final Font subTitleFont = new Font( Font.SANS_SERIF, Font.PLAIN, 11 );
 
     private static final Font labelFont = new Font( Font.SANS_SERIF, Font.PLAIN, 10 );