=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2013-09-06 08:24:36 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patient/hibernate/HibernatePatientStore.java	2013-09-06 08:35:43 +0000
@@ -37,7 +37,6 @@
 import org.hibernate.criterion.Restrictions;
 import org.hisp.dhis.common.Grid;
 import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
-import org.hisp.dhis.hibernate.HibernateGenericStore;
 import org.hisp.dhis.jdbc.StatementBuilder;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramIndicatorStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramIndicatorStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramIndicatorStore.java	2013-09-06 08:35:43 +0000
@@ -28,25 +28,23 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
-
 import org.hibernate.criterion.Restrictions;
 import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore;
 import org.hisp.dhis.program.Program;
 import org.hisp.dhis.program.ProgramIndicator;
 import org.hisp.dhis.program.ProgramIndicatorStore;
 
+import java.util.Collection;
+
 /**
  * @author Chau Thu Tran
- * @version $ HibernateProgramIndicatorStore.java Apr 16, 2013 1:39:19 PM $
  */
 public class HibernateProgramIndicatorStore
     extends HibernateIdentifiableObjectStore<ProgramIndicator>
     implements ProgramIndicatorStore
 {
-    
+    @Override
     @SuppressWarnings( "unchecked" )
-    @Override
     public Collection<ProgramIndicator> getByProgram( Program program )
     {
         return getCriteria( Restrictions.eq( "program", program ) ).list();

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramInstanceStore.java	2013-09-06 08:35:43 +0000
@@ -48,7 +48,6 @@
 
 /**
  * @author Abyot Asalefew
- * @version $Id$
  */
 public class HibernateProgramInstanceStore
     extends HibernateGenericStore<ProgramInstance>

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageDataElementStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageDataElementStore.java	2013-09-06 08:35:43 +0000
@@ -28,8 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
-
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -40,6 +38,8 @@
 import org.hisp.dhis.program.ProgramStageDataElement;
 import org.hisp.dhis.program.ProgramStageDataElementStore;
 
+import java.util.Collection;
+
 /**
  * @author Viet Nguyen
  * @version $Id$
@@ -83,7 +83,7 @@
         session.delete( programStageDataElement );
     }
 
-    @SuppressWarnings( "unchecked" )
+    @SuppressWarnings("unchecked")
     public Collection<ProgramStageDataElement> getAll()
     {
         Session session = sessionFactory.getCurrentSession();
@@ -93,7 +93,7 @@
         return criteria.list();
     }
 
-    @SuppressWarnings( "unchecked" )
+    @SuppressWarnings("unchecked")
     public Collection<ProgramStageDataElement> get( ProgramStage programStage )
     {
         Session session = sessionFactory.getCurrentSession();
@@ -103,7 +103,7 @@
         return criteria.add( Restrictions.eq( "programStage", programStage ) ).list();
     }
 
-    @SuppressWarnings( "unchecked" )
+    @SuppressWarnings("unchecked")
     public Collection<ProgramStageDataElement> get( ProgramStage programStage, boolean compulsory )
     {
         Session session = sessionFactory.getCurrentSession();
@@ -126,7 +126,7 @@
         return (ProgramStageDataElement) criteria.uniqueResult();
     }
 
-    @SuppressWarnings( "unchecked" )
+    @SuppressWarnings("unchecked")
     public Collection<DataElement> getListDataElement( ProgramStage programStage )
     {
         Session session = sessionFactory.getCurrentSession();

=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/hibernate/HibernateProgramStageSectionStore.java	2013-09-06 08:35:43 +0000
@@ -53,7 +53,7 @@
         Criteria criteria = getCriteria( Restrictions.eq( "name", name ) );
         criteria.createAlias( "programStageDataElements", "programStageDataElement" );
         criteria.add( Restrictions.eq( "programStageDataElement.programStage", programStage ) );
-        
+
         return (ProgramStageSection) criteria.uniqueResult();
     }