=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java	2011-01-31 19:47:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryOptionCombo.java	2011-02-15 06:25:53 +0000
@@ -134,21 +134,21 @@
     @Override
     public String toString()
     {
-        StringBuffer buffer = new StringBuffer( "[" + categoryCombo + ", [" );
+        StringBuilder builder = new StringBuilder( "[" + categoryCombo + ", [" );
 
         Iterator<DataElementCategoryOption> iterator = categoryOptions.iterator();
 
         while ( iterator.hasNext() )
         {
-            buffer.append( iterator.next().toString() );
+            builder.append( iterator.next().toString() );
 
             if ( iterator.hasNext() )
             {
-                buffer.append( ", " );
+                builder.append( ", " );
             }
         }
 
-        return buffer.append( "]]" ).toString();
+        return builder.append( "]]" ).toString();
     }
 
     // -------------------------------------------------------------------------
@@ -233,7 +233,7 @@
 
     public String getName()
     {
-        StringBuffer name = new StringBuffer();
+        StringBuilder name = new StringBuilder();
 
         if ( categoryOptions != null && categoryOptions.size() > 0 )
         {
@@ -310,7 +310,7 @@
 
     public String toJSON()
     {
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         result.append( "{" );
         result.append( "\"id\":" + this.getId() + "\"" );
         result.append( ",\"name\":" + StringEscapeUtils.escapeJavaScript( this.getName() ) + "\"" );