Author: yegor
Date: Fri Oct 22 15:49:12 2010
New Revision: 1026381
URL: http://svn.apache.org/viewvc?rev=1026381&view=rev
Log:
apply fixes from trunk
Modified:
poi/tags/REL_3_7/legal/RELEASE_NOTES.txt
poi/tags/REL_3_7/src/documentation/content/xdocs/index.xml
poi/tags/REL_3_7/src/documentation/content/xdocs/status.xml
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
poi/tags/REL_3_7/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/CellUtil.java
poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/RegionUtil.java
poi/tags/REL_3_7/src/java/org/apache/poi/util/FontMetricsDumper.java
poi/tags/REL_3_7/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
Modified: poi/tags/REL_3_7/legal/RELEASE_NOTES.txt
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/legal/RELEASE_NOTES.txt?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/legal/RELEASE_NOTES.txt (original)
+++ poi/tags/REL_3_7/legal/RELEASE_NOTES.txt Fri Oct 22 15:49:12 2010
@@ -5,9 +5,11 @@ See the downloads page for binary and so
Release Notes -- Apache POI -- Version 3.7
-Apache POI is an open source Java library for working with Microsoft Office
documents. POI 3.7 is an incremental feature release based on the earlier 3.6
release. The most notable changes since POI 3.6 are:
-
+Apache POI is an open source Java library for working with Microsoft Office
documents.
+POI 3.7 is an incremental feature release based on the earlier 3.6 release.
+The most notable changes since POI 3.6 are:
+-------------------------------------------
OOXML
* support for reading aes-encrypted/write-protected ooxml files
* support Java 1.5 in auto-generated xmlbeans for ooxml schemas
@@ -21,7 +23,7 @@ Spreadsheet (Excel)
* numerous fixes and performance optimizations in the Formula Evaluation
module
* ability to add, modify and remove series from HSSF Charts
* numerous improvements in the cell data formatter (handling more formatting
rules, better color detection, allow overriding of default locale)
- * more examples including a rich "spreadsheet to HTML" convertor
+ * more examples including a rich "spreadsheet to HTML" converter
Document (Word)
* initial support for the HWPF revision marks authors list
@@ -86,8 +88,8 @@ Release Contents
This release comes in two forms:
- pre-built binaries containing compiled versions of all Apache POI
components and documentation
- (poi-bin-3.7-20101025.zip or poi-bin-3.7-20101025.tar.gz)
- - source archive you can build POI from (poi-src-3.7-20101025.zip or
poi-src-3.7-20101025.tar.gz)
+ (poi-bin-3.7-20101029.zip or poi-bin-3.7-20101029.tar.gz)
+ - source archive you can build POI from (poi-src-3.7-20101029.zip or
poi-src-3.7-20101029.tar.gz)
Pre-built versions of all POI components are also available in the central
Maven repository
under Group ID "org.apache.poi" and Version "3.7"
Modified: poi/tags/REL_3_7/src/documentation/content/xdocs/index.xml
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/documentation/content/xdocs/index.xml?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/documentation/content/xdocs/index.xml (original)
+++ poi/tags/REL_3_7/src/documentation/content/xdocs/index.xml Fri Oct 22
15:49:12 2010
@@ -32,7 +32,7 @@
</header>
<body>
- <section><title>15 October 2010 - POI 3.7 available</title>
+ <section><title>29 October 2010 - POI 3.7 available</title>
<p>The Apache POI team is pleased to announce the release of POI 3.7.
See the
<link
href="http://www.apache.org/dist/poi/release/bin/RELEASE-NOTES.txt";>full
release notes</link> for more details.
</p>
Modified: poi/tags/REL_3_7/src/documentation/content/xdocs/status.xml
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/documentation/content/xdocs/status.xml?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/documentation/content/xdocs/status.xml (original)
+++ poi/tags/REL_3_7/src/documentation/content/xdocs/status.xml Fri Oct 22
15:49:12 2010
@@ -33,7 +33,7 @@
</developers>
<changes>
- <release version="3.7" date="2010-10-25">
+ <release version="3.7" date="2010-10-29">
<action dev="poi-developers" type="fix">50075 - avoid NPE in
ListLevel.getNumberText() when numberText is null </action>
<action dev="poi-developers" type="fix">50067 - marked
commons-logging and log4j as optional dependencies in POI poms</action>
<action dev="poi-developers" type="add">49928 - allow overridden
built-in formats in XSSFCellStyle</action>
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Codec.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.io.BufferedReader;
import java.io.IOException;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptor.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.io.*;
import org.apache.poi.poifs.filesystem.*;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/DocumentDescriptorRenderer.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.awt.*;
import javax.swing.*;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/ExtendableTreeCellRenderer.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.awt.*;
import javax.swing.*;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/POIBrowser.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptor.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/PropertySetDescriptorRenderer.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.awt.Color;
import java.awt.Component;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
(original)
+++
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/TreeReaderListener.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.util.HashMap;
import java.util.Map;
Modified:
poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
(original)
+++ poi/tags/REL_3_7/src/examples/src/org/apache/poi/poifs/poibrowser/Util.java
Fri Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.poibrowser;
+package org.apache.poi.poifs.poibrowser;
import java.awt.*;
import javax.swing.*;
Modified:
poi/tags/REL_3_7/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
(original)
+++ poi/tags/REL_3_7/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
Fri Oct 22 15:49:12 2010
@@ -1594,8 +1594,6 @@ public final class HSSFWorkbook extends
// TODO: Some kind of structure.
HSSFPictureData picture = new HSSFPictureData(blip);
pictures.add(picture);
- } else {
- pictures.add(null);
}
Modified: poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java
(original)
+++ poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFCellUtil.java Fri
Oct 22 15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.usermodel.contrib;
+package org.apache.poi.hssf.util;
import org.apache.poi.hssf.usermodel.HSSFCell;
@@ -24,7 +24,7 @@ import org.apache.poi.hssf.usermodel.HSS
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.contrib.CellUtil;
+import org.apache.poi.ss.util.CellUtil;
/**
* Various utility functions that make working with a cells and rows easier.
The various
Modified: poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java
(original)
+++ poi/tags/REL_3_7/src/java/org/apache/poi/hssf/util/HSSFRegionUtil.java Fri
Oct 22 15:49:12 2010
@@ -15,11 +15,11 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.usermodel.contrib;
+package org.apache.poi.hssf.util;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.contrib.RegionUtil;
+import org.apache.poi.ss.util.RegionUtil;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.Region;
Modified: poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/CellUtil.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/CellUtil.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/CellUtil.java (original)
+++ poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/CellUtil.java Fri Oct 22
15:49:12 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.ss.usermodel.contrib;
+package org.apache.poi.ss.util;
import java.util.HashMap;
import java.util.Map;
Modified: poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/RegionUtil.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/RegionUtil.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/RegionUtil.java (original)
+++ poi/tags/REL_3_7/src/java/org/apache/poi/ss/util/RegionUtil.java Fri Oct 22
15:49:12 2010
@@ -15,13 +15,12 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.ss.usermodel.contrib;
+package org.apache.poi.ss.util;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.util.CellRangeAddress;
/**
* Various utility functions that make working with a region of cells easier.
Modified: poi/tags/REL_3_7/src/java/org/apache/poi/util/FontMetricsDumper.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/java/org/apache/poi/util/FontMetricsDumper.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
--- poi/tags/REL_3_7/src/java/org/apache/poi/util/FontMetricsDumper.java
(original)
+++ poi/tags/REL_3_7/src/java/org/apache/poi/util/FontMetricsDumper.java Fri
Oct 22 15:49:12 2010
@@ -16,7 +16,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.contrib.metrics;
+package org.apache.poi.util;
import java.awt.*;
import java.io.FileOutputStream;
Modified:
poi/tags/REL_3_7/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/tags/REL_3_7/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java?rev=1026381&r1=1026380&r2=1026381&view=diff
==============================================================================
---
poi/tags/REL_3_7/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
(original)
+++
poi/tags/REL_3_7/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFPictureData.java
Fri Oct 22 15:49:12 2010
@@ -71,4 +71,16 @@ public final class TestHSSFPictureData e
}
}
}
+
+ public void testNotNullPictures() throws IOException {
+
+ HSSFWorkbook wb =
HSSFTestDataSamples.openSampleWorkbook("SheetWithDrawing.xls");
+
+ @SuppressWarnings("unchecked") // TODO - add getFormat() to interface
PictureData and genericise wb.getAllPictures()
+ List<HSSFPictureData> lst =
(List<HSSFPictureData>)(List<?>)wb.getAllPictures();
+ for(HSSFPictureData pict : lst){
+ assertNotNull(pict);
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
