← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21496: minor fix

 

------------------------------------------------------------
revno: 21496
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-12-18 12:54:39 +0100
message:
  minor fix
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportCount.java
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportSummary.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-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportCount.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportCount.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/importsummary/ImportCount.java	2015-12-18 11:54:39 +0000
@@ -33,7 +33,7 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import org.hisp.dhis.common.DxfNamespaces;
 
-@JacksonXmlRootElement(localName = "count", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "count", namespace = DxfNamespaces.DXF_2_0 )
 public class ImportCount
 {
     private int imported;
@@ -57,7 +57,7 @@
     }
 
     @JsonProperty
-    @JacksonXmlProperty(isAttribute = true)
+    @JacksonXmlProperty( isAttribute = true )
     public int getImported()
     {
         return imported;
@@ -69,7 +69,7 @@
     }
 
     @JsonProperty
-    @JacksonXmlProperty(isAttribute = true)
+    @JacksonXmlProperty( isAttribute = true )
     public int getUpdated()
     {
         return updated;
@@ -81,7 +81,7 @@
     }
 
     @JsonProperty
-    @JacksonXmlProperty(isAttribute = true)
+    @JacksonXmlProperty( isAttribute = true )
     public int getIgnored()
     {
         return ignored;
@@ -93,7 +93,7 @@
     }
 
     @JsonProperty
-    @JacksonXmlProperty(isAttribute = true)
+    @JacksonXmlProperty( isAttribute = true )
     public int getDeleted()
     {
         return deleted;

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportSummary.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportSummary.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportSummary.java	2015-12-18 11:54:39 +0000
@@ -41,7 +41,7 @@
 /**
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
  */
-@JacksonXmlRootElement(localName = "importSummary", namespace = DxfNamespaces.DXF_2_0)
+@JacksonXmlRootElement( localName = "importSummary", namespace = DxfNamespaces.DXF_2_0 )
 public class ImportSummary
 {
     private ImportCount importCount = new ImportCount();
@@ -54,7 +54,7 @@
     }
 
     @JsonProperty
-    @JacksonXmlProperty(namespace = DxfNamespaces.DXF_2_0)
+    @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public ImportCount getImportCount()
     {
         return importCount;
@@ -66,8 +66,8 @@
     }
 
     @JsonProperty
-    @JacksonXmlElementWrapper(localName = "typeSummaries", namespace = DxfNamespaces.DXF_2_0)
-    @JacksonXmlProperty(localName = "typeSummary", namespace = DxfNamespaces.DXF_2_0)
+    @JacksonXmlElementWrapper( localName = "typeSummaries", namespace = DxfNamespaces.DXF_2_0 )
+    @JacksonXmlProperty( localName = "typeSummary", namespace = DxfNamespaces.DXF_2_0 )
     public List<ImportTypeSummary> getImportTypeSummaries()
     {
         return importTypeSummaries;
@@ -90,26 +90,6 @@
         this.importCount.incrementDeleted( importCount.getDeleted() );
     }
 
-    public void incrementImported( int n )
-    {
-        importCount.incrementImported( n );
-    }
-
-    public void incrementUpdated( int n )
-    {
-        importCount.incrementUpdated( n );
-    }
-
-    public void incrementIgnored( int n )
-    {
-        importCount.incrementIgnored( n );
-    }
-
-    public void incrementDeleted( int n )
-    {
-        importCount.incrementDeleted( n );
-    }
-
     @Override
     public String toString()
     {