Simplify OfficeArtContent#getBStoreContainer method
Due to the new structure of the class, we can be more specific about how we load the BStore.
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887011 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java b/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
index 4967c54..59a6159 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/model/OfficeArtContent.java
@@ -121,7 +121,7 @@
return drawingGroupData.getChildRecords();
}
- public List<? extends EscherContainerRecord> getDgContainers() {
+ private List<? extends EscherContainerRecord> getDgContainers() {
List<EscherContainerRecord> dgContainers = new ArrayList<>(2);
if (mainDocumentDgContainer != null) {
dgContainers.add(mainDocumentDgContainer);
@@ -132,18 +132,11 @@
return dgContainers;
}
- public List<? extends EscherContainerRecord> getBStoreContainers()
- {
- List<EscherContainerRecord> bStoreContainers = new ArrayList<>(
- 1);
- for ( EscherRecord escherRecord : drawingGroupData.getChildRecords() )
- {
- if ( escherRecord.getRecordId() == (short) 0xF001 )
- {
- bStoreContainers.add( (EscherContainerRecord) escherRecord );
- }
- }
- return bStoreContainers;
+ /**
+ * @return The {@link EscherRecordTypes#BSTORE_CONTAINER} or {@code null} if the document doesn't have one.
+ */
+ public EscherContainerRecord getBStoreContainer() {
+ return drawingGroupData.getChildById(EscherRecordTypes.BSTORE_CONTAINER.typeID);
}
public List<? extends EscherContainerRecord> getSpgrContainers()
diff --git a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
index 0dcb388..253cc07 100644
--- a/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
+++ b/src/scratchpad/src/org/apache/poi/hwpf/usermodel/OfficeDrawingsImpl.java
@@ -52,12 +52,10 @@
private EscherBlipRecord getBitmapRecord( int bitmapIndex )
{
- List<? extends EscherContainerRecord> bContainers = officeArtContent
- .getBStoreContainers();
- if ( bContainers == null || bContainers.size() != 1 )
+ EscherContainerRecord bContainer = officeArtContent.getBStoreContainer();
+ if (bContainer == null)
return null;
- EscherContainerRecord bContainer = bContainers.get( 0 );
final List<EscherRecord> bitmapRecords = bContainer.getChildRecords();
if ( bitmapRecords.size() < bitmapIndex )
