dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5129
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-11-09 14:39:59 +0700
message:
  local vn - Updated
modified:
  local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.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 'local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java'
--- local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java	2011-11-03 04:26:28 +0000
+++ local/vn/dhis-web-spreadsheet-reporting/src/main/java/org/hisp/dhis/reportsheet/preview/action/XMLStructureResponseImport.java	2011-11-09 07:39:59 +0000
@@ -69,7 +69,7 @@
      * The workbook we are reading from a given file
      */
     private Workbook WORKBOOK;
-    
+
     private FormulaEvaluator evaluatorFormula;
 
     private static final String WORKBOOK_OPENTAG = "<workbook>";
@@ -119,10 +119,10 @@
         {
             this.WORKBOOK = new XSSFWorkbook( inputStream );
         }
-        
+
         resetDecimalFormatByLocale( Locale.GERMAN );
         applyPatternDecimalFormat( PATTERN_DECIMAL_FORMAT1 );
-        
+
         this.evaluatorFormula = WORKBOOK.getCreationHelper().createFormulaEvaluator();
 
         this.writeFormattedXML( collectSheets, importItems, bWriteDescription );
@@ -201,7 +201,8 @@
                             && (importItem.getColumn() == (j + 1)) )
                         {
                             xml.append( " id='" + importItem.getExpression() + "'>" );
-                            // If there is any importItem matched the condition then break out the for loop
+                            // If there is any importItem matched the condition
+                            // then break out the for loop
                             break;
                         }
 
@@ -254,7 +255,9 @@
 
         if ( format != null )
         {
-            xml.append( "<format align='" + convertAlignmentString( format.getAlignment() ) + "'/>" );
+            xml.append( "<format align='" + convertAlignmentString( format.getAlignment() ) + "'" );
+            xml.append( " border='" + format.getBorderBottom() + format.getBorderLeft() + format.getBorderRight()
+                + format.getBorderTop() + "'/>" );
         }
     }
 }
\ No newline at end of file