Changeset 29298 in osm

Timestamp:

2013-03-02T00:32:50+01:00 (11 years ago)

Author:

donvip

Message:

[josm_opendata] better handling of .ods files (management of repeated cells)

Location:

applications/editors/josm/plugins/opendata

Files:

• includes/org/jopendocument/io/SaxContentUnmarshaller.java (modified) (1 diff)
• includes/org/jopendocument/model/table/TableTableCell.java (modified) (3 diffs)
• includes/org/jopendocument/model/table/TableTableRow.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java (modified) (3 diffs)

applications/editors/josm/plugins/opendata/includes/org/jopendocument/io/SaxContentUnmarshaller.java

@@ -285 +285 @@
             final TableTableCell cell = new TableTableCell();
             cell.setTableStyleName(attribs.getValue("table:style-name"));
-            //cell.setTableNumberColumnsRepeated(attribs.getValue("table:number-columns-repeated"));
+            cell.setTableNumberColumnsRepeated(attribs.getValue("table:number-columns-repeated"));
             //cell.setTableNumberColumnsSpanned(attribs.getValue("table:number-columns-spanned"));
             //cell.setTableNumberRowsSpanned(attribs.getValue("table:number-rows-spanned"));

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableCell.java

@@ -22 +22 @@
     private TableTableColumn column;
 
+    protected int tableNumberColumnsRepeated = 1;
+    
     protected String tableStyleName;
 
     private TextP textP;
+
+    protected TableTableCell cloneCell() {
+        final TableTableCell c = new TableTableCell();
+
+        c.tableNumberColumnsRepeated = this.tableNumberColumnsRepeated;
+        c.tableStyleName = this.tableStyleName;
+        c.textP = this.textP;
+        return c;
+    }
 
     private void computeStyle() {
@@ -48 +59 @@
     }
 
+    /**
+     * Gets the value of the tableNumberColumnsRepeated property.
+     * 
+     */
+    public int getTableNumberColumnsRepeated() {
+        return this.tableNumberColumnsRepeated;
+    }
+    
     public TextP getTextP() {
         return this.textP;
+    }
+
+    /**
+     * Sets the value of the tableNumberColumnsRepeated property.
+     * 
+     * @param value allowed object is {@link String }
+     * 
+     */
+    public void setTableNumberColumnsRepeated(final String value) {
+        if (value != null) {
+            this.tableNumberColumnsRepeated = Integer.valueOf(value);
+        }
     }
 
@@ -64 +95 @@
 
     }
-
 
     public void setTextP(final TextP p) {

applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java

@@ -16 +16 @@
 package org.jopendocument.model.table;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Vector;
 
@@ -23 +25 @@
 public class TableTableRow {
     static int count = 0;
-
+    ArrayList<TableTableCell> allCells;
 
     Vector<TableTableCell> cells = new Vector<TableTableCell>();
 
     int id = 0;
-
+    
     protected int tableNumberRowsRepeated = 1;
 
@@ -39 +41 @@
         this.cells.add(c);
 
+    }
+    
+    /**
+     * Compute AllCell except the last one
+     */
+    void computeAllCells() {
+        this.allCells = new ArrayList<TableTableCell>();
+        for (int index = 0; index < this.cells.size(); index++) {
+            final TableTableCell c = this.cells.get(index);
+            // for (TableTableCell c : cells) {
+            //final int colPosition = this.allCells.size();
+            int repeated = c.getTableNumberColumnsRepeated();
+            // la derniere colonne n'est repétée que dans la limite de la zone d'impression
+            // sinon, on s'en coltine des milliers
+            if (index == this.cells.size() - 1) {
+                //repeated = this.getTable().getPrintStopCol() - this.allCells.size() + 1;
+                // Patch JOSM open data : do not care about last cell
+                repeated = 0;
+            }
+            for (int i = 0; i < repeated; i++) {
+             // Patch JOSM open data : do not care about column
+                //final TableTableColumn col = this.table.getColumnAtPosition(colPosition + i);
+                final TableTableCell cc = c.cloneCell();
+                //cc.setRowAndColumn(this, col);
+                this.allCells.add(cc);
+            }
+        }
+        // }}
+        // System.err.println("Computed:" + allCells.size() + " :" + allCells);
+    }
+    
+    public Collection<TableTableCell> getAllCells() {
+
+        if (this.allCells == null) {
+            this.computeAllCells();
+        }
+        
+        return this.allCells;
     }
 
@@ -56 +96 @@
     // return cells;
     // }
-
 
     public String getText() {

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/OdsReader.java

@@ -24 +24 @@
 import org.jopendocument.model.office.OfficeSpreadsheet;
 import org.jopendocument.model.table.TableTable;
+import org.jopendocument.model.table.TableTableCell;
 import org.jopendocument.model.table.TableTableRow;
+import org.jopendocument.model.text.TextP;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -36 +38 @@
         private int rowIndex;
         
-        private static final String SEP = "TextP:\\[";
+        private static final String SEP = "TextP:[";
         
         public OdsReader(SpreadSheetHandler handler) {
@@ -79 +81 @@
                         List<String> result = new ArrayList<String>();
                         boolean allFieldsBlank = true;
-                        for (String text : row.getText().replaceFirst(SEP, "").replaceAll("\\]", "").replaceAll("null", SEP).split(SEP)) {
-                                result.add(text);
-                                if (allFieldsBlank && !text.isEmpty()) {
-                                        allFieldsBlank = false;
-                                }
+                        for (TableTableCell cell : row.getAllCells()) {
+                            TextP textP = cell.getTextP();
+                            String text = textP == null ? "" : textP.toString().replace(SEP, "").replace("]", "").replace("null", "").trim();
+                result.add(text);
+                if (allFieldsBlank && !text.isEmpty()) {
+                    allFieldsBlank = false;
+                }
                         }