dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18527
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2015-03-08 15:00:13 +0100
message:
  Store layer, made sure store interfaces extend the correct generic interface
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSectionStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.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/attribute/AttributeStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java	2015-03-08 14:00:13 +0000
@@ -28,15 +28,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.common.GenericNameableObjectStore;
-
 import java.util.Set;
 
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
+
 /**
  * @author mortenoh
  */
 public interface AttributeStore
-    extends GenericNameableObjectStore<Attribute>
+    extends GenericIdentifiableObjectStore<Attribute>
 {
     String ID = AttributeStore.class.getName();
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java	2015-03-08 14:00:13 +0000
@@ -31,7 +31,7 @@
 import java.util.Collection;
 import java.util.Set;
 
-import org.hisp.dhis.common.GenericNameableObjectStore;
+import org.hisp.dhis.common.GenericDimensionalObjectStore;
 import org.hisp.dhis.common.ListMap;
 import org.hisp.dhis.dataset.DataSet;
 
@@ -41,7 +41,7 @@
  * @author Torgeir Lorange Ostby
  */
 public interface DataElementStore
-    extends GenericNameableObjectStore<DataElement>
+    extends GenericDimensionalObjectStore<DataElement>
 {
     String ID = DataElementStore.class.getName();
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSectionStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSectionStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageSectionStore.java	2015-03-08 14:00:13 +0000
@@ -28,14 +28,14 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.common.GenericNameableObjectStore;
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 
 /**
  * @author Chau Thu Tran
  * @version $ ProgramStageSectionStore.java Apr 8, 2013 3:48:37 PM $
  */
 public interface ProgramStageSectionStore
-    extends GenericNameableObjectStore<ProgramStageSection>
+    extends GenericIdentifiableObjectStore<ProgramStageSection>
 {
     /**
      * Retrieve a program stage section by name and a program stage

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStageStore.java	2015-03-08 14:00:13 +0000
@@ -28,13 +28,13 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.common.GenericNameableObjectStore;
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 
 /**
  * @author Chau Thu Tran
  */
 public interface ProgramStageStore
-    extends GenericNameableObjectStore<ProgramStage>
+    extends GenericIdentifiableObjectStore<ProgramStage>
 {
 
     /**

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java	2015-02-13 08:50:17 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/program/ProgramStore.java	2015-03-08 14:00:13 +0000
@@ -28,18 +28,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.common.GenericNameableObjectStore;
+import java.util.Collection;
+
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.trackedentity.TrackedEntity;
 
-import java.util.Collection;
-
 /**
  * @author Chau Thu Tran
  * @version $Id: ProgramStore.java Dec 14, 2011 9:22:17 AM $
  */
 public interface ProgramStore
-    extends GenericNameableObjectStore<Program>
+    extends GenericIdentifiableObjectStore<Program>
 {
     String ID = ProgramStore.class.getName();
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleStore.java	2015-03-08 14:00:13 +0000
@@ -30,7 +30,7 @@
 
 import java.util.Collection;
 
-import org.hisp.dhis.common.GenericNameableObjectStore;
+import org.hisp.dhis.common.GenericIdentifiableObjectStore;
 import org.hisp.dhis.dataelement.DataElement;
 
 /**
@@ -38,7 +38,7 @@
  * @version ValidationRuleStore.java 2010-05-18 17:05:50Z
  */
 public interface ValidationRuleStore
-    extends GenericNameableObjectStore<ValidationRule>
+    extends GenericIdentifiableObjectStore<ValidationRule>
 {
     String ID = ValidationRuleStore.class.getName();