aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/bloodasp/galacticgreg/auxiliary
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/bloodasp/galacticgreg/auxiliary')
-rw-r--r--src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java9
-rw-r--r--src/main/java/bloodasp/galacticgreg/auxiliary/ProfilingStorage.java19
2 files changed, 12 insertions, 16 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java
index 4f6166e3eb..eb3db77060 100644
--- a/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java
+++ b/src/main/java/bloodasp/galacticgreg/auxiliary/LogHelper.java
@@ -1,17 +1,16 @@
package bloodasp.galacticgreg.auxiliary;
-import java.util.ArrayList;
-
+import cpw.mods.fml.common.FMLLog;
import org.apache.logging.log4j.Level;
-import cpw.mods.fml.common.FMLLog;
+import java.util.ArrayList;
/**
* Generic LogHelper to print stuff to the console
* @author Namikon
*/
public final class LogHelper {
- private ArrayList<String> _mReportedCategories = new ArrayList<String>();
+ private ArrayList<String> _mReportedCategories = new ArrayList<>();
private boolean doDebugLogs = false;
private boolean doTraceLogs = false;
private boolean quietMode = false;
@@ -56,7 +55,7 @@ public final class LogHelper {
*/
public void ResetCategories()
{
- _mReportedCategories = new ArrayList<String>();
+ _mReportedCategories = new ArrayList<>();
}
/**
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<String, List<Long>>();
+ 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<Long>());
+ mProfilingMap.put(pDimension.getDimIdentifier(), new LinkedList<>());
LinkedList<Long> ll = (LinkedList<Long>) 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<Long> ll = (LinkedList<Long>) mProfilingMap.get(pDimension.getDimIdentifier());
if(ll != null)
{
- Iterator<Long> qItr = ll.iterator();
- while(qItr.hasNext())
- {
- tAverage += qItr.next();
+ for (Long aLong : ll) {
+ tAverage += aLong;
tTotalVal++;
}