Changeset 29298 in osm for applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java

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)

File:

• applications/editors/josm/plugins/opendata/includes/org/jopendocument/model/table/TableTableRow.java (modified) (4 diffs)

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() {