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/09/04 22:45:11 UTC
svn commit: r1165108 - in
/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel: XSLFComments.java
XSLFNotes.java XSLFRelation.java XSLFSlide.java
Author: nick
Date: Sun Sep 4 20:45:10 2011
New Revision: 1165108
URL: http://svn.apache.org/viewvc?rev=1165108&view=rev
Log:
Add XSLF access to slide comments, and fix some code comments
Added:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
Added: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java?rev=1165108&view=auto
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java (added)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFComments.java Sun Sep 4 20:45:10 2011
@@ -0,0 +1,62 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.xslf.usermodel;
+
+import java.io.IOException;
+
+import org.apache.poi.POIXMLDocumentPart;
+import org.apache.poi.openxml4j.opc.PackagePart;
+import org.apache.poi.openxml4j.opc.PackageRelationship;
+import org.apache.poi.util.Beta;
+import org.apache.xmlbeans.XmlException;
+import org.openxmlformats.schemas.presentationml.x2006.main.CTCommentList;
+import org.openxmlformats.schemas.presentationml.x2006.main.CmLstDocument;
+
+@Beta
+public class XSLFComments extends POIXMLDocumentPart {
+ private final CTCommentList _comments;
+
+ /**
+ * Create a new set of slide comments
+ */
+ XSLFComments() {
+ super();
+ CmLstDocument doc = CmLstDocument.Factory.newInstance();
+ _comments = doc.addNewCmLst();
+ }
+
+ /**
+ * Construct a SpreadsheetML slide comments from a package part
+ *
+ * @param part the package part holding the comments data,
+ * the content type must be <code>application/vnd.openxmlformats-officedocument.comments+xml</code>
+ * @param rel the package relationship holding this comments,
+ * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments
+ */
+ XSLFComments(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
+ super(part, rel);
+
+ CmLstDocument doc =
+ CmLstDocument.Factory.parse(getPackagePart().getInputStream());
+ _comments = doc.getCmLst();
+ }
+
+ public CTCommentList getCTCommentsList() {
+ return _comments;
+ }
+}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java?rev=1165108&r1=1165107&r2=1165108&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFNotes.java Sun Sep 4 20:45:10 2011
@@ -31,7 +31,7 @@ public final class XSLFNotes extends XSL
private CTNotesSlide _notes;
/**
- * Create a new slide
+ * Create a new notes
*/
XSLFNotes() {
super();
@@ -40,12 +40,12 @@ public final class XSLFNotes extends XSL
}
/**
- * Construct a SpreadsheetML drawing from a package part
+ * Construct a SpreadsheetML notes from a package part
*
- * @param part the package part holding the drawing data,
- * the content type must be <code>application/vnd.openxmlformats-officedocument.drawing+xml</code>
- * @param rel the package relationship holding this drawing,
- * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing
+ * @param part the package part holding the notes data,
+ * the content type must be <code>application/vnd.openxmlformats-officedocument.notes+xml</code>
+ * @param rel the package relationship holding this notes,
+ * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/notes
*/
XSLFNotes(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
super(part, rel);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java?rev=1165108&r1=1165107&r2=1165108&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFRelation.java Sun Sep 4 20:45:10 2011
@@ -108,7 +108,8 @@ public class XSLFRelation extends POIXML
public static final XSLFRelation COMMENTS = new XSLFRelation(
"application/vnd.openxmlformats-officedocument.presentationml.comments+xml",
"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
- null, null
+ "/ppt/comments/comment#.xml",
+ XSLFComments.class
);
public static final XSLFRelation HYPERLINK = new XSLFRelation(
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java?rev=1165108&r1=1165107&r2=1165108&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSlide.java Sun Sep 4 20:45:10 2011
@@ -38,6 +38,7 @@ import org.openxmlformats.schemas.presen
public final class XSLFSlide extends XSLFSheet {
private final CTSlide _slide;
private XSLFSlideLayout _layout;
+ private XSLFComments _comments;
private XSLFNotes _notes;
/**
@@ -50,12 +51,12 @@ public final class XSLFSlide extends XSL
}
/**
- * Construct a SpreadsheetML drawing from a package part
+ * Construct a SpreadsheetML slide from a package part
*
- * @param part the package part holding the drawing data,
- * the content type must be <code>application/vnd.openxmlformats-officedocument.drawing+xml</code>
- * @param rel the package relationship holding this drawing,
- * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing
+ * @param part the package part holding the slide data,
+ * the content type must be <code>application/vnd.openxmlformats-officedocument.slide+xml</code>
+ * @param rel the package relationship holding this slide,
+ * the relationship type must be http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide
*/
XSLFSlide(PackagePart part, PackageRelationship rel) throws IOException, XmlException {
super(part, rel);
@@ -125,6 +126,22 @@ public final class XSLFSlide extends XSL
return _layout;
}
+ public XSLFComments getComments() {
+ if(_comments == null) {
+ for (POIXMLDocumentPart p : getRelations()) {
+ if (p instanceof XSLFComments) {
+ _comments = (XSLFComments)p;
+ }
+ }
+ }
+ if(_comments == null) {
+ // This slide lacks comments
+ // Not all have them, sorry...
+ return null;
+ }
+ return _comments;
+ }
+
public XSLFNotes getNotes() {
if(_notes == null) {
for (POIXMLDocumentPart p : getRelations()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org