dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1030
committer: hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Mon 2009-11-16 11:46:58 +0700
message:
  A few of modification ...
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/ExportXMLAction.java
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/StringUtils.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-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/ExportXMLAction.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/ExportXMLAction.java	2009-11-13 10:28:52 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/ExportXMLAction.java	2009-11-16 04:46:58 +0000
@@ -45,7 +45,6 @@
 public class ExportXMLAction
     implements Action
 {
-    private static final String SEPARATE = "/";
 
     private static final String ENCODING = "UTF8";
 
@@ -132,12 +131,4 @@
 
         // inputStream.close();
     }
-
-    @SuppressWarnings( "unused" )
-    private static final String replacedSeparateSimple( String path )
-    {
-        path = path.replace( "\\", SEPARATE );
-
-        return path;
-    }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java	2009-11-16 04:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/preview/action/XMLStructureResponse.java	2009-11-16 04:46:58 +0000
@@ -92,8 +92,6 @@
 
     private static final String PRINT_END_LINE = "\n";
 
-    public static final String NUMBER_OF_ZERO = "0";
-
     // ------------------------------------------------
     // Get & Set methods //
     // ------------------------------------------------
@@ -136,7 +134,6 @@
 
         if ( bFormat )
         {
-            // recalculatedValueForCellFormula(sheetId);
             writeFormattedXML( sheetId, bDetailed, bWriteDescription );
         }
         else
@@ -302,7 +299,6 @@
                         recalculatedValue = "";
 
                         switch ( evaluator.evaluateInCell( cellRef ).getCellType() )
-//                        switch ( evaluator.evaluateFormulaCell( cellRef ) )
                         {
                         case org.apache.poi.ss.usermodel.Cell.CELL_TYPE_NUMERIC:
 

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java	2009-11-16 04:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/ExcelUtils.java	2009-11-16 04:46:58 +0000
@@ -56,8 +56,6 @@
 
     public static final String NUMBER = "NUMBER";
 
-    public static final String NUMBER_OF_ZERO = "0";
-
     private final static Integer NUMBER_OF_LETTER = new Integer( 26 );
 
     public static void writeValue( int row, int column, String value, String type, WritableSheet sheet,

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/StringUtils.java'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/StringUtils.java	2009-11-16 04:13:04 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/utils/StringUtils.java	2009-11-16 04:46:58 +0000
@@ -39,6 +39,8 @@
     private static final String MIDDLE_LINE = "-";
 
     public static final String NUMBER_OF_ZERO = "0";
+    
+    private static final String SEPARATE = "/";
 
     /* ---------------------------------------------------------------------- */
     /*                                                                        */
@@ -69,7 +71,7 @@
 
             if ( Double.parseDouble( input ) >= 0.0d )
             {
-                if ( input.contains( "." ) )
+                if ( input.contains( DOT ) )
                 {
                     s1 = input.split( "\\." )[0];
                     s2 = input.split( "\\." )[1];
@@ -126,4 +128,16 @@
 
         return number;
     }
+    
+    /* ---------------------------------------------------------------------- */
+    /*                                                                        */
+    /* ---------------------------------------------------------------------- */
+
+    @SuppressWarnings("unused")
+    private static final String replacedSeparateCharacter( String path )
+    {
+        path = path.replace( "\\", SEPARATE );
+
+        return path;
+    }
 }