dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1083
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-11-23 13:22:51 +0100
message:
  Fixed issues reported by FindBugs.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementGroupMemberXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementIndicatorGroupXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataTypeXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorGroupMemberXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorTypeXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/PeriodTypeXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserRoleXSDConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserXSDConverter.java
  dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/tallysheet/DefaultTallySheetPdfService.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-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java	2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/DataValueConverter.java	2009-11-23 12:22:51 +0000
@@ -97,7 +97,7 @@
 
     public void read( BufferedReader reader, ImportParams params )
     {
-        String line = new String();
+        String line = "";
         
         final DataValue value = new DataValue();
         final DataElement dataElement = new DataElement();

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/CalculatedDataElementAssociationXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
 public class CalculatedDataElementAssociationXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementGroupMemberXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementGroupMemberXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementGroupMemberXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: DataElementGroupMemberXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class DataElementGroupMemberXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementIndicatorGroupXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementIndicatorGroupXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementIndicatorGroupXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: DataElementIndicatorGroupXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class DataElementIndicatorGroupXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementXSDConverter.java	2009-03-09 14:42:31 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataElementXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: DataElementXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class DataElementXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataTypeXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataTypeXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/DataTypeXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: DataTypeXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class DataTypeXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorGroupMemberXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorGroupMemberXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorGroupMemberXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: IndicatorGroupMemberXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class IndicatorGroupMemberXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorTypeXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorTypeXSDConverter.java	2009-03-09 14:42:31 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorTypeXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: IndicatorTypeXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class IndicatorTypeXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorXSDConverter.java	2009-03-09 14:42:31 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/IndicatorXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: IndicatorXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class IndicatorXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/PeriodTypeXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/PeriodTypeXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/PeriodTypeXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: PeriodTypeXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class PeriodTypeXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserRoleXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserRoleXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserRoleXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id$
  */
 public class UserRoleXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserXSDConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserXSDConverter.java	2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/xsd/UserXSDConverter.java	2009-11-23 12:22:51 +0000
@@ -31,14 +31,13 @@
 import org.amplecode.staxwax.writer.XMLWriter;
 import org.hisp.dhis.importexport.ExportParams;
 import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.XMLConverter;
 
 /**
  * @author Lars Helge Overland
  * @version $Id: UserXSDConverter.java 6455 2008-11-24 08:59:37Z larshelg $
  */
 public class UserXSDConverter
-    extends AbstractXSDConverter implements XMLConverter
+    extends AbstractXSDConverter
 {
     // -------------------------------------------------------------------------
     // Constructor

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/tallysheet/DefaultTallySheetPdfService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/tallysheet/DefaultTallySheetPdfService.java	2009-08-26 13:57:16 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/tallysheet/DefaultTallySheetPdfService.java	2009-11-23 12:22:51 +0000
@@ -64,7 +64,7 @@
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         InputStream inputStream = null;
         Document document = new Document();
-        String facilityName = new String();
+        String facilityName = "";
 
         boolean a3Format = tallySheet.isA3Format();