dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15646
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2014-06-12 11:11:27 +0200
message:
  minor fix, change to List for programStageDataElements
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
  dhis-2/pom.xml


--
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-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2014-05-31 07:39:57 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2014-06-12 09:11:27 +0000
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.apache.commons.logging.Log;
@@ -124,7 +125,7 @@
     @Autowired
     private SchemaService schemaService;
 
-    @Autowired( required = false )
+    @Autowired(required = false)
     private List<ObjectHandler<T>> objectHandlers;
 
     //-------------------------------------------------------------------------------------------------------
@@ -154,12 +155,12 @@
         private Expression leftSide;
         private Expression rightSide;
 
+        private DataEntryForm dataEntryForm;
+
         private Set<DataElementOperand> compulsoryDataElementOperands = Sets.newHashSet();
         private Set<DataElementOperand> greyedFields = Sets.newHashSet();
 
-        private DataEntryForm dataEntryForm;
-
-        private Set<ProgramStageDataElement> programStageDataElements = Sets.newHashSet();
+        private List<ProgramStageDataElement> programStageDataElements = Lists.newArrayList();
         private Set<ProgramTrackedEntityAttribute> programTrackedEntityAttributes = Sets.newHashSet();
 
         public void extract( T object )
@@ -450,9 +451,9 @@
             ReflectionUtils.invokeSetterMethod( "programTrackedEntityAttributes", object, programTrackedEntityAttributes );
         }
 
-        private Set<ProgramStageDataElement> extractProgramStageDataElements( T object )
+        private List<ProgramStageDataElement> extractProgramStageDataElements( T object )
         {
-            Set<ProgramStageDataElement> programStageDataElements = Sets.newHashSet();
+            List<ProgramStageDataElement> programStageDataElements = Lists.newArrayList();
 
             if ( ReflectionUtils.findGetterMethod( "programStageDataElements", object ) != null )
             {
@@ -474,7 +475,7 @@
             return programStageDataElements;
         }
 
-        private void saveProgramStageDataElements( T object, Set<ProgramStageDataElement> programStageDataElements )
+        private void saveProgramStageDataElements( T object, List<ProgramStageDataElement> programStageDataElements )
         {
             for ( ProgramStageDataElement programStageDataElement : programStageDataElements )
             {

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2014-06-12 07:52:53 +0000
+++ dhis-2/pom.xml	2014-06-12 09:11:27 +0000
@@ -976,6 +976,7 @@
         <version>0.9.1</version>
         <scope>test</scope>
       </dependency>
+
       <dependency>
         <groupId>org.hamcrest</groupId>
         <artifactId>hamcrest-library</artifactId>