dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6519
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-07 11:40:09 +0200
message:
  Generifix
modified:
  dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.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-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-04-07 09:26:28 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java	2012-04-07 09:40:09 +0000
@@ -53,7 +53,7 @@
     @Autowired
     private Set<Importer> importerClasses = new HashSet<Importer>();
 
-    private Importer findImporterClass( List<?> clazzes )
+    private <T> Importer<T> findImporterClass( List<?> clazzes )
     {
         if ( !clazzes.isEmpty() )
         {
@@ -63,9 +63,9 @@
         return null;
     }
 
-    private Importer findImporterClass( Class<?> clazz )
+    private <T> Importer<T> findImporterClass( Class<?> clazz )
     {
-        for ( Importer i : importerClasses )
+        for ( Importer<T> i : importerClasses )
         {
             if ( i.canHandle( clazz ) )
             {
@@ -76,11 +76,11 @@
         return null;
     }
 
-    private void doImport( List<?> objects, ImportOptions importOptions, ImportSummary importSummary )
+    private <T> void doImport( List<T> objects, ImportOptions importOptions, ImportSummary importSummary )
     {
         if ( !objects.isEmpty() )
         {
-            Importer importer = findImporterClass( objects );
+            Importer<T> importer = findImporterClass( objects );
 
             if ( importer != null )
             {