dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Lars Helge Øverland (larshelge)
------------------------------------------------------------
revno: 21908 [merge]
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-02-08 16:37:12 +0100
message:
  Javadoc
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatIdentifier.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/SchedulingManager.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties


--
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/preheat/PreheatIdentifier.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatIdentifier.java	2016-02-01 07:10:53 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/PreheatIdentifier.java	2016-02-08 15:37:12 +0000
@@ -50,6 +50,7 @@
      */
     AUTO;
 
+    @SuppressWarnings("incomplete-switch")
     <T extends IdentifiableObject> String getIdentifier( T object )
     {
         switch ( this )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java	2016-01-20 00:58:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/hibernate/HibernateOrganisationUnitStore.java	2016-02-08 15:37:12 +0000
@@ -283,7 +283,6 @@
     }
 
     @Override
-    @SuppressWarnings( "unchecked" )
     public void updatePaths()
     {
         getQuery( "from OrganisationUnit ou where ou.path is null or ou.hierarchyLevel is null" ).list();

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/SchedulingManager.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/SchedulingManager.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/scheduling/SchedulingManager.java	2016-02-08 15:37:12 +0000
@@ -52,9 +52,12 @@
     void scheduleTasks();
     
     /**
-     * Schedules the given tasks.
+     * Schedules the given tasks. The task map will replace the currently scheduled
+     * tasks.
      * 
-     * @param cronKeyMap a mapping of cron expressions and task keys.
+     * @param cronKeyMap a mapping of cron expressions and list of task keys. A
+     * task key refers to a bean identifier in the application context. The bean
+     * must implement Runnable in order to be scheduled for execution.
      */
     void scheduleTasks( ListMap<String, String> cronKeyMap );
     
@@ -70,7 +73,7 @@
     ListMap<String, String> getCronKeyMap();
     
     /**
-     * Gets all keys currenty scheduled for any task.
+     * Gets all keys currently scheduled for any task.
      */
     Set<String> getScheduledKeys();
     

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2015-11-10 16:19:38 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/hibernate-default.properties	2016-02-08 15:37:12 +0000
@@ -20,7 +20,7 @@
 
 # See c3p0-config.xml
 # hibernate.c3p0.min_size = 3
-# hibernate.c3p0.max_size = 20
+# hibernate.c3p0.max_size = 100
 # hibernate.c3p0.acquire_increment = 2
 # hibernate.c3p0.timeout = 5000
 # hibernate.c3p0.max_statements = 50