From a9cd69509866f86ecec7c797cdcc9585bc79cd34 Mon Sep 17 00:00:00 2001 From: Javen O'Neal Date: Sat, 25 Jun 2016 05:10:22 +0000 Subject: [PATCH] add @Override annotation for updateOtherRecordReferences on PositionDependentRecordAtom descendents git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1750181 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hslf/record/DocumentEncryptionAtom.java | 7 ++++--- .../src/org/apache/poi/hslf/record/ExOleObjStg.java | 6 +++--- .../src/org/apache/poi/hslf/record/PersistPtrHolder.java | 3 ++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java b/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java index 99c6c68835..c21f89dd13 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/DocumentEncryptionAtom.java @@ -39,8 +39,8 @@ import org.apache.poi.util.LittleEndianInputStream; * @author Nick Burch */ public final class DocumentEncryptionAtom extends PositionDependentRecordAtom { - private static long _type = 12052l; - private byte[] _header; + private static final long _type = 12052l; + private final byte[] _header; private EncryptionInfo ei; /** @@ -123,7 +123,8 @@ public final class DocumentEncryptionAtom extends PositionDependentRecordAtom { out.write(data, 0, bos.getWriteIndex()); } + @Override public void updateOtherRecordReferences(Map oldToNewReferencesLookup) { - + // nothing to update } } diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java b/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java index 5ef523159f..7a875c5e5e 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/ExOleObjStg.java @@ -41,7 +41,7 @@ public class ExOleObjStg extends RecordAtom implements PositionDependentRecord, /** * Record header. */ - private byte[] _header; + private final byte[] _header; /** * Record data. @@ -184,8 +184,8 @@ public class ExOleObjStg extends RecordAtom implements PositionDependentRecord, myLastOnDiskOffset = offset; } + @Override public void updateOtherRecordReferences(Map oldToNewReferencesLookup) { - return; + // nothing to update } - } diff --git a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java index b108241486..b800f3e219 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java +++ b/src/scratchpad/src/org/apache/poi/hslf/record/PersistPtrHolder.java @@ -45,7 +45,7 @@ import org.apache.poi.util.POILogger; public final class PersistPtrHolder extends PositionDependentRecordAtom { - private byte[] _header; + private final byte[] _header; private byte[] _ptrData; // Will need to update this once we allow updates to _slideLocations private long _type; @@ -159,6 +159,7 @@ public final class PersistPtrHolder extends PositionDependentRecordAtom * At write-out time, update the references to the sheets to their * new positions */ + @Override public void updateOtherRecordReferences(Map oldToNewReferencesLookup) { // Loop over all the slides we know about // Find where they used to live, and where they now live