Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ExVideoContainer.java Fri Jan 10 23:13:20 2020 @@ -78,7 +78,7 @@ public final class ExVideoContainer exte _header[0] = 0x0f; // We are a container record LittleEndian.putShort(_header, 2, (short)getRecordType()); - _children = new Record[2]; + _children = new org.apache.poi.hslf.record.Record[2]; _children[0] = mediaAtom = new ExMediaAtom(); _children[1] = pathAtom = new CString(); }
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/FontCollection.java Fri Jan 10 23:13:20 2020 @@ -52,7 +52,7 @@ public final class FontCollection extend _children = Record.findChildRecords(source,start+8,len-8); - for (Record r : _children){ + for (org.apache.poi.hslf.record.Record r : _children){ if(r instanceof FontEntityAtom) { HSLFFontInfo fi = new HSLFFontInfo((FontEntityAtom) r); fonts.put(fi.getIndex(), fi); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HSLFEscherClientDataRecord.java Fri Jan 10 23:13:20 2020 @@ -41,7 +41,7 @@ public class HSLFEscherClientDataRecord //arbitrarily selected; may need to increase private static final int MAX_RECORD_LENGTH = 1_000_000; - private final List<Record> _childRecords = new ArrayList<>(); + private final List<org.apache.poi.hslf.record.Record> _childRecords = new ArrayList<>(); public HSLFEscherClientDataRecord() {} @@ -99,7 +99,7 @@ public class HSLFEscherClientDataRecord public byte[] getRemainingData() { ByteArrayOutputStream bos = new ByteArrayOutputStream(); try { - for (Record r : _childRecords) { + for (org.apache.poi.hslf.record.Record r : _childRecords) { r.writeOut(bos); } } catch (IOException e) { @@ -113,7 +113,7 @@ public class HSLFEscherClientDataRecord _childRecords.clear(); int offset = 0; while (offset < remainingData.length) { - final Record r = Record.buildRecordAtOffset(remainingData, offset); + final org.apache.poi.hslf.record.Record r = Record.buildRecordAtOffset(remainingData, offset); if (r != null) { _childRecords.add(r); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/HeadersFootersContainer.java Fri Jan 10 23:13:20 2020 @@ -104,7 +104,7 @@ public final class HeadersFootersContain LittleEndian.putShort(_header, 2, (short)getRecordType()); hdAtom = new HeadersFootersAtom(); - _children = new Record[]{ + _children = new org.apache.poi.hslf.record.Record[]{ hdAtom }; csDate = csHeader = csFooter = null; @@ -198,7 +198,7 @@ public final class HeadersFootersContain csHeader = new CString(); csHeader.setOptions(HEADERATOM << 4); - Record r = hdAtom; + org.apache.poi.hslf.record.Record r = hdAtom; if(csDate != null) r = hdAtom; addChildAfter(csHeader, r); @@ -216,7 +216,7 @@ public final class HeadersFootersContain csFooter = new CString(); csFooter.setOptions(FOOTERATOM << 4); - Record r = hdAtom; + org.apache.poi.hslf.record.Record r = hdAtom; if(csHeader != null) r = csHeader; else if(csDate != null) r = csDate; addChildAfter(csFooter, r); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/InteractiveInfo.java Fri Jan 10 23:13:20 2020 @@ -73,7 +73,7 @@ public class InteractiveInfo extends Rec */ public InteractiveInfo() { _header = new byte[8]; - _children = new Record[1]; + _children = new org.apache.poi.hslf.record.Record[1]; // Setup our header block _header[0] = 0x0f; // We are a container record Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawing.java Fri Jan 10 23:13:20 2020 @@ -168,7 +168,7 @@ public final class PPDrawing extends Rec findFirst(); } - private static Stream<StyleTextProp9Atom> findInProgBinaryTag(Record r) { + private static Stream<StyleTextProp9Atom> findInProgBinaryTag(org.apache.poi.hslf.record.Record r) { Record[] ch = r.getChildRecords(); if (ch != null && ch.length == 2 && @@ -253,7 +253,7 @@ public final class PPDrawing extends Rec /** * We're pretending to be an atom, so return null */ - public Record[] getChildRecords() { return null; } + public org.apache.poi.hslf.record.Record[] getChildRecords() { return null; } /** * Write the contents of the record back, so it can be written @@ -396,7 +396,7 @@ public final class PPDrawing extends Rec return GenericRecordUtil.getGenericProperties("escherRecords", this::getEscherRecords); } - private static Predicate<Record> sameHSLF(RecordTypes type) { + private static Predicate<org.apache.poi.hslf.record.Record> sameHSLF(RecordTypes type) { return (p) -> p.getRecordType() == type.typeID; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/PPDrawingGroup.java Fri Jan 10 23:13:20 2020 @@ -73,7 +73,7 @@ public final class PPDrawingGroup extend /** * We're pretending to be an atom, so return null */ - public Record[] getChildRecords() { + public org.apache.poi.hslf.record.Record[] getChildRecords() { return null; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/ParentAwareRecord.java Fri Jan 10 23:13:20 2020 @@ -24,6 +24,6 @@ package org.apache.poi.hslf.record; * @author Nick Burch (nick at torchbox dot com) */ public interface ParentAwareRecord { - public RecordContainer getParentRecord(); + public org.apache.poi.hslf.record.RecordContainer getParentRecord(); public void setParentRecord(RecordContainer parentRecord); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Record.java Fri Jan 10 23:13:20 2020 @@ -79,7 +79,7 @@ public abstract class Record implements } @Override - public List<Record> getGenericChildren() { + public List<org.apache.poi.hslf.record.Record> getGenericChildren() { Record[] recs = getChildRecords(); return (recs == null) ? null : Arrays.asList(recs); } @@ -107,7 +107,7 @@ public abstract class Record implements * @param b The byte array to build from * @param offset The offset to build at */ - public static Record buildRecordAtOffset(byte[] b, int offset) { + public static org.apache.poi.hslf.record.Record buildRecordAtOffset(byte[] b, int offset) { long type = LittleEndian.getUShort(b,offset+2); long rlen = LittleEndian.getUInt(b,offset+4); @@ -122,7 +122,7 @@ public abstract class Record implements * Default method for finding child records of a container record */ public static Record[] findChildRecords(byte[] b, int start, int len) { - List<Record> children = new ArrayList<>(5); + List<org.apache.poi.hslf.record.Record> children = new ArrayList<>(5); // Jump our little way along, creating records as we go int pos = start; @@ -149,7 +149,7 @@ public abstract class Record implements } // Turn the vector into an array, and return - return children.toArray(new Record[0]); + return children.toArray(new org.apache.poi.hslf.record.Record[0]); } /** @@ -161,7 +161,7 @@ public abstract class Record implements * (not including the size of the header), this code assumes you're * passing in corrected lengths */ - public static Record createRecordForType(long type, byte[] b, int start, int len) { + public static org.apache.poi.hslf.record.Record createRecordForType(long type, byte[] b, int start, int len) { // We use the RecordTypes class to provide us with the right // class to use for a given type // A spot of reflection gets us the (byte[],int,int) constructor Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordAtom.java Fri Jan 10 23:13:20 2020 @@ -33,5 +33,5 @@ public abstract class RecordAtom extends /** * We're an atom, returns null */ - public Record[] getChildRecords() { return null; } + public org.apache.poi.hslf.record.Record[] getChildRecords() { return null; } } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/RecordContainer.java Fri Jan 10 23:13:20 2020 @@ -42,7 +42,7 @@ public abstract class RecordContainer ex * Return any children */ @Override - public Record[] getChildRecords() { return _children; } + public org.apache.poi.hslf.record.Record[] getChildRecords() { return _children; } /** * We're not an atom @@ -61,7 +61,7 @@ public abstract class RecordContainer ex */ private int findChildLocation(Record child) { int i=0; - for(Record r : _children) { + for(org.apache.poi.hslf.record.Record r : _children) { if (r.equals(child)) { return i; } @@ -77,7 +77,7 @@ public abstract class RecordContainer ex */ private int appendChild(Record newChild) { // Copy over, and pop the child in at the end - Record[] nc = new Record[(_children.length + 1)]; + Record[] nc = new org.apache.poi.hslf.record.Record[(_children.length + 1)]; System.arraycopy(_children, 0, nc, 0, _children.length); // Switch the arrays nc[_children.length] = newChild; @@ -125,8 +125,8 @@ public abstract class RecordContainer ex * or null if none of the child records are of the * given type. Does not descend. */ - public Record findFirstOfType(long type) { - for (Record r : _children) { + public org.apache.poi.hslf.record.Record findFirstOfType(long type) { + for (org.apache.poi.hslf.record.Record r : _children) { if (r.getRecordType() == type) { return r; } @@ -140,17 +140,17 @@ public abstract class RecordContainer ex * @param ch the child to remove * @return the removed record */ - public Record removeChild(Record ch) { - Record rm = null; - ArrayList<Record> lst = new ArrayList<>(); - for(Record r : _children) { + public org.apache.poi.hslf.record.Record removeChild(Record ch) { + org.apache.poi.hslf.record.Record rm = null; + ArrayList<org.apache.poi.hslf.record.Record> lst = new ArrayList<>(); + for(org.apache.poi.hslf.record.Record r : _children) { if(r != ch) { lst.add(r); } else { rm = r; } } - _children = lst.toArray(new Record[0]); + _children = lst.toArray(new org.apache.poi.hslf.record.Record[0]); return rm; } @@ -278,7 +278,7 @@ public abstract class RecordContainer ex * * @param records the new child records */ - public void setChildRecord(Record[] records) { + public void setChildRecord(org.apache.poi.hslf.record.Record[] records) { this._children = records.clone(); } @@ -360,7 +360,7 @@ public abstract class RecordContainer ex */ public static void handleParentAwareRecords(RecordContainer br) { // Loop over child records, looking for interesting ones - for (Record record : br.getChildRecords()) { + for (org.apache.poi.hslf.record.Record record : br.getChildRecords()) { // Tell parent aware records of their parent if (record instanceof ParentAwareRecord) { ((ParentAwareRecord) record).setParentRecord(br); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/Slide.java Fri Jan 10 23:13:20 2020 @@ -92,7 +92,7 @@ public final class Slide extends SheetCo ColorSchemeAtom colorAtom = new ColorSchemeAtom(); - _children = new Record[] { + _children = new org.apache.poi.hslf.record.Record[] { slideAtom, ppDrawing, colorAtom Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/SlideListWithText.java Fri Jan 10 23:13:20 2020 @@ -96,7 +96,7 @@ public final class SlideListWithText ext // Create a SlideAtomsSets, not caring if they're empty //if(emptySet) { continue; } - Record[] spaChildren = new Record[clen]; + org.apache.poi.hslf.record.Record[] spaChildren = new org.apache.poi.hslf.record.Record[clen]; System.arraycopy(_children,i+1,spaChildren,0,clen); SlideAtomsSet set = new SlideAtomsSet((SlidePersistAtom)_children[i],spaChildren); sets.add(set); @@ -120,7 +120,7 @@ public final class SlideListWithText ext LittleEndian.putInt(_header, 4, 0); // We have no children to start with - _children = new Record[0]; + _children = new org.apache.poi.hslf.record.Record[0]; slideAtomsSets = new SlideAtomsSet[0]; } @@ -133,7 +133,7 @@ public final class SlideListWithText ext // Add the new SlidePersistAtom at the end appendChildRecord(spa); - SlideAtomsSet newSAS = new SlideAtomsSet(spa, new Record[0]); + SlideAtomsSet newSAS = new SlideAtomsSet(spa, new org.apache.poi.hslf.record.Record[0]); // Update our SlideAtomsSets with this SlideAtomsSet[] sas = new SlideAtomsSet[slideAtomsSets.length+1]; @@ -186,15 +186,15 @@ public final class SlideListWithText ext */ public static class SlideAtomsSet { private SlidePersistAtom slidePersistAtom; - private Record[] slideRecords; + private org.apache.poi.hslf.record.Record[] slideRecords; /** Get the SlidePersistAtom, which gives details on the Slide this text is associated with */ public SlidePersistAtom getSlidePersistAtom() { return slidePersistAtom; } /** Get the Text related records for this slide */ - public Record[] getSlideRecords() { return slideRecords; } + public org.apache.poi.hslf.record.Record[] getSlideRecords() { return slideRecords; } /** Create one to hold the Records for one Slide's text */ - public SlideAtomsSet(SlidePersistAtom s, Record[] r) { + public SlideAtomsSet(SlidePersistAtom s, org.apache.poi.hslf.record.Record[] r) { slidePersistAtom = s; slideRecords = r.clone(); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/TextHeaderAtom.java Fri Jan 10 23:13:20 2020 @@ -36,7 +36,7 @@ import org.apache.poi.util.LittleEndian; public final class TextHeaderAtom extends RecordAtom implements ParentAwareRecord { public static final long _type = RecordTypes.TextHeaderAtom.typeID; private byte[] _header; - private RecordContainer parentRecord; + public org.apache.poi.hslf.record.RecordContainer parentRecord; /** The kind of text it is */ private int textType; @@ -65,7 +65,7 @@ public final class TextHeaderAtom extend public void setIndex(int index) { this.index = index; } @Override - public RecordContainer getParentRecord() { return parentRecord; } + public org.apache.poi.hslf.record.RecordContainer getParentRecord() { return parentRecord; } @Override public void setParentRecord(RecordContainer record) { this.parentRecord = record; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/UnknownRecordPlaceholder.java Fri Jan 10 23:13:20 2020 @@ -68,7 +68,7 @@ public final class UnknownRecordPlacehol /** * Return the value as enum we were given at creation */ - public RecordTypes getRecordTypeEnum() { + public org.apache.poi.hslf.record.RecordTypes getRecordTypeEnum() { return RecordTypes.forTypeID((int)_type); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/record/VBAInfoContainer.java Fri Jan 10 23:13:20 2020 @@ -59,7 +59,7 @@ public final class VBAInfoContainer exte */ private VBAInfoContainer() { _header = new byte[8]; - _children = new Record[0]; + _children = new org.apache.poi.hslf.record.Record[0]; // Setup our header block _header[0] = 0x0f; // We are a container record Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFHyperlink.java Fri Jan 10 23:13:20 2020 @@ -340,7 +340,7 @@ public final class HSLFHyperlink impleme //document-level container which stores info about all links in a presentation ExObjList exobj = ppt.getDocumentRecord().getExObjList(false); if (exobj != null) { - Record[] records = firstPara.getRecords(); + org.apache.poi.hslf.record.Record[] records = firstPara.getRecords(); find(Arrays.asList(records), exobj, lst); } @@ -372,7 +372,7 @@ public final class HSLFHyperlink impleme private static void find(List<? extends Record> records, ExObjList exobj, List<HSLFHyperlink> out){ ListIterator<? extends Record> iter = records.listIterator(); while (iter.hasNext()) { - Record r = iter.next(); + org.apache.poi.hslf.record.Record r = iter.next(); // see if we have InteractiveInfo in the textrun's records if (!(r instanceof InteractiveInfo)) { continue; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFObjectShape.java Fri Jan 10 23:13:20 2020 @@ -104,7 +104,7 @@ public final class HSLFObjectShape exten HSLFEscherClientDataRecord cldata = getClientData(true); ExObjRefAtom uer = null; - for (Record r : cldata.getHSLFChildRecords()) { + for (org.apache.poi.hslf.record.Record r : cldata.getHSLFChildRecords()) { if (r.getRecordType() == RecordTypes.ExObjRefAtom.typeID) { uer = (ExObjRefAtom)r; break; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java Fri Jan 10 23:13:20 2020 @@ -715,7 +715,7 @@ public abstract class HSLFShape implemen public <T extends Record> T getClientDataRecord(int recordType) { List<? extends Record> records = getClientRecords(); - if (records != null) for (Record r : records) { + if (records != null) for (org.apache.poi.hslf.record.Record r : records) { if (r.getRecordType() == recordType){ return (T)r; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapeFactory.java Fri Jan 10 23:13:20 2020 @@ -162,7 +162,7 @@ public final class HSLFShapeFactory { @SuppressWarnings("unchecked") protected static <T extends Record> T getClientDataRecord(EscherContainerRecord spContainer, int recordType) { HSLFEscherClientDataRecord cldata = spContainer.getChildById(EscherClientDataRecord.RECORD_ID); - if (cldata != null) for (Record r : cldata.getHSLFChildRecords()) { + if (cldata != null) for (org.apache.poi.hslf.record.Record r : cldata.getHSLFChildRecords()) { if (r.getRecordType() == recordType) { return (T)r; } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShapePlaceholderDetails.java Fri Jan 10 23:13:20 2020 @@ -212,7 +212,7 @@ public class HSLFShapePlaceholderDetails throw new HSLFException("Placeholder aren't allowed for shape type: " + shape.getClass().getSimpleName()); } - for (Record r : clientData.getHSLFChildRecords()) { + for (org.apache.poi.hslf.record.Record r : clientData.getHSLFChildRecords()) { if (r instanceof OEPlaceholderAtom) { oePlaceholderAtom = (OEPlaceholderAtom)r; } else if (r instanceof RoundTripHFPlaceholder12) { Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlide.java Fri Jan 10 23:13:20 2020 @@ -412,7 +412,7 @@ public final class HSLFSlide extends HSL RecordTypes.ProgTags, RecordTypes.ProgBinaryTag, RecordTypes.BinaryTagData); if (binaryTags != null) { - for (final Record record : binaryTags.getChildRecords()) { + for (final org.apache.poi.hslf.record.Record record : binaryTags.getChildRecords()) { if (record instanceof Comment2000) { comments.add(new HSLFComment((Comment2000)record)); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShow.java Fri Jan 10 23:13:20 2020 @@ -85,7 +85,7 @@ public final class HSLFSlideShow impleme // Pointers to the most recent versions of the core records // (Document, Notes, Slide etc) - private Record[] _mostRecentCoreRecords; + private org.apache.poi.hslf.record.Record[] _mostRecentCoreRecords; // Lookup between the PersitPtr "sheet" IDs, and the position // in the mostRecentCoreRecords array private Map<Integer,Integer> _sheetIdToCoreRecordsLookup; @@ -117,7 +117,7 @@ public final class HSLFSlideShow impleme _hslfSlideShow = hslfSlideShow; // Handle Parent-aware Records - for (Record record : _hslfSlideShow.getRecords()) { + for (org.apache.poi.hslf.record.Record record : _hslfSlideShow.getRecords()) { if(record instanceof RecordContainer){ RecordContainer.handleParentAwareRecords((RecordContainer)record); } @@ -179,7 +179,7 @@ public final class HSLFSlideShow impleme private void findMostRecentCoreRecords() { // To start with, find the most recent in the byte offset domain Map<Integer,Integer> mostRecentByBytes = new HashMap<>(); - for (Record record : _hslfSlideShow.getRecords()) { + for (org.apache.poi.hslf.record.Record record : _hslfSlideShow.getRecords()) { if (record instanceof PersistPtrHolder) { PersistPtrHolder pph = (PersistPtrHolder) record; @@ -200,7 +200,7 @@ public final class HSLFSlideShow impleme // We now know how many unique special records we have, so init // the array - _mostRecentCoreRecords = new Record[mostRecentByBytes.size()]; + _mostRecentCoreRecords = new org.apache.poi.hslf.record.Record[mostRecentByBytes.size()]; // We'll also want to be able to turn the slide IDs into a position // in this array @@ -217,7 +217,7 @@ public final class HSLFSlideShow impleme } // Now convert the byte offsets back into record offsets - for (Record record : _hslfSlideShow.getRecords()) { + for (org.apache.poi.hslf.record.Record record : _hslfSlideShow.getRecords()) { if (!(record instanceof PositionDependentRecord)) { continue; } @@ -245,7 +245,7 @@ public final class HSLFSlideShow impleme } // Now look for the interesting records in there - for (Record record : _mostRecentCoreRecords) { + for (org.apache.poi.hslf.record.Record record : _mostRecentCoreRecords) { // Check there really is a record at this number if (record != null) { // Find the Document, and interesting things in it @@ -264,7 +264,7 @@ public final class HSLFSlideShow impleme * For a given SlideAtomsSet, return the core record, based on the refID * from the SlidePersistAtom */ - private Record getCoreRecordForSAS(SlideAtomsSet sas) { + public org.apache.poi.hslf.record.Record getCoreRecordForSAS(SlideAtomsSet sas) { SlidePersistAtom spa = sas.getSlidePersistAtom(); int refID = spa.getRefID(); return getCoreRecordForRefID(refID); @@ -277,7 +277,7 @@ public final class HSLFSlideShow impleme * @param refID * the refID */ - private Record getCoreRecordForRefID(int refID) { + public org.apache.poi.hslf.record.Record getCoreRecordForRefID(int refID) { Integer coreRecordId = _sheetIdToCoreRecordsLookup.get(refID); if (coreRecordId != null) { return _mostRecentCoreRecords[coreRecordId]; @@ -342,7 +342,7 @@ public final class HSLFSlideShow impleme } for (SlideAtomsSet sas : masterSLWT.getSlideAtomsSets()) { - Record r = getCoreRecordForSAS(sas); + org.apache.poi.hslf.record.Record r = getCoreRecordForSAS(sas); int sheetNo = sas.getSlidePersistAtom().getSlideIdentifier(); if (r instanceof Slide) { HSLFTitleMaster master = new HSLFTitleMaster((Slide)r, sheetNo); @@ -368,7 +368,7 @@ public final class HSLFSlideShow impleme for (SlideAtomsSet notesSet : notesSLWT.getSlideAtomsSets()) { idx++; // Get the right core record - Record r = getCoreRecordForSAS(notesSet); + org.apache.poi.hslf.record.Record r = getCoreRecordForSAS(notesSet); SlidePersistAtom spa = notesSet.getSlidePersistAtom(); String loggerLoc = "A Notes SlideAtomSet at "+idx+" said its record was at refID "+spa.getRefID(); @@ -409,7 +409,7 @@ public final class HSLFSlideShow impleme idx++; // Get the right core record SlidePersistAtom spa = sas.getSlidePersistAtom(); - Record r = getCoreRecordForSAS(sas); + org.apache.poi.hslf.record.Record r = getCoreRecordForSAS(sas); // Ensure it really is a slide record if (!(r instanceof Slide)) { @@ -492,7 +492,7 @@ public final class HSLFSlideShow impleme * Returns an array of the most recent version of all the interesting * records */ - public Record[] getMostRecentCoreRecords() { + public org.apache.poi.hslf.record.Record[] getMostRecentCoreRecords() { return _mostRecentCoreRecords; } @@ -611,13 +611,13 @@ public final class HSLFSlideShow impleme _slides.get(newSlideNumber - 1).setSlideNumber(newSlideNumber); _slides.get(oldSlideNumber - 1).setSlideNumber(oldSlideNumber); - ArrayList<Record> lst = new ArrayList<>(); + ArrayList<org.apache.poi.hslf.record.Record> lst = new ArrayList<>(); for (SlideAtomsSet s : sas) { lst.add(s.getSlidePersistAtom()); lst.addAll(Arrays.asList(s.getSlideRecords())); } - Record[] r = lst.toArray(new Record[0]); + org.apache.poi.hslf.record.Record[] r = lst.toArray(new org.apache.poi.hslf.record.Record[0]); slwt.setChildRecord(r); } @@ -646,7 +646,7 @@ public final class HSLFSlideShow impleme } SlideAtomsSet[] sas = slwt.getSlideAtomsSets(); - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hslf.record.Record> records = new ArrayList<>(); List<SlideAtomsSet> sa = new ArrayList<>(Arrays.asList(sas)); HSLFSlide removedSlide = _slides.remove(index); @@ -666,7 +666,7 @@ public final class HSLFSlideShow impleme _documentRecord.removeSlideListWithText(slwt); } else { slwt.setSlideAtomsSets(sa.toArray(new SlideAtomsSet[0])); - slwt.setChildRecord(records.toArray(new Record[0])); + slwt.setChildRecord(records.toArray(new org.apache.poi.hslf.record.Record[0])); } // if the removed slide had notes - remove references to them too @@ -690,7 +690,7 @@ public final class HSLFSlideShow impleme if (!na.isEmpty()) { nslwt.setSlideAtomsSets(na.toArray(new SlideAtomsSet[0])); - nslwt.setChildRecord(records.toArray(new Record[0])); + nslwt.setChildRecord(records.toArray(new org.apache.poi.hslf.record.Record[0])); } } if (na.isEmpty()) { @@ -1042,7 +1042,7 @@ public final class HSLFSlideShow impleme ExEmbed exEmbed = new ExEmbed(); // remove unneccessary infos, so we don't need to specify the type // of the ole object multiple times - Record[] children = exEmbed.getChildRecords(); + org.apache.poi.hslf.record.Record[] children = exEmbed.getChildRecords(); exEmbed.removeChild(children[2]); exEmbed.removeChild(children[3]); exEmbed.removeChild(children[4]); @@ -1108,7 +1108,7 @@ public final class HSLFSlideShow impleme private int addPersistentObject(PositionDependentRecord slideRecord) { slideRecord.setLastOnDiskOffset(HSLFSlideShowImpl.UNSET_OFFSET); - _hslfSlideShow.appendRootLevelRecord((Record)slideRecord); + _hslfSlideShow.appendRootLevelRecord((org.apache.poi.hslf.record.Record)slideRecord); // For position dependent records, hold where they were and now are // As we go along, update, and hand over, to any Position Dependent Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowEncrypted.java Fri Jan 10 23:13:20 2020 @@ -83,7 +83,7 @@ public class HSLFSlideShowEncrypted impl // need to ignore already set UserEdit and PersistAtoms UserEditAtom userEditAtomWithEncryption = null; for (Map.Entry<Integer, Record> me : recordMap.descendingMap().entrySet()) { - Record r = me.getValue(); + org.apache.poi.hslf.record.Record r = me.getValue(); if (!(r instanceof UserEditAtom)) { continue; } @@ -99,7 +99,7 @@ public class HSLFSlideShowEncrypted impl return; } - Record r = recordMap.get(userEditAtomWithEncryption.getPersistPointersOffset()); + org.apache.poi.hslf.record.Record r = recordMap.get(userEditAtomWithEncryption.getPersistPointersOffset()); assert(r instanceof PersistPtrHolder); PersistPtrHolder ptr = (PersistPtrHolder)r; @@ -138,7 +138,7 @@ public class HSLFSlideShowEncrypted impl return (dea != null) ? dea.getEncryptionInfo() : null; } - protected OutputStream encryptRecord(OutputStream plainStream, int persistId, Record record) { + protected OutputStream encryptRecord(OutputStream plainStream, int persistId, org.apache.poi.hslf.record.Record record) { boolean isPlain = (dea == null || record instanceof UserEditAtom || record instanceof PersistPtrHolder @@ -359,7 +359,7 @@ public class HSLFSlideShowEncrypted impl } } - protected Record[] updateEncryptionRecord(Record[] records) { + protected org.apache.poi.hslf.record.Record[] updateEncryptionRecord(org.apache.poi.hslf.record.Record[] records) { String password = Biff8EncryptionKey.getCurrentUserPassword(); if (password == null) { if (dea == null) { @@ -396,7 +396,7 @@ public class HSLFSlideShowEncrypted impl * Before this method is called, make sure that the offsets are correct, * i.e. call {@link HSLFSlideShowImpl#updateAndWriteDependantRecords(OutputStream, Map)} */ - protected static Record[] normalizeRecords(Record[] records) { + protected static org.apache.poi.hslf.record.Record[] normalizeRecords(org.apache.poi.hslf.record.Record[] records) { // http://msdn.microsoft.com/en-us/library/office/gg615594(v=office.14).aspx // repeated slideIds can be overwritten, i.e. ignored @@ -406,7 +406,7 @@ public class HSLFSlideShowEncrypted impl TreeMap<Integer,Record> recordMap = new TreeMap<>(); List<Integer> obsoleteOffsets = new ArrayList<>(); int duplicatedCount = 0; - for (Record r : records) { + for (org.apache.poi.hslf.record.Record r : records) { assert(r instanceof PositionDependentRecord); PositionDependentRecord pdr = (PositionDependentRecord)r; if (pdr instanceof UserEditAtom) { @@ -452,17 +452,17 @@ public class HSLFSlideShowEncrypted impl recordMap.remove(oldOffset); } - return recordMap.values().toArray(new Record[0]); + return recordMap.values().toArray(new org.apache.poi.hslf.record.Record[0]); } - protected static Record[] removeEncryptionRecord(Record[] records) { + protected static org.apache.poi.hslf.record.Record[] removeEncryptionRecord(org.apache.poi.hslf.record.Record[] records) { int deaSlideId = -1; int deaOffset = -1; PersistPtrHolder ptr = null; UserEditAtom uea = null; - List<Record> recordList = new ArrayList<>(); - for (Record r : records) { + List<org.apache.poi.hslf.record.Record> recordList = new ArrayList<>(); + for (org.apache.poi.hslf.record.Record r : records) { if (r instanceof DocumentEncryptionAtom) { deaOffset = ((DocumentEncryptionAtom)r).getLastOnDiskOffset(); continue; @@ -496,16 +496,16 @@ public class HSLFSlideShowEncrypted impl uea.setMaxPersistWritten(maxSlideId); - records = recordList.toArray(new Record[0]); + records = recordList.toArray(new org.apache.poi.hslf.record.Record[0]); return records; } - protected static Record[] addEncryptionRecord(Record[] records, DocumentEncryptionAtom dea) { + protected static org.apache.poi.hslf.record.Record[] addEncryptionRecord(org.apache.poi.hslf.record.Record[] records, DocumentEncryptionAtom dea) { assert(dea != null); int ueaIdx = -1, ptrIdx = -1, deaIdx = -1, idx = -1; - for (Record r : records) { + for (org.apache.poi.hslf.record.Record r : records) { idx++; if (r instanceof UserEditAtom) { ueaIdx = idx; @@ -530,7 +530,7 @@ public class HSLFSlideShowEncrypted impl uea.setEncryptSessionPersistIdRef(nextSlideId); uea.setMaxPersistWritten(nextSlideId); - Record[] newRecords = new Record[records.length + 1]; + org.apache.poi.hslf.record.Record[] newRecords = new org.apache.poi.hslf.record.Record[records.length + 1]; if (ptrIdx > 0) { System.arraycopy(records, 0, newRecords, 0, ptrIdx); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java Fri Jan 10 23:13:20 2020 @@ -82,7 +82,7 @@ public final class HSLFSlideShowImpl ext private byte[] _docstream; // Low level contents - private Record[] _records; + private org.apache.poi.hslf.record.Record[] _records; // Raw Pictures contained in the pictures stream private List<HSLFPictureData> _pictures; @@ -251,7 +251,7 @@ public final class HSLFSlideShowImpl ext _records = read(_docstream, (int) currentUser.getCurrentEditOffset()); } - private Record[] read(byte[] docstream, int usrOffset) throws IOException { + private org.apache.poi.hslf.record.Record[] read(byte[] docstream, int usrOffset) throws IOException { //sort found records by offset. //(it is not necessary but SlideShow.findMostRecentCoreRecords() expects them sorted) NavigableMap<Integer, Record> records = new TreeMap<>(); // offset -> record @@ -261,7 +261,7 @@ public final class HSLFSlideShowImpl ext for (Map.Entry<Integer, Record> entry : records.entrySet()) { Integer offset = entry.getKey(); - Record record = entry.getValue(); + org.apache.poi.hslf.record.Record record = entry.getValue(); Integer persistId = persistIds.get(offset); if (record == null) { // all plain records have been already added, @@ -277,7 +277,7 @@ public final class HSLFSlideShowImpl ext } decryptData.close(); - return records.values().toArray(new Record[0]); + return records.values().toArray(new org.apache.poi.hslf.record.Record[0]); } private void initRecordOffsets(byte[] docstream, int usrOffset, NavigableMap<Integer, Record> recordMap, Map<Integer, Integer> offset2id) { @@ -318,7 +318,7 @@ public final class HSLFSlideShowImpl ext } public DocumentEncryptionAtom getDocumentEncryptionAtom() { - for (Record r : _records) { + for (org.apache.poi.hslf.record.Record r : _records) { if (r instanceof DocumentEncryptionAtom) { return (DocumentEncryptionAtom) r; } @@ -470,7 +470,7 @@ public final class HSLFSlideShowImpl ext UserEditAtom usr = null; PersistPtrHolder ptr = null; CountingOS cos = new CountingOS(); - for (Record record : _records) { + for (org.apache.poi.hslf.record.Record record : _records) { // all top level records are position dependent assert (record instanceof PositionDependentRecord); PositionDependentRecord pdr = (PositionDependentRecord) record; @@ -512,7 +512,7 @@ public final class HSLFSlideShowImpl ext } try (HSLFSlideShowEncrypted encData = new HSLFSlideShowEncrypted(getDocumentEncryptionAtom())) { - for (Record record : _records) { + for (org.apache.poi.hslf.record.Record record : _records) { assert (record instanceof PositionDependentRecord); // We've already figured out their new location, and // told them that @@ -727,7 +727,7 @@ public final class HSLFSlideShowImpl ext @SuppressWarnings({"UnusedReturnValue", "WeakerAccess"}) public synchronized int appendRootLevelRecord(Record newRecord) { int addedAt = -1; - Record[] r = new Record[_records.length + 1]; + org.apache.poi.hslf.record.Record[] r = new org.apache.poi.hslf.record.Record[_records.length + 1]; boolean added = false; for (int i = (_records.length - 1); i >= 0; i--) { if (added) { @@ -779,7 +779,7 @@ public final class HSLFSlideShowImpl ext /** * Returns an array of all the records found in the slideshow */ - public Record[] getRecords() { + public org.apache.poi.hslf.record.Record[] getRecords() { return _records; } @@ -824,7 +824,7 @@ public final class HSLFSlideShowImpl ext public HSLFObjectData[] getEmbeddedObjects() { if (_objects == null) { List<HSLFObjectData> objects = new ArrayList<>(); - for (Record r : _records) { + for (org.apache.poi.hslf.record.Record r : _records) { if (r instanceof ExOleObjStg) { objects.add(new HSLFObjectData((ExOleObjStg) r)); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSoundData.java Fri Jan 10 23:13:20 2020 @@ -76,11 +76,11 @@ public final class HSLFSoundData { */ public static HSLFSoundData[] find(Document document){ ArrayList<HSLFSoundData> lst = new ArrayList<>(); - Record[] ch = document.getChildRecords(); + org.apache.poi.hslf.record.Record[] ch = document.getChildRecords(); for (int i = 0; i < ch.length; i++) { if(ch[i].getRecordType() == RecordTypes.SoundCollection.typeID){ RecordContainer col = (RecordContainer)ch[i]; - Record[] sr = col.getChildRecords(); + org.apache.poi.hslf.record.Record[] sr = col.getChildRecords(); for (int j = 0; j < sr.length; j++) { if(sr[j] instanceof Sound){ lst.add(new HSLFSoundData((Sound)sr[j])); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextParagraph.java Fri Jan 10 23:13:20 2020 @@ -267,7 +267,7 @@ public final class HSLFTextParagraph imp _ruler = getTextRuler(); if (_ruler == null) { _ruler = TextRulerAtom.getParagraphInstance(); - Record childAfter = _byteAtom; + org.apache.poi.hslf.record.Record childAfter = _byteAtom; if (childAfter == null) { childAfter = _charAtom; } @@ -285,18 +285,18 @@ public final class HSLFTextParagraph imp * * @return text run records */ - public Record[] getRecords() { - Record[] r = _headerAtom.getParentRecord().getChildRecords(); + public org.apache.poi.hslf.record.Record[] getRecords() { + org.apache.poi.hslf.record.Record[] r = _headerAtom.getParentRecord().getChildRecords(); return getRecords(r, new int[] { 0 }, _headerAtom); } - private static Record[] getRecords(Record[] records, int[] startIdx, TextHeaderAtom headerAtom) { + private static org.apache.poi.hslf.record.Record[] getRecords(org.apache.poi.hslf.record.Record[] records, int[] startIdx, TextHeaderAtom headerAtom) { if (records == null) { throw new NullPointerException("records need to be set."); } for (; startIdx[0] < records.length; startIdx[0]++) { - Record r = records[startIdx[0]]; + org.apache.poi.hslf.record.Record r = records[startIdx[0]]; if (r instanceof TextHeaderAtom && (headerAtom == null || r == headerAtom)) { break; } @@ -304,18 +304,18 @@ public final class HSLFTextParagraph imp if (startIdx[0] >= records.length) { logger.log(POILogger.INFO, "header atom wasn't found - container might contain only an OutlineTextRefAtom"); - return new Record[0]; + return new org.apache.poi.hslf.record.Record[0]; } int length; for (length = 1; startIdx[0] + length < records.length; length++) { - Record r = records[startIdx[0]+length]; + org.apache.poi.hslf.record.Record r = records[startIdx[0]+length]; if (r instanceof TextHeaderAtom || r instanceof SlidePersistAtom) { break; } } - Record[] result = new Record[length]; + org.apache.poi.hslf.record.Record[] result = new org.apache.poi.hslf.record.Record[length]; System.arraycopy(records, startIdx[0], result, 0, length); startIdx[0] += length; @@ -932,7 +932,7 @@ public final class HSLFTextParagraph imp private static StyleTextPropAtom findStyleAtomPresent(TextHeaderAtom header, int textLen) { boolean afterHeader = false; StyleTextPropAtom style = null; - for (Record record : header.getParentRecord().getChildRecords()) { + for (org.apache.poi.hslf.record.Record record : header.getParentRecord().getChildRecords()) { long rt = record.getRecordType(); if (afterHeader && rt == RecordTypes.TextHeaderAtom.typeID) { // already on the next header, quit searching @@ -989,7 +989,7 @@ public final class HSLFTextParagraph imp StyleTextPropAtom styleAtom = findStyleAtomPresent(headerAtom, rawText.length()); // Store in the appropriate record - Record oldRecord = null, newRecord; + org.apache.poi.hslf.record.Record oldRecord = null, newRecord; if (isUnicode) { if (byteAtom != null || charAtom == null) { oldRecord = byteAtom; @@ -1010,10 +1010,10 @@ public final class HSLFTextParagraph imp assert (newRecord != null); RecordContainer _txtbox = headerAtom.getParentRecord(); - Record[] cr = _txtbox.getChildRecords(); + org.apache.poi.hslf.record.Record[] cr = _txtbox.getChildRecords(); int /* headerIdx = -1, */ textIdx = -1, styleIdx = -1; for (int i = 0; i < cr.length; i++) { - Record r = cr[i]; + org.apache.poi.hslf.record.Record r = cr[i]; if (r == headerAtom) { // headerIdx = i; } else if (r == oldRecord || r == newRecord) { @@ -1099,7 +1099,7 @@ public final class HSLFTextParagraph imp // If TextSpecInfoAtom is present, we must update the text size in it, // otherwise the ppt will be corrupted - for (Record r : paragraphs.get(0).getRecords()) { + for (org.apache.poi.hslf.record.Record r : paragraphs.get(0).getRecords()) { if (r instanceof TextSpecInfoAtom) { ((TextSpecInfoAtom) r).setParentSize(rawText.length() + 1); break; @@ -1111,7 +1111,7 @@ public final class HSLFTextParagraph imp TextHeaderAtom headerAtom = paragraphs.get(0)._headerAtom; RecordContainer _txtbox = headerAtom.getParentRecord(); // remove existing hyperlink records - for (Record r : _txtbox.getChildRecords()) { + for (org.apache.poi.hslf.record.Record r : _txtbox.getChildRecords()) { if (r instanceof InteractiveInfo || r instanceof TxInteractiveInfoAtom) { _txtbox.removeChild(r); } @@ -1403,7 +1403,7 @@ public final class HSLFTextParagraph imp * * @param records the records to build from */ - protected static List<List<HSLFTextParagraph>> findTextParagraphs(Record[] records) { + protected static List<List<HSLFTextParagraph>> findTextParagraphs(org.apache.poi.hslf.record.Record[] records) { List<List<HSLFTextParagraph>> paragraphCollection = new ArrayList<>(); int[] recordIdx = { 0 }; @@ -1415,7 +1415,7 @@ public final class HSLFTextParagraph imp TextRulerAtom ruler = null; MasterTextPropAtom indents = null; - for (Record r : getRecords(records, recordIdx, null)) { + for (org.apache.poi.hslf.record.Record r : getRecords(records, recordIdx, null)) { long rt = r.getRecordType(); if (RecordTypes.TextHeaderAtom.typeID == rt) { header = (TextHeaderAtom) r; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java Fri Jan 10 23:13:20 2020 @@ -47,7 +47,7 @@ public final class TestRecordContainer { is.close(); Record[] r = hss.getRecords(); - for (Record rec : r) { + for ( org.apache.poi.hslf.record.Record rec : r) { if(rec instanceof RecordContainer) { recordContainer = (RecordContainer)rec; return; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSound.java Fri Jan 10 23:13:20 2020 @@ -42,7 +42,7 @@ public final class TestSound { Document doc = ppt.getDocumentRecord(); SoundCollection soundCollection = null; Record[] doc_ch = doc.getChildRecords(); - for (Record rec : doc_ch) { + for ( org.apache.poi.hslf.record.Record rec : doc_ch) { if (rec instanceof SoundCollection) { soundCollection = (SoundCollection) rec; break; @@ -53,7 +53,7 @@ public final class TestSound { Sound sound = null; Record[] sound_ch = soundCollection.getChildRecords(); int k = 0; - for (Record rec : sound_ch) { + for ( org.apache.poi.hslf.record.Record rec : sound_ch) { if (rec instanceof Sound) { sound = (Sound) rec; k++; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestAddingSlides.java Fri Jan 10 23:13:20 2020 @@ -81,7 +81,7 @@ public final class TestAddingSlides { // grab UserEditAtom UserEditAtom usredit = null; Record[] _records = ss_empty.getSlideShowImpl().getRecords(); - for (Record record : _records) { + for ( org.apache.poi.hslf.record.Record record : _records) { if (record.getRecordType() == RecordTypes.UserEditAtom.typeID) { usredit = (UserEditAtom) record; } @@ -169,7 +169,7 @@ public final class TestAddingSlides { // grab UserEditAtom UserEditAtom usredit = null; Record[] _records = ss_two.getSlideShowImpl().getRecords(); - for (Record record : _records) { + for ( org.apache.poi.hslf.record.Record record : _records) { if (record.getRecordType() == RecordTypes.UserEditAtom.typeID) { usredit = (UserEditAtom) record; } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java Fri Jan 10 23:13:20 2020 @@ -517,7 +517,7 @@ public final class TestBugs { SlideAtomsSet s1 = slidesSLWT.getSlideAtomsSets()[0]; int tha = 0; - for (Record r : s1.getSlideRecords()) { + for ( org.apache.poi.hslf.record.Record r : s1.getSlideRecords()) { if (r instanceof TextHeaderAtom) { tha++; } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java Fri Jan 10 23:13:20 2020 @@ -44,7 +44,7 @@ public final class TestMostRecentRecords @Test public void testCount() { // Most recent core records - Record[] mrcr = ss.getMostRecentCoreRecords(); + org.apache.poi.hslf.record.Record[] mrcr = ss.getMostRecentCoreRecords(); // Master sheet + master notes + 2 slides + 2 notes + document assertEquals(7, mrcr.length); @@ -53,7 +53,7 @@ public final class TestMostRecentRecords @Test public void testRightRecordTypes() { // Most recent core records - Record[] mrcr = ss.getMostRecentCoreRecords(); + org.apache.poi.hslf.record.Record[] mrcr = ss.getMostRecentCoreRecords(); // Document assertEquals(1000, mrcr[0].getRecordType()); @@ -75,10 +75,10 @@ public final class TestMostRecentRecords @Test public void testCorrectRecords() { // Most recent core records - Record[] mrcr = ss.getMostRecentCoreRecords(); + org.apache.poi.hslf.record.Record[] mrcr = ss.getMostRecentCoreRecords(); // All records - Record[] allr = hss.getRecords(); + org.apache.poi.hslf.record.Record[] allr = hss.getRecords(); // Ensure they are the right (latest) version of each Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java Fri Jan 10 23:13:20 2020 @@ -46,20 +46,20 @@ public final class TestRecordSetup { @Test public void testHandleParentAwareRecords() { - Record[] records = hss.getRecords(); - for (Record record : records) { + org.apache.poi.hslf.record.Record[] records = hss.getRecords(); + for ( org.apache.poi.hslf.record.Record record : records) { ensureParentAware(record,null); } } - private void ensureParentAware(Record r,RecordContainer parent) { + private void ensureParentAware( org.apache.poi.hslf.record.Record r,RecordContainer parent) { if(r instanceof ParentAwareRecord) { ParentAwareRecord pr = (ParentAwareRecord)r; assertEquals(parent, pr.getParentRecord()); } if(r instanceof RecordContainer) { RecordContainer rc = (RecordContainer)r; - Record[] children = rc.getChildRecords(); - for (Record rec : children) { + org.apache.poi.hslf.record.Record[] children = rc.getChildRecords(); + for ( org.apache.poi.hslf.record.Record rec : children) { ensureParentAware(rec, rc); } } Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java Fri Jan 10 23:13:20 2020 @@ -418,7 +418,7 @@ public final class TestRichTextRun { assertArrayEquals(raw_file, raw_ss); } - private byte[] writeRecord(Record r) throws IOException { + private byte[] writeRecord( org.apache.poi.hslf.record.Record r) throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); r.writeOut(baos); return baos.toByteArray(); Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java Fri Jan 10 23:13:20 2020 @@ -129,7 +129,7 @@ public final class TestTextRun { TextHeaderAtom tha = null; TextBytesAtom tba = null; TextCharsAtom tca = null; - for (Record r : para.getRecords()) { + for ( org.apache.poi.hslf.record.Record r : para.getRecords()) { if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r; else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r; else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r; @@ -145,7 +145,7 @@ public final class TestTextRun { HSLFTextParagraph.setText(paras, changeBytesOnly); para = paras.get(0); tha = null; tba = null; tca = null; - for (Record r : para.getRecords()) { + for ( org.apache.poi.hslf.record.Record r : para.getRecords()) { if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r; else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r; else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r; @@ -164,7 +164,7 @@ public final class TestTextRun { HSLFTextParagraph.setText(paras, changeByteChar); para = paras.get(0); tha = null; tba = null; tca = null; - for (Record r : para.getRecords()) { + for ( org.apache.poi.hslf.record.Record r : para.getRecords()) { if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r; else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r; else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r; @@ -183,7 +183,7 @@ public final class TestTextRun { HSLFTextParagraph.setText(paras, changeCharChar); para = paras.get(0); tha = null; tba = null; tca = null; - for (Record r : para.getRecords()) { + for ( org.apache.poi.hslf.record.Record r : para.getRecords()) { if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r; else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r; else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r; @@ -525,8 +525,8 @@ public final class TestTextRun { HSLFTextShape tx = (HSLFTextShape)sh; List<HSLFTextParagraph> paras = tx.getTextParagraphs(); //verify that records cached in TextRun and EscherTextboxWrapper are the same - Record[] runChildren = paras.get(0).getRecords(); - Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords(); + org.apache.poi.hslf.record.Record[] runChildren = paras.get(0).getRecords(); + org.apache.poi.hslf.record.Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords(); assertEquals(runChildren.length, txboxChildren.length); for(int i=0; i < txboxChildren.length; i++){ assertSame(txboxChildren[i], runChildren[i]); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventmodel/TestAbortableListener.java Fri Jan 10 23:13:20 2020 @@ -95,7 +95,7 @@ public final class TestAbortableListener lastRecordSeen = null; } @Override - public short abortableProcessRecord(Record record) { + public short abortableProcessRecord(org.apache.poi.hssf.record.Record record) { countSeen++; lastRecordSeen = record; Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestEventWorkbookBuilder.java Fri Jan 10 23:13:20 2020 @@ -61,7 +61,7 @@ public final class TestEventWorkbookBuil } } - private void addFormulaRecord(Record r) { + private void addFormulaRecord(org.apache.poi.hssf.record.Record r) { if (r instanceof FormulaRecord) { fRecs.add((FormulaRecord)r); } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestFormatTrackingHSSFListener.java Fri Jan 10 23:13:20 2020 @@ -82,7 +82,7 @@ public final class TestFormatTrackingHSS // Now check we can turn all the numeric // cells into strings without error - for(Record r : mockListen._records) { + for(org.apache.poi.hssf.record.Record r : mockListen._records) { CellValueRecordInterface cvr = null; if(r instanceof NumberRecord) { @@ -106,10 +106,10 @@ public final class TestFormatTrackingHSS private static final class MockHSSFListener implements HSSFListener { public MockHSSFListener() {} - private final List<Record> _records = new ArrayList<>(); + private final List<org.apache.poi.hssf.record.Record> _records = new ArrayList<>(); @Override - public void processRecord(Record record) { + public void processRecord(org.apache.poi.hssf.record.Record record) { _records.add(record); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestHSSFEventFactory.java Fri Jan 10 23:13:20 2020 @@ -47,7 +47,7 @@ import org.junit.Test; * Testing for {@link HSSFEventFactory} */ public final class TestHSSFEventFactory { - private final List<Record> records = new ArrayList<>(); + private final List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); private void openSample(String sampleFileName) throws IOException { records.clear(); @@ -132,7 +132,7 @@ public final class TestHSSFEventFactory // Has one sheet, with values 1,2,3 in column A rows 1-3 boolean hasSheet = false, hasA1 = false, hasA2 = false, hasA3 = false; - for (Record r : records) { + for (org.apache.poi.hssf.record.Record r : records) { if (r instanceof BoundSheetRecord) { BoundSheetRecord bsr = (BoundSheetRecord) r; assertEquals("Sheet1", bsr.getSheetname()); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/eventusermodel/TestMissingRecordAwareHSSFListener.java Fri Jan 10 23:13:20 2020 @@ -48,7 +48,7 @@ import org.junit.Test; */ public final class TestMissingRecordAwareHSSFListener { - private final List<Record> _records = new ArrayList<>(); + private final List<org.apache.poi.hssf.record.Record> _records = new ArrayList<>(); private void readRecords(String sampleFileName) throws IOException { _records.clear(); @@ -103,7 +103,7 @@ public final class TestMissingRecordAwar readRecords("MRExtraLines.xls"); int rowCount=0; - for (Record rec : _records) { + for (org.apache.poi.hssf.record.Record rec : _records) { if (rec instanceof LastCellOfRowDummyRecord) { LastCellOfRowDummyRecord eor = (LastCellOfRowDummyRecord) rec; assertEquals(rowCount, eor.getRow()); @@ -158,10 +158,10 @@ public final class TestMissingRecordAwar assertEquals(exp, act); } - private int lastIndexOf(Predicate<Record> pre) { + private int lastIndexOf(Predicate<org.apache.poi.hssf.record.Record> pre) { int found = -1; int i = 0; - for (Record r : _records) { + for (org.apache.poi.hssf.record.Record r : _records) { if (pre.test(r)) { found = i; } @@ -173,7 +173,7 @@ public final class TestMissingRecordAwar private String digest(int start, int len) { StringBuilder sb = new StringBuilder(len*10); int lastRow = -1; - for (Record r : _records.subList(start, start+len+1)) { + for (org.apache.poi.hssf.record.Record r : _records.subList(start, start+len+1)) { String dig = null; int row = -1; if (r instanceof RowRecord) { @@ -221,7 +221,7 @@ public final class TestMissingRecordAwar return sb.toString(); } - private long matches(Predicate<Record> r) { + private long matches(Predicate<org.apache.poi.hssf.record.Record> r) { return _records.stream().filter(r).count(); } } Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestDrawingAggregate.java Fri Jan 10 23:13:20 2020 @@ -113,7 +113,7 @@ public class TestDrawingAggregate { byte[] getRawBytes(){ ByteArrayOutputStream out = new ByteArrayOutputStream(); for (RecordBase rb : aggRecords) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; try { out.write(r.serialize()); } catch (IOException e) { @@ -255,7 +255,7 @@ public class TestDrawingAggregate { private static byte[] toByteArray(List<RecordBase> records) { ByteArrayOutputStream out = new ByteArrayOutputStream(); for (RecordBase rb : records) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; try { out.write(r.serialize()); } catch (IOException e) { @@ -370,7 +370,7 @@ public class TestDrawingAggregate { byte[] dgBytes = toByteArray(dgRecords); for (RecordBase rb : dgRecords) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; short sid = r.getSid(); // we expect that drawing block consists of either // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord @@ -435,7 +435,7 @@ public class TestDrawingAggregate { // records to be aggregated List<RecordBase> dgRecords = records.subList(19, 26); for (RecordBase rb : dgRecords) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; short sid = r.getSid(); // we expect that drawing block consists of either // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord @@ -493,8 +493,8 @@ public class TestDrawingAggregate { assertSame(r1.getClass(), r2.getClass()); assertEquals(r1.getRecordSize(), r2.getRecordSize()); if (r1 instanceof Record) { - assertEquals(((Record) r1).getSid(), ((Record) r2).getSid()); - assertArrayEquals(((Record) r1).serialize(), ((Record) r2).serialize()); + assertEquals(((org.apache.poi.hssf.record.Record) r1).getSid(), ((org.apache.poi.hssf.record.Record) r2).getSid()); + assertArrayEquals(((org.apache.poi.hssf.record.Record) r1).serialize(), ((org.apache.poi.hssf.record.Record) r2).serialize()); } } } @@ -520,7 +520,7 @@ public class TestDrawingAggregate { // records to be aggregated List<RecordBase> dgRecords = records.subList(19, 39); for (RecordBase rb : dgRecords) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; short sid = r.getSid(); // we expect that drawing block consists of either // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord @@ -581,7 +581,7 @@ public class TestDrawingAggregate { // records to be aggregated List<RecordBase> dgRecords = records.subList(22, 300); for (RecordBase rb : dgRecords) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; short sid = r.getSid(); // we expect that drawing block consists of either // DrawingRecord or ContinueRecord or ObjRecord or TextObjectRecord @@ -723,7 +723,7 @@ public class TestDrawingAggregate { "fvcr1v8aFU6POn+OCqfj4ffS/e+pcOEMKhABrCdUAAPhwB+pQHYGFcT/BBUEz6LC/wGpc+eRNSkAAA=="; byte[] dgBytes = decompress(data); - List<Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes)); + List<org.apache.poi.hssf.record.Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes)); assertEquals(20, dgRecords.size()); short[] expectedSids = { @@ -901,7 +901,7 @@ public class TestDrawingAggregate { "BPza/oPKABD5z4SARKQEELP1WQsFMc+QwP8ATkmhK404AAA="; byte[] dgBytes = decompress(data); - List<Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes)); + List<org.apache.poi.hssf.record.Record> dgRecords = RecordFactory.createRecords(new ByteArrayInputStream(dgBytes)); assertEquals(14, dgRecords.size()); short[] expectedSids = { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestEscherRecordFactory.java Fri Jan 10 23:13:20 2020 @@ -44,7 +44,7 @@ public class TestEscherRecordFactory { private static byte[] toByteArray(List<RecordBase> records) { ByteArrayOutputStream out = new ByteArrayOutputStream(); for (RecordBase rb : records) { - Record r = (Record) rb; + Record r = (org.apache.poi.hssf.record.Record) rb; try { out.write(r.serialize()); } catch (IOException e) { Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestLinkTable.java Fri Jan 10 23:13:20 2020 @@ -127,7 +127,7 @@ public final class TestLinkTable { SupBookRecord.createAddInFunctions(), new SSTRecord(), }; - List<Record> recList = Arrays.asList(recs); + List<org.apache.poi.hssf.record.Record> recList = Arrays.asList(recs); WorkbookRecordList wrl = new WorkbookRecordList(); // Bug 47001b: Expected an EXTERNSHEET record but got (org.apache.poi.hssf.record.SSTRecord) @@ -145,7 +145,7 @@ public final class TestLinkTable { new NameCommentRecord("name2", "comment2"), }; - final List<Record> recList = Arrays.asList(recs); + final List<org.apache.poi.hssf.record.Record> recList = Arrays.asList(recs); final WorkbookRecordList wrl = new WorkbookRecordList(); final Map<String, NameCommentRecord> commentRecords = new LinkedHashMap<>(); Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestSheet.java Fri Jan 10 23:13:20 2020 @@ -50,24 +50,24 @@ import org.junit.Test; * Unit test for the {@link InternalSheet} class. */ public final class TestSheet { - private static InternalSheet createSheet(List<Record> inRecs) { + private static InternalSheet createSheet(List<org.apache.poi.hssf.record.Record> inRecs) { return InternalSheet.createSheet(new RecordStream(inRecs, 0)); } @Test public void testCreateSheet() { // Check we're adding row and cell aggregates - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); records.add(BOFRecord.createSheetBOF()); records.add( new DimensionsRecord() ); records.add(createWindow2Record()); records.add(EOFRecord.instance); InternalSheet sheet = createSheet(records); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, 0); - Iterator<Record> iter = outRecs.iterator(); + Iterator<org.apache.poi.hssf.record.Record> iter = outRecs.iterator(); assertTrue(iter.next() instanceof BOFRecord ); assertTrue(iter.next() instanceof IndexRecord); assertTrue(iter.next() instanceof DimensionsRecord); @@ -75,7 +75,7 @@ public final class TestSheet { assertTrue(iter.next() instanceof EOFRecord); } - private static Record createWindow2Record() { + private static org.apache.poi.hssf.record.Record createWindow2Record() { WindowTwoRecord result = new WindowTwoRecord(); result.setOptions(( short ) 0x6b6); result.setTopRow(( short ) 0); @@ -93,7 +93,7 @@ public final class TestSheet { _count = 0; } @Override - public void visitRecord(Record r) { + public void visitRecord(org.apache.poi.hssf.record.Record r) { if (r instanceof MergeCellsRecord) { _count++; } @@ -179,7 +179,7 @@ public final class TestSheet { */ @Test public void testMovingMergedRegion() { - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); CellRangeAddress[] cras = { new CellRangeAddress(0, 1, 0, 2), @@ -218,7 +218,7 @@ public final class TestSheet { */ @Test public void testRowAggregation() { - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); records.add(InternalSheet.createBOF()); records.add(new DimensionsRecord()); @@ -430,7 +430,7 @@ public final class TestSheet { @Test public void testUncalcSize_bug45066() { - List<Record> records = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> records = new ArrayList<>(); records.add(BOFRecord.createSheetBOF()); records.add(new UncalcedRecord()); records.add(new DimensionsRecord()); @@ -510,7 +510,7 @@ public final class TestSheet { return _indexRecord; } @Override - public void visitRecord(Record r) { + public void visitRecord(org.apache.poi.hssf.record.Record r) { if (r instanceof IndexRecord) { if (_indexRecord != null) { throw new RuntimeException("too many index records"); @@ -588,7 +588,7 @@ public final class TestSheet { nr.setColumn((short) colIx); nr.setValue(3.0); - List<Record> inRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> inRecs = new ArrayList<>(); inRecs.add(BOFRecord.createSheetBOF()); inRecs.add(new RowRecord(rowIx)); inRecs.add(nr); @@ -596,7 +596,7 @@ public final class TestSheet { inRecs.add(EOFRecord.instance); InternalSheet sheet = createSheet(inRecs); - List<Record> outRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> outRecs = new ArrayList<>(); sheet.visitContainedRecords(outRecs::add, rowIx); assertEquals(8, outRecs.size()); DimensionsRecord dims = (DimensionsRecord) outRecs.get(5); @@ -643,7 +643,7 @@ public final class TestSheet { @Test public void testCloneMulBlank_bug46776() { - Record[] recs = { + org.apache.poi.hssf.record.Record[] recs = { InternalSheet.createBOF(), new DimensionsRecord(), new RowRecord(1), @@ -657,7 +657,7 @@ public final class TestSheet { InternalSheet sheet2 = sheet.cloneSheet(); - List<Record> clonedRecs = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> clonedRecs = new ArrayList<>(); sheet2.visitContainedRecords(clonedRecs::add, 0); // +2 for INDEX and DBCELL assertEquals(recs.length+2, clonedRecs.size()); @@ -700,7 +700,7 @@ public final class TestSheet { r2.setStr(new HSSFRichTextString("Aggregated")); NoteRecord n2 = new NoteRecord(); - List<Record> recordStream = new ArrayList<>(); + List<org.apache.poi.hssf.record.Record> recordStream = new ArrayList<>(); recordStream.add(InternalSheet.createBOF()); recordStream.add( d1 ); recordStream.add( r1 ); @@ -734,7 +734,7 @@ public final class TestSheet { confirmAggregatedRecords(recordStream); } - private void confirmAggregatedRecords(List<Record> recordStream){ + private void confirmAggregatedRecords(List<org.apache.poi.hssf.record.Record> recordStream){ InternalSheet sheet = InternalSheet.createSheet(); sheet.getRecords().clear(); sheet.getRecords().addAll(recordStream); @@ -745,10 +745,10 @@ public final class TestSheet { sheet.aggregateDrawingRecords(drawingManager, false); assertEquals(4, sheetRecords.size()); - assertEquals(BOFRecord.sid, ((Record)sheetRecords.get(0)).getSid()); - assertEquals(EscherAggregate.sid, ((Record)sheetRecords.get(1)).getSid()); - assertEquals(WindowTwoRecord.sid, ((Record)sheetRecords.get(2)).getSid()); - assertEquals(EOFRecord.sid, ((Record)sheetRecords.get(3)).getSid()); + assertEquals(BOFRecord.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(0)).getSid()); + assertEquals(EscherAggregate.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(1)).getSid()); + assertEquals(WindowTwoRecord.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(2)).getSid()); + assertEquals(EOFRecord.sid, ((org.apache.poi.hssf.record.Record)sheetRecords.get(3)).getSid()); } @Test Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java?rev=1872610&r1=1872609&r2=1872610&view=diff ============================================================================== --- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java (original) +++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestDrawingRecord.java Fri Jan 10 23:13:20 2020 @@ -53,7 +53,7 @@ public final class TestDrawingRecord { ContinueRecord cn = new ContinueRecord(data2); out.write(cn.serialize()); - List<Record> rec = RecordFactory.createRecords(new ByteArrayInputStream(out.toByteArray())); + List<org.apache.poi.hssf.record.Record> rec = RecordFactory.createRecords(new ByteArrayInputStream(out.toByteArray())); assertEquals(2, rec.size()); assertTrue(rec.get(0) instanceof DrawingRecord); assertTrue(rec.get(1) instanceof ContinueRecord); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
