Paramaretize LinkedList, ArrayList, and HashMap.
This commit is contained in:
parent
36f54115ab
commit
205787372d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -41,7 +41,7 @@ public class PlatformInput {
|
|||
private static int windowWidth = 640;
|
||||
private static int windowHeight = 480;
|
||||
|
||||
private static final List<KeyboardEvent> keyboardEventList = new LinkedList();
|
||||
private static final List<KeyboardEvent> keyboardEventList = new LinkedList<>();
|
||||
private static KeyboardEvent currentKeyboardEvent = null;
|
||||
|
||||
private static final char[] keyboardReleaseEventChars = new char[256];
|
||||
|
@ -49,7 +49,7 @@ public class PlatformInput {
|
|||
private static boolean enableRepeatEvents = false;
|
||||
private static int functionKeyModifier = GLFW_KEY_F;
|
||||
|
||||
private static final List<Character> keyboardCharList = new LinkedList();
|
||||
private static final List<Character> keyboardCharList = new LinkedList<>();
|
||||
|
||||
private static class KeyboardEvent {
|
||||
|
||||
|
@ -66,7 +66,7 @@ public class PlatformInput {
|
|||
|
||||
}
|
||||
|
||||
private static final List<MouseEvent> mouseEventList = new LinkedList();
|
||||
private static final List<MouseEvent> mouseEventList = new LinkedList<>();
|
||||
private static MouseEvent currentMouseEvent = null;
|
||||
|
||||
private static class MouseEvent {
|
||||
|
|
|
@ -79,7 +79,7 @@ public class PlatformNetworking {
|
|||
}
|
||||
}
|
||||
|
||||
private static final List<byte[]> playPackets = new LinkedList();
|
||||
private static final List<byte[]> playPackets = new LinkedList<>();
|
||||
|
||||
public static byte[] readPlayPacket() {
|
||||
synchronized(playPackets) {
|
||||
|
|
|
@ -29,8 +29,8 @@ class WebSocketServerQuery extends WebSocketClient implements IServerQuery {
|
|||
|
||||
public static final Logger logger = LogManager.getLogger("WebSocketQuery");
|
||||
|
||||
private final List<QueryResponse> queryResponses = new LinkedList();
|
||||
private final List<byte[]> queryResponsesBytes = new LinkedList();
|
||||
private final List<QueryResponse> queryResponses = new LinkedList<>();
|
||||
private final List<byte[]> queryResponsesBytes = new LinkedList<>();
|
||||
private final String type;
|
||||
private boolean open = true;
|
||||
private boolean alive = false;
|
||||
|
|
|
@ -22,7 +22,7 @@ public class DesktopClientConfigAdapter implements IClientConfigAdapter {
|
|||
|
||||
public static final IClientConfigAdapter instance = new DesktopClientConfigAdapter();
|
||||
|
||||
public final List<DefaultServer> defaultServers = new ArrayList();
|
||||
public final List<DefaultServer> defaultServers = new ArrayList<>();
|
||||
|
||||
@Override
|
||||
public String getDefaultLocale() {
|
||||
|
|
|
@ -119,7 +119,7 @@ public class EagRuntime {
|
|||
public static List<String> getResourceLines(String path) {
|
||||
byte[] bytes = PlatformAssets.getResourceBytes(path);
|
||||
if(bytes != null) {
|
||||
List<String> ret = new ArrayList();
|
||||
List<String> ret = new ArrayList<>();
|
||||
try {
|
||||
BufferedReader rd = new BufferedReader(new StringReader(path));
|
||||
String s;
|
||||
|
@ -158,7 +158,7 @@ public class EagRuntime {
|
|||
}
|
||||
|
||||
public static String[] getStackTraceElements(Throwable t) {
|
||||
List<String> lst = new ArrayList();
|
||||
List<String> lst = new ArrayList<>();
|
||||
PlatformRuntime.getStackTrace(t, (s) -> {
|
||||
lst.add(s);
|
||||
});
|
||||
|
|
|
@ -128,8 +128,8 @@ public class EaglercraftSoundManager {
|
|||
settings.getSoundLevel(SoundCategory.ANIMALS), settings.getSoundLevel(SoundCategory.PLAYERS),
|
||||
settings.getSoundLevel(SoundCategory.AMBIENT), settings.getSoundLevel(SoundCategory.VOICE)
|
||||
};
|
||||
activeSounds = new LinkedList();
|
||||
queuedSounds = new LinkedList();
|
||||
activeSounds = new LinkedList<>();
|
||||
queuedSounds = new LinkedList<>();
|
||||
}
|
||||
|
||||
public void unloadSoundSystem() {
|
||||
|
|
|
@ -30,7 +30,7 @@ public class IOUtils {
|
|||
return Arrays.asList(
|
||||
new String(((EaglerInputStream) parInputStream).getAsArray(), charset).split("(\\r\\n|\\n|\\r)"));
|
||||
}else {
|
||||
List<String> ret = new ArrayList();
|
||||
List<String> ret = new ArrayList<>();
|
||||
try(InputStream is = parInputStream) {
|
||||
BufferedReader rd = new BufferedReader(new InputStreamReader(is, charset));
|
||||
String s;
|
||||
|
|
|
@ -23,7 +23,7 @@ public class EaglerLoadingCache<K, V> {
|
|||
|
||||
public EaglerLoadingCache(EaglerCacheProvider<K, V> provider) {
|
||||
this.provider = provider;
|
||||
this.cacheMap = new HashMap();
|
||||
this.cacheMap = new HashMap<>();
|
||||
}
|
||||
|
||||
public V get(K key) {
|
||||
|
|
|
@ -20,7 +20,7 @@ import java.util.concurrent.Executor;
|
|||
*/
|
||||
public class ListenableFutureTask<V> extends FutureTask<V> implements ListenableFuture<V> {
|
||||
|
||||
private final List<Runnable> listeners = new ArrayList();
|
||||
private final List<Runnable> listeners = new ArrayList<>();
|
||||
|
||||
public ListenableFutureTask(Callable<V> callable) {
|
||||
super(callable);
|
||||
|
|
|
@ -51,10 +51,10 @@ import net.minecraft.util.IChatComponent;
|
|||
*/
|
||||
public class JSONTypeProvider {
|
||||
|
||||
private static final Map<Class<?>,JSONTypeSerializer<?,?>> serializers = new HashMap();
|
||||
private static final Map<Class<?>,JSONTypeDeserializer<?,?>> deserializers = new HashMap();
|
||||
private static final Map<Class<?>,JSONTypeSerializer<?,?>> serializers = new HashMap<>();
|
||||
private static final Map<Class<?>,JSONTypeDeserializer<?,?>> deserializers = new HashMap<>();
|
||||
|
||||
private static final List<JSONDataParserImpl> parsers = new ArrayList();
|
||||
private static final List<JSONDataParserImpl> parsers = new ArrayList<>();
|
||||
|
||||
public static <J> J serialize(Object object) throws JSONException {
|
||||
JSONTypeSerializer<Object,J> ser = (JSONTypeSerializer<Object,J>) serializers.get(object.getClass());
|
||||
|
|
|
@ -28,7 +28,7 @@ public class SoundMapDeserializer implements JSONTypeDeserializer<JSONObject, So
|
|||
|
||||
@Override
|
||||
public SoundMap deserialize(JSONObject json) throws JSONException {
|
||||
Map<String, SoundList> soundsMap = new HashMap();
|
||||
Map<String, SoundList> soundsMap = new HashMap<>();
|
||||
for(String str : json.keySet()) {
|
||||
soundsMap.put(str, JSONTypeProvider.deserialize(json.getJSONObject(str), SoundList.class));
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@ import java.util.Map;
|
|||
*/
|
||||
public class LogManager {
|
||||
|
||||
private static final Map<String,Logger> loggerInstances = new HashMap();
|
||||
private static final Map<String,Logger> loggerInstances = new HashMap<>();
|
||||
|
||||
public static final Object logLock = new Object();
|
||||
public static Level logLevel = Level.DEBUG;
|
||||
|
|
|
@ -35,7 +35,7 @@ public class ChunkUpdateManager {
|
|||
private int chunkUpdatesQueuedLast = 0;
|
||||
private long chunkUpdatesTotalLastUpdate = 0l;
|
||||
|
||||
private final List<ChunkCompileTaskGenerator> queue = new LinkedList();
|
||||
private final List<ChunkCompileTaskGenerator> queue = new LinkedList<>();
|
||||
|
||||
public ChunkUpdateManager() {
|
||||
worldVertexUploader = new WorldVertexBufferUploader();
|
||||
|
@ -99,7 +99,7 @@ public class ChunkUpdateManager {
|
|||
}else {
|
||||
boolean flag = false;
|
||||
long millis = System.currentTimeMillis();
|
||||
List<ChunkCompileTaskGenerator> droppedUpdates = new LinkedList();
|
||||
List<ChunkCompileTaskGenerator> droppedUpdates = new LinkedList<>();
|
||||
while(!queue.isEmpty()) {
|
||||
ChunkCompileTaskGenerator generator = queue.remove(0);
|
||||
|
||||
|
|
|
@ -202,7 +202,7 @@ public class EaglercraftGPU {
|
|||
++GlStateManager.stateNormalSerial;
|
||||
}
|
||||
|
||||
private static final Map<Integer,String> stringCache = new HashMap();
|
||||
private static final Map<Integer,String> stringCache = new HashMap<>();
|
||||
|
||||
public static final String glGetString(int param) {
|
||||
String str = stringCache.get(param);
|
||||
|
|
|
@ -36,7 +36,7 @@ public class EaglerProfile {
|
|||
public static int presetSkinId;
|
||||
public static int customSkinId;
|
||||
|
||||
public static final List<CustomSkin> customSkins = new ArrayList();
|
||||
public static final List<CustomSkin> customSkins = new ArrayList<>();
|
||||
|
||||
public static final EaglercraftRandom rand;
|
||||
|
||||
|
|
|
@ -123,9 +123,9 @@ public class ServerSkinCache {
|
|||
|
||||
private final SkinCacheEntry defaultCacheEntry = new SkinCacheEntry(0);
|
||||
private final SkinCacheEntry defaultSlimCacheEntry = new SkinCacheEntry(1);
|
||||
private final Map<EaglercraftUUID, SkinCacheEntry> skinsCache = new HashMap();
|
||||
private final Map<EaglercraftUUID, WaitingSkin> waitingSkins = new HashMap();
|
||||
private final Map<EaglercraftUUID, Long> evictedSkins = new HashMap();
|
||||
private final Map<EaglercraftUUID, SkinCacheEntry> skinsCache = new HashMap<>();
|
||||
private final Map<EaglercraftUUID, WaitingSkin> waitingSkins = new HashMap<>();
|
||||
private final Map<EaglercraftUUID, Long> evictedSkins = new HashMap<>();
|
||||
|
||||
private final EaglercraftNetworkManager networkManager;
|
||||
protected final TextureManager textureManager;
|
||||
|
|
|
@ -26,7 +26,7 @@ public enum SkinModel {
|
|||
public final boolean sanitize;
|
||||
|
||||
public static final SkinModel[] skinModels = new SkinModel[3];
|
||||
private static final Map<String, SkinModel> skinModelsByName = new HashMap();
|
||||
private static final Map<String, SkinModel> skinModelsByName = new HashMap<>();
|
||||
|
||||
private SkinModel(int id, int w, int h, String profileSkinType, boolean sanitize) {
|
||||
this.id = id;
|
||||
|
|
|
@ -44,7 +44,7 @@ public class GuiHandshakeApprove extends GuiScreen {
|
|||
public void initGui() {
|
||||
this.buttonList.clear();
|
||||
titleString = I18n.format("handshakeApprove." + message + ".title");
|
||||
bodyLines = new ArrayList();
|
||||
bodyLines = new ArrayList<>();
|
||||
int i = 0;
|
||||
boolean wasNull = true;
|
||||
while(true) {
|
||||
|
|
|
@ -21,8 +21,8 @@ public class RateLimitTracker {
|
|||
|
||||
private static long lastTickUpdate = 0l;
|
||||
|
||||
private static final Map<String, Long> blocks = new HashMap();
|
||||
private static final Map<String, Long> lockout = new HashMap();
|
||||
private static final Map<String, Long> blocks = new HashMap<>();
|
||||
private static final Map<String, Long> lockout = new HashMap<>();
|
||||
|
||||
public static boolean isLockedOut(String addr) {
|
||||
Long lockoutStatus = lockout.get(addr);
|
||||
|
|
|
@ -244,7 +244,7 @@ public class Minecraft implements IThreadListener {
|
|||
private SoundHandler mcSoundHandler;
|
||||
private MusicTicker mcMusicTicker;
|
||||
private ResourceLocation mojangLogo;
|
||||
private final List<FutureTask<?>> scheduledTasks = new LinkedList();
|
||||
private final List<FutureTask<?>> scheduledTasks = new LinkedList<>();
|
||||
private long field_175615_aJ = 0L;
|
||||
private final Thread mcThread = Thread.currentThread();
|
||||
private ModelManager modelManager;
|
||||
|
|
|
@ -83,7 +83,7 @@ public class Chunk {
|
|||
this.updateSkylightColumns = new boolean[256];
|
||||
this.chunkTileEntityMap = Maps.newHashMap();
|
||||
this.queuedLightChecks = 4096;
|
||||
this.tileEntityPosQueue = new ArrayList();
|
||||
this.tileEntityPosQueue = new ArrayList<>();
|
||||
this.entityLists = (ClassInheritanceMultiMap[]) (new ClassInheritanceMultiMap[16]);
|
||||
this.worldObj = worldIn;
|
||||
this.xPosition = x;
|
||||
|
|
|
@ -42,7 +42,7 @@ public class PlatformAssets {
|
|||
|
||||
private static final byte[] MISSING_FILE = new byte[0];
|
||||
|
||||
static final Map<String,byte[]> assets = new HashMap();
|
||||
static final Map<String,byte[]> assets = new HashMap<>();
|
||||
|
||||
public static final byte[] getResourceBytes(String path) {
|
||||
if(path.startsWith("/")) {
|
||||
|
|
|
@ -47,7 +47,7 @@ public class PlatformAudio {
|
|||
|
||||
private static AudioContext audioctx = null;
|
||||
private static MediaStreamAudioDestinationNode recDest = null;
|
||||
private static final Map<String, BrowserAudioResource> soundCache = new HashMap();
|
||||
private static final Map<String, BrowserAudioResource> soundCache = new HashMap<>();
|
||||
|
||||
private static long cacheFreeTimer = 0l;
|
||||
|
||||
|
|
|
@ -57,8 +57,8 @@ public class PlatformInput {
|
|||
private static EventListener wheel = null;
|
||||
private static EventListener pointerlock = null;
|
||||
|
||||
private static List<MouseEvent> mouseEvents = new LinkedList();
|
||||
private static List<KeyboardEvent> keyEvents = new LinkedList();
|
||||
private static List<MouseEvent> mouseEvents = new LinkedList<>();
|
||||
private static List<KeyboardEvent> keyEvents = new LinkedList<>();
|
||||
|
||||
private static int mouseX = 0;
|
||||
private static int mouseY = 0;
|
||||
|
|
|
@ -38,7 +38,7 @@ public class PlatformNetworking {
|
|||
private static boolean sockIsConnected = false;
|
||||
private static boolean sockIsAlive = false;
|
||||
private static boolean sockIsFailed = false;
|
||||
private static LinkedList<byte[]> readPackets = new LinkedList();
|
||||
private static LinkedList<byte[]> readPackets = new LinkedList<>();
|
||||
private static String currentSockURI = null;
|
||||
private static EnumServerRateLimit serverRateLimit = null;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@ public class TeaVMClientConfigAdapter implements IClientConfigAdapter {
|
|||
|
||||
private String defaultLocale = "en_US";
|
||||
private boolean hideDownDefaultServers = false;
|
||||
private List<DefaultServer> defaultServers = new ArrayList();
|
||||
private List<DefaultServer> defaultServers = new ArrayList<>();
|
||||
private String serverToJoin = null;
|
||||
|
||||
void loadJSON(JSONObject eaglercraftOpts) {
|
||||
|
|
|
@ -36,8 +36,8 @@ public class TeaVMServerQuery implements IServerQuery {
|
|||
|
||||
public static final Logger logger = LogManager.getLogger("WebSocketQuery");
|
||||
|
||||
private final List<QueryResponse> queryResponses = new LinkedList();
|
||||
private final List<byte[]> queryResponsesBytes = new LinkedList();
|
||||
private final List<QueryResponse> queryResponses = new LinkedList<>();
|
||||
private final List<byte[]> queryResponsesBytes = new LinkedList<>();
|
||||
|
||||
protected final String uri;
|
||||
protected final String accept;
|
||||
|
|
|
@ -49,7 +49,7 @@ public class VFile {
|
|||
protected String path;
|
||||
|
||||
public static String createPath(Object... p) {
|
||||
ArrayList<String> r = new ArrayList();
|
||||
ArrayList<String> r = new ArrayList<>();
|
||||
for(int i = 0; i < p.length; ++i) {
|
||||
if(p[i] == null) {
|
||||
continue;
|
||||
|
|
|
@ -323,7 +323,7 @@ public class VirtualFilesystem {
|
|||
|
||||
}
|
||||
|
||||
private final HashMap<String, VFSFile> fileMap = new HashMap();
|
||||
private final HashMap<String, VFSFile> fileMap = new HashMap<>();
|
||||
|
||||
public final String database;
|
||||
private final IDBDatabase indexeddb;
|
||||
|
@ -409,7 +409,7 @@ public class VirtualFilesystem {
|
|||
}
|
||||
|
||||
public List<String> listFiles(String prefix) {
|
||||
final ArrayList<String> list = new ArrayList();
|
||||
final ArrayList<String> list = new ArrayList<>();
|
||||
AsyncHandlers.iterateFiles(indexeddb, this, prefix, false, (v) -> {
|
||||
list.add(v.getPath());
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue
Block a user