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 2010/06/11 16:46:30 UTC
svn commit: r953707 - in
/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel: XWPFDocument.java
XWPFFooter.java XWPFHeader.java XWPFHeaderFooter.java XWPFParagraph.java
XWPFTable.java XWPFTableCell.java
Author: nick
Date: Fri Jun 11 14:46:29 2010
New Revision: 953707
URL: http://svn.apache.org/viewvc?rev=953707&view=rev
Log:
Fix 1.6-isms from the patch from bug #48574
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFDocument.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
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=953707&r1=953706&r2=953707&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 Jun 11 14:46:29 2010
@@ -304,7 +304,6 @@ public class XWPFDocument extends POIXML
/**
* @see org.apache.poi.xwpf.usermodel.IBody#getTableArray(int)
*/
- @Override
public XWPFTable getTableArray(int pos) {
if(pos > 0 && pos < tables.size()){
return tables.get(pos);
@@ -942,7 +941,6 @@ public class XWPFDocument extends POIXML
* @param i
* @param table
*/
- @Override
public void insertTable(int pos, XWPFTable table) {
bodyElements.add(pos, table);
int i;
@@ -1163,7 +1161,6 @@ public class XWPFDocument extends POIXML
* Returns the paragraph that of position pos
* @see org.apache.poi.xwpf.usermodel.IBody#getParagraphArray(int)
*/
- @Override
public XWPFParagraph getParagraphArray(int pos) {
if(pos > 0 && pos < paragraphs.size()){
return paragraphs.get(pos);
@@ -1179,7 +1176,6 @@ public class XWPFDocument extends POIXML
* belongs.
* @see org.apache.poi.xwpf.usermodel.IBody#getPart()
*/
- @Override
public IBody getPart() {
return this;
}
@@ -1190,7 +1186,6 @@ public class XWPFDocument extends POIXML
* @return
* @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
*/
- @Override
public BodyType getPartType() {
return BodyType.DOCUMENT;
}
@@ -1200,7 +1195,6 @@ public class XWPFDocument extends POIXML
* @param o
* @return
*/
- @Override
public XWPFTableCell getTableCell(CTTc cell) {
XmlCursor cursor = cell.newCursor();
cursor.toParent();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java?rev=953707&r1=953706&r2=953707&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFFooter.java Fri Jun 11 14:46:29 2010
@@ -138,7 +138,6 @@ public class XWPFFooter extends XWPFHead
* returns the Part, to which the body belongs, which you need for adding relationship to other parts
* @see org.apache.poi.xwpf.usermodel.IBody#getPart()
*/
- @Override
public IBody getPart() {
return this;
}
@@ -147,7 +146,6 @@ public class XWPFFooter extends XWPFHead
* get the PartType of the body
* @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
*/
- @Override
public BodyType getPartType() {
return BodyType.FOOTER;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java?rev=953707&r1=953706&r2=953707&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeader.java Fri Jun 11 14:46:29 2010
@@ -147,7 +147,6 @@ public class XWPFHeader extends XWPFHead
* returns the Part, to which the body belongs, which you need for adding relationship to other parts
* @see org.apache.poi.xwpf.usermodel.IBody#getPart()
*/
- @Override
public IBody getPart() {
return this;
}
@@ -156,7 +155,6 @@ public class XWPFHeader extends XWPFHead
* get the PartType of the body
* @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
*/
- @Override
public BodyType getPartType() {
return BodyType.HEADER;
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java?rev=953707&r1=953706&r2=953707&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFHeaderFooter.java Fri Jun 11 14:46:29 2010
@@ -441,7 +441,6 @@ public abstract class XWPFHeaderFooter e
* Returns the table at position pos
* @see org.apache.poi.xwpf.usermodel.IBody#getTableArray(int)
*/
- @Override
public XWPFTable getTableArray(int pos) {
if(pos > 0 && pos < tables.size()){
@@ -455,7 +454,6 @@ public abstract class XWPFHeaderFooter e
* @param i
* @param table
*/
- @Override
public void insertTable(int pos, XWPFTable table) {
bodyElements.add(pos, table);
int i;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java?rev=953707&r1=953706&r2=953707&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java Fri Jun 11 14:46:29 2010
@@ -1278,7 +1278,6 @@ public class XWPFParagraph implements IB
* returns the type of the BodyElement Paragraph
* @see org.apache.poi.xwpf.usermodel.IBodyElement#getElementType()
*/
- @Override
public BodyElementType getElementType() {
return BodyElementType.PARAGRAPH;
}
@@ -1287,7 +1286,6 @@ public class XWPFParagraph implements IB
* returns the part of the bodyElement
* @see org.apache.poi.xwpf.usermodel.IBody#getPart()
*/
- @Override
public IBody getPart() {
if(part != null){
return part.getPart();
@@ -1299,7 +1297,6 @@ public class XWPFParagraph implements IB
* returns the partType of the bodyPart which owns the bodyElement
* @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
*/
- @Override
public BodyType getPartType() {
return part.getPartType();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java?rev=953707&r1=953706&r2=953707&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTable.java Fri Jun 11 14:46:29 2010
@@ -291,7 +291,6 @@ public class XWPFTable implements IBodyE
* returns the type of the BodyElement Table
* @see org.apache.poi.xwpf.usermodel.IBodyElement#getElementType()
*/
- @Override
public BodyElementType getElementType() {
return BodyElementType.TABLE;
}
@@ -301,7 +300,6 @@ public class XWPFTable implements IBodyE
* returns the part of the bodyElement
* @see org.apache.poi.xwpf.usermodel.IBody#getPart()
*/
- @Override
public IBody getPart() {
if(part != null){
return part.getPart();
@@ -314,7 +312,6 @@ public class XWPFTable implements IBodyE
* returns the partType of the bodyPart which owns the bodyElement
* @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
*/
- @Override
public BodyType getPartType() {
return ((IBody)part).getPartType();
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java?rev=953707&r1=953706&r2=953707&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFTableCell.java Fri Jun 11 14:46:29 2010
@@ -114,7 +114,6 @@ public class XWPFTableCell implements IB
* @return null if there is no XWPFParagraph with an corresponding CTPparagraph in the paragraphList of this table
* XWPFParagraph with the correspondig CTP p
*/
- @Override
public XWPFParagraph getParagraph(CTP p){
for (XWPFParagraph paragraph : paragraphs) {
if(p.equals(paragraph.getCTP())){
@@ -232,7 +231,6 @@ public class XWPFTableCell implements IB
/**
* @see org.apache.poi.xwpf.usermodel.IBody#getParagraphArray(int)
*/
- @Override
public XWPFParagraph getParagraphArray(int pos) {
if(pos > 0 && pos < paragraphs.size()){
return paragraphs.get(pos);
@@ -247,7 +245,6 @@ public class XWPFTableCell implements IB
* get the to which the TableCell belongs
* @see org.apache.poi.xwpf.usermodel.IBody#getPart()
*/
- @Override
public IBody getPart() {
return (IBody) tableRow.getTable().getPart();
}
@@ -256,7 +253,6 @@ public class XWPFTableCell implements IB
/**
* @see org.apache.poi.xwpf.usermodel.IBody#getPartType()
*/
- @Override
public BodyType getPartType() {
return BodyType.TABLECELL;
}
@@ -266,7 +262,6 @@ public class XWPFTableCell implements IB
* get a table by its CTTbl-Object
* @see org.apache.poi.xwpf.usermodel.IBody#getTable(org.openxmlformats.schemas.wordprocessingml.x2006.main.CTTbl)
*/
- @Override
public XWPFTable getTable(CTTbl ctTable) {
for(int i=0; i<tables.size(); i++){
if(getTables().get(i).getCTTbl() == ctTable) return getTables().get(i);
@@ -278,7 +273,6 @@ public class XWPFTableCell implements IB
/**
* @see org.apache.poi.xwpf.usermodel.IBodyPart#getTableArray(int)
*/
- @Override
public XWPFTable getTableArray(int pos) {
if(pos > 0 && pos < tables.size()){
return tables.get(pos);
@@ -290,7 +284,6 @@ public class XWPFTableCell implements IB
/**
* @see org.apache.poi.xwpf.usermodel.IBodyPart#getTables()
*/
- @Override
public List<XWPFTable> getTables() {
return Collections.unmodifiableList(tables);
}
@@ -300,7 +293,6 @@ public class XWPFTableCell implements IB
* inserts an existing XWPFTable to the arrays bodyElements and tables
* @see org.apache.poi.xwpf.usermodel.IBody#insertTable(int, org.apache.poi.xwpf.usermodel.XWPFTable)
*/
- @Override
public void insertTable(int pos, XWPFTable table) {
bodyElements.add(pos, table);
int i;
@@ -327,7 +319,6 @@ public class XWPFTableCell implements IB
* @param o
* @return
*/
- @Override
public XWPFTableCell getTableCell(CTTc cell) {
XmlCursor cursor = cell.newCursor();
cursor.toParent();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org