← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19245: Tracker, code style

 

------------------------------------------------------------
revno: 19245
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2015-06-02 12:18:48 +0200
message:
  Tracker, code style
modified:
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/EventReportDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageDataElementService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageSectionService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/EventStatusUserType.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageSectionDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipTypeService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeGroupService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAuditService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityAuditStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueDeletionHandler.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitycomment/DefaultTrackedEntityCommentService.java
  dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitydatavalue/hibernate/HibernateTrackedEntityDataValueStore.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/programrule/ProgramRuleVariableStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitycomment/TrackedEntityCommentServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java
  dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.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-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java	2015-02-22 20:02:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventchart/EventChartDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -37,7 +37,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id$
  */
 public class EventChartDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/EventReportDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/EventReportDeletionHandler.java	2015-02-22 20:02:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/eventreport/EventReportDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -37,7 +37,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id$
  */
 public class EventReportDeletionHandler
     extends DeletionHandler
@@ -63,6 +62,7 @@
     public void deleteProgramStage( ProgramStage programStage )
     {
         Collection<EventReport> charts = eventReportService.getAllEventReprots();
+        
         for( EventReport chart : charts )
         {
             if( chart.getProgramStage().equals( programStage ))
@@ -76,6 +76,7 @@
     public void deleteProgram( Program program )
     {
         Collection<EventReport> charts = eventReportService.getAllEventReprots();
+        
         for( EventReport chart : charts )
         {
             if( chart.getProgram().equals( program ))

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2015-03-30 09:30:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2015-06-02 10:18:48 +0000
@@ -45,7 +45,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ DefaultProgramDataEntryService.java May 26, 2011 3:59:43 PM $
  */
 public class DefaultProgramDataEntryService
     implements ProgramDataEntryService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java	2015-03-06 11:40:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java	2015-06-02 10:18:48 +0000
@@ -49,8 +49,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version DefaultProgramExpressionService.java 3:06:24 PM Nov 8, 2012 $
  */
 @Transactional
 public class DefaultProgramExpressionService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java	2015-05-28 15:04:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramService.java	2015-06-02 10:18:48 +0000
@@ -48,7 +48,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 @Transactional
 public class DefaultProgramService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageDataElementService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageDataElementService.java	2015-03-30 09:30:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageDataElementService.java	2015-06-02 10:18:48 +0000
@@ -35,7 +35,6 @@
 
 /**
  * @author Viet Nguyen
- * @version $Id$
  */
 @Transactional
 public class DefaultProgramStageDataElementService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageSectionService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageSectionService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramStageSectionService.java	2015-06-02 10:18:48 +0000
@@ -35,8 +35,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version DefaultProgramStageSectionService.java 11:19:35 AM Aug 22, 2012 $
  */
 @Transactional
 public class DefaultProgramStageSectionService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2015-03-06 11:40:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2015-06-02 10:18:48 +0000
@@ -48,7 +48,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ DefaultProgramValidationService.java Apr 28, 2011 10:36:50 AM $
  */
 @Transactional
 public class DefaultProgramValidationService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/EventStatusUserType.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/EventStatusUserType.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/EventStatusUserType.java	2015-06-02 10:18:48 +0000
@@ -33,11 +33,9 @@
 
 /**
  * @author Chau Thu Tran
- *
- * @version $ EventStatusUserType.java Jun 20, 2014 7:38:45 PM $
  */
 public class EventStatusUserType
-extends EnumUserType<EventStatus>
+    extends EnumUserType<EventStatus>
 {
   public  EventStatusUserType()
   {

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java	2015-03-06 11:40:00 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -36,8 +36,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ ProgramDataEntryDeletionHandler.java Aug 25, 2011 3:02:00 PM $
- * 
  */
 public class ProgramDataEntryFormDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramInstanceDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -40,7 +40,6 @@
 
 /**
  * @author Quang Nguyen
- * @version $Id$
  */
 public class ProgramInstanceDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDataElementDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -36,8 +36,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version ProgramStageDataElementDeletionHandler.java Oct 5, 2010 11:06:03 PM
  */
 public class ProgramStageDataElementDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -32,6 +32,9 @@
 
 import org.hisp.dhis.system.deletion.DeletionHandler;
 
+/**
+ * @author Lars Helge Overland
+ */
 public class ProgramStageDeletionHandler
     extends DeletionHandler
 {

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageInstanceDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -34,9 +34,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $Id: ProgramStageInstanceDeletionHandler.java Nov 30, 2011 10:20:41
- *          AM $
  */
 public class ProgramStageInstanceDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageSectionDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageSectionDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramStageSectionDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -32,8 +32,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version ProgramStageSectionDeletionHandler.java 3:14:59 PM Oct 1, 2012 $
  */
 public class ProgramStageSectionDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramValidationDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -34,8 +34,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ ProgramValidationDeletionHandler.java Aug 25, 2011 12:55:08 PM $
- * 
  */
 public class ProgramValidationDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java	2015-06-02 10:18:48 +0000
@@ -37,7 +37,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ HibernateProgramStageStore.java Apr 8, 2013 1:30:00 PM $
  */
 public class HibernateProgramStageSectionStore
     extends HibernateIdentifiableObjectStore<ProgramStageSection>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageStore.java	2015-06-02 10:18:48 +0000
@@ -36,7 +36,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ HibernateProgramStageStore.java Apr 8, 2013 1:30:00 PM $
  */
 public class HibernateProgramStageStore
     extends HibernateIdentifiableObjectStore<ProgramStage>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramValidationStore.java	2015-06-02 10:18:48 +0000
@@ -38,7 +38,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ HibernateProgramValidationStore.java Apr 28, 2011 10:43:09 AM $
  */
 public class HibernateProgramValidationStore
     extends HibernateIdentifiableObjectStore<ProgramValidation>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java	2015-02-19 09:54:46 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipService.java	2015-06-02 10:18:48 +0000
@@ -36,7 +36,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 @Transactional
 public class DefaultRelationshipService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipTypeService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipTypeService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/DefaultRelationshipTypeService.java	2015-06-02 10:18:48 +0000
@@ -37,7 +37,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 @Transactional
 public class DefaultRelationshipTypeService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/RelationshipDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -35,8 +35,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version RelationshipDeletionHandler.java Sep 30, 2010 1:20:23 PM
  */
 public class RelationshipDeletionHandler
     extends DeletionHandler
@@ -75,6 +73,5 @@
                 relationshipSevice.deleteRelationship( relationship );
             }
         }
-    }
-    
+    }    
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/relationship/hibernate/HibernateRelationshipStore.java	2015-06-02 10:18:48 +0000
@@ -39,7 +39,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 public class HibernateRelationshipStore
     extends HibernateGenericStore<Relationship>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeGroupService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeGroupService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAttributeGroupService.java	2015-06-02 10:18:48 +0000
@@ -38,7 +38,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id$
  */
 @Transactional
 public class DefaultTrackedEntityAttributeGroupService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAuditService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAuditService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityAuditService.java	2015-06-02 10:18:48 +0000
@@ -39,8 +39,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version DefaultTrackedEntityAuditService.java 9:08:54 AM Sep 26, 2012 $
  */
 @Transactional
 public class DefaultTrackedEntityAuditService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityFormService.java	2015-06-02 10:18:48 +0000
@@ -46,8 +46,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version DefaultTrackedEntityFormService.java 9:44:29 AM Jan 31, 2013 $
  */
 @Transactional
 public class DefaultTrackedEntityFormService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityInstanceReminderService.java	2015-06-02 10:18:48 +0000
@@ -50,9 +50,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ DefaultTrackedEntityInstanceReminderService.java Aug 7, 2013
- *          9:54:59 AM $
  */
 public class DefaultTrackedEntityInstanceReminderService
     implements TrackedEntityInstanceReminderService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/DefaultTrackedEntityService.java	2015-06-02 10:18:48 +0000
@@ -35,7 +35,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ DefaultTrackedEntityService.java Feb 15, 2014 7:28:41 PM $
  */
 @Transactional
 public class DefaultTrackedEntityService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -34,6 +34,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 
+/**
+ * @author Chau Thu Tran
+ */
 public class TrackedEntityInstanceDeletionHandler
     extends DeletionHandler
 {

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityAuditStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityAuditStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityAuditStore.java	2015-06-02 10:18:48 +0000
@@ -40,8 +40,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version HibernateTrackedEntityAuditStore.java 9:12:20 AM Sep 26, 2012 $
  */
 public class HibernateTrackedEntityAuditStore
     extends HibernateGenericStore<TrackedEntityAudit>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityStore.java	2015-03-08 13:34:06 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityStore.java	2015-06-02 10:18:48 +0000
@@ -32,9 +32,11 @@
 import org.hisp.dhis.trackedentity.TrackedEntity;
 import org.hisp.dhis.trackedentity.TrackedEntityStore;
 
+/**
+ * @author Lars Helge Overland
+ */
 public class HibernateTrackedEntityStore
     extends HibernateIdentifiableObjectStore<TrackedEntity>
     implements TrackedEntityStore
 {
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/DefaultTrackedEntityAttributeValueService.java	2015-06-02 10:18:48 +0000
@@ -36,7 +36,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 @Transactional
 public class DefaultTrackedEntityAttributeValueService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueDeletionHandler.java	2015-06-02 10:18:48 +0000
@@ -37,9 +37,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version TrackedEntityAttributeValueDeletionHandler.java Sep 30, 2010 1:34:28
- *          PM
  */
 public class TrackedEntityAttributeValueDeletionHandler
     extends DeletionHandler

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentityattributevalue/hibernate/HibernateTrackedEntityAttributeValueStore.java	2015-06-02 10:18:48 +0000
@@ -42,7 +42,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 public class HibernateTrackedEntityAttributeValueStore
     extends HibernateGenericStore<TrackedEntityAttributeValue>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitycomment/DefaultTrackedEntityCommentService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitycomment/DefaultTrackedEntityCommentService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitycomment/DefaultTrackedEntityCommentService.java	2015-06-02 10:18:48 +0000
@@ -32,8 +32,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version DefaultTrackedEntityCommentService.java 9:45:40 AM Aug 17, 2012 $
  */
 public class DefaultTrackedEntityCommentService
     implements TrackedEntityCommentService

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitydatavalue/hibernate/HibernateTrackedEntityDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitydatavalue/hibernate/HibernateTrackedEntityDataValueStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentitydatavalue/hibernate/HibernateTrackedEntityDataValueStore.java	2015-06-02 10:18:48 +0000
@@ -44,7 +44,6 @@
 
 /**
  * @author Abyot Asalefew Gizaw
- * @version $Id$
  */
 public class HibernateTrackedEntityDataValueStore
     extends HibernateGenericStore<TrackedEntityDataValue>

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java	2015-03-30 09:30:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramDataEntryServiceTest.java	2015-06-02 10:18:48 +0000
@@ -46,7 +46,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id$
  */
 public class ProgramDataEntryServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java	2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramExpressionServiceTest.java	2015-06-02 10:18:48 +0000
@@ -53,7 +53,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $Id$
  */
 public class ProgramExpressionServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceServiceTest.java	2015-06-02 10:18:48 +0000
@@ -54,8 +54,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramInstanceServiceTest.java Nov 13, 2013 1:34:55 PM $
  */
 public class ProgramInstanceServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramInstanceStoreTest.java	2015-06-02 10:18:48 +0000
@@ -49,8 +49,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramInstanceStoreTest.java Nov 13, 2013 1:34:55 PM $
  */
 public class ProgramInstanceStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java	2015-06-02 10:18:48 +0000
@@ -46,7 +46,6 @@
 
 /**
  * @author Lars Helge Overland
- * @version $Id$
  */
 public class ProgramServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java	2015-03-30 09:30:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementServiceTest.java	2015-06-02 10:18:48 +0000
@@ -46,8 +46,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageDataElementServiceTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageDataElementServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java	2015-03-30 09:30:54 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageDataElementStoreTest.java	2015-06-02 10:18:48 +0000
@@ -46,8 +46,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageDataElementServiceTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageDataElementStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceServiceTest.java	2015-06-02 10:18:48 +0000
@@ -62,8 +62,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageInstanceServiceTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageInstanceServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageInstanceStoreTest.java	2015-06-02 10:18:48 +0000
@@ -53,8 +53,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageInstanceStoreTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageInstanceStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionServiceTest.java	2015-06-02 10:18:48 +0000
@@ -47,8 +47,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageSectionServiceTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageSectionServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageSectionStoreTest.java	2015-06-02 10:18:48 +0000
@@ -45,8 +45,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageSectionStoreTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageSectionStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageServiceTest.java	2015-06-02 10:18:48 +0000
@@ -42,8 +42,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageServiceTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStageStoreTest.java	2015-06-02 10:18:48 +0000
@@ -41,8 +41,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStageStoreTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStageStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramStoreTest.java	2015-06-02 10:18:48 +0000
@@ -42,8 +42,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramStoreTest.java Nov 14, 2013 4:22:27 PM $
  */
 public class ProgramStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java	2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationServiceTest.java	2015-06-02 10:18:48 +0000
@@ -53,8 +53,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramValidationServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class ProgramValidationServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/program/ProgramValidationStoreTest.java	2015-06-02 10:18:48 +0000
@@ -44,8 +44,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ ProgramValidationServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class ProgramValidationStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/programrule/ProgramRuleVariableStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/programrule/ProgramRuleVariableStoreTest.java	2015-03-13 08:24:36 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/programrule/ProgramRuleVariableStoreTest.java	2015-06-02 10:18:48 +0000
@@ -27,6 +27,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipServiceTest.java	2015-06-02 10:18:48 +0000
@@ -45,8 +45,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ RelationshipServiceTest.java Nov 13, 2013 1:34:55 PM $
  */
 public class RelationshipServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipStoreTest.java	2015-06-02 10:18:48 +0000
@@ -43,8 +43,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ RelationshipStoreTest.java Nov 13, 2013 1:34:55 PM $
  */
 public class RelationshipStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeServiceTest.java	2015-06-02 10:18:48 +0000
@@ -39,8 +39,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ RelationshipTypeServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class RelationshipTypeServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/relationship/RelationshipTypeStoreTest.java	2015-06-02 10:18:48 +0000
@@ -36,8 +36,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ RelationshipTypeServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class RelationshipTypeStoreTest
     extends DhisSpringTest
@@ -59,5 +57,4 @@
         relationshipTypeStore.save( relationshipTypeA );
         assertEquals( relationshipTypeA, relationshipTypeStore.getRelationshipType( "aIsToB", "bIsToA" ) );
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeGroupServiceTest.java	2015-06-02 10:18:48 +0000
@@ -42,8 +42,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAttributeGroupServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class TrackedEntityAttributeGroupServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeServiceTest.java	2015-06-02 10:18:48 +0000
@@ -41,8 +41,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAttributeServiceTest.java Nov 5, 2013 3:42:42 PM $
  */
 public class TrackedEntityAttributeServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAttributeStoreTest.java	2015-06-02 10:18:48 +0000
@@ -43,8 +43,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAttributeStoreTest.java Nov 5, 2013 04:21:02 PM $
  */
 public class TrackedEntityAttributeStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditServiceTest.java	2015-06-02 10:18:48 +0000
@@ -45,8 +45,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAuditServiceTest.java Nov 6, 2013 8:52:24 AM $
  */
 public class TrackedEntityAuditServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityAuditStoreTest.java	2015-06-02 10:18:48 +0000
@@ -43,8 +43,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAuditStoreTest.java Nov 6, 2013 8:52:24 AM $
  */
 public class TrackedEntityAuditStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormServiceTest.java	2015-06-02 10:18:48 +0000
@@ -49,8 +49,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityFormServiceTest.java Nov 8, 2013 10:07:30 AM $
  */
 public class TrackedEntityFormServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityFormStoreTest.java	2015-06-02 10:18:48 +0000
@@ -45,8 +45,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityFormStoreTest.java Nov 8, 2013 10:07:30 AM $
  */
 public class TrackedEntityFormStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java	2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceReminderServiceTest.java	2015-06-02 10:18:48 +0000
@@ -56,9 +56,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityInstanceReminderServiceTest.java Nov 5, 2013 3:11:48
- *          PM $
  */
 public class TrackedEntityInstanceReminderServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentity/TrackedEntityInstanceServiceTest.java	2015-06-02 10:18:48 +0000
@@ -52,8 +52,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityInstanceServiceTest.java Nov 5, 2013 10:35:31 AM $
  */
 public class TrackedEntityInstanceServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueServiceTest.java	2015-06-02 10:18:48 +0000
@@ -48,8 +48,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAttributeValueServiceTest.java Nov 11, 2013 9:45:10 AM $
  */
 public class TrackedEntityAttributeValueServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentityattributevalue/TrackedEntityAttributeValueStoreTest.java	2015-06-02 10:18:48 +0000
@@ -48,8 +48,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityAttributeValueStoreTest.java Nov 11, 2013 9:45:10 AM $
  */
 public class TrackedEntityAttributeValueStoreTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitycomment/TrackedEntityCommentServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitycomment/TrackedEntityCommentServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitycomment/TrackedEntityCommentServiceTest.java	2015-06-02 10:18:48 +0000
@@ -40,8 +40,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityCommentServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class TrackedEntityCommentServiceTest
     extends DhisSpringTest
@@ -112,5 +110,4 @@
         assertEquals( commentA, commentService.getTrackedEntityComment( idA ) );
         assertEquals( commentB, commentService.getTrackedEntityComment( idB ) );
     }
-
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java	2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueServiceTest.java	2015-06-02 10:18:48 +0000
@@ -59,7 +59,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $ TrackedEntityDataValueServiceTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class TrackedEntityDataValueServiceTest
     extends DhisSpringTest

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java	2015-05-18 17:05:23 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/trackedentitydatavalue/TrackedEntityDataValueStoreTest.java	2015-06-02 10:18:48 +0000
@@ -58,8 +58,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
- * @version $ TrackedEntityDataValueStoreTest.java Nov 5, 2013 3:11:48 PM $
  */
 public class TrackedEntityDataValueStoreTest
     extends DhisSpringTest