dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8450
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-09 12:30:12 +0200
message:
  Changed explicit tahoma font with logical sans serif font for server side charts
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.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-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java	2012-06-14 17:36:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseIdentifiableObject.java	2012-10-09 10:30:12 +0000
@@ -308,10 +308,6 @@
     {
         Validate.notNull( other );
 
-        // since we are using these objects as db objects, i don't really think we want to "merge"
-        // with other.id, since .id is used by the underlying db.
-        // this.id = other.getId() == 0 ? this.id : other.getId();
-
         this.uid = other.getUid() == null ? this.uid : other.getUid();
         this.name = other.getName() == null ? this.name : other.getName();
         this.code = other.getCode() == null ? this.code : other.getCode();

=== 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	2012-07-31 18:18:33 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2012-10-09 10:30:12 +0000
@@ -107,11 +107,11 @@
 public class DefaultChartService
     implements ChartService
 {
-    private static final Font titleFont = new Font( "Tahoma", Font.BOLD, 15 );
-
-    private static final Font subTitleFont = new Font( "Tahoma", Font.PLAIN, 12 );
-
-    private static final Font labelFont = new Font( "Tahoma", Font.PLAIN, 10 );
+    private static final Font titleFont = new Font( Font.SANS_SERIF, Font.BOLD, 15 );
+
+    private static final Font subTitleFont = new Font( Font.SANS_SERIF, Font.PLAIN, 12 );
+
+    private static final Font labelFont = new Font( Font.SANS_SERIF, Font.PLAIN, 10 );
 
     private static final String TREND_PREFIX = "Trend - ";