You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2011/05/06 04:14:49 UTC
svn commit: r1100027 - in /poi/trunk/src:
documentation/content/xdocs/status.xml
ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
Author: nick
Date: Fri May 6 02:14:48 2011
New Revision: 1100027
URL: http://svn.apache.org/viewvc?rev=1100027&view=rev
Log:
Fix bug #51148 - XWPFDocument remove of tables/paragraphs now works correctly, and code is simplified
Modified:
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=1100027&r1=1100026&r2=1100027&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Fri May 6 02:14:48 2011
@@ -34,6 +34,7 @@
<changes>
<release version="3.8-beta3" date="2011-??-??">
+ <action dev="poi-developers" type="fix">51148 - XWPFDocument now properly tracks paragraphs and tables when adding/removing them</action>
<action dev="poi-developers" type="fix">51153 - Correct sizing of LbsDataSubRecord with unused padding fields</action>
<action dev="poi-developers" type="fix">51143 - NameCommentRecord correction for writing non ASCII strings</action>
<action dev="poi-developers" type="fix">51112 - Correct XWPFTable tracking of new rows</action>
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java?rev=1100027&r1=1100026&r2=1100027&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java Fri May 6 02:14:48 2011
@@ -254,6 +254,11 @@ public class XWPFDocument extends POIXML
comments = new ArrayList<XWPFComment>();
paragraphs = new ArrayList<XWPFParagraph>();
tables= new ArrayList<XWPFTable>();
+ bodyElements = new ArrayList<IBodyElement>();
+ footers = new ArrayList<XWPFFooter>();
+ headers = new ArrayList<XWPFHeader>();
+ footnotes = new HashMap<Integer, XWPFFootnote>();
+ endnotes = new HashMap<Integer, XWPFFootnote>();
ctDocument = CTDocument1.Factory.newInstance();
ctDocument.addNewBody();
@@ -439,6 +444,36 @@ public class XWPFDocument extends POIXML
}
/**
+ * Finds that for example the 2nd entry in the body list is the 1st paragraph
+ */
+ private int getBodyElementSpecificPos(int pos, List<? extends IBodyElement> list) {
+ // If there's nothing to find, skip it
+ if(list.size() == 0) {
+ return -1;
+ }
+
+ if(pos >= 0 && pos < bodyElements.size()) {
+ // Ensure the type is correct
+ IBodyElement needle = bodyElements.get(pos);
+ if(needle.getElementType() != list.get(0).getElementType()) {
+ // Wrong type
+ return -1;
+ }
+
+ // Work back until we find it
+ int startPos = Math.min(pos, list.size()-1);
+ for(int i=startPos; i>=0; i--) {
+ if(list.get(i) == needle) {
+ return i;
+ }
+ }
+ }
+
+ // Couldn't be found
+ return -1;
+ }
+
+ /**
* get with the position of a Paragraph in the bodyelement array list
* the position of this paragraph in the paragraph array list
* @param pos position of the paragraph in the bodyelement array list
@@ -447,26 +482,7 @@ public class XWPFDocument extends POIXML
*
*/
public int getParagraphPos(int pos){
- if(pos >= 0 && pos < bodyElements.size()){
- if(bodyElements.get(pos).getElementType() == BodyElementType.PARAGRAPH){
- int startPos;
- //find the startpoint for searching
- if(pos < paragraphs.size()){
- startPos = pos;
- }
- else{
- startPos = (paragraphs.size());
- }
- for(int i = startPos; i < 0; i--){
- if(paragraphs.get(i) == bodyElements.get(pos))
- return i;
- }
- }
- }
- if(paragraphs.size() == 0){
- return 0;
- }
- return -1;
+ return getBodyElementSpecificPos(pos, paragraphs);
}
/**
@@ -477,27 +493,7 @@ public class XWPFDocument extends POIXML
* else it will return null.
*/
public int getTablePos(int pos){
- if(pos >= 0 && pos < bodyElements.size()){
- if(bodyElements.get(pos).getElementType() == BodyElementType.TABLE){
- int startPos;
- //find the startpoint for searching
- if(pos < tables.size()){
- startPos = pos;
- }
- else{
- startPos = (tables.size());
- }
- for(int i = startPos; i > 0; i--){
- if(tables.get(i) == bodyElements.get(pos))
- return i;
- }
- }
- }
- if(tables.size() == 0){
- return 0;
- }
- else
- return -1;
+ return getBodyElementSpecificPos(pos, tables);
}
/**
@@ -650,6 +646,7 @@ public class XWPFDocument extends POIXML
*/
public XWPFParagraph createParagraph(){
XWPFParagraph p = new XWPFParagraph(ctDocument.getBody().addNewP(), this);
+ bodyElements.add(p);
paragraphs.add(p);
return p;
}
@@ -660,21 +657,20 @@ public class XWPFDocument extends POIXML
* @return true if removing was successfully, else return false
*/
public boolean removeBodyElement(int pos){
- if(pos >= 0 && pos < bodyElements.size()){
- if(bodyElements.get(pos).getElementType() == BodyElementType.TABLE){
- bodyElements.remove(pos);
- Integer tablePos = getTablePos(pos);
+ if(pos >= 0 && pos < bodyElements.size()) {
+ BodyElementType type = bodyElements.get(pos).getElementType();
+ if(type == BodyElementType.TABLE){
+ int tablePos = getTablePos(pos);
tables.remove(tablePos);
ctDocument.getBody().removeTbl(tablePos);
- return true;
}
- if(bodyElements.get(pos).getElementType() == BodyElementType.PARAGRAPH){
- bodyElements.remove(pos);
- Integer paraPos = getParagraphPos(pos);
+ if(type == BodyElementType.PARAGRAPH){
+ int paraPos = getParagraphPos(pos);
paragraphs.remove(paraPos);
ctDocument.getBody().removeP(paraPos);
- return true;
}
+ bodyElements.remove(pos);
+ return true;
}
return false;
}
@@ -702,7 +698,10 @@ public class XWPFDocument extends POIXML
* @return a new table
*/
public XWPFTable createTable(){
- return new XWPFTable(ctDocument.getBody().addNewTbl(), this);
+ XWPFTable table = new XWPFTable(ctDocument.getBody().addNewTbl(), this);
+ bodyElements.add(table);
+ tables.add(table);
+ return table;
}
/**
@@ -712,7 +711,10 @@ public class XWPFDocument extends POIXML
* @return table
*/
public XWPFTable createTable(int rows, int cols) {
- return new XWPFTable(ctDocument.getBody().addNewTbl(), this, rows, cols);
+ XWPFTable table = new XWPFTable(ctDocument.getBody().addNewTbl(), this, rows, cols);
+ bodyElements.add(table);
+ tables.add(table);
+ return table;
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java?rev=1100027&r1=1100026&r2=1100027&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java Fri May 6 02:14:48 2011
@@ -130,4 +130,65 @@ public final class TestXWPFDocument exte
e.printStackTrace();
}
}
+
+ public void testRemoveBodyElement() {
+ XWPFDocument doc = XWPFTestDataSamples.openSampleDocument("sample.docx");
+ assertEquals(3, doc.getParagraphs().size());
+ assertEquals(3, doc.getBodyElements().size());
+
+ XWPFParagraph p1 = doc.getParagraphs().get(0);
+ XWPFParagraph p2 = doc.getParagraphs().get(1);
+ XWPFParagraph p3 = doc.getParagraphs().get(2);
+
+ assertEquals(p1, doc.getBodyElements().get(0));
+ assertEquals(p1, doc.getParagraphs().get(0));
+ assertEquals(p2, doc.getBodyElements().get(1));
+ assertEquals(p2, doc.getParagraphs().get(1));
+ assertEquals(p3, doc.getBodyElements().get(2));
+ assertEquals(p3, doc.getParagraphs().get(2));
+
+ // Add another
+ XWPFParagraph p4 = doc.createParagraph();
+
+ assertEquals(4, doc.getParagraphs().size());
+ assertEquals(4, doc.getBodyElements().size());
+ assertEquals(p1, doc.getBodyElements().get(0));
+ assertEquals(p1, doc.getParagraphs().get(0));
+ assertEquals(p2, doc.getBodyElements().get(1));
+ assertEquals(p2, doc.getParagraphs().get(1));
+ assertEquals(p3, doc.getBodyElements().get(2));
+ assertEquals(p3, doc.getParagraphs().get(2));
+ assertEquals(p4, doc.getBodyElements().get(3));
+ assertEquals(p4, doc.getParagraphs().get(3));
+
+ // Remove the 2nd
+ assertEquals(true, doc.removeBodyElement(1));
+ assertEquals(3, doc.getParagraphs().size());
+ assertEquals(3, doc.getBodyElements().size());
+
+ assertEquals(p1, doc.getBodyElements().get(0));
+ assertEquals(p1, doc.getParagraphs().get(0));
+ assertEquals(p3, doc.getBodyElements().get(1));
+ assertEquals(p3, doc.getParagraphs().get(1));
+ assertEquals(p4, doc.getBodyElements().get(2));
+ assertEquals(p4, doc.getParagraphs().get(2));
+
+ // Remove the 1st
+ assertEquals(true, doc.removeBodyElement(0));
+ assertEquals(2, doc.getParagraphs().size());
+ assertEquals(2, doc.getBodyElements().size());
+
+ assertEquals(p3, doc.getBodyElements().get(0));
+ assertEquals(p3, doc.getParagraphs().get(0));
+ assertEquals(p4, doc.getBodyElements().get(1));
+ assertEquals(p4, doc.getParagraphs().get(1));
+
+ // Remove the last
+ assertEquals(true, doc.removeBodyElement(1));
+ assertEquals(1, doc.getParagraphs().size());
+ assertEquals(1, doc.getBodyElements().size());
+
+ assertEquals(p3, doc.getBodyElements().get(0));
+ assertEquals(p3, doc.getParagraphs().get(0));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org