dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 22262
committer: Morten Olav Hansen <morten@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2016-03-12 19:29:55 +0700
message:
  minor, add ATOMIC_ import strategies to isCreate, isUpdate etc.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportStrategy.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/importexport/ImportStrategy.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportStrategy.java	2016-03-10 11:35:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportStrategy.java	2016-03-12 12:29:55 +0000
@@ -50,22 +50,22 @@
 
     public boolean isCreate()
     {
-        return this == NEW || this == CREATE;
+        return this == NEW || this == CREATE || this == ATOMIC_CREATE;
     }
 
     public boolean isUpdate()
     {
-        return this == UPDATES || this == UPDATE;
+        return this == UPDATES || this == UPDATE || this == ATOMIC_UPDATE;
     }
 
     public boolean isCreateAndUpdate()
     {
-        return this == NEW_AND_UPDATES || this == CREATE_AND_UPDATE;
+        return this == NEW_AND_UPDATES || this == CREATE_AND_UPDATE || this == ATOMIC_CREATE_AND_UPDATE;
     }
 
     public boolean isDelete()
     {
-        return this == DELETE || this == DELETES;
+        return this == DELETE || this == DELETES || this == ATOMIC_DELETE;
     }
 
     public boolean isAtomic()