From 6a87e5b8ea8537ec048251fca9ba190851391408 Mon Sep 17 00:00:00 2001 From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Date: Sat, 7 Mar 2020 18:35:21 +0100 Subject: Update to Java 8 + Fixed Crash with BWOres --- .../galacticgreg/auxiliary/ProfilingStorage.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java') diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java b/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java index 192fb07262..dafa1e628e 100644 --- a/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java +++ b/src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java @@ -1,13 +1,12 @@ package bloodasp.galacticgreg.auxiliary; +import bloodasp.galacticgreg.api.ModDimensionDef; + import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import bloodasp.galacticgreg.api.ModDimensionDef; - /** * A simple FIFO-storage for Long-values * Will keep 50 values for each dimension in memory @@ -18,13 +17,13 @@ public class ProfilingStorage { public ProfilingStorage() { - mProfilingMap = new HashMap>(); + mProfilingMap = new HashMap<>(); } /** * Add a new time to the list of pDimension. Will be ignored it tTotalTime == 0 * @param pDimension - * @param tTotalTime + * @param pTotalTime */ public void AddTimeToList(ModDimensionDef pDimension, long pTotalTime) { @@ -34,7 +33,7 @@ public class ProfilingStorage { return; if(!mProfilingMap.containsKey(pDimension.getDimIdentifier())) - mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList()); + mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList<>()); LinkedList ll = (LinkedList) mProfilingMap.get(pDimension.getDimIdentifier()); @@ -64,14 +63,12 @@ public class ProfilingStorage { long tAverage = 0; long tReturnVal = 0; - LinkedList ll = (LinkedList) mProfilingMap.get(pDimension.getDimIdentifier()); + LinkedList ll = (LinkedList) mProfilingMap.get(pDimension.getDimIdentifier()); if(ll != null) { - Iterator qItr = ll.iterator(); - while(qItr.hasNext()) - { - tAverage += qItr.next(); + for (Long aLong : ll) { + tAverage += aLong; tTotalVal++; } -- cgit