dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 367
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-06-11 02:09:19 +0200
message:
  Cosmetic fixes
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java
  dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java
  dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java
  dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/legend/ValidateLegendSetAction.java
  dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/SVGUtils.java
  dhis-2/dhis-web/dhis-web-jforum-integration/src/test/java/org/hisp/dhis/jforum/manager/JForumManagerTest.java

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java	2009-06-11 00:09:19 +0000
@@ -28,7 +28,6 @@
  */
 
 import java.util.Collection;
-import java.util.Map;
 
 /**
  * @author Lars Helge Overland
@@ -63,8 +62,6 @@
     Indicator getIndicatorByAlternativeName( String alternativeName );
 
     Indicator getIndicatorByCode( String code );
-    
-    Map<Integer, Integer> getIndicatorFactorMap( Collection<Integer> identifiers );
 
     // -------------------------------------------------------------------------
     // IndicatorType

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java	2009-06-11 00:09:19 +0000
@@ -29,9 +29,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.Iterator;
-import java.util.Map;
 
 import org.hisp.dhis.i18n.I18nService;
 import org.hisp.dhis.system.util.UUIdUtils;
@@ -147,18 +145,6 @@
         return indicatorStore.getIndicatorByCode( code );
     }
     
-    public Map<Integer, Integer> getIndicatorFactorMap( Collection<Integer> identifiers )
-    {
-        Map<Integer, Integer> map = new HashMap<Integer, Integer>();
-        
-        for ( Integer id : identifiers )
-        {
-            map.put( id, getIndicator( id ).getIndicatorType().getFactor() );
-        }
-        
-        return map;
-    }
-
     // -------------------------------------------------------------------------
     // IndicatorType
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java	2009-06-10 22:26:49 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/dbms/HibernateDbmsManager.java	2009-06-11 00:09:19 +0000
@@ -151,6 +151,10 @@
         sessionFactory.getCurrentSession().clear();
     }
 
+    // -------------------------------------------------------------------------
+    // Supportive methods
+    // -------------------------------------------------------------------------
+
     private void emptyTable( String table )
     {
         try

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/DefaultHibernateConfigurationProvider.java	2009-06-11 00:09:19 +0000
@@ -73,18 +73,8 @@
     
     private List<Resource> jarResources = new ArrayList<Resource>();
     
-    public List<Resource> getJarResources() 
-    {
-        return jarResources;
-    }
-    
     private List<Resource> dirResources = new ArrayList<Resource>();
     
-    public List<Resource> getDirectoryResources() 
-    {
-        return dirResources;
-    }    
-    
     // -------------------------------------------------------------------------
     // Dependencies
     // -------------------------------------------------------------------------
@@ -199,16 +189,26 @@
     // HibernateConfigurationProvider implementation
     // -------------------------------------------------------------------------
 
+    public Configuration getConfiguration()
+    {
+        return configuration;
+    }
+
     public void setEventListener( String type, Object listener )
     {
         configuration.setListener( type, listener );
     }
 
-    public Configuration getConfiguration()
+    public List<Resource> getJarResources() 
     {
-        return configuration;
+        return jarResources;
     }
 
+    public List<Resource> getDirectoryResources() 
+    {
+        return dirResources;
+    }    
+    
     // -------------------------------------------------------------------------
     // Supporting methods
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java	2009-06-10 22:26:49 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingDirectoryLocationsFactoryBean.java	2009-06-11 00:09:19 +0000
@@ -59,7 +59,7 @@
     }
 
     @SuppressWarnings("unchecked")
-	public Class getObjectType()
+    public Class getObjectType()
     {
         return Resource.class;
     }

=== modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java'
--- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java	2009-06-10 22:26:49 +0000
+++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateMappingJarLocationsFactoryBean.java	2009-06-11 00:09:19 +0000
@@ -59,7 +59,7 @@
     }
 
     @SuppressWarnings("unchecked")
-	public Class getObjectType()
+    public Class getObjectType()
     {
         return Resource.class;
     }

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2009-06-08 15:44:48 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/deletion/DeletionHandler.java	2009-06-11 00:09:19 +0000
@@ -81,6 +81,7 @@
  * @author Lars Helge Overland
  * @version $Id$
  */
+@SuppressWarnings( "unused" )
 public abstract class DeletionHandler
 {
     // -------------------------------------------------------------------------

=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java	2009-03-30 06:13:54 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/export/ExportExcelAction.java	2009-06-11 00:09:19 +0000
@@ -30,13 +30,12 @@
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+
 import jxl.Workbook;
-
 import jxl.format.Alignment;
 import jxl.format.Border;
 import jxl.format.BorderLineStyle;
@@ -47,6 +46,7 @@
 import jxl.write.WritableImage;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
+
 import org.hisp.dhis.gis.Legend;
 import org.hisp.dhis.gis.action.configuration.GISConfigurationManagerService;
 import org.hisp.dhis.gis.state.SelectionManager;
@@ -131,7 +131,6 @@
     }
 
     private File getLegends( File directory, List<Legend> legends )
-        throws IOException, InterruptedException
     {
 
         if ( fileFeatureStore.createLegends( legends ) )

=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/legend/ValidateLegendSetAction.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/legend/ValidateLegendSetAction.java	2009-03-13 11:44:39 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/action/legend/ValidateLegendSetAction.java	2009-06-11 00:09:19 +0000
@@ -28,7 +28,6 @@
  */
 
 import java.util.Collection;
-import java.util.Set;
 
 import org.hisp.dhis.gis.LegendService;
 import org.hisp.dhis.gis.LegendSet;

=== modified file 'dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/SVGUtils.java'
--- dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/SVGUtils.java	2009-03-30 10:31:13 +0000
+++ dhis-2/dhis-web/dhis-web-gis/src/main/java/org/hisp/dhis/gis/util/SVGUtils.java	2009-06-11 00:09:19 +0000
@@ -12,6 +12,7 @@
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.PNGTranscoder;
 
+@SuppressWarnings( "deprecation" )
 public class SVGUtils
 {
 
@@ -27,7 +28,7 @@
         try
         {
             // Create the transcoder input.
-            String svgURI = new File( inputPath ).toURL().toString();
+            String svgURI = new File( inputPath ).toURL().toString(); //TODO fix
             TranscoderInput input = new TranscoderInput( svgURI );
             // Create the transcoder output.
             OutputStream ostream = new FileOutputStream( outputPath );

=== modified file 'dhis-2/dhis-web/dhis-web-jforum-integration/src/test/java/org/hisp/dhis/jforum/manager/JForumManagerTest.java'
--- dhis-2/dhis-web/dhis-web-jforum-integration/src/test/java/org/hisp/dhis/jforum/manager/JForumManagerTest.java	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-web/dhis-web-jforum-integration/src/test/java/org/hisp/dhis/jforum/manager/JForumManagerTest.java	2009-06-11 00:09:19 +0000
@@ -27,7 +27,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import org.hisp.dhis.DhisConvenienceTest;
 import org.hisp.dhis.DhisSpringTest;
 import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.indicator.IndicatorService;



--
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.