dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5330
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-08 13:34:45 +0100
message:
  uuid -> uid name change
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.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-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java	2011-12-02 14:53:08 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java	2011-12-08 12:34:45 +0000
@@ -176,14 +176,14 @@
     {
         DataSet dataSet = null;
 
-        String uuid = dataValueSet.getDataSetIdentifier();
-        if ( uuid != null )
+        String uid = dataValueSet.getDataSetIdentifier();
+        if ( uid != null )
         {
-            dataSet = dataSetService.getDataSet( uuid );
+            dataSet = dataSetService.getDataSet( uid );
 
             if ( dataSet == null )
             {
-                throw new IllegalArgumentException( "Data set with UUID " + uuid + " does not exist" );
+                throw new IllegalArgumentException( "Data set with UID " + uid + " does not exist" );
             }
         }
         else