From 72708e125960fbbf80ce38c0cec573aebf038cc5 Mon Sep 17 00:00:00 2001 From: draknyte1 Date: Wed, 29 Mar 2017 17:36:18 +1000 Subject: % Changed some ArrayList functions for J7 compliance. --- src/Java/gtPlusPlus/core/util/Utils.java | 4 ++-- src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java index f969d3e075..45dc2ce701 100644 --- a/src/Java/gtPlusPlus/core/util/Utils.java +++ b/src/Java/gtPlusPlus/core/util/Utils.java @@ -340,8 +340,8 @@ public class Utils { return targetList; } - public static List convertArrayListToList(@SuppressWarnings("rawtypes") final ArrayList sourceArray) { - final List targetList = new ArrayList<>(Arrays.asList(sourceArray)); + public static List convertArrayListToList(final ArrayList sourceArray) { + final List targetList = new ArrayList(Arrays.asList(sourceArray)); return targetList; } diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index da68bfaaae..1150fe6602 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -35,8 +35,8 @@ public class MaterialUtils { public static List oreDictValuesForEntry(final String oredictName){ List oredictItemNames; if(OreDictionary.doesOreNameExist(oredictName)){ - final ArrayList oredictItems = OreDictionary.getOres(oredictName); - oredictItemNames = Utils.convertArrayListToList(oredictItems); + final List oredictItems = OreDictionary.getOres(oredictName); + oredictItemNames = oredictItems; return oredictItemNames; } return null; -- cgit