From: Nick Burch Date: Tue, 19 Oct 2010 21:25:41 +0000 (+0000) Subject: Fix more HSLF generics warnings X-Git-Tag: REL_3_8_BETA1~150 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1a9cfa44d4cec78fd59f4803461ddd55c2eec694;p=poi.git Fix more HSLF generics warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1024420 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java index 17d999991f..7a739ac3cb 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java +++ b/src/scratchpad/src/org/apache/poi/hslf/HSLFSlideShow.java @@ -227,8 +227,8 @@ public final class HSLFSlideShow extends POIDocument { } private Record[] read(byte[] docstream, int usrOffset){ - ArrayList lst = new ArrayList(); - HashMap offset2id = new HashMap(); + ArrayList lst = new ArrayList(); + HashMap offset2id = new HashMap(); while (usrOffset != 0){ UserEditAtom usr = (UserEditAtom) Record.buildRecordAtOffset(docstream, usrOffset); lst.add(Integer.valueOf(usrOffset)); @@ -236,11 +236,9 @@ public final class HSLFSlideShow extends POIDocument { PersistPtrHolder ptr = (PersistPtrHolder)Record.buildRecordAtOffset(docstream, psrOffset); lst.add(Integer.valueOf(psrOffset)); - Hashtable entries = ptr.getSlideLocationsLookup(); - for (Iterator it = entries.keySet().iterator(); it.hasNext(); ) { - Integer id = (Integer)it.next(); - Integer offset = (Integer)entries.get(id); - + Hashtable entries = ptr.getSlideLocationsLookup(); + for(Integer id : entries.keySet()) { + Integer offset = entries.get(id); lst.add(offset); offset2id.put(offset, id); } @@ -249,15 +247,15 @@ public final class HSLFSlideShow extends POIDocument { } //sort found records by offset. //(it is not necessary but SlideShow.findMostRecentCoreRecords() expects them sorted) - Object a[] = lst.toArray(); + Integer a[] = lst.toArray(new Integer[lst.size()]); Arrays.sort(a); Record[] rec = new Record[lst.size()]; for (int i = 0; i < a.length; i++) { - Integer offset = (Integer)a[i]; + Integer offset = a[i]; rec[i] = Record.buildRecordAtOffset(docstream, offset.intValue()); if(rec[i] instanceof PersistRecord) { PersistRecord psr = (PersistRecord)rec[i]; - Integer id = (Integer)offset2id.get(offset); + Integer id = offset2id.get(offset); psr.setPersistId(id.intValue()); } } @@ -379,7 +377,7 @@ public final class HSLFSlideShow extends POIDocument { POIFSFileSystem outFS = new POIFSFileSystem(); // The list of entries we've written out - List writtenEntries = new ArrayList(1); + List writtenEntries = new ArrayList(1); // Write out the Property Streams writeProperties(outFS, writtenEntries); @@ -388,7 +386,7 @@ public final class HSLFSlideShow extends POIDocument { // For position dependent records, hold where they were and now are // As we go along, update, and hand over, to any Position Dependent // records we happen across - Hashtable oldToNewPositions = new Hashtable(); + Hashtable oldToNewPositions = new Hashtable(); // First pass - figure out where all the position dependent // records are going to end up, in the new scheme @@ -549,13 +547,13 @@ public final class HSLFSlideShow extends POIDocument { */ public ObjectData[] getEmbeddedObjects() { if (_objects == null) { - List objects = new ArrayList(); + List objects = new ArrayList(); for (int i = 0; i < _records.length; i++) { if (_records[i] instanceof ExOleObjStg) { objects.add(new ObjectData((ExOleObjStg) _records[i])); } } - _objects = (ObjectData[]) objects.toArray(new ObjectData[objects.size()]); + _objects = objects.toArray(new ObjectData[objects.size()]); } return _objects; } diff --git a/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java b/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java index dd985a0381..ec3ab7f225 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java +++ b/src/scratchpad/src/org/apache/poi/hslf/model/Fill.java @@ -209,7 +209,7 @@ public final class Fill { EscherContainerRecord dggContainer = doc.getPPDrawingGroup().getDggContainer(); EscherContainerRecord bstore = (EscherContainerRecord)Shape.getEscherChild(dggContainer, EscherContainerRecord.BSTORE_CONTAINER); - java.util.List lst = bstore.getChildRecords(); + java.util.List lst = bstore.getChildRecords(); int idx = p.getPropertyValue(); if (idx == 0){ logger.log(POILogger.WARN, "no reference to picture data found "); diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java index 9418363849..8061cc8176 100644 --- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java +++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/SlideShow.java @@ -62,7 +62,7 @@ public final class SlideShow { private Record[] _mostRecentCoreRecords; // Lookup between the PersitPtr "sheet" IDs, and the position // in the mostRecentCoreRecords array - private Hashtable _sheetIdToCoreRecordsLookup; + private Hashtable _sheetIdToCoreRecordsLookup; // Records that are interesting private Document _documentRecord; @@ -131,7 +131,7 @@ public final class SlideShow { */ private void findMostRecentCoreRecords() { // To start with, find the most recent in the byte offset domain - Hashtable mostRecentByBytes = new Hashtable(); + Hashtable mostRecentByBytes = new Hashtable(); for (int i = 0; i < _records.length; i++) { if (_records[i] instanceof PersistPtrHolder) { PersistPtrHolder pph = (PersistPtrHolder) _records[i]; @@ -147,7 +147,7 @@ public final class SlideShow { } // Now, update the byte level locations with their latest values - Hashtable thisSetOfLocations = pph.getSlideLocationsLookup(); + Hashtable thisSetOfLocations = pph.getSlideLocationsLookup(); for (int j = 0; j < ids.length; j++) { Integer id = Integer.valueOf(ids[j]); mostRecentByBytes.put(id, thisSetOfLocations.get(id)); @@ -161,11 +161,11 @@ public final class SlideShow { // We'll also want to be able to turn the slide IDs into a position // in this array - _sheetIdToCoreRecordsLookup = new Hashtable(); + _sheetIdToCoreRecordsLookup = new Hashtable(); int[] allIDs = new int[_mostRecentCoreRecords.length]; - Enumeration ids = mostRecentByBytes.keys(); + Enumeration ids = mostRecentByBytes.keys(); for (int i = 0; i < allIDs.length; i++) { - Integer id = (Integer) ids.nextElement(); + Integer id = ids.nextElement(); allIDs[i] = id.intValue(); } Arrays.sort(allIDs); @@ -182,11 +182,11 @@ public final class SlideShow { // Is it one we care about? for (int j = 0; j < allIDs.length; j++) { Integer thisID = Integer.valueOf(allIDs[j]); - Integer thatRecordAt = (Integer) mostRecentByBytes.get(thisID); + Integer thatRecordAt = mostRecentByBytes.get(thisID); if (thatRecordAt.equals(recordAt)) { // Bingo. Now, where do we store it? - Integer storeAtI = (Integer) _sheetIdToCoreRecordsLookup.get(thisID); + Integer storeAtI = _sheetIdToCoreRecordsLookup.get(thisID); int storeAt = storeAtI.intValue(); // Tell it its Sheet ID, if it cares @@ -236,7 +236,7 @@ public final class SlideShow { * the refID */ private Record getCoreRecordForRefID(int refID) { - Integer coreRecordId = (Integer) _sheetIdToCoreRecordsLookup.get(Integer.valueOf(refID)); + Integer coreRecordId = _sheetIdToCoreRecordsLookup.get(Integer.valueOf(refID)); if (coreRecordId != null) { Record r = _mostRecentCoreRecords[coreRecordId.intValue()]; return r; @@ -289,8 +289,8 @@ public final class SlideShow { if (masterSLWT != null) { masterSets = masterSLWT.getSlideAtomsSets(); - ArrayList mmr = new ArrayList(); - ArrayList tmr = new ArrayList(); + ArrayList mmr = new ArrayList(); + ArrayList tmr = new ArrayList(); for (int i = 0; i < masterSets.length; i++) { Record r = getCoreRecordForSAS(masterSets[i]); @@ -314,7 +314,6 @@ public final class SlideShow { _titleMasters = new TitleMaster[tmr.size()]; tmr.toArray(_titleMasters); - } // Having sorted out the masters, that leaves the notes and slides @@ -323,14 +322,15 @@ public final class SlideShow { // notesSLWT org.apache.poi.hslf.record.Notes[] notesRecords; SlideAtomsSet[] notesSets = new SlideAtomsSet[0]; - Hashtable slideIdToNotes = new Hashtable(); + Hashtable slideIdToNotes = new Hashtable(); if (notesSLWT == null) { // None notesRecords = new org.apache.poi.hslf.record.Notes[0]; } else { // Match up the records and the SlideAtomSets notesSets = notesSLWT.getSlideAtomsSets(); - ArrayList notesRecordsL = new ArrayList(); + ArrayList notesRecordsL = + new ArrayList(); for (int i = 0; i < notesSets.length; i++) { // Get the right core record Record r = getCoreRecordForSAS(notesSets[i]); @@ -352,7 +352,7 @@ public final class SlideShow { } } notesRecords = new org.apache.poi.hslf.record.Notes[notesRecordsL.size()]; - notesRecords = (org.apache.poi.hslf.record.Notes[]) notesRecordsL.toArray(notesRecords); + notesRecords = notesRecordsL.toArray(notesRecords); } // Now, do the same thing for our slides @@ -560,7 +560,7 @@ public final class SlideShow { sas[oldSlideNumber - 1] = sas[newSlideNumber - 1]; sas[newSlideNumber - 1] = tmp; - ArrayList lst = new ArrayList(); + ArrayList lst = new ArrayList(); for (int i = 0; i < sas.length; i++) { lst.add(sas[i].getSlidePersistAtom()); Record[] r = sas[i].getSlideRecords(); @@ -569,7 +569,7 @@ public final class SlideShow { } _slides[i].setSlideNumber(i + 1); } - Record[] r = (Record[]) lst.toArray(new Record[lst.size()]); + Record[] r = lst.toArray(new Record[lst.size()]); slwt.setChildRecord(r); }