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/22 12:26:34 UTC
svn commit: r1174045 - in /poi/trunk:
src/ooxml/java/org/apache/poi/openxml4j/exceptions/
src/ooxml/java/org/apache/poi/openxml4j/opc/
src/ooxml/java/org/apache/poi/xssf/usermodel/
src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/ src/ooxml/...
Author: nick
Date: Thu Sep 22 10:26:33 2011
New Revision: 1174045
URL: http://svn.apache.org/viewvc?rev=1174045&view=rev
Log:
Add a disabled test for bug #51850, and tweak the OPC package exceptions to make it easier to spot when a part name is already used
Added:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
poi/trunk/test-data/spreadsheet/51850.xlsx (with props)
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java?rev=1174045&r1=1174044&r2=1174045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/InvalidOperationException.java Thu Sep 22 10:26:33 2011
@@ -19,13 +19,9 @@ package org.apache.poi.openxml4j.excepti
/**
* Throw when an invalid operation is done.
- *
- * @author Julien Chable
- * @version 1.0
*/
@SuppressWarnings("serial")
-public final class InvalidOperationException extends OpenXML4JRuntimeException{
-
+public class InvalidOperationException extends OpenXML4JRuntimeException{
public InvalidOperationException(String message){
super(message);
}
Added: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java?rev=1174045&view=auto
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java (added)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/exceptions/PartAlreadyExistsException.java Thu Sep 22 10:26:33 2011
@@ -0,0 +1,31 @@
+/* ====================================================================
+ 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.openxml4j.exceptions;
+
+import org.apache.poi.openxml4j.opc.PackagePart;
+
+/**
+ * Throw when trying to create a {@link PackagePart} but one
+ * already exists with that name.
+ */
+@SuppressWarnings("serial")
+public final class PartAlreadyExistsException extends InvalidOperationException {
+ public PartAlreadyExistsException(String message){
+ super(message);
+ }
+}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1174045&r1=1174044&r2=1174045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Thu Sep 22 10:26:33 2011
@@ -40,6 +40,7 @@ import org.apache.poi.openxml4j.exceptio
import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
import org.apache.poi.openxml4j.exceptions.OpenXML4JRuntimeException;
+import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
import org.apache.poi.openxml4j.opc.internal.ContentType;
import org.apache.poi.openxml4j.opc.internal.ContentTypeManager;
import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
@@ -716,7 +717,7 @@ public abstract class OPCPackage impleme
// Check if the specified part name already exists
if (partList.containsKey(partName)
&& !partList.get(partName).isDeleted()) {
- throw new InvalidOperationException(
+ throw new PartAlreadyExistsException(
"A part with the name '"
+ partName.getName()
+ "' already exists : Packages shall not contain equivalent part names and package implementers shall neither create nor recognize packages with equivalent part names. [M1.12]");
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java?rev=1174045&r1=1174044&r2=1174045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDrawing.java Thu Sep 22 10:26:33 2011
@@ -37,15 +37,14 @@ import org.apache.poi.util.Internal;
import org.apache.poi.xssf.model.CommentsTable;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTConnector;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTDrawing;
+import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGraphicalObjectFrame;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGroupShape;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTPicture;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTShape;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTTwoCellAnchor;
import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.STEditAs;
-import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTGraphicalObjectFrame;
import org.openxmlformats.schemas.officeDocument.x2006.relationships.STRelationshipId;
/**
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java?rev=1174045&r1=1174044&r2=1174045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCCompliancePackageModel.java Thu Sep 22 10:26:33 2011
@@ -17,20 +17,20 @@
package org.apache.poi.openxml4j.opc.compliance;
-import java.io.File;
import java.io.IOException;
import junit.framework.TestCase;
+import org.apache.poi.POIDataSamples;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.openxml4j.exceptions.InvalidOperationException;
+import org.apache.poi.openxml4j.exceptions.PartAlreadyExistsException;
import org.apache.poi.openxml4j.opc.ContentTypes;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePartName;
import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
import org.apache.poi.openxml4j.opc.TargetMode;
-import org.apache.poi.POIDataSamples;
/**
* Test Open Packaging Convention package model compliance.
@@ -102,7 +102,7 @@ public class TestOPCCompliancePackageMod
pkg.createPart(name1, ContentTypes.XML);
try {
pkg.createPart(name2, ContentTypes.XML);
- } catch (InvalidOperationException e) {
+ } catch (PartAlreadyExistsException e) {
return;
}
fail("Packages shall not contain equivalent part names and package implementers shall neither create nor recognize packages with equivalent part names. [M1.12]");
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java?rev=1174045&r1=1174044&r2=1174045&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java Thu Sep 22 10:26:33 2011
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.poi.POIXMLDocumentPart;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.hssf.util.PaneInformation;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
@@ -31,7 +30,11 @@ import org.apache.poi.ss.usermodel.BaseT
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.CellValue;
+import org.apache.poi.ss.usermodel.ClientAnchor;
+import org.apache.poi.ss.usermodel.Comment;
+import org.apache.poi.ss.usermodel.CreationHelper;
import org.apache.poi.ss.usermodel.DataFormatter;
+import org.apache.poi.ss.usermodel.Drawing;
import org.apache.poi.ss.usermodel.Font;
import org.apache.poi.ss.usermodel.FormulaError;
import org.apache.poi.ss.usermodel.FormulaEvaluator;
@@ -1169,4 +1172,38 @@ public final class TestXSSFBugs extends
assertEquals(rels0.get(0).getPackageRelationship(), rels1.get(0).getPackageRelationship());
}
+
+ /**
+ * Add comments to Sheet 1, when Sheet 2 already has
+ * comments (so /xl/comments1.xml is taken)
+ */
+ public void DISABLEDtest51850() {
+ XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("51850.xlsx");
+ XSSFSheet sh1 = wb.getSheetAt(0);
+ XSSFSheet sh2 = wb.getSheetAt(1);
+
+ // Sheet 2 has comments
+ assertNotNull(sh2.getCommentsTable(false));
+
+ // Sheet 1 doesn't (yet)
+ assertNull(sh1.getCommentsTable(false));
+
+ // Try to add comments to Sheet 1
+ CreationHelper factory = wb.getCreationHelper();
+ Drawing drawing = sh1.createDrawingPatriarch();
+
+ ClientAnchor anchor = factory.createClientAnchor();
+ anchor.setCol1(0);
+ anchor.setCol2(4);
+ anchor.setRow1(0);
+ anchor.setRow2(1);
+
+ Comment excelComment = drawing.createCellComment(anchor);
+ excelComment.setString(
+ factory.createRichTextString("I like this cell. It's my favourite."));
+ excelComment.setAuthor("Bob T. Fish");
+
+ Cell c = sh1.getRow(0).getCell(4);
+ c.setCellComment(excelComment);
+ }
}
Added: poi/trunk/test-data/spreadsheet/51850.xlsx
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/51850.xlsx?rev=1174045&view=auto
==============================================================================
Binary file - no diff available.
Propchange: poi/trunk/test-data/spreadsheet/51850.xlsx
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org