From: Nick Burch Date: Tue, 22 Jun 2010 11:08:21 +0000 (+0000) Subject: Revert r954835 now that POI 3.7 beta1 is out - go back to using 1.5 compiled editions... X-Git-Tag: REL_3_7_BETA2~55 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a155ef63a718b01b645ce89babc46242c11b3aa0;p=poi.git Revert r954835 now that POI 3.7 beta1 is out - go back to using 1.5 compiled editions of the ooxml schemas git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@956850 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build.xml b/build.xml index 18984f8cab..cf73e62752 100644 --- a/build.xml +++ b/build.xml @@ -135,9 +135,9 @@ under the License. - + + value="${repository.m2}/maven2/org/apache/poi/ooxml-schemas/1.1/ooxml-schemas-1.1.jar"/> @@ -146,8 +146,8 @@ under the License. - - + + @@ -397,7 +397,7 @@ under the License. srcgendir="${ooxml.xsds.src.dir}" optimize="yes" destfile="${ooxml.xsds.jar}" - javasource="1.4" + javasource="1.5" failonerror="true" fork="true" memoryMaximumSize="512m" diff --git a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java b/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java index 3e35db871e..f443be4837 100644 --- a/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java +++ b/src/ooxml/java/org/apache/poi/xssf/model/CommentsTable.java @@ -116,7 +116,7 @@ public class CommentsTable extends POIXMLDocumentPart { // Create the cache if needed if(commentRefs == null) { commentRefs = new HashMap(); - for (CTComment comment : comments.getCommentList().getCommentArray()) { + for (CTComment comment : comments.getCommentList().getCommentList()) { commentRefs.put(comment.getRef(), comment); } } diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java index e771424170..6aabadef95 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java @@ -93,8 +93,8 @@ public class XWPFParagraph implements IBodyElement{ } runs = new ArrayList(); - if (prgrph.getRArray().length > 0) { - for(CTR ctRun : prgrph.getRArray()) { + if (prgrph.getRList().size() > 0) { + for(CTR ctRun : prgrph.getRList()) { runs.add(new XWPFRun(ctRun, this)); } } @@ -111,17 +111,17 @@ public class XWPFParagraph implements IBodyElement{ // TODO - replace this with some sort of XPath expression // to directly find all the CTRs, in the right order ArrayList rs = new ArrayList(); - rs.addAll( Arrays.asList(paragraph.getRArray()) ); + rs.addAll( paragraph.getRList() ); - for (CTSdtRun sdt : paragraph.getSdtArray()) { + for (CTSdtRun sdt : paragraph.getSdtList()) { CTSdtContentRun run = sdt.getSdtContent(); - rs.addAll( Arrays.asList(run.getRArray()) ); + rs.addAll( run.getRList() ); } - for (CTRunTrackChange c : paragraph.getDelArray()) { - rs.addAll( Arrays.asList(c.getRArray()) ); + for (CTRunTrackChange c : paragraph.getDelList()) { + rs.addAll( c.getRList() ); } - for (CTRunTrackChange c : paragraph.getInsArray()) { - rs.addAll( Arrays.asList(c.getRArray()) ); + for (CTRunTrackChange c : paragraph.getInsList()) { + rs.addAll( c.getRList() ); } // Get text of the paragraph @@ -179,7 +179,7 @@ public class XWPFParagraph implements IBodyElement{ // Loop over pictures inside our // paragraph, looking for text in them - for(CTPicture pict : rs.get(j).getPictArray()) { + for(CTPicture pict : rs.get(j).getPictList()) { XmlObject[] t = pict .selectPath("declare namespace w='http://schemas.openxmlformats.org/wordprocessingml/2006/main' .//w:t"); for (int m = 0; m < t.length; m++) {