litvinovg/w2phtml
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 21 Packages Wiki Activity Actions

Refactored table rows split method

Browse source
This commit is contained in:
Georgy Litvinov 2020-07-24 19:27:14 +02:00
parent 4ff33bcc3f
commit 874aae1e80
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/w2phtml/xhtml/ODFPageSplitter.java
View file

@ -316,7 +316,6 @@ public class ODFPageSplitter {
String tableChildNodeName = tableChildNode.getNodeName(); String tableChildNodeName = tableChildNode.getNodeName();
//System.out.println("Table child node " + tableChildNodeName); //System.out.println("Table child node " + tableChildNodeName);
if (containsSPB(tableChildNode)){ if (containsSPB(tableChildNode)){
Node tableChildFirstPart = tableChildNode.cloneNode(false);
if (tableChildNodeName.equals(TEXT_SOFT_PAGE_BREAK)) { if (tableChildNodeName.equals(TEXT_SOFT_PAGE_BREAK)) {
// remove inner soft page break node // remove inner soft page break node
table.removeChild(tableChildNode); table.removeChild(tableChildNode);
@ -327,9 +326,9 @@ public class ODFPageSplitter {
tableFirstPart.appendChild(tableChildNode.getPreviousSibling()); tableFirstPart.appendChild(tableChildNode.getPreviousSibling());
} }
} else if ( tableChildNodeName.equals(TABLE_TABLE_ROWS)) { } else if ( tableChildNodeName.equals(TABLE_TABLE_ROWS)) {
if (handleTableRows(tableChildFirstPart, tableChildNode)){ if (handleTableRows(tableChildNode)){
dataMoved = true; dataMoved = true;
tableFirstPart.appendChild(tableChildFirstPart); tableFirstPart.appendChild(tableChildNode.getPreviousSibling());
} }
} else if ( tableChildNodeName.equals(TABLE_TABLE_ROW)) { } else if ( tableChildNodeName.equals(TABLE_TABLE_ROW)) {
if (handleTableRow(tableChildNode)){ if (handleTableRow(tableChildNode)){
@ -384,7 +383,6 @@ public class ODFPageSplitter {
String nodeName = tableRowGroupChildNode.getNodeName(); String nodeName = tableRowGroupChildNode.getNodeName();
if (containsSPB(tableRowGroupChildNode)){ if (containsSPB(tableRowGroupChildNode)){
Node tableRowGroupChildFirstPart = tableRowGroupChildNode.cloneNode(false);
if (nodeName.equals(TEXT_SOFT_PAGE_BREAK)){ if (nodeName.equals(TEXT_SOFT_PAGE_BREAK)){
// remove inner soft page break node // remove inner soft page break node
tableRowGroup.removeChild(tableRowGroupChildNode); tableRowGroup.removeChild(tableRowGroupChildNode);
@ -404,9 +402,9 @@ public class ODFPageSplitter {
tableRowGroupFistPart.appendChild(tableRowGroupChildNode.getPreviousSibling()); tableRowGroupFistPart.appendChild(tableRowGroupChildNode.getPreviousSibling());
} }
} else if (nodeName.equals(TABLE_TABLE_ROWS)){ } else if (nodeName.equals(TABLE_TABLE_ROWS)){
if (handleTableRows(tableRowGroupChildFirstPart, tableRowGroupChildNode)){ if (handleTableRows(tableRowGroupChildNode)){
dataMoved = true; dataMoved = true;
tableRowGroupFistPart.appendChild(tableRowGroupChildFirstPart); tableRowGroupFistPart.appendChild(tableRowGroupChildNode.getPreviousSibling());
} }
} }
break; break;
@ -434,7 +432,9 @@ public class ODFPageSplitter {
return dataMoved; return dataMoved;
} }
private static boolean handleTableRows(Node tableRowsFistPart, Node tableRows) { private static boolean handleTableRows(Node tableRows) {
Node tableRowsFirstPart = tableRows.cloneNode(false);
Node parent = tableRows.getParentNode();
boolean dataMoved = false; boolean dataMoved = false;
// Node counter // Node counter
int i = 0; int i = 0;
@ -446,7 +446,6 @@ public class ODFPageSplitter {
String nodeName = tableRowsChildNode.getNodeName(); String nodeName = tableRowsChildNode.getNodeName();
if (containsSPB(tableRowsChildNode)){ if (containsSPB(tableRowsChildNode)){
Node tableRowGroupChildFirstPart = tableRowsChildNode.cloneNode(false);
if (nodeName.equals(TEXT_SOFT_PAGE_BREAK)){ if (nodeName.equals(TEXT_SOFT_PAGE_BREAK)){
// remove inner soft page break node // remove inner soft page break node
tableRows.removeChild(tableRowsChildNode); tableRows.removeChild(tableRowsChildNode);
@ -454,12 +453,12 @@ public class ODFPageSplitter {
} else if (nodeName.equals(TABLE_TABLE_ROW)){ } else if (nodeName.equals(TABLE_TABLE_ROW)){
if (handleTableRow(tableRowsChildNode)){ if (handleTableRow(tableRowsChildNode)){
dataMoved = true; dataMoved = true;
tableRowsFistPart.appendChild(tableRowsChildNode.getPreviousSibling()); tableRowsFirstPart.appendChild(tableRowsChildNode.getPreviousSibling());
} }
} }
break; break;
} else { } else {
tableRowsFistPart.appendChild(tableRowsChildNode); tableRowsFirstPart.appendChild(tableRowsChildNode);
dataMoved = true; dataMoved = true;
} }
} else { } else {
@ -470,6 +469,9 @@ public class ODFPageSplitter {
} }
} }
if (dataMoved) {
parent.insertBefore(tableRowsFirstPart, tableRows);
}
return dataMoved; return dataMoved;
} }
private static boolean handleTableRow(Node tableRow) { private static boolean handleTableRow(Node tableRow) {