=== 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-23 18:30:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeService.java 2011-11-23 18:37:43 +0000 @@ -32,7 +32,7 @@ /** * @author mortenoh */ -interface AttributeService +public interface AttributeService { String ID = AttributeService.class.getName(); @@ -48,6 +48,8 @@ Attribute getAttribute( int id ); + Attribute getAttribute( String uid ); + Attribute getAttributeByName( String name ); Set getAllAttributes(); === 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-23 18:30:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/attribute/AttributeStore.java 2011-11-23 18:37:43 +0000 @@ -34,7 +34,7 @@ /** * @author mortenoh */ -interface AttributeStore +public interface AttributeStore extends GenericNameableObjectStore { String ID = AttributeStore.class.getName(); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2011-11-14 16:02:32 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/attribute/DefaultAttributeService.java 2011-11-23 18:37:43 +0000 @@ -92,6 +92,12 @@ } @Override + public Attribute getAttribute( String uid ) + { + return attributeStore.getByUid( uid ); + } + + @Override public Attribute getAttributeByName( String name ) { return attributeStore.getByName( name );