dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20823
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-21 13:30:24 +0200
message:
  Enums, minor
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.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/DisplayDensity.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java	2015-09-15 11:43:48 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DisplayDensity.java	2015-10-21 11:30:24 +0000
@@ -33,5 +33,5 @@
  */
 public enum DisplayDensity
 {
-    COMFORTABLE, NORMAL, COMPACT, NONE;
+    COMFORTABLE, NORMAL, COMPACT, NONE
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java	2015-09-15 10:40:23 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/FontSize.java	2015-10-21 11:30:24 +0000
@@ -33,5 +33,5 @@
  */
 public enum FontSize
 {
-    LARGE, NORMAL, SMALL;
+    LARGE, NORMAL, SMALL
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java	2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/ConfigurationService.java	2015-10-21 11:30:24 +0000
@@ -1,5 +1,7 @@
 package org.hisp.dhis.configuration;
 
+import java.util.Set;
+
 /*
  * Copyright (c) 2004-2015, University of Oslo
  * All rights reserved.
@@ -35,7 +37,24 @@
 {
     String ID = ConfigurationService.class.getName();
     
+    /**
+     * Sets the configuration.
+     * 
+     * @param configuration the configuration.
+     */
     void setConfiguration( Configuration configuration );
     
+    /**
+     * Gets the configuration.
+     * 
+     * @return the configuration.
+     */
     Configuration getConfiguration();
+    
+    /**
+     * Gets the CORS white list inside a transaction.
+     * 
+     * @return the CORS white list.
+     */
+    Set<String> getCorsWhitelist();
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java	2015-09-15 10:26:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemShape.java	2015-10-21 11:30:24 +0000
@@ -33,5 +33,5 @@
  */
 public enum DashboardItemShape
 {
-    NORMAL, DOUBLE_WIDTH, FULL_WIDTH;
+    NORMAL, DOUBLE_WIDTH, FULL_WIDTH
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java	2015-09-15 10:15:00 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dashboard/DashboardItemType.java	2015-10-21 11:30:24 +0000
@@ -33,7 +33,7 @@
  */
 public enum DashboardItemType
 {
-    CHART, EVENT_CHART, MAP, REPORT_TABLE, EVENT_REPORT, USERS, 
-    REPORTS, RESOURCES, MESSAGES;
-
+    CHART, EVENT_CHART, MAP, REPORT_TABLE, 
+    EVENT_REPORT, USERS, REPORTS, 
+    RESOURCES, MESSAGES
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java	2015-09-14 10:33:55 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportType.java	2015-10-21 11:30:24 +0000
@@ -33,5 +33,5 @@
  */
 public enum ReportType
 {
-    JASPER_REPORT_TABLE, JASPER_JDBC, HTML;
+    JASPER_REPORT_TABLE, JASPER_JDBC, HTML
 }