=== modified file 'dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/framework/XMLPipeTest.java'
--- dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/framework/XMLPipeTest.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-support/dhis-support-xml/src/test/java/org/amplecode/staxwax/framework/XMLPipeTest.java	2013-09-03 18:39:37 +0000
@@ -101,8 +101,7 @@
         while ( pipeoutput.hasNext() )
         {
             events2++;
-            XMLEvent ev = pipeoutput.nextEvent();
-            // stdoutWriter.add( ev );
+            pipeoutput.nextEvent();
         }
 
         assertEquals( "Number of events in and out of pipe", events1, events2 );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/CrudControllerAdvice.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/CrudControllerAdvice.java	2013-08-26 11:46:08 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/CrudControllerAdvice.java	2013-09-03 18:39:37 +0000
@@ -41,8 +41,6 @@
 import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.client.HttpStatusCodeException;
 
-import java.io.IOException;
-
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
@@ -50,7 +48,7 @@
 public class CrudControllerAdvice
 {
     @ExceptionHandler
-    public ResponseEntity<String> notAuthenticatedExceptionHandler( NotAuthenticatedException ex ) throws IOException
+    public ResponseEntity<String> notAuthenticatedExceptionHandler( NotAuthenticatedException ex )
     {
         HttpHeaders headers = new HttpHeaders();
         headers.add( "Content-Type", MediaType.TEXT_PLAIN_VALUE );
@@ -59,7 +57,7 @@
     }
 
     @ExceptionHandler({ NotFoundException.class, NotFoundForQueryException.class })
-    public ResponseEntity<String> notFoundExceptionHandler( Exception ex ) throws IOException
+    public ResponseEntity<String> notFoundExceptionHandler( Exception ex )
     {
         HttpHeaders headers = new HttpHeaders();
         headers.add( "Content-Type", MediaType.TEXT_PLAIN_VALUE );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/PdfDataEntryFormImportUtil.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/PdfDataEntryFormImportUtil.java	2013-09-03 15:04:30 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/PdfDataEntryFormImportUtil.java	2013-09-03 18:39:37 +0000
@@ -87,6 +87,7 @@
     // METHODS
     // -------------------------------------------------------------------------
 
+    @SuppressWarnings("unchecked")
     public void ImportProgramStage( InputStream in, I18nFormat format )
         throws Exception
     {
@@ -147,7 +148,6 @@
         for ( Map.Entry<Integer, ProgramStageInstanceStoage> entry : programStageInstanceDataManager
             .getProgramStageInstanceData().entrySet() )
         {
-            Integer key = entry.getKey(); // rowNumber
             ProgramStageInstanceStoage programStageInstanceStoage = entry.getValue();
 
             int date = programStageInstanceStoage.getDate();

=== modified file 'dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java'
--- dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java	2013-09-03 15:24:51 +0000
+++ dhis-2/dhis-web/dhis-web-appmanager/src/main/java/org/hisp/dhis/appmanager/action/DeleteAppAction.java	2013-09-03 18:39:37 +0000
@@ -35,7 +35,6 @@
 import org.hisp.dhis.appmanager.App;
 import org.hisp.dhis.appmanager.AppManagerService;
 import org.hisp.dhis.i18n.I18n;
-import org.hisp.dhis.security.authority.SystemAuthoritiesProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
@@ -53,13 +52,6 @@
     @Autowired
     private AppManagerService appManagerService;
 
-    private SystemAuthoritiesProvider authoritiesProvider;
-
-    public void setAuthoritiesProvider( SystemAuthoritiesProvider authoritiesProvider )
-    {
-        this.authoritiesProvider = authoritiesProvider;
-    }
-
     // -------------------------------------------------------------------------
     // Input & Output
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/dashboard/action/ProvideContentAction.java	2013-09-03 18:39:37 +0000
@@ -37,7 +37,6 @@
 import org.hisp.dhis.document.Document;
 import org.hisp.dhis.reporttable.ReportTable;
 import org.hisp.dhis.user.CurrentUserService;
-import org.hisp.dhis.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import com.opensymphony.xwork2.Action;
@@ -108,7 +107,7 @@
     {
         chartsForAll = new ArrayList<Chart>( chartService.getAllCharts() );
         
-        User user = currentUserService.getCurrentUser();
+        currentUserService.getCurrentUser();
         
         //TODO implement new dashboard solution
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/AddOptionSetAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/AddOptionSetAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/AddOptionSetAction.java	2013-09-03 18:39:37 +0000
@@ -36,7 +36,6 @@
 
 /**
  * @author Chau Thu Tran
- * @version $AddOptionSetAction.java Feb 3, 2012 9:28:11 PM$
  */
 public class AddOptionSetAction
     implements Action
@@ -55,8 +54,6 @@
 
     private List<String> options;
 
-    private Integer version;
-
     // -------------------------------------------------------------------------------------------------
     // Setters
     // -------------------------------------------------------------------------------------------------
@@ -76,11 +73,6 @@
         this.options = options;
     }
 
-    public void setVersion( Integer version )
-    {
-        this.version = version;
-    }
-
     // -------------------------------------------------------------------------------------------------
     // Action implementation
     // -------------------------------------------------------------------------------------------------
@@ -97,5 +89,4 @@
 
         return SUCCESS;
     }
-
 }

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ExportAnalysisResultAction.java'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ExportAnalysisResultAction.java	2013-09-03 15:04:30 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/java/org/hisp/dhis/validationrule/action/dataanalysis/ExportAnalysisResultAction.java	2013-09-03 18:39:37 +0000
@@ -83,13 +83,6 @@
         this.type = type;
     }
 
-    private Integer organisationUnitId;
-
-    public void setOrganisationUnitId( Integer organisationUnitId )
-    {
-        this.organisationUnitId = organisationUnitId;
-    }
-
     // -------------------------------------------------------------------------
     // Output
     // -------------------------------------------------------------------------