dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11616
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-08-08 15:54:42 +0200
message:
  Removed pointless code
modified:
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java
  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/WebUtils.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-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-07-22 15:17:19 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2013-08-08 13:54:42 +0000
@@ -619,18 +619,8 @@
     
     private JFreeChart getStackedBarChart( Chart chart, CategoryDataset dataSet, boolean horizontal )
     {
-        JFreeChart stackedBarChart = null;
-
-        if ( chart.isType( TYPE_STACKED_BAR ) )
-        {
-            stackedBarChart = ChartFactory.createStackedBarChart( chart.getName(), chart.getDomainAxisLabel(),
-                chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
-        }
-        else
-        {
-            stackedBarChart = ChartFactory.createStackedBarChart( chart.getName(), chart.getDomainAxisLabel(),
-                chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
-        }
+        JFreeChart stackedBarChart = ChartFactory.createStackedBarChart( chart.getName(), chart.getDomainAxisLabel(),
+            chart.getRangeAxisLabel(), dataSet, PlotOrientation.VERTICAL, true, false, false );
 
         CategoryPlot plot = (CategoryPlot) stackedBarChart.getPlot();
         plot.setBackgroundPaint( Color.WHITE );
@@ -650,18 +640,8 @@
 
     private JFreeChart getMultiplePieChart( Chart chart, CategoryDataset[] dataSets )
     {
-        JFreeChart multiplePieChart = null;
-
-        if ( chart.isType( TYPE_PIE ) )
-        {
-            multiplePieChart = ChartFactory.createMultiplePieChart( chart.getName(), dataSets[0], TableOrder.BY_ROW,
-                !chart.isHideLegend(), false, false );
-        }
-        else
-        {
-            multiplePieChart = ChartFactory.createMultiplePieChart3D( chart.getName(), dataSets[0], TableOrder.BY_ROW,
-                !chart.isHideLegend(), false, false );
-        }
+        JFreeChart multiplePieChart = ChartFactory.createMultiplePieChart( chart.getName(), dataSets[0], TableOrder.BY_ROW,
+            !chart.isHideLegend(), false, false );
 
         multiplePieChart.getTitle().setFont( titleFont );
         multiplePieChart.addSubtitle( getSubTitle( chart ) );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java	2013-07-26 03:52:08 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/event/EventController.java	2013-08-08 13:54:42 +0000
@@ -39,7 +39,6 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;

=== 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-05-25 06:19:23 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/PdfDataEntryFormImportUtil.java	2013-08-08 13:54:42 +0000
@@ -57,12 +57,6 @@
 
 public class PdfDataEntryFormImportUtil
 {
-    private static final String DATAVALUE_IMPORT_STOREBY = "admin";
-
-    private static final String DATAVALUE_IMPORT_COMMENT = "Imported by PDF Data Entry Form";
-
-    private static final String DATAVALUE_IMPORT_TIMESTAMP_DATEFORMAT = "yyyy-MM-dd";
-
     // -------------------------------------------------------------------------
     // DEPENDENCIES
     // -------------------------------------------------------------------------
@@ -207,7 +201,7 @@
 
     private void insertValue_ProgramStageDataElement( ProgramStageInstance programStageInstance, int dataElementId,
         String value )
-        throws IOException, Exception
+        throws Exception
     {
 
         DataElement dataElement = dataElementService.getDataElement( dataElementId );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2013-05-31 04:06:10 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/WebUtils.java	2013-08-08 13:54:42 +0000
@@ -49,7 +49,6 @@
 {
     private static final Log log = LogFactory.getLog( WebUtils.class );
 
-    @SuppressWarnings("unchecked")
     public static void generateLinks( WebMetaData metaData )
     {
         Class<?> baseType = null;