From c7466a9210a37d57b5ae4bbaf7889353dbe27f8d Mon Sep 17 00:00:00 2001
From: Yegor Kozlov <yegor@apache.org>
Date: Fri, 21 Aug 2009 06:08:31 +0000
Subject: [PATCH] fixes and misc refactorings suggested by Intellij

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@806426 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/poi/POIXMLFactory.java    |  2 +-
 .../poi/POIXMLPropertiesTextExtractor.java    |  6 +-
 .../org/apache/poi/POIXMLTextExtractor.java   |  6 +-
 .../apache/poi/openxml4j/opc/OPCPackage.java  | 18 ++---
 .../apache/poi/openxml4j/opc/PackagePart.java | 18 ++---
 .../poi/openxml4j/opc/PackagePartName.java    |  2 +-
 .../openxml4j/opc/PackageRelationship.java    |  6 +-
 .../poi/openxml4j/opc/PackagingURIHelper.java |  4 +-
 .../opc/internal/PackagePropertiesPart.java   |  4 +-
 .../poi/openxml4j/opc/internal/ZipHelper.java |  4 +-
 .../org/apache/poi/xssf/dev/XSSFDump.java     |  5 --
 .../xssf/extractor/XSSFExcelExtractor.java    |  4 +-
 .../apache/poi/xssf/model/StylesTable.java    | 21 +++---
 .../xssf/model/XSSFChildContainingModel.java  | 67 -----------------
 .../org/apache/poi/xssf/model/XSSFModel.java  | 34 ---------
 .../poi/xssf/model/XSSFWritableModel.java     | 37 ----------
 .../poi/xssf/usermodel/XSSFActiveXData.java   | 72 -------------------
 .../apache/poi/xssf/usermodel/XSSFCell.java   |  2 +-
 .../poi/xssf/usermodel/XSSFCellStyle.java     | 12 ++--
 .../apache/poi/xssf/usermodel/XSSFSheet.java  | 25 ++++---
 .../org/apache/poi/TestPOIXMLProperties.java  | 11 +--
 .../org/apache/poi/hpsf/basic/TestWrite.java  |  1 -
 22 files changed, 64 insertions(+), 297 deletions(-)
 delete mode 100644 src/ooxml/java/org/apache/poi/xssf/model/XSSFChildContainingModel.java
 delete mode 100644 src/ooxml/java/org/apache/poi/xssf/model/XSSFModel.java
 delete mode 100644 src/ooxml/java/org/apache/poi/xssf/model/XSSFWritableModel.java
 delete mode 100644 src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFActiveXData.java

diff --git a/src/ooxml/java/org/apache/poi/POIXMLFactory.java b/src/ooxml/java/org/apache/poi/POIXMLFactory.java
index d8b3111908..a434765bad 100755
--- a/src/ooxml/java/org/apache/poi/POIXMLFactory.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLFactory.java
@@ -28,7 +28,7 @@ public abstract class POIXMLFactory {
 
     /**
      * Create a POIXMLDocumentPart from existing package part and relation. This method is called
-     * from {@link POIXMLDocumentPart#read(POIXMLFactory)} when parsing a document
+     * from {@link POIXMLDocument#load(POIXMLFactory)} when parsing a document
      *
      * @param rel   the package part relationship
      * @param part  the PackagePart representing the created instance
diff --git a/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java b/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
index 97c9e2d695..480a71ad9b 100644
--- a/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLPropertiesTextExtractor.java
@@ -48,7 +48,7 @@ public class POIXMLPropertiesTextExtractor extends POIXMLTextExtractor {
 	/**
 	 * Returns the core document properties, eg author
 	 */
-	public String getCorePropertiesText() throws IOException, OpenXML4JException, XmlException {
+	public String getCorePropertiesText() {
 		StringBuffer text = new StringBuffer();
 		PackagePropertiesPart props =
 			document.getProperties().getCoreProperties().getUnderlyingProperties();
@@ -79,7 +79,7 @@ public class POIXMLPropertiesTextExtractor extends POIXMLTextExtractor {
 	 * Returns the extended document properties, eg
 	 *  application
 	 */
-	public String getExtendedPropertiesText() throws IOException, OpenXML4JException, XmlException {
+	public String getExtendedPropertiesText() {
 		StringBuffer text = new StringBuffer();
 		org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties
 			props = document.getProperties().getExtendedProperties().getUnderlyingProperties();
@@ -106,7 +106,7 @@ public class POIXMLPropertiesTextExtractor extends POIXMLTextExtractor {
 	 * Returns the custom document properties, if 
 	 *  there are any
 	 */
-	public String getCustomPropertiesText() throws IOException, OpenXML4JException, XmlException {
+	public String getCustomPropertiesText() {
 		StringBuffer text = new StringBuffer();
 		org.openxmlformats.schemas.officeDocument.x2006.customProperties.CTProperties
 			props = document.getProperties().getCustomProperties().getUnderlyingProperties();
diff --git a/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java b/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
index 25310fff3a..3f66ee5391 100644
--- a/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
@@ -38,19 +38,19 @@ public abstract class POIXMLTextExtractor extends POITextExtractor {
 	/**
 	 * Returns the core document properties
 	 */
-	public CoreProperties getCoreProperties() throws IOException, OpenXML4JException, XmlException {
+	public CoreProperties getCoreProperties() {
 		 return document.getProperties().getCoreProperties();
 	}
 	/**
 	 * Returns the extended document properties
 	 */
-	public ExtendedProperties getExtendedProperties() throws IOException, OpenXML4JException, XmlException {
+	public ExtendedProperties getExtendedProperties() {
 		return document.getProperties().getExtendedProperties();
 	}
 	/**
 	 * Returns the custom document properties
 	 */
-	public CustomProperties getCustomProperties() throws IOException, OpenXML4JException, XmlException {
+	public CustomProperties getCustomProperties() {
 		return document.getProperties().getCustomProperties();
 	}
 
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
index 5952d9122d..0f53bc4021 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
@@ -682,7 +682,7 @@ public abstract class OPCPackage implements RelationshipSource {
 			throw new IllegalArgumentException("partName");
 		}
 
-		if (contentType == null || contentType == "") {
+		if (contentType == null || contentType.equals("")) {
 			throw new IllegalArgumentException("contentType");
 		}
 
@@ -703,7 +703,7 @@ public abstract class OPCPackage implements RelationshipSource {
 		// A format consumer shall consider more than one core properties
 		// relationship for a package to be an error. If present, the
 		// relationship shall target the Core Properties part.
-		if (contentType == ContentTypes.CORE_PROPERTIES_PART) {
+		if (contentType.equals(ContentTypes.CORE_PROPERTIES_PART)) {
 			if (this.packageProperties != null)
 				throw new InvalidOperationException(
 						"OPC Compliance error [M4.1]: you try to add more than one core properties relationship in the package !");
@@ -1200,16 +1200,12 @@ public abstract class OPCPackage implements RelationshipSource {
 	/**
 	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#isRelationshipExists(org.apache.poi.openxml4j.opc.PackageRelationship)
 	 */
-	@SuppressWarnings("finally")
 	public boolean isRelationshipExists(PackageRelationship rel) {
-		try {
-			for (PackageRelationship r : this.getRelationships()) {
-				if (r == rel)
-					return true;
-			}
-		} finally {
-			return false;
-		}
+        for (PackageRelationship r : this.getRelationships()) {
+            if (r == rel)
+                return true;
+        }
+        return false;
 	}
 
 	/**
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
index 2b49cb21ec..36bcc37a3c 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePart.java
@@ -444,16 +444,16 @@ public abstract class PackagePart implements RelationshipSource {
 	 *         else returns <b>false</b>
 	 * @see org.apache.poi.openxml4j.opc.RelationshipSource#isRelationshipExists(org.apache.poi.openxml4j.opc.PackageRelationship)
 	 */
-	@SuppressWarnings("finally")
 	public boolean isRelationshipExists(PackageRelationship rel) {
-		try {
-			for (PackageRelationship r : this.getRelationships()) {
-				if (r == rel)
-					return true;
-			}
-		} finally {
-			return false;
-		}
+        try {
+            for (PackageRelationship r : this.getRelationships()) {
+                if (r == rel)
+                    return true;
+            }
+        } catch (InvalidFormatException e){
+            ;
+        }
+        return false;
 	}
 
 	/**
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
index 4b1a8448d9..6f946a278c 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
@@ -233,7 +233,7 @@ public final class PackagePartName implements Comparable<PackagePartName> {
 	 */
 	private static void throwExceptionIfPartNameHaveInvalidSegments(URI partUri)
 			throws InvalidFormatException {
-		if (partUri == null || "".equals(partUri)) {
+		if (partUri == null) {
 			throw new IllegalArgumentException("partUri");
 		}
 
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
index f43fa1b62f..2a5ade28d6 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
@@ -120,8 +120,8 @@ public final class PackageRelationship {
 			return false;
 		}
 		PackageRelationship rel = (PackageRelationship) obj;
-		return (this.id == rel.id
-				&& this.relationshipType == rel.relationshipType
+		return (this.id.equals(rel.id)
+				&& this.relationshipType.equals(rel.relationshipType)
 				&& (rel.source != null ? rel.source.equals(this.source) : true)
 				&& this.targetMode == rel.targetMode && this.targetUri
 				.equals(rel.targetUri));
@@ -217,7 +217,7 @@ public final class PackageRelationship {
 		sb.append(container == null ? " - container=null" : " - container="
 				+ container.toString());
 		sb.append(relationshipType == null ? " - relationshipType=null"
-				: " - relationshipType=" + relationshipType.toString());
+				: " - relationshipType=" + relationshipType);
 		sb.append(source == null ? " - source=null" : " - source="
 				+ getSourceURI().toASCIIString());
 		sb.append(targetUri == null ? " - target=null" : " - target="
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
index 2b6dcc63f8..d74e0a13ef 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
@@ -620,8 +620,8 @@ public final class PackagingURIHelper {
 		if (partName == null)
 			throw new IllegalArgumentException("partName");
 
-		if (PackagingURIHelper.PACKAGE_ROOT_URI.getPath() == partName.getURI()
-				.getPath())
+		if (PackagingURIHelper.PACKAGE_ROOT_URI.getPath().equals(
+                partName.getURI().getPath()) )
 			return PackagingURIHelper.PACKAGE_RELATIONSHIPS_ROOT_PART_NAME;
 
 		if (partName.isRelationshipPartURI())
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
index 76bb424376..f27d05cbac 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PackagePropertiesPart.java
@@ -574,10 +574,10 @@ public final class PackagePropertiesPart extends PackagePart implements
 	 * @param d
 	 *            The Date to convert.
 	 * @return The formated date or null.
-	 * @see java.util.SimpleDateFormat
+	 * @see java.text.SimpleDateFormat
 	 */
 	private String getDateValue(Nullable<Date> d) {
-		if (d == null || d.equals("")) {
+		if (d == null) {
 			return "";
 		}
 		SimpleDateFormat df = new SimpleDateFormat(
diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
index 5e72198f65..cbfd5a7ee5 100755
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ZipHelper.java
@@ -113,7 +113,7 @@ public final class ZipHelper {
 		if (opcItemName == null)
 			throw new IllegalArgumentException("opcItemName");
 
-		String retVal = new String(opcItemName);
+		String retVal = opcItemName;
 		while (retVal.startsWith(FORWARD_SLASH))
 			retVal = retVal.substring(1);
 		return retVal;
@@ -131,7 +131,7 @@ public final class ZipHelper {
 		if (opcItemName == null)
 			throw new IllegalArgumentException("opcItemName");
 
-		String retVal = new String(opcItemName);
+		String retVal = opcItemName;
 		while (retVal.startsWith(FORWARD_SLASH))
 			retVal = retVal.substring(1);
 		try {
diff --git a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java b/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java
index af1d55a960..d1e8ef49b1 100755
--- a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java
+++ b/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java
@@ -20,8 +20,6 @@ package org.apache.poi.xssf.dev;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
 import java.io.*;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipEntry;
@@ -43,9 +41,6 @@ public final class XSSFDump {
     }
 
     public static void dump(ZipFile zip) throws Exception {
-        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-        DocumentBuilder builder = factory.newDocumentBuilder();
-
         String zipname = zip.getName();
         int sep = zipname.lastIndexOf('.');
         File root = new File(zipname.substring(0, sep));
diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
index 382f5c1547..b4b3c9d78f 100644
--- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
+++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExcelExtractor.java
@@ -99,7 +99,7 @@ public class XSSFExcelExtractor extends POIXMLTextExtractor implements org.apach
 		for(int i=0; i<workbook.getNumberOfSheets(); i++) {
 			XSSFSheet sheet = workbook.getSheetAt(i);
 			if(includeSheetNames) {
-				text.append(workbook.getSheetName(i) + "\n");
+				text.append(workbook.getSheetName(i)).append("\n");
 			}
 
 			// Header(s), if present
@@ -137,7 +137,7 @@ public class XSSFExcelExtractor extends POIXMLTextExtractor implements org.apach
 					    // Replace any newlines with spaces, otherwise it
 					    //  breaks the output
 					    String commentText = comment.getString().getString().replace('\n', ' ');
-					    text.append(" Comment by "+comment.getAuthor()+": "+commentText);
+					    text.append(" Comment by ").append(comment.getAuthor()).append(": ").append(commentText);
 					}
 
 					if(ri.hasNext())
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java b/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
index f408d936ce..47d75efe5e 100644
--- a/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
+++ b/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
@@ -121,19 +121,14 @@ public class StylesTable extends POIXMLDocumentPart {
 			for (CTBorder border : doc.getStyleSheet().getBorders().getBorderArray()) {
 				borders.add(new XSSFCellBorder(border));
 			}
-			if(doc.getStyleSheet().getCellXfs() != null)
-			for (CTXf xf : doc.getStyleSheet().getCellXfs().getXfArray()) {
-				xfs.add(xf);
-			}
-			if(doc.getStyleSheet().getCellStyleXfs() != null)
-			for (CTXf xf : doc.getStyleSheet().getCellStyleXfs().getXfArray()) {
-				styleXfs.add(xf);
-			}
-			// dxf
-			if(doc.getStyleSheet().getDxfs() != null)
-			for (CTDxf dxf : doc.getStyleSheet().getDxfs().getDxfArray()) {
-				dxfs.add(dxf);
-			}
+            CTCellXfs cellXfs = doc.getStyleSheet().getCellXfs();
+            if(cellXfs != null) xfs.addAll(Arrays.asList(cellXfs.getXfArray()));
+
+            CTCellStyleXfs cellStyleXfs = doc.getStyleSheet().getCellStyleXfs();
+            if(cellStyleXfs != null) styleXfs.addAll(Arrays.asList(cellStyleXfs.getXfArray()));
+
+            CTDxfs styleDxfs = doc.getStyleSheet().getDxfs();
+			if(styleDxfs != null) dxfs.addAll(Arrays.asList(styleDxfs.getDxfArray()));
 
 		} catch (XmlException e) {
 			throw new IOException(e.getLocalizedMessage());
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/XSSFChildContainingModel.java b/src/ooxml/java/org/apache/poi/xssf/model/XSSFChildContainingModel.java
deleted file mode 100644
index 1a0a6555fe..0000000000
--- a/src/ooxml/java/org/apache/poi/xssf/model/XSSFChildContainingModel.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/* ====================================================================
-   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.xssf.model;
-
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-import org.apache.poi.openxml4j.opc.PackagePart;
-
-/**
- * Common interface for XSSF models, which have (typically
- *  binary) children to them.
- * One example is a VmlDrawing (Drawing), which can have
- *  raw images associated with it. 
- */
-public interface XSSFChildContainingModel extends XSSFModel {
-	/**
-	 * Returns the relationship type of any children we
-	 *  expect
-	 */
-	public String[] getChildrenRelationshipTypes();
-	/**
-	 * Called for each matching child, so that the 
-	 *  appropriate model or usermodel thing can be 
-	 *  created for it.
-	 * @param childPart The PackagePart of the child
-	 * @param childRelId the ID of the relationship the child comes from
-	 */
-	public void generateChild(PackagePart childPart, String childRelId);
-
-	/**
-	 * Returns the number of children contained, which
-	 *  will need to be written out.
-	 */
-	public int getNumberOfChildren();
-	/**
-	 * Called for each child in turn when writing out, 
-	 *  which returns a WritableChild for the child in
-	 *  that position. The WritableChild has enough
-	 *  information to be able to write it out.  
-	 * @param index A zero based index of this child
-	 */
-	public WritableChild getChildForWriting(int index); 
-	
-	static class WritableChild {
-		private XSSFWritableModel model;
-		private XSSFRelation relation;
-		public WritableChild(XSSFWritableModel model, XSSFRelation rel) {
-			this.model = model;
-			this.relation = rel;
-		}
-		public XSSFWritableModel getModel() { return model; }
-		public XSSFRelation getRelation() { return relation; }
-	}
-}
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/XSSFModel.java b/src/ooxml/java/org/apache/poi/xssf/model/XSSFModel.java
deleted file mode 100644
index 38a484be55..0000000000
--- a/src/ooxml/java/org/apache/poi/xssf/model/XSSFModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/* ====================================================================
-   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.xssf.model;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-
-/**
- * Common interface for XSSF models, which deal with
- *  parts of the xssf file.
- * These should also implement a constructor of
- *  (InputStream is), so they can be used with
- *  {@link XSSFRelation}
- */
-public interface XSSFModel extends XSSFWritableModel {
-	/** Read from the given InputStream */
-	public void readFrom(InputStream is) throws IOException;
-}
diff --git a/src/ooxml/java/org/apache/poi/xssf/model/XSSFWritableModel.java b/src/ooxml/java/org/apache/poi/xssf/model/XSSFWritableModel.java
deleted file mode 100644
index 45f8d7ab38..0000000000
--- a/src/ooxml/java/org/apache/poi/xssf/model/XSSFWritableModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/* ====================================================================
-   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.xssf.model;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.xssf.usermodel.XSSFRelation;
-
-/**
- * A very stripped down XSSF models interface,
- *  which only allows writing out. Normally only
- *  used with the children of a
- *  {@link XSSFChildContainingModel}.
- * Most proper models will go for {@link XSSFModel}
- *  instead of this one.
- * {@link XSSFRelation} needs classes to implement
- *  this, so that it can write them out.
- */
-public interface XSSFWritableModel {
-	/** Write to the supplied OutputStream, with default options */
-	public void writeTo(OutputStream out) throws IOException;
-}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFActiveXData.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFActiveXData.java
deleted file mode 100644
index be967cf062..0000000000
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFActiveXData.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/* ====================================================================
-   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.xssf.usermodel;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.apache.poi.ss.usermodel.PictureData;
-import org.apache.poi.util.IOUtils;
-import org.apache.poi.xssf.model.XSSFWritableModel;
-import org.apache.poi.POIXMLException;
-import org.apache.poi.openxml4j.opc.PackagePart;
-
-/**
- * 
- * @author Nick Burch
- */
-public final class XSSFActiveXData implements PictureData, XSSFWritableModel {
-
-	private final PackagePart _packagePart;
-	private final String _originalId;
-
-	public XSSFActiveXData(PackagePart packagePart, String originalId) {
-		_packagePart = packagePart;
-		_originalId = originalId;
-	}
-
-	public XSSFActiveXData(PackagePart packagePart) {
-		this(packagePart, null);
-	}
-
-	public String getOriginalId() {
-		return _originalId;
-	}
-
-	public PackagePart getPart() {
-		return _packagePart;
-	}
-
-	public void writeTo(OutputStream out) throws IOException {
-		IOUtils.copy(_packagePart.getInputStream(), out);
-	}
-
-	public byte[] getData() {
-		// TODO - is this right?
-		// Are there headers etc?
-		try {
-			return IOUtils.toByteArray(_packagePart.getInputStream());
-		} catch(IOException e) {
-			throw new POIXMLException(e);
-		}
-	}
-
-	public String suggestFileExtension() {
-		return _packagePart.getPartName().getExtension();
-	}
-}
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
index 883d2696bb..e76f22a97b 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
@@ -857,7 +857,7 @@ public final class XSSFCell implements Cell {
                 int sstIndex = Integer.parseInt(_cell.getV());
                 XSSFRichTextString rt = new XSSFRichTextString(_sharedStringSource.getEntryAt(sstIndex));
                 String text = rt.getString();
-                return Boolean.valueOf(text).booleanValue();
+                return Boolean.valueOf(text);
             case CELL_TYPE_NUMERIC:
                 return Double.parseDouble(_cell.getV()) != 0;
 
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
index 4987d6564f..b67133c143 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCellStyle.java
@@ -311,7 +311,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     public short getBottomBorderColor() {
         XSSFColor clr = getBottomBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : (short)clr.getIndexed();
+        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
     }
 
     /**
@@ -359,7 +359,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     public short getFillBackgroundColor() {
         XSSFColor clr = getFillBackgroundXSSFColor();
-        return clr == null ? IndexedColors.AUTOMATIC.getIndex() : (short)clr.getIndexed();
+        return clr == null ? IndexedColors.AUTOMATIC.getIndex() : clr.getIndexed();
     }
 
     /**
@@ -391,7 +391,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     public short getFillForegroundColor() {
         XSSFColor clr = getFillForegroundXSSFColor();
-        return clr == null ? IndexedColors.AUTOMATIC.getIndex() : (short)clr.getIndexed();
+        return clr == null ? IndexedColors.AUTOMATIC.getIndex() : clr.getIndexed();
     }
 
     /**
@@ -508,7 +508,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     public short getLeftBorderColor() {
         XSSFColor clr = getLeftBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : (short)clr.getIndexed();
+        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
     }
 
     /**
@@ -543,7 +543,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     public short getRightBorderColor() {
         XSSFColor clr = getRightBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : (short)clr.getIndexed();
+        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
     }
     /**
      * Get the color to use for the right border
@@ -586,7 +586,7 @@ public class XSSFCellStyle implements CellStyle {
      */
     public short getTopBorderColor() {
         XSSFColor clr = getTopBorderXSSFColor();
-        return clr == null ? IndexedColors.BLACK.getIndex() : (short)clr.getIndexed();
+        return clr == null ? IndexedColors.BLACK.getIndex() : clr.getIndexed();
     }
 
     /**
diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
index bd2b5b875b..935774582c 100644
--- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
+++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java
@@ -1369,13 +1369,13 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     	}
 
     	boolean styleChanged = style != null
-    	&& ci.getStyle() != style.intValue();
+    	&& ci.getStyle() != style;
     	boolean levelChanged = level != null
-    	&& ci.getOutlineLevel() != level.intValue();
+    	&& ci.getOutlineLevel() != level;
     	boolean hiddenChanged = hidden != null
-    	&& ci.getHidden() != hidden.booleanValue();
+    	&& ci.getHidden() != hidden;
     	boolean collapsedChanged = collapsed != null
-    	&& ci.getCollapsed() != collapsed.booleanValue();
+    	&& ci.getCollapsed() != collapsed;
     	boolean columnChanged = levelChanged || hiddenChanged
     	|| collapsedChanged || styleChanged;
     	if (!columnChanged) {
@@ -1828,11 +1828,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     }
 
     /**
-     * @param rowIndex the zero based row index to expand
+     * @param rowNumber the zero based row index to expand
      */
     private void expandRow(int rowNumber) {
-    	int idx = rowNumber;
-    	if (idx == -1)
+    	if (rowNumber == -1)
     		return;
     	XSSFRow row = getRow(rowNumber);
     	// If it is already expanded do nothing.
@@ -1840,10 +1839,10 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     		return;
 
     	// Find the start of the group.
-    	int startIdx = findStartOfRowOutlineGroup(idx);
+    	int startIdx = findStartOfRowOutlineGroup(rowNumber);
 
     	// Find the end of the group.
-    	int endIdx = findEndOfRowOutlineGroup(idx);
+    	int endIdx = findEndOfRowOutlineGroup(rowNumber);
 
     	// expand:
     	// collapsed must be unset
@@ -1856,7 +1855,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     	// is the enclosing group
     	// hidden bit only is altered for this outline level. ie. don't
     	// un-collapse contained groups
-    	if (!isRowGroupHiddenByParent(idx)) {
+    	if (!isRowGroupHiddenByParent(rowNumber)) {
     		for (int i = startIdx; i < endIdx; i++) {
     			if (row.getCTRow().getOutlineLevel() == getRow(i).getCTRow()
     					.getOutlineLevel()) {
@@ -1871,7 +1870,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     }
 
     /**
-     * @param rowIndex the zero based row index to find from
+     * @param row the zero based row index to find from
      */
     public int findEndOfRowOutlineGroup(int row) {
     	int level = getRow(row).getCTRow().getOutlineLevel();
@@ -1886,7 +1885,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     }
 
     /**
-     * @param rowIndex the zero based row index to find from
+     * @param row the zero based row index to find from
      */
     private boolean isRowGroupHiddenByParent(int row) {
     	// Look out outline details of end
@@ -1922,7 +1921,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet {
     }
 
     /**
-     * @param rowIndex the zero based row index to find from
+     * @param row the zero based row index to find from
      */
     private boolean isRowGroupCollapsed(int row) {
     	int collapseRow = findEndOfRowOutlineGroup(row) + 1;
diff --git a/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java b/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
index dd9eeeb939..3a3dc27d72 100755
--- a/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
+++ b/src/ooxml/testcases/org/apache/poi/TestPOIXMLProperties.java
@@ -28,6 +28,7 @@ import org.apache.poi.POIXMLProperties.CoreProperties;
 import org.apache.poi.xssf.XSSFTestDataSamples;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.apache.poi.xwpf.XWPFTestDataSamples;
 
 /**
  * Test setting extended and custom OOXML properties
@@ -37,15 +38,7 @@ public final class TestPOIXMLProperties extends TestCase {
 	private CoreProperties _coreProperties;
 
 	public void setUp() throws Exception{
-		File sampleFile = new File(
-				System.getProperty("HWPF.testdata.path") +
-				File.separator + "documentProperties.docx"
-		);
-		assertTrue(sampleFile.exists());
-		XWPFDocument sampleDoc;
-		sampleDoc = new XWPFDocument(
-				POIXMLDocument.openPackage(sampleFile.toString())
-		);
+        XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("documentProperties.docx");
 		_props = sampleDoc.getProperties();
 		_coreProperties = _props.getCoreProperties();
 		assertNotNull(_props);
diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
index 92238acc39..dbb528f6e2 100644
--- a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
+++ b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java
@@ -696,7 +696,6 @@ public class TestWrite extends TestCase
      */
     private void testRecreate(final File f)
     {
-        System.out.println("Recreating file \"" + f + "\"");
         try
         {
             /* Read the POI filesystem's property set streams: */
-- 
2.39.5