[FOray-commit] SF.net SVN: foray:[12996] trunk/foray

[<vic...@us...>]

Revision: 12996
          http://sourceforge.net/p/foray/code/12996
Author:   victormote
Date:     2023-01-01 15:15:15 +0000 (Sun, 01 Jan 2023)
Log Message:
-----------
Conform to aXSL change: Change return type from array to List.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
    trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java
    trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractTablePartPnr.java

Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2023-01-01 12:42:15 UTC (rev 12995)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java	2023-01-01 15:15:15 UTC (rev 12996)
@@ -280,8 +280,8 @@
         double tuMin = Double.MAX_VALUE;
         /* Loop through the columns and total the fixed widths and proportional
          * units for each one. */
-        for (int i = 0; i < table.getTableColumns().length; i++) {
-            final TableColumn column = table.getTableColumns()[i];
+        for (int i = 0; i < table.getTableColumns().size(); i++) {
+            final TableColumn column = table.getTableColumns().get(i);
             if (column == null) {
                 getAreaTree().logWarning("No table-column specification for column " + (i + 1) + ".");
             } else {
@@ -379,8 +379,8 @@
         }
         // Now distribute the extra units onto each column and set offsets
         int columnOffset = 0;
-        for (int i = 0; i < table.getTableColumns().length; i++) {
-            final TableColumn column = table.getTableColumns()[i];
+        for (int i = 0; i < table.getTableColumns().size(); i++) {
+            final TableColumn column = table.getTableColumns().get(i);
             if (column != null) {
                 //Compute the width of the column
                 int colWidth = -1;

Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java	2023-01-01 12:42:15 UTC (rev 12995)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java	2023-01-01 15:15:15 UTC (rev 12996)
@@ -223,13 +223,8 @@
     }
 
     @Override
-    public TableColumn4a[] getTableColumns() {
-        final TableColumn4a[] returnColumns =
-                new TableColumn4a[this.columns.size()];
-        for (int i = 0; i < this.columns.size(); i++) {
-            returnColumns[i] = this.columns.get(i);
-        }
-        return returnColumns;
+    public List<TableColumn4a> getTableColumns() {
+        return this.columns;
     }
 
     @Override

Modified: trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractTablePartPnr.java
===================================================================
--- trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractTablePartPnr.java	2023-01-01 12:42:15 UTC (rev 12995)
+++ trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/AbstractTablePartPnr.java	2023-01-01 15:15:15 UTC (rev 12996)
@@ -92,8 +92,7 @@
 
         if (getProgress() == FoNodePnr.START) {
             if (this.rowSpanMgr == null) {
-                this.rowSpanMgr = new RowSpanMgr(table.getTableColumns().length,
-                        this.getLayout());
+                this.rowSpanMgr = new RowSpanMgr(table.getTableColumns().size(), this.getLayout());
             }
 
             // if (this.isInListBody) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.