← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5206: Simply code

 

------------------------------------------------------------
revno: 5206
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-11-23 19:30:19 +0100
message:
  Simply code
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.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/AttributeService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2011-11-14 16:02:32 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java	2011-11-23 18:30:19 +0000
@@ -32,7 +32,7 @@
 /**
  * @author mortenoh
  */
-public interface AttributeService
+interface AttributeService
 {
     String ID = AttributeService.class.getName();
 
@@ -40,47 +40,47 @@
     // Attribute
     // -------------------------------------------------------------------------
 
-    public void addAttribute( Attribute attribute );
-
-    public void updateAttribute( Attribute attribute );
-
-    public void deleteAttribute( Attribute attribute );
-
-    public Attribute getAttribute( int id );
-
-    public Attribute getAttributeByName( String name );
-
-    public Set<Attribute> getAllAttributes();
-
-    public Set<Attribute> getDataElementAttributes();
-
-    public Set<Attribute> getIndicatorAttributes();
-
-    public Set<Attribute> getOrganisationUnitAttributes();
-
-    public Set<Attribute> getUserAttributes();
-
-    public int getAttributeCount();
-
-    public int getAttributeCountByName( String name );
-
-    public Set<Attribute> getAttributesBetween( int first, int max );
-
-    public Set<Attribute> getAttributesBetweenByName( String name, int first, int max );
+    void addAttribute( Attribute attribute );
+
+    void updateAttribute( Attribute attribute );
+
+    void deleteAttribute( Attribute attribute );
+
+    Attribute getAttribute( int id );
+
+    Attribute getAttributeByName( String name );
+
+    Set<Attribute> getAllAttributes();
+
+    Set<Attribute> getDataElementAttributes();
+
+    Set<Attribute> getIndicatorAttributes();
+
+    Set<Attribute> getOrganisationUnitAttributes();
+
+    Set<Attribute> getUserAttributes();
+
+    int getAttributeCount();
+
+    int getAttributeCountByName( String name );
+
+    Set<Attribute> getAttributesBetween( int first, int max );
+
+    Set<Attribute> getAttributesBetweenByName( String name, int first, int max );
 
     // -------------------------------------------------------------------------
     // AttributeValue
     // -------------------------------------------------------------------------
 
-    public void addAttributeValue( AttributeValue attributeValue );
-
-    public void updateAttributeValue( AttributeValue attributeValue );
-
-    public void deleteAttributeValue( AttributeValue attributeValue );
-
-    public AttributeValue getAttributeValue( int id );
-
-    public Set<AttributeValue> getAllAttributeValues();
-
-    public int getAttributeValueCount();
+    void addAttributeValue( AttributeValue attributeValue );
+
+    void updateAttributeValue( AttributeValue attributeValue );
+
+    void deleteAttributeValue( AttributeValue attributeValue );
+
+    AttributeValue getAttributeValue( int id );
+
+    Set<AttributeValue> getAllAttributeValues();
+
+    int getAttributeValueCount();
 }

=== 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	2011-11-03 01:02:13 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java	2011-11-23 18:30:19 +0000
@@ -34,7 +34,7 @@
 /**
  * @author mortenoh
  */
-public interface AttributeStore
+interface AttributeStore
     extends GenericNameableObjectStore<Attribute>
 {
     String ID = AttributeStore.class.getName();
@@ -44,26 +44,26 @@
      * 
      * @return All attributes with attribute.dataElement = true
      */
-    public Set<Attribute> getDataElementAttributes();
+    Set<Attribute> getDataElementAttributes();
 
     /**
      * Get all attributes that are enabled for indicators.
      * 
      * @return All attributes with attribute.indicator = true
      */
-    public Set<Attribute> getIndicatorAttributes();
+    Set<Attribute> getIndicatorAttributes();
 
     /**
      * Get all attributes that are enabled for organisation units.
      * 
      * @return All attributes with attribute.organisationUnit = true
      */
-    public Set<Attribute> getOrganisationUnitAttributes();
+    Set<Attribute> getOrganisationUnitAttributes();
 
     /**
      * Get all attributes that are enabled for users.
      * 
      * @return All attributes with attribute.organisationUnit = true
      */
-    public Set<Attribute> getUserAttributes();
+    Set<Attribute> getUserAttributes();
 }