dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15735
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-06-17 23:55:23 +0800
message:
  Remove Property programInstances in Program object.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.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/program/Program.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-05-28 19:02:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/Program.java	2014-06-17 15:55:23 +0000
@@ -90,9 +90,7 @@
 
     @Scanned
     private Set<OrganisationUnit> organisationUnits = new HashSet<OrganisationUnit>();
-
-    private Set<ProgramInstance> programInstances = new HashSet<ProgramInstance>();
-
+    
     @Scanned
     private Set<ProgramStage> programStages = new HashSet<ProgramStage>();
 
@@ -269,16 +267,6 @@
         this.organisationUnits = organisationUnits;
     }
 
-    public Set<ProgramInstance> getProgramInstances()
-    {
-        return programInstances;
-    }
-
-    public void setProgramInstances( Set<ProgramInstance> programInstances )
-    {
-        this.programInstances = programInstances;
-    }
-
     @JsonProperty( value = "programStages" )
     @JsonSerialize( contentAs = BaseIdentifiableObject.class )
     @JsonView( { DetailedView.class, ExportView.class, WithoutOrganisationUnitsView.class } )

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java	2014-05-23 15:31:37 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramInstance.java	2014-06-17 15:55:23 +0000
@@ -119,7 +119,6 @@
         entityInstance.getProgramInstances().add( this );
 
         setProgram( program );
-        program.getProgramInstances().add( this );
     }
 
     public ProgramStageInstance getProgramStageInstanceByStage( int stage )

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2014-04-29 11:12:05 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/NoRegistrationSingleEventServiceTest.java	2014-06-17 15:55:23 +0000
@@ -115,7 +115,6 @@
         programInstance.setEnrollmentDate( new Date() );
 
         programInstanceService.addProgramInstance( programInstance );
-        programA.getProgramInstances().add( programInstance );
         identifiableObjectManager.update( programA );
 
         createUserAndInjectSecurityContext( true );