dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12459
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-10-07 11:41:37 +0200
message:
  Clean up
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.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-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2013-10-02 12:58:34 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/DataValueSetController.java	2013-10-07 09:41:37 +0000
@@ -28,13 +28,16 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.io.*;
 import static org.hisp.dhis.api.utils.ContextUtils.CONTENT_TYPE_CSV;
 import static org.hisp.dhis.api.utils.ContextUtils.CONTENT_TYPE_HTML;
 import static org.hisp.dhis.api.utils.ContextUtils.CONTENT_TYPE_JSON;
 import static org.hisp.dhis.api.utils.ContextUtils.CONTENT_TYPE_TEXT;
 import static org.hisp.dhis.api.utils.ContextUtils.CONTENT_TYPE_XML;
 
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringWriter;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.Set;
@@ -214,7 +217,7 @@
         importOptions.setOrgUnitIdScheme( "CODE");
         importOptions.setDataElementIdScheme( "CODE");
         
-        ImportSummary summary = dataValueSetService.saveDataValueSetJson( 
+        dataValueSetService.saveDataValueSetJson( 
             new ByteArrayInputStream(dxf2.toString().getBytes( "UTF-8") ), importOptions );
     }
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java	2013-10-07 09:33:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/i18n/action/GetStringsFromLocaleAction.java	2013-10-07 09:41:37 +0000
@@ -52,13 +52,6 @@
         this.loc = loc;
     }
 
-//    private String type;
-//
-//    public void setType( String type )
-//    {
-//        this.type = type;
-//    }
-
     private I18n i18nObject;
 
     public I18n getI18nObject()