=== 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-02-19 09:18:17 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramDataEntryService.java	2015-03-06 11:40:00 +0000
@@ -483,10 +483,6 @@
                     }
                 }
 
-                // -----------------------------------------------------------
-                //
-                // -----------------------------------------------------------
-
                 inputHTML = inputHTML.replace( "$DATAELEMENTID", String.valueOf( dataElementUid ) );
                 inputHTML = inputHTML.replace( "$VALUE", dataElementValue );
                 inputHTML = inputHTML.replace( "$PROGRAMSTAGEID", String.valueOf( programStageUid ) );

=== 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-02-02 13:58:48 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramExpressionService.java	2015-03-06 11:40:00 +0000
@@ -193,8 +193,7 @@
             }
 
             matcher.appendReplacement( description,
-                "[" + key + ProgramExpression.SEPARATOR_OBJECT
-                    + programStage.getDisplayName() + SEPARATOR_ID + name + "]" );
+                "[" + key + ProgramExpression.SEPARATOR_OBJECT + programStage.getDisplayName() + SEPARATOR_ID + name + "]" );
         }
 
         StringBuffer tail = new StringBuffer();
@@ -230,5 +229,4 @@
 
         return dataElements;
     }
-    
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java	2015-03-06 11:35:01 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramIndicatorService.java	2015-03-06 11:40:00 +0000
@@ -209,7 +209,7 @@
                 return DateUtils.getMediumDateString( date );
             }
 
-            return Math.floor( value ) + "";
+            return String.valueOf( Math.floor( value ) );
         }
 
         return null;

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2015-03-06 11:40:00 +0000
@@ -287,9 +287,11 @@
         for ( Program program : programs )
         {
             List<TrackedEntityAttribute> atttributes = program.getTrackedEntityAttributes();
+            
             while ( iterAttribute.hasNext() )
             {
                 TrackedEntityAttributeValue attributeValue = iterAttribute.next();
+                
                 if ( !atttributes.contains( attributeValue.getAttribute() ) )
                 {
                     iterAttribute.remove();

=== 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-02-12 15:18:51 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/DefaultProgramValidationService.java	2015-03-06 11:40:00 +0000
@@ -253,6 +253,7 @@
                 return true;
             }
         }
+        
         return false;
     }
 }

=== 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-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramDataEntryFormDeletionHandler.java	2015-03-06 11:40:00 +0000
@@ -99,6 +99,5 @@
                 dataEntryFormService.deleteDataEntryForm( dataEntryForm );
             }
         }
-
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramIndicatorDeletionHandler.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramIndicatorDeletionHandler.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/program/ProgramIndicatorDeletionHandler.java	2015-03-06 11:40:00 +0000
@@ -72,5 +72,4 @@
             programIndicatorService.deleteProgramIndicator( indicator );
         }
     }
-
 }