=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java	2011-11-25 18:17:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericDimensionalObjectStore.java	2012-01-19 03:59:07 +0000
@@ -35,7 +35,8 @@
  * @author bobj
  * @version created 23-Nov-2011
  */
-public interface GenericDimensionalObjectStore<T> extends GenericIdentifiableObjectStore<T>
+public interface GenericDimensionalObjectStore<T> 
+    extends GenericIdentifiableObjectStore<T>
 {
-    public Collection<T> getByConcept(Concept concept);    
+    Collection<T> getByConcept(Concept concept);    
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java	2011-12-26 10:07:59 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java	2012-01-19 03:59:07 +0000
@@ -1,8 +1,5 @@
 package org.hisp.dhis.common;
 
-
-import java.util.Date;
-
 /*
  * Copyright (c) 2004-2012, University of Oslo
  * All rights reserved.
@@ -30,16 +27,18 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.Date;
+
 public interface IdentifiableObject
     extends ImportableObject, LinkableObject, Comparable<IdentifiableObject>
 {
-    public abstract int getId();
-
-    public abstract String getUid();
-
-    public abstract String getName();
-
-    public abstract String getCode();
-
-    public abstract Date getLastUpdated();
+    int getId();
+
+    String getUid();
+
+    String getName();
+
+    String getCode();
+
+    Date getLastUpdated();
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/LinkableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/LinkableObject.java	2011-12-19 22:11:19 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/LinkableObject.java	2012-01-19 03:59:07 +0000
@@ -32,7 +32,7 @@
  */
 public interface LinkableObject
 {
-    public String getLink();
+    String getLink();
 
-    public void setLink( String link );
+    void setLink( String link );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NameableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NameableObject.java	2011-09-15 14:47:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/NameableObject.java	2012-01-19 03:59:07 +0000
@@ -27,11 +27,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-public interface NameableObject extends IdentifiableObject
+public interface NameableObject 
+    extends IdentifiableObject
 {
-    public String getAlternativeName();
-
-    public String getShortName();
-
-    public String getDescription();
+    String getAlternativeName();
+
+    String getShortName();
+
+    String getDescription();
 }
\ No newline at end of file