dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7953
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-08-22 14:45:25 +0200
message:
  Cleanup
modified:
  dhis-2/dhis-api/pom.xml
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java
  dhis-2/dhis-services/dhis-service-integration/pom.xml
  dhis-2/dhis-services/dhis-service-mapping/pom.xml
  dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java
  dhis-2/pom.xml


--
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-api/pom.xml'
--- dhis-2/dhis-api/pom.xml	2012-08-03 11:05:49 +0000
+++ dhis-2/dhis-api/pom.xml	2012-08-22 12:45:25 +0000
@@ -51,7 +51,6 @@
     <dependency>
       <groupId>org.smslib</groupId>
       <artifactId>smslib</artifactId>
-      <version>3.5.2-r2307</version>
     </dependency>
 
   </dependencies>

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2012-07-30 22:03:07 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2012-08-22 12:45:25 +0000
@@ -195,7 +195,6 @@
         return null;
     }
 
-    @SuppressWarnings( "unchecked" )
     private <T> Importer<T> findImporterClass( Class<?> clazz )
     {
         for ( Importer<T> i : importerClasses )

=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2012-07-30 22:03:07 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java	2012-08-22 12:45:25 +0000
@@ -412,7 +412,6 @@
     //-------------------------------------------------------------------------------------------------------
 
     @Override
-    @SuppressWarnings( "unchecked" )
     public ImportTypeSummary importObjects( List<T> objects, ImportOptions options )
     {
         this.options = options;

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java	2012-02-11 13:58:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DataEntryFormUpgrader.java	2012-08-22 12:45:25 +0000
@@ -104,8 +104,6 @@
 
     private String upgradeProgramDataEntryFormForTextBox( String htmlCode )
     {
-        int i = 0;
-
         Matcher matcher = ID_PROGRAM_ENTRY_TEXTBOX.matcher( htmlCode );
 
         StringBuffer out = new StringBuffer();
@@ -116,8 +114,6 @@
                 + "-val\"";
 
             matcher.appendReplacement( out, upgradedId );
-
-            i++;
         }
 
         matcher.appendTail( out );

=== modified file 'dhis-2/dhis-services/dhis-service-integration/pom.xml'
--- dhis-2/dhis-services/dhis-service-integration/pom.xml	2012-08-03 11:05:49 +0000
+++ dhis-2/dhis-services/dhis-service-integration/pom.xml	2012-08-22 12:45:25 +0000
@@ -22,7 +22,6 @@
     <dependency>
       <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
-      <version>2.2.5</version>
     </dependency>
     
     <!-- DHIS -->

=== modified file 'dhis-2/dhis-services/dhis-service-mapping/pom.xml'
--- dhis-2/dhis-services/dhis-service-mapping/pom.xml	2012-08-03 11:05:49 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/pom.xml	2012-08-22 12:45:25 +0000
@@ -11,7 +11,7 @@
   
   <artifactId>dhis-service-mapping</artifactId>
   <packaging>jar</packaging>
-  <name>DHIS OrganisationUnit API Implementations</name>
+  <name>DHIS Mapping Service Implementation</name>
   
   <dependencies>
     

=== modified file 'dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java'
--- dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java	2012-07-20 08:07:59 +0000
+++ dhis-2/dhis-services/dhis-service-mobile/src/main/java/org/hisp/dhis/api/mobile/model/OrgUnits.java	2012-08-22 12:45:25 +0000
@@ -99,7 +99,6 @@
         throws IOException
     {
         orgUnits = new ArrayList<MobileOrgUnitLinks>();
-        double version = dataInputStream.readDouble();
         int size = dataInputStream.readInt();
 
         for ( int i = 0; i < size; i++ )

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2012-08-21 13:12:22 +0000
+++ dhis-2/pom.xml	2012-08-22 12:45:25 +0000
@@ -178,7 +178,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.6</version>
+        <version>1.7</version>
         <executions>
           <execution>
             <phase>generate-resources</phase>