diff --git a/src/main/ProjectSWG.java b/src/main/ProjectSWG.java index 788d11290..851f76b06 100644 --- a/src/main/ProjectSWG.java +++ b/src/main/ProjectSWG.java @@ -52,15 +52,15 @@ public class ProjectSWG { try { server.run(); } catch (CoreException e) { - Log.e("CoreManager", "Shutting down. Reason: " + e.getMessage()); - Log.e("CoreManager", e); + Log.e("Shutting down. Reason: " + e.getMessage()); + Log.e(e); } catch (Exception e) { - Log.e("CoreManager", "Shutting down - unknown error."); - Log.e("CoreManager", e); + Log.e("Shutting down - unknown error."); + Log.e(e); } server.stop(); server.terminate(); - Log.i("CoreManager", "Server shut down."); + Log.i("Server shut down."); } /** @@ -89,7 +89,7 @@ public class ProjectSWG { long start = System.nanoTime(); manager = new CoreManager(); long end = System.nanoTime(); - Log.i(manager, "Created new manager in %.3fms", (end-start)/1E6); + Log.i("Created new manager in %.3fms", (end-start)/1E6); while (!shutdownRequested && !manager.isShutdownRequested()) { initialize(); start(); @@ -100,7 +100,7 @@ public class ProjectSWG { start = System.nanoTime(); manager = new CoreManager(); end = System.nanoTime(); - Log.i(manager, "Created new manager in %.3fms", (end-start)/1E6); + Log.i("Created new manager in %.3fms", (end-start)/1E6); } } } @@ -118,17 +118,17 @@ public class ProjectSWG { private void initialize() { setStatus(ServerStatus.INITIALIZING); - Log.i(manager, "Initializing..."); + Log.i("Initializing..."); if (!manager.initialize()) throw new CoreException("Failed to initialize."); - Log.i(manager, "Initialized. Time: %.3fms", manager.getCoreTime()); + Log.i("Initialized. Time: %.3fms", manager.getCoreTime()); } private void start() { - Log.i(manager, "Starting..."); + Log.i("Starting..."); if (!manager.start()) throw new CoreException("Failed to start."); - Log.i(manager, "Started. Time: %.3fms", manager.getCoreTime()); + Log.i("Started. Time: %.3fms", manager.getCoreTime()); } private void loop() { @@ -145,32 +145,32 @@ public class ProjectSWG { private void stop() { if (manager == null || status == ServerStatus.OFFLINE) return; - Log.i(manager, "Stopping..."); + Log.i("Stopping..."); setStatus(ServerStatus.STOPPING); if (!manager.stop()) { - Log.e(manager, "Failed to stop."); + Log.e("Failed to stop."); } long intentWait = System.nanoTime(); while (IntentManager.getIntentsQueued() > 0 && System.nanoTime()-intentWait < 3E9) { try { Thread.sleep(10); } catch (InterruptedException e) { - Log.e(manager, "Failed to stop! Interrupted with %d intents remaining", IntentManager.getIntentsQueued()); + Log.e("Failed to stop! Interrupted with %d intents remaining", IntentManager.getIntentsQueued()); break; } } - Log.i(manager, "Stopped. Time: %.3fms", manager.getCoreTime()); + Log.i("Stopped. Time: %.3fms", manager.getCoreTime()); } private void terminate() { if (manager == null || status == ServerStatus.OFFLINE) return; - Log.i(manager, "Terminating..."); + Log.i("Terminating..."); setStatus(ServerStatus.TERMINATING); if (!manager.terminate()) throw new CoreException("Failed to terminate."); setStatus(ServerStatus.OFFLINE); - Log.i(manager, "Terminated. Time: %.3fms", manager.getCoreTime()); + Log.i("Terminated. Time: %.3fms", manager.getCoreTime()); } public static class CoreException extends RuntimeException { diff --git a/src/network/NetworkClient.java b/src/network/NetworkClient.java index 46bd3bde7..a01f1884b 100644 --- a/src/network/NetworkClient.java +++ b/src/network/NetworkClient.java @@ -126,7 +126,7 @@ public class NetworkClient { } } catch (EOFException e) { - Log.e(this, "Read error: " + e.getMessage()); + Log.e("Read error: " + e.getMessage()); } finally { inboundSemaphore.unlock(); } @@ -188,7 +188,7 @@ public class NetworkClient { private void sendPacket(Packet p) { if (sender == null) { - Log.w(this, "Unable to send packet %s - sender is null!"); + Log.w("Unable to send packet %s - sender is null!"); return; } sender.sendPacket(address, protocol.encode(p)); diff --git a/src/network/PacketType.java b/src/network/PacketType.java index ee48c20f2..a9e427581 100644 --- a/src/network/PacketType.java +++ b/src/network/PacketType.java @@ -251,8 +251,8 @@ public enum PacketType { try { return c.newInstance(); } catch (Exception e) { - Log.e("PacketType", "Packet: [%08X] %s", crc, c.getName()); - Log.e("PacketType", e); + Log.e("Packet: [%08X] %s", crc, c.getName()); + Log.e(e); } return null; } diff --git a/src/network/encryption/MD5.java b/src/network/encryption/MD5.java index 865373aec..76b023df4 100644 --- a/src/network/encryption/MD5.java +++ b/src/network/encryption/MD5.java @@ -42,9 +42,9 @@ public class MD5 { md.update(text.getBytes("iso-8859-1"), 0, text.length()); result = convertToHex(md.digest()); } catch (NoSuchAlgorithmException e) { - Log.e("MD5", e); + Log.e(e); } catch (UnsupportedEncodingException e) { - Log.e("MD5", e); + Log.e(e); } return result; } diff --git a/src/network/packets/Packet.java b/src/network/packets/Packet.java index d15028470..d81e96745 100644 --- a/src/network/packets/Packet.java +++ b/src/network/packets/Packet.java @@ -103,7 +103,7 @@ public class Packet { break; case UNICODE: for (String s : list) { addUnicode(bb, s); } break; - default: Log.e("Packet", "Cannot encode StringType " + type); + default: Log.e("Cannot encode StringType " + type); break; } } @@ -283,7 +283,7 @@ public class Packet { int size = getInt(bb); if (size < 0) { - Log.e("Packet", "Read list with size less than zero!"); + Log.e("Read list with size less than zero!"); return null; } else if (size == 0) { return new ArrayList<>(); @@ -298,11 +298,11 @@ public class Packet { list.add(instance); } } catch (InstantiationException | IllegalAccessException e) { - Log.e("Packet", e); + Log.e(e); } if (size != list.size()) - Log.e("Packet", "Expected list size %d but only have %d elements in the list", size, list.size()); + Log.e("Expected list size %d but only have %d elements in the list", size, list.size()); return list; } @@ -312,7 +312,7 @@ public class Packet { instance = type.newInstance(); instance.decode(bb); } catch (InstantiationException | IllegalAccessException e) { - Log.e("Packet", e); + Log.e(e); } return instance; @@ -322,7 +322,7 @@ public class Packet { int size = getInt(bb); if (size < 0) { - Log.e("Packet", "Read list with size less than zero!"); + Log.e("Read list with size less than zero!"); return null; } else if (size == 0) { return new ArrayList<>(); @@ -335,7 +335,7 @@ public class Packet { break; case UNICODE: for (int i = 0; i < size; i++) { list.add(getUnicode(bb)); } break; - default: Log.e("Packet", "Do not know how to read list of StringType " + type); + default: Log.e("Do not know how to read list of StringType " + type); break; } diff --git a/src/network/packets/swg/SWGPacket.java b/src/network/packets/swg/SWGPacket.java index fb554e2e9..a552775a8 100644 --- a/src/network/packets/swg/SWGPacket.java +++ b/src/network/packets/swg/SWGPacket.java @@ -60,7 +60,7 @@ public class SWGPacket extends Packet { setSWGOpcode(getInt(data)); if (getSWGOpcode() == crc) return true; - Log.w(getClass().getSimpleName(), "SWG Opcode does not match actual! Expected: 0x%08X Actual: 0x%08X", crc, getSWGOpcode()); + Log.w("SWG Opcode does not match actual! Expected: 0x%08X Actual: 0x%08X", crc, getSWGOpcode()); return false; } diff --git a/src/network/packets/swg/zone/object_controller/ObjectController.java b/src/network/packets/swg/zone/object_controller/ObjectController.java index b9fdb3e54..8ab25e7ba 100644 --- a/src/network/packets/swg/zone/object_controller/ObjectController.java +++ b/src/network/packets/swg/zone/object_controller/ObjectController.java @@ -61,7 +61,7 @@ public abstract class ObjectController extends SWGPacket { return; update = getInt(data); if (getInt(data) != controllerCrc) - Log.e(getClass().getSimpleName(), "Attempting to process invalid controller"); + Log.e("Attempting to process invalid controller"); objectId = getLong(data); getInt(data); return; @@ -109,7 +109,7 @@ public abstract class ObjectController extends SWGPacket { case 0x00F5: return new MissionListRequest(data); case 0x041C: return new JTLTerminalSharedMessage(data); } - Log.w("ObjectController", "Unknown object controller: %08X", crc); + Log.w("Unknown object controller: %08X", crc); return new GenericObjectController(crc, data); } diff --git a/src/network/packets/swg/zone/resource/ResourceWeight.java b/src/network/packets/swg/zone/resource/ResourceWeight.java new file mode 100644 index 000000000..a833a2601 --- /dev/null +++ b/src/network/packets/swg/zone/resource/ResourceWeight.java @@ -0,0 +1,157 @@ +/************************************************************************************ + * Copyright (c) 2015 /// Project SWG /// www.projectswg.com * + * * + * ProjectSWG is the first NGE emulator for Star Wars Galaxies founded on * + * July 7th, 2011 after SOE announced the official shutdown of Star Wars Galaxies. * + * Our goal is to create an emulator which will provide a server for players to * + * continue playing a game similar to the one they used to play. We are basing * + * it on the final publish of the game prior to end-game events. * + * * + * This file is part of Holocore. * + * * + * -------------------------------------------------------------------------------- * + * * + * Holocore is free software: you can redistribute it and/or modify * + * it under the terms of the GNU Affero General Public License as * + * published by the Free Software Foundation, either version 3 of the * + * License, or (at your option) any later version. * + * * + * Holocore is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU Affero General Public License for more details. * + * * + * You should have received a copy of the GNU Affero General Public License * + * along with Holocore. If not, see . * + * * + ***********************************************************************************/ +package network.packets.swg.zone.resource; + +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import resources.control.Assert; +import network.packets.swg.zone.object_controller.ObjectController; + +public class ResourceWeight extends ObjectController { + + public static final int CRC = 0x0207; + + private final Map> attributes; + private final Map> resourceMaxWeights; + private int schematicId; + private int schematicCrc; + + public ResourceWeight() { + super(CRC); + attributes = new HashMap<>(); + resourceMaxWeights = new HashMap<>(); + } + + @Override + public void decode(ByteBuffer data) { + decodeHeader(data); + schematicId = getInt(data); + schematicCrc = getInt(data); + int count = getByte(data); + decodeWeights(data, attributes, count); + decodeWeights(data, resourceMaxWeights, count); + Assert.test(attributes.size() == resourceMaxWeights.size()); + } + + @Override + public ByteBuffer encode() { + int len = HEADER_LENGTH + 9; + for (List weights : attributes.values()) + len += 3 + weights.size(); + for (List weights : resourceMaxWeights.values()) + len += 3 + weights.size(); + Assert.test(attributes.size() == resourceMaxWeights.size()); + ByteBuffer data = ByteBuffer.allocate(len); + encodeHeader(data); + encodeWeights(data, attributes); + encodeWeights(data, resourceMaxWeights); + addInt(data, attributes.size()); + return data; + } + + private void decodeWeights(ByteBuffer data, Map> map, int count) { + for (int i = 0; i < count; i++) { + getByte(data); // index + int slot = getByte(data); + int weightCount = getByte(data); + List weights = new ArrayList<>(); + map.put(slot, weights); + for (int j = 0; j < weightCount; j++) { + byte b = getByte(data); + weights.add(new Weight((b & 0xF0) >>> 4, b & 0x0F)); + } + } + } + + private void encodeWeights(ByteBuffer data, Map> map) { + int i = 0; + for (Entry> e : map.entrySet()) { + List weights = e.getValue(); + addByte(data, i++); + addByte(data, e.getKey()); + addByte(data, weights.size()); + for (Weight w : weights) { + addByte(data, (w.getResourceId() << 4) | w.getWeight()); + } + } + } + + public Map> getAttributes() { + return attributes; + } + + public Map> getResourceMaxWeights() { + return resourceMaxWeights; + } + + public int getSchematicId() { + return schematicId; + } + + public int getSchematicCrc() { + return schematicCrc; + } + + public void setSchematicId(int schematicId) { + this.schematicId = schematicId; + } + + public void setSchematicCrc(int schematicCrc) { + this.schematicCrc = schematicCrc; + } + + public static class Weight { + + private int resourceId; + private int weight; + + public Weight() { + this(-1, 0); + } + + public Weight(int resourceId, int weight) { + this.resourceId = resourceId; + this.weight = weight; + } + + public int getResourceId() { + return resourceId; + } + + public int getWeight() { + return weight; + } + + } + +} diff --git a/src/resources/callback/CallbackManager.java b/src/resources/callback/CallbackManager.java index f15745a7d..b03614a82 100644 --- a/src/resources/callback/CallbackManager.java +++ b/src/resources/callback/CallbackManager.java @@ -88,11 +88,11 @@ public class CallbackManager extends BaseCallbackManager { try { call.run(callback); } catch (Throwable t) { - Log.e(this, t); + Log.e(t); } } } catch (Throwable t) { - Log.e(this, t); + Log.e(t); } finally { running.decrementAndGet(); } diff --git a/src/resources/client_info/ClientFactory.java b/src/resources/client_info/ClientFactory.java index 26cb31429..a9bd5e114 100644 --- a/src/resources/client_info/ClientFactory.java +++ b/src/resources/client_info/ClientFactory.java @@ -144,7 +144,7 @@ public class ClientFactory extends DataFactory { protected ClientData createDataObject(String type) { String c = typeMap.get(type); if (c == null) { - Log.e("ClientFactory", "Don't know what class to use for " + type); + Log.e("Don't know what class to use for " + type); return null; } @@ -170,7 +170,7 @@ public class ClientFactory extends DataFactory { case "SkeletalMeshGeneratorTemplateData": return new SkeletalMeshGeneratorTemplateData(); case "StaticShaderData": return new StaticShaderData(); case "WorldSnapshotData": return new WorldSnapshotData(); - default: Log.e("ClientFactory", "Unimplemented typeMap value: " + c); return null; + default: Log.e("Unimplemented typeMap value: " + c); return null; } } diff --git a/src/resources/client_info/DataFactory.java b/src/resources/client_info/DataFactory.java index 784a34c08..a791e6aaf 100644 --- a/src/resources/client_info/DataFactory.java +++ b/src/resources/client_info/DataFactory.java @@ -39,12 +39,12 @@ public abstract class DataFactory { protected ClientData readFile(String filename) { if (filename == null || filename.isEmpty()) { - Log.e("DataFactory", "File cannot be null or empty!"); + Log.e("File cannot be null or empty!"); return null; } File file = new File(getFolder() + filename); if (!file.isFile()) { - Log.e("DataFactory", "Not a file: " + file); + Log.e("Not a file: " + file); return null; } @@ -53,7 +53,7 @@ public abstract class DataFactory { try { swgFile.read(file); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } ClientData clientData = createDataObject(swgFile.getType()); @@ -66,7 +66,7 @@ public abstract class DataFactory { protected File writeFile(SWGFile swgFile, ClientData data) { if (swgFile == null || data == null) { - Log.e("DataFactory", "File or data objects cannot be null or empty!"); + Log.e("File or data objects cannot be null or empty!"); return null; } @@ -75,7 +75,7 @@ public abstract class DataFactory { try { swgFile.save(save); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return save; diff --git a/src/resources/client_info/SWGFile.java b/src/resources/client_info/SWGFile.java index 768f675e6..d9ae995f1 100644 --- a/src/resources/client_info/SWGFile.java +++ b/src/resources/client_info/SWGFile.java @@ -88,12 +88,12 @@ public class SWGFile { currentForm = master; if (!isValidIff(bb, size)) { - Log.e("SWGFile", "Tried to open a file not in a valid Interchangeable File Format: " + file.getAbsolutePath()); + Log.e("Tried to open a file not in a valid Interchangeable File Format: " + file.getAbsolutePath()); return; } if (size != master.populateFromBuffer(bb)) { - Log.e("SWGFile", "Size mismatch between population result and channel size: " + file.getAbsolutePath()); + Log.e("Size mismatch between population result and channel size: " + file.getAbsolutePath()); return; } diff --git a/src/resources/client_info/ServerFactory.java b/src/resources/client_info/ServerFactory.java index 870ac8e5a..c755a3b84 100644 --- a/src/resources/client_info/ServerFactory.java +++ b/src/resources/client_info/ServerFactory.java @@ -76,12 +76,12 @@ public final class ServerFactory extends DataFactory { if (!iff.exists()) { convertSdf(path, name); - Log.i("ServerFactory", "Created Server Datatable: %s", name); + Log.i("Created Server Datatable: %s", name); } else { File sif = path.toFile(); if (sif.lastModified() > iff.lastModified()) { convertSdf(path, name); - Log.i("ServerFactory", "Updated Server Datatable: %s", name); + Log.i("Updated Server Datatable: %s", name); } } } @@ -148,7 +148,7 @@ public final class ServerFactory extends DataFactory { } if (columnNames == null || columnTypes == null) { - Log.e("ServerFactory", "Failed to convert sdf " + sif.getFileName()); + Log.e("Failed to convert sdf " + sif.getFileName()); return; } @@ -159,7 +159,7 @@ public final class ServerFactory extends DataFactory { } } catch (IOException e) { - Log.e(this, e); + Log.e(e); } data.setColumnNames(columnNames); @@ -186,11 +186,11 @@ public final class ServerFactory extends DataFactory { case "i": table[rowNum][t] = Integer.valueOf(val); break; case "f": table[rowNum][t] = Float.valueOf(val); break; case "s": table[rowNum][t] = val; break; - default: Log.e("ServerFactory", "Don't know how to parse type " + type); break; + default: Log.e("Don't know how to parse type " + type); break; } } catch (NumberFormatException e) { - Log.e("ServerFactory:createDatableRow", "Cannot format string %s to a number", val); - Log.e(this, e); + Log.e("Cannot format string %s to a number", val); + Log.e(e); } } diff --git a/src/resources/client_info/visitors/ObjectData.java b/src/resources/client_info/visitors/ObjectData.java index a662806a4..58664c688 100644 --- a/src/resources/client_info/visitors/ObjectData.java +++ b/src/resources/client_info/visitors/ObjectData.java @@ -173,7 +173,7 @@ public class ObjectData extends ClientData { ClientData attrData = ClientFactory.getInfoFromFile(file, true); if (attrData == null || !(attrData instanceof ObjectData)) { - Log.w("ObjectData", "Could not load attribute data from file " + file + "!"); + Log.w("Could not load attribute data from file " + file + "!"); return; // break out of whole method as we should only continue if we have all the extended attributes } diff --git a/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java b/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java index 2a338591c..99d1a3ea3 100644 --- a/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java +++ b/src/resources/client_info/visitors/appearance/AppearanceTemplateList.java @@ -85,7 +85,7 @@ public class AppearanceTemplateList extends ClientData implements RenderableData if (child instanceof RenderableData) subAppearance = (RenderableData) child; else - Log.e(this, "Sub-appearance does not implement RenderableData!"); + Log.e("Sub-appearance does not implement RenderableData!"); } } diff --git a/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java b/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java index cce0226b2..ed44596b4 100644 --- a/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java +++ b/src/resources/client_info/visitors/appearance/DetailedAppearanceTemplateData.java @@ -144,7 +144,7 @@ public class DetailedAppearanceTemplateData extends ClientData implements Render if (child instanceof RenderableDataChild) children.add((RenderableDataChild) child); else - Log.e(this, "Child does not implement RenderableDataChild!"); + Log.e("Child does not implement RenderableDataChild!"); } } diff --git a/src/resources/collections/SWGList.java b/src/resources/collections/SWGList.java index 61d31013d..94820430b 100644 --- a/src/resources/collections/SWGList.java +++ b/src/resources/collections/SWGList.java @@ -216,7 +216,7 @@ public class SWGList extends SynchronizedList implements Encodable { add(instance); } } catch (InstantiationException | IllegalAccessException e) { - Log.e("SWGList", e); + Log.e(e); return false; } } else { diff --git a/src/resources/collections/SWGMap.java b/src/resources/collections/SWGMap.java index c30266a56..00aedba7f 100644 --- a/src/resources/collections/SWGMap.java +++ b/src/resources/collections/SWGMap.java @@ -151,7 +151,7 @@ public class SWGMap extends SynchronizedMap implements Encodable { put((K) buffer.getString(keyType), (V) buffer.getString(valType)); } } catch (ClassCastException e) { - Log.e(this, e); + Log.e(e); } clearDeltaQueue(); } @@ -170,10 +170,10 @@ public class SWGMap extends SynchronizedMap implements Encodable { if (value != null && vType.isAssignableFrom(value.getClass())) put((K) key, (V) value); else - Log.e("SWGMap", "Unable to parse: key=%s value=%s", key, value); + Log.e("Unable to parse: key=%s value=%s", key, value); } } catch (ClassCastException e) { - Log.e(this, e); + Log.e(e); } clearDeltaQueue(); } @@ -189,18 +189,18 @@ public class SWGMap extends SynchronizedMap implements Encodable { buffer.getByte(); Object key = buffer.getGeneric(kType); if (key == null) { - Log.e("SWGMap", "Failed to decode: " + kType.getSimpleName()); + Log.e("Failed to decode: " + kType.getSimpleName()); break; } Object value = buffer.getGeneric(vType); if (value == null) { - Log.e("SWGMap", "Failed to decode: " + vType.getSimpleName()); + Log.e("Failed to decode: " + vType.getSimpleName()); break; } if (kType.isAssignableFrom(key.getClass()) && vType.isAssignableFrom(value.getClass())) put((K) key, (V) value); else - Log.e("SWGMap", "Failed to insert key=" + key + " value=" + value); + Log.e("Failed to insert key=" + key + " value=" + value); } clearDeltaQueue(); } diff --git a/src/resources/collections/SWGSet.java b/src/resources/collections/SWGSet.java index 880aed481..4e06a443a 100644 --- a/src/resources/collections/SWGSet.java +++ b/src/resources/collections/SWGSet.java @@ -135,7 +135,7 @@ public class SWGSet extends SynchronizedSet implements Encodable { private void addObjectData(E obj, byte update) { byte[] encodedData = Encoder.encode(obj, strType); if (encodedData == null) { - Log.e("SWGSet", "Tried to encode an object that could not be encoded properly. Object: " + obj); + Log.e("Tried to encode an object that could not be encoded properly. Object: " + obj); return; } @@ -149,7 +149,7 @@ public class SWGSet extends SynchronizedSet implements Encodable { private void removeObjectData(Object obj, byte update) { byte[] encodedData = Encoder.encode(obj, strType); if (encodedData == null) { - Log.e("SWGSet", "Tried to encode an object that could not be encoded properly. Object: " + obj); + Log.e("Tried to encode an object that could not be encoded properly. Object: " + obj); return; } @@ -268,7 +268,7 @@ public class SWGSet extends SynchronizedSet implements Encodable { add(instance); } } catch (InstantiationException | IllegalAccessException e) { - Log.e("SWGList", e); + Log.e(e); return false; } } else { diff --git a/src/resources/commands/callbacks/AdminTeleportCallback.java b/src/resources/commands/callbacks/AdminTeleportCallback.java index ca72123a7..5a20474c5 100644 --- a/src/resources/commands/callbacks/AdminTeleportCallback.java +++ b/src/resources/commands/callbacks/AdminTeleportCallback.java @@ -42,8 +42,8 @@ public class AdminTeleportCallback implements ICmdCallback { public void execute(GalacticManager galacticManager, Player player, SWGObject target, String args) { String [] cmd = args.split(" "); if (cmd.length < 4) { - Log.e("AdminTeleportCallback", "Wrong Syntax. For teleporting yourself, command has to be: /teleport "); - Log.e("AdminTeleportCallback", "For teleporting another player, command has to be: /teleport "); + Log.e("Wrong Syntax. For teleporting yourself, command has to be: /teleport "); + Log.e("For teleporting another player, command has to be: /teleport "); return; } double x, y, z; @@ -55,7 +55,7 @@ public class AdminTeleportCallback implements ICmdCallback { y = Double.parseDouble(cmd[cmdOffset+2]); z = Double.parseDouble(cmd[cmdOffset+3]); } catch (NumberFormatException e) { - Log.e("AdminTeleportCallback", "Wrong Syntax or Value. Please enter the command like this: /teleport "); + Log.e("Wrong Syntax or Value. Please enter the command like this: /teleport "); return; } diff --git a/src/resources/commands/callbacks/GotoCmdCallback.java b/src/resources/commands/callbacks/GotoCmdCallback.java index 856bfa94a..131f1381a 100644 --- a/src/resources/commands/callbacks/GotoCmdCallback.java +++ b/src/resources/commands/callbacks/GotoCmdCallback.java @@ -76,7 +76,7 @@ public class GotoCmdCallback implements ICmdCallback { Terrain t = Terrain.getTerrainFromName(set.getString("terrain_name")); return teleportToGoto(objManager, obj, set.getLong("object_id"), cell, new Location(0, 0, 0, t)); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return "Exception thrown. Failed to teleport: ["+e.getErrorCode()+"] " + e.getMessage(); } } @@ -86,13 +86,13 @@ public class GotoCmdCallback implements ICmdCallback { SWGObject parent = objManager.getObjectById(buildingId); if (parent == null || !(parent instanceof BuildingObject)) { String err = String.format("Invalid parent! Either null or not a building: %s BUID: %d", parent, buildingId); - Log.e("CharacterCreationService", err); + Log.e(err); return err; } CellObject cell = ((BuildingObject) parent).getCellByNumber(cellNumber); if (cell == null) { String err = String.format("Building does not have any cells! B-Template: %s BUID: %d", parent.getTemplate(), buildingId); - Log.e("CharacterCreationService", err); + Log.e(err); return err; } new ObjectTeleportIntent(obj, cell, l).broadcast(); diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/resources/commands/callbacks/QaToolCmdCallback.java index d4b88713e..80fdf672b 100644 --- a/src/resources/commands/callbacks/QaToolCmdCallback.java +++ b/src/resources/commands/callbacks/QaToolCmdCallback.java @@ -100,7 +100,7 @@ public class QaToolCmdCallback implements ICmdCallback { try { Scripts.invoke("commands/helper/qatool/details", "sendDetails", player, target, args.split(" ")); } catch (FileNotFoundException ex) { - Log.e("QATool", "sendDetails qatool script not found!"); + Log.e("sendDetails qatool script not found!"); } break; case "xp": @@ -116,7 +116,7 @@ public class QaToolCmdCallback implements ICmdCallback { } else { displayMainWindow(player); } - Log.i("QA", "%s has accessed the QA Tool", player.getUsername()); + Log.i("%s has accessed the QA Tool", player.getUsername()); } /* Windows */ @@ -147,7 +147,7 @@ public class QaToolCmdCallback implements ICmdCallback { if (inventory == null) return; - Log.i("QA", "%s attempted to create item %s", player, itemName); + Log.i("%s attempted to create item %s", player, itemName); new CreateStaticItemIntent(creature, inventory, new ObjectCreationHandler() { @Override public void success(SWGObject[] createdObjects) { @@ -170,14 +170,14 @@ public class QaToolCmdCallback implements ICmdCallback { SuiMessageBox inputBox = new SuiMessageBox(SuiButtons.OK_CANCEL, "Force Delete?", "Are you sure you want to delete this object?"); inputBox.addOkButtonCallback("handleDeleteObject", (caller, actor, event, parameters) -> { if (target instanceof CreatureObject && ((CreatureObject) target).isPlayer()) { - Log.i("QA", "[%s] Requested deletion of character: %s", player.getUsername(), target.getObjectName()); + Log.i("[%s] Requested deletion of character: %s", player.getUsername(), target.getObjectName()); new DeleteCharacterIntent((CreatureObject) target).broadcast(); Player owner = target.getOwner(); if (owner != null) new CloseConnectionIntent(owner.getNetworkId(), DisconnectReason.APPLICATION).broadcast(); return; } - Log.i("QA", "[%s] Requested deletion of object: %s", player.getUsername(), target); + Log.i("[%s] Requested deletion of object: %s", player.getUsername(), target); if (target != null) { new DestroyObjectIntent(target).broadcast(); } @@ -221,7 +221,7 @@ public class QaToolCmdCallback implements ICmdCallback { return "No such location found: " + loc; return teleportToRecovery(objManager, obj, loc, set); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return "Exception thrown. Failed to teleport: [" + e.getErrorCode() + "] " + e.getMessage(); } } @@ -242,13 +242,13 @@ public class QaToolCmdCallback implements ICmdCallback { SWGObject parent = objManager.getObjectById(buildingId); if (parent == null || !(parent instanceof BuildingObject)) { String err = String.format("Invalid parent! Either null or not a building: %s BUID: %d", parent, buildingId); - Log.e("CharacterCreationService", err); + Log.e(err); return err; } CellObject cell = ((BuildingObject) parent).getCellByName(cellName); if (cell == null) { String err = String.format("Invalid cell! Cell does not exist: %s B-Template: %s BUID: %d", cellName, parent.getTemplate(), buildingId); - Log.e("CharacterCreationService", err); + Log.e(err); return err; } new ObjectTeleportIntent(obj, cell, l).broadcast(); @@ -264,10 +264,10 @@ public class QaToolCmdCallback implements ICmdCallback { try { int xpGained = Integer.valueOf(xpGainedArg); new ExperienceIntent(player.getCreatureObject(), xpType, xpGained).broadcast(); - Log.i("QA", "XP command: %s gave themselves %d %s XP", player.getUsername(), xpGained, xpType); + Log.i("XP command: %s gave themselves %d %s XP", player.getUsername(), xpGained, xpType); } catch (NumberFormatException e) { sendSystemMessage(player, String.format("XP command: %s is not a number", xpGainedArg)); - Log.e("QA", "XP command: %s gave a non-numerical XP gained argument of %s", player.getUsername(), xpGainedArg); + Log.e("XP command: %s gave a non-numerical XP gained argument of %s", player.getUsername(), xpGainedArg); } } diff --git a/src/resources/commands/callbacks/RequestBiographyCmdCallback.java b/src/resources/commands/callbacks/RequestBiographyCmdCallback.java index b1f795acc..d23bf759a 100644 --- a/src/resources/commands/callbacks/RequestBiographyCmdCallback.java +++ b/src/resources/commands/callbacks/RequestBiographyCmdCallback.java @@ -48,10 +48,10 @@ public class RequestBiographyCmdCallback implements ICmdCallback { if(target instanceof CreatureObject && ((CreatureObject) target).isPlayer()) { player.sendPacket(new BiographyUpdate(creatureObject.getObjectId(), target.getObjectId(), ((CreatureObject) target).getPlayerObject().getBiography())); } else { - Log.w("RequestBiographyCmdCallback", "%s tried to request biography of NPC %s", creatureObject, target); + Log.w("%s tried to request biography of NPC %s", creatureObject, target); } } else { - Log.w("RequestBiographyCmdCallback", "%s tried to request biography of a null object", creatureObject); + Log.w("%s tried to request biography of a null object", creatureObject); } } diff --git a/src/resources/commands/callbacks/ServerCmdCallback.java b/src/resources/commands/callbacks/ServerCmdCallback.java index bda89f6b8..9aa85c001 100644 --- a/src/resources/commands/callbacks/ServerCmdCallback.java +++ b/src/resources/commands/callbacks/ServerCmdCallback.java @@ -72,7 +72,7 @@ public class ServerCmdCallback implements ICmdCallback { case 2: handleUnbanPlayer(player); break; case 3: handleShutdownServer(player); break; case 4: handleCustomShutdownServer(player); break; - default: Log.i("ServerCmdCallback", "There is no handle function for selected list item %d", selection); break; + default: Log.i("There is no handle function for selected list item %d", selection); break; } } diff --git a/src/resources/control/Assert.java b/src/resources/control/Assert.java index b532a7dff..d76ee55f6 100644 --- a/src/resources/control/Assert.java +++ b/src/resources/control/Assert.java @@ -93,9 +93,9 @@ public class Assert { private static void warn(Exception e) { StackTraceElement [] elements = e.getStackTrace(); if (elements.length <= 1) - Log.e("Assert", e); + Log.e(e); else - Log.e(elements[elements.length-2].getClassName(), e); + Log.e(e); } private static class AssertionException extends RuntimeException { diff --git a/src/resources/control/IntentManager.java b/src/resources/control/IntentManager.java index 9d4eab18a..b4886f5b7 100644 --- a/src/resources/control/IntentManager.java +++ b/src/resources/control/IntentManager.java @@ -143,8 +143,8 @@ public class IntentManager { try { r.onIntentReceived(i); } catch (Throwable t) { - Log.e("IntentManager", "Fatal Exception while processing intent: " + i); - Log.e("IntentManager", t); + Log.e("Fatal Exception while processing intent: " + i); + Log.e(t); } } diff --git a/src/resources/control/Manager.java b/src/resources/control/Manager.java index 0f27a2787..ea98d97b3 100644 --- a/src/resources/control/Manager.java +++ b/src/resources/control/Manager.java @@ -57,7 +57,7 @@ public abstract class Manager extends Service { synchronized (children) { for (Service child : children) { if (!child.initialize()) { - Log.e(this, child.getClass().getSimpleName() + " failed to initialize!"); + Log.e(child.getClass().getSimpleName() + " failed to initialize!"); success = false; break; } @@ -78,7 +78,7 @@ public abstract class Manager extends Service { synchronized (children) { for (Service child : children) { if (!child.start()) { - Log.e(this, child.getClass().getSimpleName() + " failed to start!"); + Log.e(child.getClass().getSimpleName() + " failed to start!"); success = false; break; } @@ -102,7 +102,7 @@ public abstract class Manager extends Service { break; cSuccess = child.stop(); if (!cSuccess) { - Log.e(this, child.getClass().getSimpleName() + " failed to stop!"); + Log.e(child.getClass().getSimpleName() + " failed to stop!"); success = false; } } diff --git a/src/resources/control/Service.java b/src/resources/control/Service.java index bd0ce8cd3..db1cccf55 100644 --- a/src/resources/control/Service.java +++ b/src/resources/control/Service.java @@ -123,7 +123,7 @@ public abstract class Service implements IntentReceiver { */ @Override public void onIntentReceived(Intent i) { - Log.w(this, "Warning: " + getClass().getSimpleName() + " did not override onIntentReceived"); + Log.w("Warning: " + getClass().getSimpleName() + " did not override onIntentReceived"); } /** diff --git a/src/resources/encodables/OutOfBandPackage.java b/src/resources/encodables/OutOfBandPackage.java index 18c4ad232..19d77b4d5 100644 --- a/src/resources/encodables/OutOfBandPackage.java +++ b/src/resources/encodables/OutOfBandPackage.java @@ -139,7 +139,7 @@ public class OutOfBandPackage implements Encodable, Persistable { packages.add(stringId); break; default: - Log.e("OutOfBandPackage", "Tried to decode an unsupported OutOfBandData Type: " + type); + Log.e("Tried to decode an unsupported OutOfBandData Type: " + type); break; } } diff --git a/src/resources/encodables/ProsePackage.java b/src/resources/encodables/ProsePackage.java index 9c205dd0b..7b1004013 100644 --- a/src/resources/encodables/ProsePackage.java +++ b/src/resources/encodables/ProsePackage.java @@ -114,13 +114,13 @@ public class ProsePackage implements OutOfBandData { case "DI": if (prose instanceof Integer) setDI((Integer) prose); - else { Log.w("ProsePackage", "DI can only be a Integer!"); } + else { Log.w("DI can only be a Integer!"); } break; case "DF": if (prose instanceof Float) setDF((Float) prose); - else { Log.w("ProsePackage", "DF can only be a Float!"); } + else { Log.w("DF can only be a Float!"); } break; default: break; @@ -132,8 +132,8 @@ public class ProsePackage implements OutOfBandData { if (prose instanceof StringId) { base = (StringId) prose; } else if (prose instanceof String) { if (((String) prose).startsWith("@")) { base = new StringId((String) prose); } - else { Log.w("ProsePackage", "The base STF cannot be a custom string!"); } - } else { Log.w("ProsePackage", "The base STF must be either a Stf or a String! Received class: " + prose.getClass().getName()); } + else { Log.w("The base STF cannot be a custom string!"); } + } else { Log.w("The base STF must be either a Stf or a String! Received class: " + prose.getClass().getName()); } } public void setTU(Object prose) { @@ -149,7 +149,7 @@ public class ProsePackage implements OutOfBandData { else if (prose instanceof BigInteger) actor.setObjectId(((BigInteger) prose).longValue()); else - Log.w("ProsePackage", "Proses can only be Strings or Longs! Received class: " + prose.getClass().getName()); + Log.w("Proses can only be Strings or Longs! Received class: " + prose.getClass().getName()); } public void setTT(Object prose) { @@ -165,7 +165,7 @@ public class ProsePackage implements OutOfBandData { else if (prose instanceof BigInteger) target.setObjectId(((BigInteger) prose).longValue()); else - Log.w("ProsePackage", "Proses can only be Strings or Longs! Received class: " + prose.getClass().getName()); + Log.w("Proses can only be Strings or Longs! Received class: " + prose.getClass().getName()); } public void setTO(Object prose) { @@ -181,7 +181,7 @@ public class ProsePackage implements OutOfBandData { else if (prose instanceof BigInteger) other.setObjectId(((BigInteger) prose).longValue()); else - Log.w("ProsePackage", "Proses can only be Strings or Longs! Received class: " + prose.getClass().getName()); + Log.w("Proses can only be Strings or Longs! Received class: " + prose.getClass().getName()); } public void setDI(Integer prose) { diff --git a/src/resources/encodables/StringId.java b/src/resources/encodables/StringId.java index 14b6eca57..0cf7a26ad 100644 --- a/src/resources/encodables/StringId.java +++ b/src/resources/encodables/StringId.java @@ -49,7 +49,7 @@ public class StringId implements OutOfBandData, Persistable { public StringId(String stf) { if (!stf.contains(":")) { - Log.e("Stf", "Invalid stf format! Expected a semi-colon for " + stf); + Log.e("Invalid stf format! Expected a semi-colon for " + stf); return; } diff --git a/src/resources/encodables/player/Equipment.java b/src/resources/encodables/player/Equipment.java index 35b79f0ba..697e42271 100644 --- a/src/resources/encodables/player/Equipment.java +++ b/src/resources/encodables/player/Equipment.java @@ -162,7 +162,7 @@ public class Equipment implements Encodable, Persistable { weapon.parseBaseline(b6); if (weapon instanceof TangibleObject) return (TangibleObject) weapon; - Log.e("Equipment", "Unknown Equipment Type: " + weapon.getClass().getSimpleName()); + Log.e("Unknown Equipment Type: " + weapon.getClass().getSimpleName()); return null; } diff --git a/src/resources/network/BaselineBuilder.java b/src/resources/network/BaselineBuilder.java index 81474bdc3..de44cc8f3 100644 --- a/src/resources/network/BaselineBuilder.java +++ b/src/resources/network/BaselineBuilder.java @@ -100,7 +100,7 @@ public class BaselineBuilder { try { dataStream.write(str.getBytes(ASCII)); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -109,7 +109,7 @@ public class BaselineBuilder { try { dataStream.write(str.getBytes(UNICODE)); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -117,7 +117,7 @@ public class BaselineBuilder { try { dataStream.writeByte(b); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -125,7 +125,7 @@ public class BaselineBuilder { try { dataStream.writeShort(s); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -133,7 +133,7 @@ public class BaselineBuilder { try { dataStream.writeInt(i); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -141,7 +141,7 @@ public class BaselineBuilder { try { dataStream.writeLong(l); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -149,7 +149,7 @@ public class BaselineBuilder { try { dataStream.writeFloat(f); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -158,7 +158,7 @@ public class BaselineBuilder { try { dataStream.write(array); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/resources/network/NetBuffer.java b/src/resources/network/NetBuffer.java index e6dc22a27..47a7ce4ce 100644 --- a/src/resources/network/NetBuffer.java +++ b/src/resources/network/NetBuffer.java @@ -241,7 +241,7 @@ public class NetBuffer { instance = type.newInstance(); ((Encodable) instance).decode(data); } catch (InstantiationException | IllegalAccessException e) { - Log.e(this, e); + Log.e(e); } return instance; @@ -264,7 +264,7 @@ public class NetBuffer { instance = type.newInstance(); instance.decode(data); } catch (InstantiationException | IllegalAccessException e) { - Log.e(this, e); + Log.e(e); } return instance; diff --git a/src/resources/network/TCPServer.java b/src/resources/network/TCPServer.java index 61e48b2f6..f2c4af0ea 100644 --- a/src/resources/network/TCPServer.java +++ b/src/resources/network/TCPServer.java @@ -112,7 +112,7 @@ public class TCPServer { callbackExecutor.execute(() -> callback.onConnectionDisconnect(s, sock)); return true; } catch (IOException e) { - Log.e(this, e); + Log.e(e); return false; } } @@ -134,7 +134,7 @@ public class TCPServer { channel.close(); return true; } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return false; } @@ -149,7 +149,7 @@ public class TCPServer { return true; } } catch (IOException e) { - Log.e("TCPServer", "Terminated connection with %s. Error: %s", sock.toString(), e.getMessage()); + Log.e("Terminated connection with %s. Error: %s", sock.toString(), e.getMessage()); disconnect(sc); } } @@ -192,7 +192,7 @@ public class TCPServer { selector.select(); processSelectionKeys(selector); } catch (Exception e) { - Log.e(this, e); + Log.e(e); try { Thread.sleep(100); } catch (InterruptedException e1) { @@ -201,7 +201,7 @@ public class TCPServer { } } } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -251,7 +251,7 @@ public class TCPServer { } catch (AsynchronousCloseException e) { } catch (IOException e) { - Log.a(this, e); + Log.a(e); } } @@ -279,9 +279,9 @@ public class TCPServer { stop(); } catch (IOException e) { if (e.getMessage() != null && e.getMessage().toLowerCase(Locale.US).contains("connection reset")) - Log.e("TCPServer", "Connection Reset with %s", s.socket().getRemoteSocketAddress()); + Log.e("Connection Reset with %s", s.socket().getRemoteSocketAddress()); else { - Log.e("TCPServer", e); + Log.e(e); } key.cancel(); disconnect(s); diff --git a/src/resources/network/UDPServer.java b/src/resources/network/UDPServer.java index 262391b33..74e79f258 100644 --- a/src/resources/network/UDPServer.java +++ b/src/resources/network/UDPServer.java @@ -140,7 +140,7 @@ public class UDPServer { if (msg != null && msg.startsWith("Socket") && msg.endsWith("closed")) return false; else - Log.e(this, e); + Log.e(e); return false; } } @@ -149,7 +149,7 @@ public class UDPServer { try { return send(port, InetAddress.getByName(addr), data); } catch (UnknownHostException e) { - Log.e(this, e); + Log.e(e); } return false; } @@ -230,7 +230,7 @@ public class UDPServer { loop(); } } catch (Exception e) { - Log.e(this, e); + Log.e(e); } running = false; } @@ -261,7 +261,7 @@ public class UDPServer { if (e.getMessage() != null && (e.getMessage().contains("socket closed") || e.getMessage().contains("Socket closed"))) running = false; else - Log.e(this, e); + Log.e(e); packet.setLength(0); } return packet; diff --git a/src/resources/objects/SWGObject.java b/src/resources/objects/SWGObject.java index b924e72bb..47fe6ce97 100644 --- a/src/resources/objects/SWGObject.java +++ b/src/resources/objects/SWGObject.java @@ -214,7 +214,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable 0) { - Log.w("SWGObject", "Unable to add object to container! Container Full. Max Size: %d", container.getMaxContainerSize()); + Log.w("Unable to add object to container! Container Full. Max Size: %d", container.getMaxContainerSize()); return ContainerResult.CONTAINER_FULL; } } @@ -521,7 +521,7 @@ public abstract class SWGObject extends BaselineObject implements Comparable getObjectTable() { diff --git a/src/resources/objects/buildouts/TerrainBuildoutLoader.java b/src/resources/objects/buildouts/TerrainBuildoutLoader.java index 383d06bb6..6fa6fa939 100644 --- a/src/resources/objects/buildouts/TerrainBuildoutLoader.java +++ b/src/resources/objects/buildouts/TerrainBuildoutLoader.java @@ -112,7 +112,7 @@ class TerrainBuildoutLoader { SWGObject container = objectTable.get(containerId); object.moveToContainer(container); if (container == null) - Log.e("TerrainBuildoutLoader", "Failed to load object: " + object.getTemplate()); + Log.e("Failed to load object: " + object.getTemplate()); } else { List list = objects.get(areaName); if (list == null) { diff --git a/src/resources/objects/buildouts/TerrainSnapshotLoader.java b/src/resources/objects/buildouts/TerrainSnapshotLoader.java index f30056c6f..1ab1a1ce7 100644 --- a/src/resources/objects/buildouts/TerrainSnapshotLoader.java +++ b/src/resources/objects/buildouts/TerrainSnapshotLoader.java @@ -102,12 +102,12 @@ public class TerrainSnapshotLoader { if (containerId != 0) { SWGObject container = objectTable.get(containerId); if (!(object instanceof CellObject) && container instanceof BuildingObject) { - Log.w(this, "Not adding: %s to %s - invalid type for BuildingObject", object, container); + Log.w("Not adding: %s to %s - invalid type for BuildingObject", object, container); return; } object.moveToContainer(container); if (container == null) - Log.e("TerrainSnapshotLoader", "Failed to load object: " + object.getTemplate()); + Log.e("Failed to load object: " + object.getTemplate()); } else { objects.add(object); } diff --git a/src/resources/radial/RadialOptionList.java b/src/resources/radial/RadialOptionList.java index 13c124491..28c7cce99 100644 --- a/src/resources/radial/RadialOptionList.java +++ b/src/resources/radial/RadialOptionList.java @@ -76,7 +76,7 @@ public class RadialOptionList implements Encodable { Packet.getUnicode(data); // text RadialItem item = RadialItem.getFromId(radialType); if (item == null) { - Log.e("ObjectMenuRequest", "No radial item found for: %04X"); + Log.e("No radial item found for: %04X"); continue; } option.setItem(item); @@ -86,7 +86,7 @@ public class RadialOptionList implements Encodable { } else { RadialOption parentOpt = optionMap.get(parent); if (parentOpt == null) { - Log.e("ObjectMenuRequest", "Parent not found! Parent=%d Option=%s", parent, option); + Log.e("Parent not found! Parent=%d Option=%s", parent, option); } else { parentOpt.addChild(option); } diff --git a/src/resources/radial/Radials.java b/src/resources/radial/Radials.java index 7f92adff5..9ddca9412 100644 --- a/src/resources/radial/Radials.java +++ b/src/resources/radial/Radials.java @@ -44,7 +44,7 @@ public class Radials { try { Scripts.invoke(SCRIPT_PREFIX + script, "getOptions", options, player, target, args); } catch (FileNotFoundException ex) { - Log.w("Radials", "Couldn't retrieve radial options from %s for object %s because the script couldn't be found", SCRIPT_PREFIX + script, target); + Log.w("Couldn't retrieve radial options from %s for object %s because the script couldn't be found", SCRIPT_PREFIX + script, target); } return options; } @@ -53,7 +53,7 @@ public class Radials { try { Scripts.invoke(SCRIPT_PREFIX + script, "handleSelection", player, target, selection, args); } catch (FileNotFoundException ex) { - Log.w("Radials", "Can't handle selection %s on object %s because the script couldn't be found"); + Log.w("Can't handle selection %s on object %s because the script couldn't be found"); } } diff --git a/src/resources/server_info/CachedObjectDatabase.java b/src/resources/server_info/CachedObjectDatabase.java index c208e8cea..f773b24d6 100644 --- a/src/resources/server_info/CachedObjectDatabase.java +++ b/src/resources/server_info/CachedObjectDatabase.java @@ -80,7 +80,7 @@ public class CachedObjectDatabase extends ObjectDatabase< public synchronized boolean save() { if (!loaded) { - Log.e("CachedObjectDatabase", "Not saving '" + getFile() + "', file not loaded yet!"); + Log.e("Not saving '" + getFile() + "', file not loaded yet!"); return false; } try (OutputPersistenceStream os = new OutputPersistenceStream(new FileOutputStream(getFile()))) { @@ -89,8 +89,8 @@ public class CachedObjectDatabase extends ObjectDatabase< os.write(obj, saver); } } catch (IOException e) { - Log.e("CachedObjectDatabase", "Error while saving file. IOException: " + e.getMessage()); - Log.e("CachedObjectDatabase", e); + Log.e("Error while saving file. IOException: " + e.getMessage()); + Log.e(e); return false; } return true; @@ -98,7 +98,7 @@ public class CachedObjectDatabase extends ObjectDatabase< public synchronized boolean load() { if (!fileExists()) { - Log.e("CachedObjectDatabase", "load() - file '%s' does not exist!", getFile()); + Log.e("load() - file '%s' does not exist!", getFile()); loaded = true; return false; } @@ -114,8 +114,8 @@ public class CachedObjectDatabase extends ObjectDatabase< return false; } } catch (Exception e) { - Log.e("CachedObjectDatabase", "Error while loading file. %s: %s", e.getClass().getSimpleName(), e.getMessage()); - Log.e("CachedObjectDatabase", e); + Log.e("Error while loading file. %s: %s", e.getClass().getSimpleName(), e.getMessage()); + Log.e(e); clearObjects(); return false; } diff --git a/src/resources/server_info/ConfigData.java b/src/resources/server_info/ConfigData.java index ac81168d1..e98392d08 100644 --- a/src/resources/server_info/ConfigData.java +++ b/src/resources/server_info/ConfigData.java @@ -91,7 +91,7 @@ class ConfigData { line = reader.readLine(); } } catch (IOException e) { - Log.e(this, e); + Log.e(e); return null; } finally { if (reader != null) { @@ -122,7 +122,7 @@ class ConfigData { } return true; } catch (IOException e) { - Log.e(this, e); + Log.e(e); return false; } finally { if (writer != null) { diff --git a/src/resources/server_info/ConfigWatcher.java b/src/resources/server_info/ConfigWatcher.java index 8b0af100f..7b1a41a8d 100644 --- a/src/resources/server_info/ConfigWatcher.java +++ b/src/resources/server_info/ConfigWatcher.java @@ -125,7 +125,7 @@ public final class ConfigWatcher { try { watcher.close(); } catch (Exception e) { - Log.e(this, e); + Log.e(e); } }); } diff --git a/src/resources/server_info/CrcDatabase.java b/src/resources/server_info/CrcDatabase.java index 495dfecfc..29a33ca1d 100644 --- a/src/resources/server_info/CrcDatabase.java +++ b/src/resources/server_info/CrcDatabase.java @@ -63,7 +63,7 @@ public class CrcDatabase implements AutoCloseable { insertCrcStatement.close(); getStringStatement.close(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } database.close(); } @@ -77,7 +77,7 @@ public class CrcDatabase implements AutoCloseable { } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -96,7 +96,7 @@ public class CrcDatabase implements AutoCloseable { try { insertCrcStatement.executeBatch(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -129,7 +129,7 @@ public class CrcDatabase implements AutoCloseable { else insertCrcStatement.addBatch(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -143,7 +143,7 @@ public class CrcDatabase implements AutoCloseable { return set.getString(1); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } return null; diff --git a/src/resources/server_info/DataManager.java b/src/resources/server_info/DataManager.java index ebc2afe1e..c274a75f0 100644 --- a/src/resources/server_info/DataManager.java +++ b/src/resources/server_info/DataManager.java @@ -85,7 +85,7 @@ public class DataManager implements IntentReceiver { File f = new File(file.getFilename()); try { if (!createFilesAndDirectories(f)) { - Log.w("DataManager", "ConfigFile could not be loaded! " + file.getFilename()); + Log.w("ConfigFile could not be loaded! " + file.getFilename()); } else { config.put(file, new Config(f)); } @@ -94,7 +94,7 @@ public class DataManager implements IntentReceiver { watcher.start(); watchers.add(watcher); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } } @@ -107,16 +107,16 @@ public class DataManager implements IntentReceiver { if (parentName != null && !parentName.isEmpty()) { File parent = new File(file.getParent()); if (!parent.exists() && !parent.mkdirs()) - Log.e(getClass().getSimpleName(), "Failed to create parent directories for ODB: " + file.getCanonicalPath()); + Log.e("Failed to create parent directories for ODB: " + file.getCanonicalPath()); } } catch (IOException e) { - Log.e(this, e); + Log.e(e); } try { if (!file.createNewFile()) - Log.e(getClass().getSimpleName(), "Failed to create new ODB: " + file.getCanonicalPath()); + Log.e("Failed to create new ODB: " + file.getCanonicalPath()); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return file.exists(); } diff --git a/src/resources/server_info/Log.java b/src/resources/server_info/Log.java index 758dfd0b7..caf1546a5 100644 --- a/src/resources/server_info/Log.java +++ b/src/resources/server_info/Log.java @@ -109,13 +109,13 @@ public class Log { /** * Logs the string to the server log file, formatted to display the log - * severity, time, tag and message. + * severity, time and message. * @param level the log level of this message between VERBOSE and ASSERT * @param tag the tag to use for the log * @param str the format string for the log * @param args the string format arguments, if specified */ - public static final void log(LogLevel level, String tag, String str, Object ... args) { + public static final void log(LogLevel level, String str, Object ... args) { synchronized (LOG) { if (LOG.getLevel().compareTo(level) > 0) return; @@ -125,7 +125,7 @@ public class Log { date = LOG_FORMAT.format(System.currentTimeMillis()); } String logStr = String.format(str, args); - String log = String.format("%s %c/[%s]: %s", date, level.getChar(), tag, logStr); + String log = String.format("%s %c/: %s", date, level.getChar(), logStr); if (level.compareTo(LogLevel.WARN) >= 0) System.err.println(date + " " + level.getChar() + ": " + logStr); else @@ -141,210 +141,103 @@ public class Log { /** * Logs the string to the server log file, formatted to display the log - * severity as VERBOSE, as well as the time, tag and message. - * @param tag the tag to use for the log + * severity as VERBOSE, as well as the time and message. * @param message the format string for the log * @param args the string format arguments, if specified */ - public static final void v(String tag, String message, Object ... args) { - log(LogLevel.VERBOSE, tag, message, args); + public static final void v(String message, Object ... args) { + log(LogLevel.VERBOSE, message, args); } /** * Logs the string to the server log file, formatted to display the log - * severity as VERBOSE, as well as the time, class name and message. - * @param tag the object outputting this log info + * severity as DEBUG, as well as the time and message. * @param message the format string for the log * @param args the string format arguments, if specified */ - public static final void v(Object tag, String message, Object ... args) { - log(LogLevel.VERBOSE, toString(tag), message, args); + public static final void d(String message, Object ... args) { + log(LogLevel.DEBUG, message, args); } /** * Logs the string to the server log file, formatted to display the log - * severity as DEBUG, as well as the time, tag and message. - * @param tag the tag to use for the log + * severity as INFO, as well as the time and message. * @param message the format string for the log * @param args the string format arguments, if specified */ - public static final void d(String tag, String message, Object ... args) { - log(LogLevel.DEBUG, tag, message, args); + public static final void i(String message, Object ... args) { + log(LogLevel.INFO, message, args); } /** * Logs the string to the server log file, formatted to display the log - * severity as DEBUG, as well as the time, tag and message. - * @param tag the object outputting this log info + * severity as WARN, as well as the time and message. * @param message the format string for the log * @param args the string format arguments, if specified */ - public static final void d(Object tag, String message, Object ... args) { - log(LogLevel.DEBUG, toString(tag), message, args); + public static final void w(String message, Object ... args) { + log(LogLevel.WARN, message, args); } - /** - * Logs the string to the server log file, formatted to display the log - * severity as INFO, as well as the time, tag and message. - * @param tag the tag to use for the log - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void i(String tag, String message, Object ... args) { - log(LogLevel.INFO, tag, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as INFO, as well as the time, class name and message. - * @param tag the object outputting this log info - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void i(Object tag, String message, Object ... args) { - log(LogLevel.INFO, toString(tag), message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as WARN, as well as the time, tag and message. - * @param tag the tag to use for the log - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void w(String tag, String message, Object ... args) { - log(LogLevel.WARN, tag, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as WARN, as well as the time, tag and message. - * @param tag the object outputting this log info - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void w(Object tag, String message, Object ... args) { - log(LogLevel.WARN, toString(tag), message, args); - } /** * Logs the exception to the server log file, formatted to display the log * severity as WARN, as well as the time, and tag. - * @param tag the tag to use for the log * @param exception the exception to print */ - public static final void w(String tag, Throwable exception) { - printException(LogLevel.WARN, tag, exception); - } - - /** - * Logs the exception to the server log file, formatted to display the log - * severity as WARN, as well as the time, and tag. - * @param tag the object outputting this log info - * @param exception the exception to print - */ - public static final void w(Object tag, Throwable exception) { - printException(LogLevel.WARN, toString(tag), exception); + public static final void w(Throwable exception) { + printException(LogLevel.WARN, exception); } /** * Logs the string to the server log file, formatted to display the log - * severity as ERROR, as well as the time, tag and message. + * severity as ERROR, as well as the time and message. * @param tag the tag to use for the log * @param message the format string for the log * @param args the string format arguments, if specified */ - public static final void e(String tag, String message, Object ... args) { - log(LogLevel.ERROR, tag, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as ERROR, as well as the time, tag and message. - * @param tag the object outputting this log info - * @param message the format string for the log - * @param args the string format arguments, if specified - */ - public static final void e(Object tag, String message, Object ... args) { - log(LogLevel.ERROR, toString(tag), message, args); + public static final void e(String message, Object ... args) { + log(LogLevel.ERROR, message, args); } /** * Logs the exception to the server log file, formatted to display the log * severity as ERROR, as well as the time, and tag. - * @param tag the tag to use for the log * @param exception the exception to print */ - public static final void e(String tag, Throwable exception) { - printException(LogLevel.ERROR, tag, exception); - } - - /** - * Logs the exception to the server log file, formatted to display the log - * severity as ERROR, as well as the time, and tag. - * @param tag the object outputting this log info - * @param exception the exception to print - */ - public static final void e(Object tag, Throwable exception) { - printException(LogLevel.ERROR, toString(tag), exception); + public static final void e(Throwable exception) { + printException(LogLevel.ERROR, exception); } /** * Logs the string to the server log file, formatted to display the log - * severity as ASSERT, as well as the time, tag and message. - * @param tag the tag to use for the log + * severity as ASSERT, as well as the time and message. * @param message the format string for the log * @param args the string format arguments, if specified */ - public static final void a(String tag, String message, Object ... args) { - log(LogLevel.ASSERT, tag, message, args); - } - - /** - * Logs the string to the server log file, formatted to display the log - * severity as ASSERT, as well as the time, tag and message. - * @param tag the object outputting this log info - * @param str the format string for the log - * @param args the string format arguments, if specified - */ - public static final void a(Object tag, String message, Object ... args) { - log(LogLevel.ASSERT, toString(tag), message, args); + public static final void a(String message, Object ... args) { + log(LogLevel.ASSERT, message, args); } /** * Logs the exception to the server log file, formatted to display the log * severity as ASSERT, as well as the time, and tag. - * @param tag the tag to use for the log * @param exception the exception to print */ - public static final void a(String tag, Throwable exception) { - printException(LogLevel.ASSERT, tag, exception); + public static final void a(Throwable exception) { + printException(LogLevel.ASSERT, exception); } - /** - * Logs the exception to the server log file, formatted to display the log - * severity as ASSERT, as well as the time, and tag. - * @param tag the class outputting this log info - * @param exception the exception to print - */ - public static final void a(Object tag, Throwable exception) { - printException(LogLevel.ASSERT, toString(tag), exception); - } - - private static final void printException(LogLevel level, String tag, Throwable exception) { + private static final void printException(LogLevel level, Throwable exception) { synchronized (LOG) { - log(level, tag, "Exception in thread\"%s\" %s: %s", Thread.currentThread().getName(), exception.getClass().getName(), exception.getMessage()); - log(level, tag, "Caused by: %s: %s", exception.getClass(), exception.getMessage()); + log(level, "Exception in thread\"%s\" %s: %s", Thread.currentThread().getName(), exception.getClass().getName(), exception.getMessage()); + log(level, "Caused by: %s: %s", exception.getClass(), exception.getMessage()); for (StackTraceElement e : exception.getStackTrace()) { - log(level, tag, " " + e.toString()); + log(level, " " + e.toString()); } } } - private static final String toString(Object o) { - return o.getClass().getName(); - } - public static enum LogLevel { VERBOSE ('V'), DEBUG ('D'), diff --git a/src/resources/server_info/ObjectDatabase.java b/src/resources/server_info/ObjectDatabase.java index 64dbf227a..17114d0de 100644 --- a/src/resources/server_info/ObjectDatabase.java +++ b/src/resources/server_info/ObjectDatabase.java @@ -60,7 +60,7 @@ public abstract class ObjectDatabase { try { createFilesAndDirectories(); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -71,13 +71,13 @@ public abstract class ObjectDatabase { if (parentName != null && !parentName.isEmpty()) { File parent = new File(file.getParent()); if (!parent.exists() && !parent.mkdirs()) - Log.e(getClass().getSimpleName(), "Failed to create parent directories for ODB: " + file.getCanonicalPath()); + Log.e("Failed to create parent directories for ODB: " + file.getCanonicalPath()); } try { if (!file.createNewFile()) - Log.e(getClass().getSimpleName(), "Failed to create new ODB: " + file.getCanonicalPath()); + Log.e("Failed to create new ODB: " + file.getCanonicalPath()); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -86,7 +86,7 @@ public abstract class ObjectDatabase { try { autosaveService.awaitTermination(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - Log.e(this, e); + Log.e(e); } save(); } diff --git a/src/resources/server_info/RelationalDatabase.java b/src/resources/server_info/RelationalDatabase.java index 31f58c510..964187a10 100644 --- a/src/resources/server_info/RelationalDatabase.java +++ b/src/resources/server_info/RelationalDatabase.java @@ -48,7 +48,7 @@ public abstract class RelationalDatabase implements Closeable { Class.forName(jdbcClass); initialize(url); } catch (ClassNotFoundException e) { - Log.e(this, e); + Log.e(e); online = false; } } @@ -58,7 +58,7 @@ public abstract class RelationalDatabase implements Closeable { Class.forName(jdbcClass); initialize(url, user, pass); } catch (ClassNotFoundException e) { - Log.e(this, e); + Log.e(e); online = false; } } @@ -70,7 +70,7 @@ public abstract class RelationalDatabase implements Closeable { url += "?" + params; initialize(url, user, pass); } catch (ClassNotFoundException e) { - Log.e(this, e); + Log.e(e); online = false; } } @@ -83,7 +83,7 @@ public abstract class RelationalDatabase implements Closeable { url += "?" + params; initialize(url, user, pass); } catch (ClassNotFoundException e) { - Log.e(this, e); + Log.e(e); online = false; } } @@ -94,7 +94,7 @@ public abstract class RelationalDatabase implements Closeable { metaData = connection.getMetaData(); online = true; } catch (SQLException e) { - Log.e("RelationalDatabase", "Failed to initialize relational database! %s - %s", e.getClass().getSimpleName(), e.getMessage()); + Log.e("Failed to initialize relational database! %s - %s", e.getClass().getSimpleName(), e.getMessage()); online = false; } } @@ -105,7 +105,7 @@ public abstract class RelationalDatabase implements Closeable { metaData = connection.getMetaData(); online = true; } catch (SQLException e) { - Log.e("RelationalDatabase", "Failed to initialize relational database! %s - %s", e.getClass().getSimpleName(), e.getMessage()); + Log.e("Failed to initialize relational database! %s - %s", e.getClass().getSimpleName(), e.getMessage()); online = false; } } @@ -115,7 +115,7 @@ public abstract class RelationalDatabase implements Closeable { connection.close(); online = false; } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } @@ -131,13 +131,13 @@ public abstract class RelationalDatabase implements Closeable { public PreparedStatement prepareStatement(String sql) { if (connection == null) { - Log.e("RelationalDatabase", "Cannot prepare statement! Connection is null"); + Log.e("Cannot prepare statement! Connection is null"); return null; } try { return connection.prepareStatement(sql); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return null; } } @@ -156,7 +156,7 @@ public abstract class RelationalDatabase implements Closeable { } return s.getResultSet(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); if (s != null) { try { s.close(); } catch (SQLException ex) { } } @@ -172,7 +172,7 @@ public abstract class RelationalDatabase implements Closeable { return s.executeUpdate(query); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return 0; } } diff --git a/src/resources/server_info/RelationalServerData.java b/src/resources/server_info/RelationalServerData.java index 85db36cc7..842cbad5a 100644 --- a/src/resources/server_info/RelationalServerData.java +++ b/src/resources/server_info/RelationalServerData.java @@ -93,7 +93,7 @@ public class RelationalServerData extends RelationalDatabase { return true; } } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return false; } @@ -211,13 +211,13 @@ public class RelationalServerData extends RelationalDatabase { if (set.next()) return set.getLong("last_imported"); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } finally { if (set != null) { try { set.close(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -233,7 +233,7 @@ public class RelationalServerData extends RelationalDatabase { if (updateTableMetadata.executeUpdate() > 0) return; } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return; } } @@ -243,25 +243,25 @@ public class RelationalServerData extends RelationalDatabase { insertTableMetadata.setLong(2, lastImported); insertTableMetadata.executeUpdate(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } private boolean importFromSdb(String table, File sdb) { try (TableReader reader = new TableReader(table, sdb)) { - Log.i("RelationalServerData", "Importing sdb... '" + sdb + "'"); + Log.i("Importing sdb... '" + sdb + "'"); if (sdb.getName().endsWith(".msdb")) reader.readMaster(); else reader.readNormal(); return true; } catch (IOException e) { - Log.e(this, e); + Log.e(e); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } catch (IllegalArgumentException e) { - Log.e("RelationalServerData", "Invalid file format. Aborting read of %s! Message: %s", sdb, e.getMessage()); + Log.e("Invalid file format. Aborting read of %s! Message: %s", sdb, e.getMessage()); } return false; } @@ -288,7 +288,7 @@ public class RelationalServerData extends RelationalDatabase { try { insert.close(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -322,15 +322,15 @@ public class RelationalServerData extends RelationalDatabase { while ((line = reader.readLine()) != null) { String [] parts = line.split("\t"); if (parts.length != 2) { - Log.e("RelationalServerData", "Invalid line [%d]: %s", lineNum, line); + Log.e("Invalid line [%d]: %s", lineNum, line); continue; } boolean load = Boolean.parseBoolean(parts[1]); if (load) { File sdb = new File(file.getParent(), parts[0]); - Log.i("RelationalServerData", " Importing sdb... '" + sdb + "'"); + Log.i(" Importing sdb... '" + sdb + "'"); if (!sdb.isFile()) { - Log.e("RelationalServerData", " Failed to import sdb! File is not file or does not exist"); + Log.e(" Failed to import sdb! File is not file or does not exist"); continue; } @SuppressWarnings("resource") // This closes the database.. we don't want to do that yet @@ -419,7 +419,7 @@ public class RelationalServerData extends RelationalDatabase { private void generateInsert(String [] data, int line) throws SQLException { if (columnTypes.length != data.length) { - Log.e("RelationalServerData", "Could not load record: Types length and data length mismatch. Line: " + line); + Log.e("Could not load record: Types length and data length mismatch. Line: " + line); return; } int column = 0; @@ -436,7 +436,7 @@ public class RelationalServerData extends RelationalDatabase { } insert.addBatch(); } catch (NumberFormatException e) { - Log.e("RelationalServerData", "Could not load record: Record has invalid data. Line: " + line + " Column: " + column); + Log.e("Could not load record: Record has invalid data. Line: " + line + " Column: " + column); } } diff --git a/src/resources/server_info/RelationalServerFactory.java b/src/resources/server_info/RelationalServerFactory.java index b50ce9620..c52332008 100644 --- a/src/resources/server_info/RelationalServerFactory.java +++ b/src/resources/server_info/RelationalServerFactory.java @@ -73,7 +73,7 @@ public class RelationalServerFactory { return true; data.close(); } catch (Exception e) { - Log.e(this, e); + Log.e(e); data.close(); } return false; @@ -92,7 +92,7 @@ public class RelationalServerFactory { executeCommand(data, command); return data; } catch (Exception e) { - Log.e(this, e); + Log.e(e); } data.close(); return null; @@ -127,7 +127,7 @@ public class RelationalServerFactory { try (ResultSet set = data.executeQuery(command)) { } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } else { data.updateQuery(command); diff --git a/src/resources/server_info/StandardLog.java b/src/resources/server_info/StandardLog.java index aa5b2905b..6fe990842 100644 --- a/src/resources/server_info/StandardLog.java +++ b/src/resources/server_info/StandardLog.java @@ -30,12 +30,12 @@ package resources.server_info; public class StandardLog { public static long onStartLoad(String what) { - Log.i("LOAD", "Loading %s...", what); + Log.i("Loading %s...", what); return System.nanoTime(); } public static void onEndLoad(int quantity, String what, long startTime) { - Log.i("LOAD", "Finished loading %d %s. Took %.3fms", quantity, what, (System.nanoTime() - startTime) / 1E6); + Log.i("Finished loading %d %s. Took %.3fms", quantity, what, (System.nanoTime() - startTime) / 1E6); } } diff --git a/src/resources/sui/SuiBaseWindow.java b/src/resources/sui/SuiBaseWindow.java index 531f88538..91e741fac 100644 --- a/src/resources/sui/SuiBaseWindow.java +++ b/src/resources/sui/SuiBaseWindow.java @@ -91,7 +91,7 @@ public class SuiBaseWindow implements Encodable { protected void subscribeToEvent(int event, String widgetSource, String callback) { SuiComponent component = getSubscriptionForEvent(event, widgetSource); if (component != null) { - Log.i("SuiWindow", "Added event callback %d to %s when the event is already subscribed to, replacing callback to %s", event, widgetSource, callback); + Log.i("Added event callback %d to %s when the event is already subscribed to, replacing callback to %s", event, widgetSource, callback); component.getNarrowParams().set(2, callback); } else { component = new SuiComponent(SuiComponent.Type.SUBSCRIBE_TO_EVENT, widgetSource); diff --git a/src/resources/sui/SuiComponent.java b/src/resources/sui/SuiComponent.java index 07fc4cbb3..fe1bc9e66 100644 --- a/src/resources/sui/SuiComponent.java +++ b/src/resources/sui/SuiComponent.java @@ -92,7 +92,7 @@ public class SuiComponent implements Encodable { int size = narrowParams.size(); if (size < 3) { - Log.w("SuiComponent", "Tried to get subscribed properties when there are none for target %s", getTarget()); + Log.w("Tried to get subscribed properties when there are none for target %s", getTarget()); } else { List subscribedProperties = new ArrayList<>(); @@ -112,7 +112,7 @@ public class SuiComponent implements Encodable { int size = narrowParams.size(); if (size < 3) { - Log.w("SuiComponent", "Tried to get subscribed callback when there is none for target %s", getTarget()); + Log.w("Tried to get subscribed callback when there is none for target %s", getTarget()); } else { return narrowParams.get(2); @@ -126,11 +126,11 @@ public class SuiComponent implements Encodable { int size = narrowParams.size(); if (size < 3) { - Log.w("SuiComponent", "Tried to get subscribed event type when there is none for target %s", getTarget()); + Log.w("Tried to get subscribed event type when there is none for target %s", getTarget()); } else { byte[] bytes = narrowParams.get(1).getBytes(StandardCharsets.UTF_8); if (bytes.length > 1) { - Log.w("SuiComponent", "Tried to get eventType but narrowparams string byte array length is more than 1"); + Log.w("Tried to get eventType but narrowparams string byte array length is more than 1"); return -1; } diff --git a/src/resources/zone/NameFilter.java b/src/resources/zone/NameFilter.java index 581c6461d..2198d67fd 100644 --- a/src/resources/zone/NameFilter.java +++ b/src/resources/zone/NameFilter.java @@ -87,10 +87,10 @@ public class NameFilter { } return true; } catch (FileNotFoundException e) { - Log.e(this, e); + Log.e(e); return false; } catch (IOException e) { - Log.e(this, e); + Log.e(e); return false; } } diff --git a/src/services/CoreManager.java b/src/services/CoreManager.java index 40de4c5f9..b45bf0c18 100644 --- a/src/services/CoreManager.java +++ b/src/services/CoreManager.java @@ -187,7 +187,7 @@ public class CoreManager extends Manager { } private void initiateShutdownSequence(ServerManagementIntent i) { - Log.i(this, "Beginning server shutdown sequence..."); + Log.i("Beginning server shutdown sequence..."); long time = i.getTime(); TimeUnit timeUnit = i.getTimeUnit(); @@ -222,15 +222,15 @@ public class CoreManager extends Manager { try { return new PrintStream(new FileOutputStream("packets.txt", false), true, StandardCharsets.US_ASCII.name()); } catch (UnsupportedEncodingException | FileNotFoundException e) { - Log.e(this, e); - Log.e(this, e); + Log.e(e); + Log.e(e); } } return null; } private void setupCrcDatabase() { - Log.i(this, "Generating CRCs..."); + Log.i("Generating CRCs..."); CrcDatabaseGenerator.generate(false); } diff --git a/src/services/EngineManager.java b/src/services/EngineManager.java index 5e1340412..8b7d0e583 100644 --- a/src/services/EngineManager.java +++ b/src/services/EngineManager.java @@ -77,7 +77,7 @@ public class EngineManager extends Manager { for (File f : files) { if (!f.isDirectory() && (f.getName().endsWith(".db") || f.getName().endsWith(".db.tmp"))) { if (!f.delete()) { - Log.e("EngineManager", "Failed to delete ODB: %s", f); + Log.e("Failed to delete ODB: %s", f); } } } @@ -88,7 +88,7 @@ public class EngineManager extends Manager { try { ServerFactory.getInstance().updateServerIffs(); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } } diff --git a/src/services/admin/OnlineInterfaceService.java b/src/services/admin/OnlineInterfaceService.java index f419b26bc..73882cd44 100644 --- a/src/services/admin/OnlineInterfaceService.java +++ b/src/services/admin/OnlineInterfaceService.java @@ -88,7 +88,7 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac httpServer.setMaxConnections(network.getInt("HTTP-MAX-CONNECTIONS", 2)); httpsServer.setMaxConnections(network.getInt("HTTPS-MAX-CONNECTIONS", 5)); if (!httpsServer.initialize(network)) { - Log.e(this, "Failed to initialize HTTPS server! Incorrect password?"); + Log.e("Failed to initialize HTTPS server! Incorrect password?"); httpServer.stop(); httpsServer.stop(); super.initialize(); @@ -107,7 +107,7 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac httpServer.start(); httpsServer.start(); executor.scheduleAtFixedRate(dataCollectionRunnable, 0, 1, TimeUnit.SECONDS); - Log.i(this, "Web server is now online."); + Log.i("Web server is now online."); } return super.start(); } @@ -121,7 +121,7 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac try { executor.awaitTermination(1, TimeUnit.SECONDS); } catch (InterruptedException e) { - Log.e(this, e); + Log.e(e); } } return super.stop(); @@ -129,7 +129,7 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac @Override public void onSocketCreated(HttpSocket socket) { - Log.i(TAG, "Received connection from: %s:%d [%s]", socket.getInetAddress(), socket.getPort(), socket.isSecure() ? "secure" : "insecure"); + Log.i("Received connection from: %s:%d [%s]", socket.getInetAddress(), socket.getPort(), socket.isSecure() ? "secure" : "insecure"); } @Override @@ -152,13 +152,13 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac try { socket.redirect(new URL(request.getURI().getPath()).toString()); } catch (MalformedURLException e) { - Log.w(this, "Malformed URL: " + request.getURI().getPath()); + Log.w("Malformed URL: " + request.getURI().getPath()); } return; } handler.handleRequest(socket, request); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -188,7 +188,7 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac if (c.containsKey(secondTry)) return InetAddress.getByName(c.getString(secondTry, "127.0.0.1")); } catch (UnknownHostException e) { - Log.e(this, "Unknown host for IP: " + t); + Log.e("Unknown host for IP: " + t); } return null; } @@ -206,13 +206,13 @@ public class OnlineInterfaceService extends Service implements HttpServerCallbac session.setAuthenticated(cursor.next() && isUserValid(cursor, password)); if (session.isAuthenticated()) { if (!prevAuthenticated) - Log.i(TAG, "[%s] Successfully logged in to online interface", username); + Log.i("[%s] Successfully logged in to online interface", username); } else { - Log.w(TAG, "[%s] Failed to login to online interface. Incorrect user/pass", username); + Log.w("[%s] Failed to login to online interface. Incorrect user/pass", username); } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } diff --git a/src/services/admin/WebserverHandler.java b/src/services/admin/WebserverHandler.java index c16b98c09..61397ea89 100644 --- a/src/services/admin/WebserverHandler.java +++ b/src/services/admin/WebserverHandler.java @@ -235,7 +235,7 @@ class WebserverHandler { } else if (!session.isAuthenticated() && !type.equals("text/css") && !type.equals("text/js") && !type.startsWith("image")) return null; if (!verifyPath(file)) { - Log.e("WebserverHandler", "Cannot access %s - not a valid path", file); + Log.e("Cannot access %s - not a valid path", file); return null; } return file; diff --git a/src/services/admin/http/HttpServer.java b/src/services/admin/http/HttpServer.java index f279f2ba3..136bff31b 100644 --- a/src/services/admin/http/HttpServer.java +++ b/src/services/admin/http/HttpServer.java @@ -79,7 +79,7 @@ public class HttpServer { serverSocket = createSocket(); startAcceptThread(serverSocket, secure); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } @@ -96,7 +96,7 @@ public class HttpServer { try { executor.awaitTermination(1, TimeUnit.SECONDS); } catch (InterruptedException e) { - Log.e(this, e); + Log.e(e); } } } @@ -145,7 +145,7 @@ public class HttpServer { try { socket.close(); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } synchronized (currentConnections) { currentConnections.decrementAndGet(); @@ -154,7 +154,7 @@ public class HttpServer { } private void acceptThread(ServerSocket serverSocket, boolean secure) { - Log.i(TAG, "Now listening over HTTP%s. Address: %s:%d", secure?"S":"", serverSocket.getInetAddress(), serverSocket.getLocalPort()); + Log.i("Now listening over HTTP%s. Address: %s:%d", secure?"S":"", serverSocket.getInetAddress(), serverSocket.getLocalPort()); while (serverSocket.isBound() && !serverSocket.isClosed()) { try { Socket socket = serverSocket.accept(); @@ -177,12 +177,12 @@ public class HttpServer { } catch (SocketException e) { if (serverSocket.isClosed()) break; - Log.e(this, e); + Log.e(e); } catch (Throwable t) { t.printStackTrace(); } } - Log.i(TAG, "No longer listening over HTTP%s!", secure?"S":""); + Log.i("No longer listening over HTTP%s!", secure?"S":""); } private void socketThread(HttpSocket socket) throws IOException { diff --git a/src/services/admin/http/HttpSocket.java b/src/services/admin/http/HttpSocket.java index 479215b71..10c56ae54 100644 --- a/src/services/admin/http/HttpSocket.java +++ b/src/services/admin/http/HttpSocket.java @@ -107,10 +107,10 @@ public class HttpSocket implements Closeable { if (i.intValue() > 0) { String bodyStr = readBytes(i.intValue()); if (bodyStr == null) - Log.e("HttpSocket", "Failed to read data in %s request: %s - returned null", req.length==0?"null":req[0], req.length<2?"null":req[1]); + Log.e("Failed to read data in %s request: %s - returned null", req.length==0?"null":req[0], req.length<2?"null":req[1]); else { if (bodyStr.length() != i.intValue()) - Log.w("HttpSocket", "Failed to read all data in %s request: %s", req.length==0?"null":req[0], req.length<2?"null":req[1]); + Log.w("Failed to read all data in %s request: %s", req.length==0?"null":req[0], req.length<2?"null":req[1]); body.append(bodyStr); } } @@ -230,7 +230,7 @@ public class HttpSocket implements Closeable { return null; return new String(data, 0, read); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return null; } @@ -268,7 +268,7 @@ public class HttpSocket implements Closeable { try { return new BufferedReader(new InputStreamReader(socket.getInputStream(), ASCII)); } catch (IOException e) { - Log.e(this, e); + Log.e(e); return null; } } @@ -277,7 +277,7 @@ public class HttpSocket implements Closeable { try { return new BufferedWriter(new OutputStreamWriter(socket.getOutputStream(), ASCII)); } catch (IOException e) { - Log.e(this, e); + Log.e(e); return null; } } @@ -286,7 +286,7 @@ public class HttpSocket implements Closeable { try { return socket.getOutputStream(); } catch (IOException e) { - Log.e(this, e); + Log.e(e); return null; } } diff --git a/src/services/admin/http/HttpsServer.java b/src/services/admin/http/HttpsServer.java index 0d0c7a4b5..baea49fe8 100644 --- a/src/services/admin/http/HttpsServer.java +++ b/src/services/admin/http/HttpsServer.java @@ -70,7 +70,7 @@ public class HttpsServer extends HttpServer { sslServerSocketFactory = (SSLServerSocketFactory) SSLServerSocketFactory.getDefault(); return true; } catch (Exception e) { - Log.e(this, e); + Log.e(e); return false; } } @@ -83,8 +83,8 @@ public class HttpsServer extends HttpServer { try { return sslServerSocketFactory.createServerSocket(getBindPort(), 0, getBindAddress()); } catch (IOException e) { - Log.e("HttpsServer", "Failed to start HTTPS server!"); - Log.e("HttpsServer", e); + Log.e("Failed to start HTTPS server!"); + Log.e(e); } return null; } diff --git a/src/services/chat/ChatMailService.java b/src/services/chat/ChatMailService.java index 776135273..827ad70fa 100644 --- a/src/services/chat/ChatMailService.java +++ b/src/services/chat/ChatMailService.java @@ -273,7 +273,7 @@ public class ChatMailService extends Service { insertChatLog.executeUpdate(); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/services/chat/ChatManager.java b/src/services/chat/ChatManager.java index a1944daea..13f19555b 100644 --- a/src/services/chat/ChatManager.java +++ b/src/services/chat/ChatManager.java @@ -431,7 +431,7 @@ public class ChatManager extends Manager { insertChatLog.executeUpdate(); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/services/chat/ChatRoomService.java b/src/services/chat/ChatRoomService.java index 87a5fa735..e9525bfb1 100644 --- a/src/services/chat/ChatRoomService.java +++ b/src/services/chat/ChatRoomService.java @@ -651,7 +651,7 @@ public class ChatRoomService extends Service { // This can happen if a channel was deleted while the player was offline PlayerObject ghost = player.getPlayerObject(); if (ghost == null) { - Log.e(this, "Tried to join a room with a path that does not exist: " + path); + Log.e("Tried to join a room with a path that does not exist: " + path); return; } ghost.removeJoinedChannel(path); @@ -848,7 +848,7 @@ public class ChatRoomService extends Service { insertChatLog.executeUpdate(); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/services/collections/CollectionService.java b/src/services/collections/CollectionService.java index a37366556..d190cfd9e 100644 --- a/src/services/collections/CollectionService.java +++ b/src/services/collections/CollectionService.java @@ -70,7 +70,7 @@ public class CollectionService extends Service { createClickyDatabaseConnection(); createConsumeDatabaseConnection(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } getClickyCollectionItemsStatement = clickyDatabase.prepareStatement(GET_CLICKY_DETAILS_SQL); @@ -114,7 +114,7 @@ public class CollectionService extends Service { } } } catch (SQLException ex) { - Log.e(this, ex); + Log.e(ex); } //clickyDatabase.close(); @@ -129,7 +129,7 @@ public class CollectionService extends Service { } } } catch (SQLException ex) { - Log.e(this, ex); + Log.e(ex); } //consumeDatabase.close(); @@ -149,7 +149,7 @@ public class CollectionService extends Service { try { createConsumeDatabaseConnection(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } try { @@ -162,7 +162,7 @@ public class CollectionService extends Service { } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } return collection; @@ -175,7 +175,7 @@ public class CollectionService extends Service { try { createClickyDatabaseConnection(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } try { @@ -190,7 +190,7 @@ public class CollectionService extends Service { } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } return collection; diff --git a/src/services/collections/ExplorationBadgeService.java b/src/services/collections/ExplorationBadgeService.java index cf148d592..4769f3ca9 100644 --- a/src/services/collections/ExplorationBadgeService.java +++ b/src/services/collections/ExplorationBadgeService.java @@ -95,7 +95,7 @@ public class ExplorationBadgeService extends Service { explorationLocations.get(planet).put(badgeName, new ExplorationRegion(new Point3D(x, 0, y), range)); } }catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } diff --git a/src/services/combat/CombatManager.java b/src/services/combat/CombatManager.java index 329a0647b..0e5a7c8f7 100644 --- a/src/services/combat/CombatManager.java +++ b/src/services/combat/CombatManager.java @@ -285,7 +285,7 @@ public class CombatManager extends Manager { eggParent = source.getParent(); break; - default: Log.w(this, "Unrecognised delay egg position %s from command %s - defaulting to SELF", combatCommand.getEggPosition(), combatCommand.getName()); + default: Log.w("Unrecognised delay egg position %s from command %s - defaulting to SELF", combatCommand.getEggPosition(), combatCommand.getName()); case SELF: eggLocation = source.getLocation(); eggParent = source.getParent(); @@ -488,7 +488,7 @@ public class CombatManager extends Manager { incapacitated.setPosture(Posture.INCAPACITATED); incapacitated.setCounter(INCAP_TIMER); - Log.i(this, "%s was incapacitated", incapacitated); + Log.i("%s was incapacitated", incapacitated); // Once the incapacitation counter expires, revive them. synchronized(incapacitatedCreatures) { @@ -527,12 +527,12 @@ public class CombatManager extends Manager { regeneratingActionCreatures.add(revivedCreature); } - Log.i(this, "% was revived", revivedCreature); + Log.i("% was revived", revivedCreature); } private void killCreature(CreatureObject killer, CreatureObject corpse) { corpse.setPosture(Posture.DEAD); - Log.i(this, "%s was killed by %s", corpse, killer); + Log.i("%s was killed by %s", corpse, killer); new CreatureKilledIntent(killer, corpse).broadcast(); } @@ -565,7 +565,7 @@ public class CombatManager extends Manager { } } else { // Can't happen with the current code, but in case it's ever refactored... - Log.e(this, "Incapacitation timer for player %s being deathblown unexpectedly didn't exist!", ""); + Log.e("Incapacitation timer for player %s being deathblown unexpectedly didn't exist!", ""); } } } diff --git a/src/services/combat/CombatXpService.java b/src/services/combat/CombatXpService.java index 90a55e8a7..8af25b256 100644 --- a/src/services/combat/CombatXpService.java +++ b/src/services/combat/CombatXpService.java @@ -85,7 +85,7 @@ public class CombatXpService extends Service { xpData.put(set.getShort("Level"), new XpData(set.getInt("XP"), set.getInt("Elite_XP"), set.getInt("Boss_XP"))); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } StandardLog.onEndLoad(xpData.size(), "combat XP rates", startTime); @@ -106,7 +106,7 @@ public class CombatXpService extends Service { synchronized (groupObjects) { if(object instanceof GroupObject && groupObjects.remove(object.getObjectId()) == null) { - Log.w(this, "%s was expected to be in the GroupObject mapping but wasn't", object); + Log.w("%s was expected to be in the GroupObject mapping but wasn't", object); } } } @@ -158,7 +158,7 @@ public class CombatXpService extends Service { XpData xpForLevel = this.xpData.get(corpseLevel); if (xpForLevel == null) { - Log.e(this, "%s received no XP: No XP data was found for level %d!", killer, corpseLevel); + Log.e("%s received no XP: No XP data was found for level %d!", killer, corpseLevel); return 0; } @@ -172,7 +172,7 @@ public class CombatXpService extends Service { case NORMAL: return xpForLevel.getXp(); default: - Log.e(this, "%s received no XP: Unsupported creature difficulty %s of corpse %s", killer, creatureDifficulty, corpse); + Log.e("%s received no XP: Unsupported creature difficulty %s of corpse %s", killer, creatureDifficulty, corpse); return 0; } } diff --git a/src/services/combat/CorpseService.java b/src/services/combat/CorpseService.java index 290f47f88..3fd510c8a 100644 --- a/src/services/combat/CorpseService.java +++ b/src/services/combat/CorpseService.java @@ -149,11 +149,11 @@ public final class CorpseService extends Service { if (facilityDataMap.put(ClientFactory.formatToSharedFile(objectTemplate), facilityData) != null) { // Duplicates are not allowed! - Log.e(this, "Duplicate entry for %s in row %d. Replacing previous entry with new", objectTemplate, set.getRow()); + Log.e("Duplicate entry for %s in row %d. Replacing previous entry with new", objectTemplate, set.getRow()); } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -235,7 +235,7 @@ public final class CorpseService extends Service { List availableFacilities = getAvailableFacilities(corpse); if (availableFacilities.isEmpty()) { - Log.e(this, "No cloning facility is available for terrain %s - %s has nowhere to properly clone", corpseTerrain, corpse); + Log.e("No cloning facility is available for terrain %s - %s has nowhere to properly clone", corpseTerrain, corpse); return; } @@ -279,10 +279,10 @@ public final class CorpseService extends Service { */ private void deleteCorpse(CreatureObject creatureCorpse) { if(creatureCorpse.isPlayer()) { - Log.e(this, "Cannot delete the corpse of a player!", creatureCorpse); + Log.e("Cannot delete the corpse of a player!", creatureCorpse); } else { new DestroyObjectIntent(creatureCorpse).broadcast(); - Log.i(this, "Corpse of NPC %s was deleted from the world", creatureCorpse); + Log.i("Corpse of NPC %s was deleted from the world", creatureCorpse); } } @@ -320,7 +320,7 @@ public final class CorpseService extends Service { FacilityData facilityData = facilityDataMap.get(selectedFacility.getTemplate()); if (facilityData == null) { - Log.e(this, "%s could not clone at facility %s because the object template is not in cloning_respawn.sdb", corpse, selectedFacility); + Log.e("%s could not clone at facility %s because the object template is not in cloning_respawn.sdb", corpse, selectedFacility); return CloneResult.TEMPLATE_MISSING; } @@ -328,7 +328,7 @@ public final class CorpseService extends Service { CellObject cellObject = selectedFacility.getCellByName(cellName); if (cellObject == null) { - Log.e(this, "Cell %s was invalid for cloning facility %s", cellName, selectedFacility); + Log.e("Cell %s was invalid for cloning facility %s", cellName, selectedFacility); return CloneResult.INVALID_CELL; } @@ -410,7 +410,7 @@ public final class CorpseService extends Service { suiWindow.close(corpseOwner); forceClone(corpse, facilitiesInTerrain); } else { - Log.w(this, "Could not expire timer for %s because none was active", corpse); + Log.w("Could not expire timer for %s because none was active", corpse); } } diff --git a/src/services/commands/BuffService.java b/src/services/commands/BuffService.java index d5ff5bd2c..4cbf4bcd0 100644 --- a/src/services/commands/BuffService.java +++ b/src/services/commands/BuffService.java @@ -235,7 +235,7 @@ public class BuffService extends Service { BuffData buffData = dataMap.get(newCrc); if (buffData == null) { - Log.e(this, "Could not add %s to %s - unrecognised buff name", newCrc, receiver); + Log.e("Could not add %s to %s - unrecognised buff name", newCrc, receiver); return; } @@ -321,7 +321,7 @@ public class BuffService extends Service { BuffData buffData = dataMap.get(buffCrc); if (buffData == null) { - Log.e(this, "Could not remove %s from %s - buff data for it does not exist", buffCrc, creature); + Log.e("Could not remove %s from %s - buff data for it does not exist", buffCrc, creature); return; } @@ -372,7 +372,7 @@ public class BuffService extends Service { try { Scripts.invoke("buffs/callback" + callback, callback, creature); } catch (FileNotFoundException ex) { - Log.w(this, "Callback script %s doesn't exist - buff %s won't behave as expected", callback, crc); + Log.w("Callback script %s doesn't exist - buff %s won't behave as expected", callback, crc); } } } diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java index d6c7cdc89..3ef5b343c 100644 --- a/src/services/commands/CommandService.java +++ b/src/services/commands/CommandService.java @@ -158,7 +158,7 @@ public class CommandService extends Service { private void handleCommandRequest(Player player, GalacticManager galacticManager, CommandQueueEnqueue request) { if (!commandExists(request.getCommandCrc())) { if (request.getCommandCrc() != 0) - Log.e("CommandService", "Invalid command crc: %x", request.getCommandCrc()); + Log.e("Invalid command crc: %x", request.getCommandCrc()); return; } @@ -178,7 +178,7 @@ public class CommandService extends Service { if (!combatQueue.offer(new QueuedCommand(command, galacticManager, target, request))) { // Ziggy: Shouldn't happen, unless the Queue implementation is changed - Log.e(this, "Unable to enqueue command %s from %s because the combat queue is full", command.getName(), player.getCreatureObject()); + Log.e("Unable to enqueue command %s from %s because the combat queue is full", command.getName(), player.getCreatureObject()); } } else { // Execute it now @@ -266,21 +266,21 @@ public class CommandService extends Service { if (cooldownGroups.remove(cooldownGroup)) { } else { - Log.w(this, "%s doesn't have cooldown group %s!", creature, cooldownGroup); + Log.w("%s doesn't have cooldown group %s!", creature, cooldownGroup); } } } private void executeCommand(GalacticManager galacticManager, Player player, Command command, SWGObject target, String args) { if (player.getCreatureObject() == null) { - Log.e("CommandService", "No creature object associated with the player '%s'!", player.getUsername()); + Log.e("No creature object associated with the player '%s'!", player.getUsername()); return; } if(player.getAccessLevel().getValue() < command.getGodLevel()) { String commandAccessLevel = AccessLevel.getFromValue(command.getGodLevel()).toString(); String playerAccessLevel = player.getAccessLevel().toString(); - Log.i("CommandService", "[%s] attempted to use the command \"%s\", but did not have the minimum access level. Access Level Required: %s, Player Access Level: %s", + Log.i("[%s] attempted to use the command \"%s\", but did not have the minimum access level. Access Level Required: %s, Player Access Level: %s", player.getCharacterName(), command.getName(), commandAccessLevel, playerAccessLevel); String errorProseString1 = "use that command"; new ChatBroadcastIntent(player, new ProsePackage("StringId", new StringId("cmd_err", "state_must_have_prose"), "TO", errorProseString1, "TU", commandAccessLevel)).broadcast(); @@ -288,7 +288,7 @@ public class CommandService extends Service { } if(!command.getCharacterAbility().isEmpty() && !player.getCreatureObject().hasAbility(command.getCharacterAbility())){ - Log.i("CommandService", "[%s] attempted to use the command \"%s\", but did not have the required ability. Ability Required: %s", + Log.i("[%s] attempted to use the command \"%s\", but did not have the required ability. Ability Required: %s", player.getCharacterName(), command.getName(), command.getCharacterAbility()); String errorProseString = String.format("use the %s command", command.getName()); new ChatBroadcastIntent(player, new ProsePackage("StringId", new StringId("cmd_err", "ability_prose"), "TO", errorProseString)).broadcast(); @@ -304,7 +304,7 @@ public class CommandService extends Service { try { command.getJavaCallback().newInstance().execute(galacticManager, player, target, args); } catch (InstantiationException | IllegalAccessException e) { - Log.e(this, e); + Log.e(e); } } else @@ -482,7 +482,7 @@ public class CommandService extends Service { if (callback.getConstructor() == null) throw new IllegalArgumentException("Incorrectly registered callback class. Class must extend ICmdCallback and have an empty constructor: " + callback.getName()); } catch (NoSuchMethodException e) { - Log.e(this, e); + Log.e(e); } command.setJavaCallback(callback); diff --git a/src/services/commands/EntertainmentService.java b/src/services/commands/EntertainmentService.java index f90630514..8cf815636 100644 --- a/src/services/commands/EntertainmentService.java +++ b/src/services/commands/EntertainmentService.java @@ -245,7 +245,7 @@ public class EntertainmentService extends Service { Performance performance = performerMap.get(performanceListenTarget); if(performance == null) { - Log.e(this, "Couldn't perform range check on %s, because there was no performer with object ID %d", movedPlayer, performanceListenTarget); + Log.e("Couldn't perform range check on %s, because there was no performer with object ID %d", movedPlayer, performanceListenTarget); return; } @@ -259,7 +259,7 @@ public class EntertainmentService extends Service { if(performance.removeSpectator(movedPlayer)) { stopWatching(movedPlayer, true); } else { - Log.w(this, "%s ran out of range of %s, but couldn't stop watching because they weren't watching in the first place", movedPlayer, performer); + Log.w("%s ran out of range of %s, but couldn't stop watching because they weren't watching in the first place", movedPlayer, performer); } } } @@ -276,7 +276,7 @@ public class EntertainmentService extends Service { } private void scheduleExperienceTask(CreatureObject performer, String performanceName) { - Log.d(this, "Scheduled %s to receive XP every %d seconds", performer, XP_CYCLE_RATE); + Log.d("Scheduled %s to receive XP every %d seconds", performer, XP_CYCLE_RATE); synchronized(performerMap) { long performerId = performer.getObjectId(); Future future = executorService.scheduleAtFixedRate(new EntertainerExperience(performer), XP_CYCLE_RATE, XP_CYCLE_RATE, TimeUnit.SECONDS); @@ -292,12 +292,12 @@ public class EntertainmentService extends Service { } private void cancelExperienceTask(CreatureObject performer) { - Log.d(this, "%s no longer receives XP every %d seconds", performer, XP_CYCLE_RATE); + Log.d("%s no longer receives XP every %d seconds", performer, XP_CYCLE_RATE); synchronized (performerMap) { Performance performance = performerMap.get(performer.getObjectId()); if(performance == null) { - Log.e(this, "Couldn't cancel experience task for %s because they weren't found in performerMap", performer); + Log.e("Couldn't cancel experience task for %s because they weren't found in performerMap", performer); return; } @@ -441,7 +441,7 @@ public class EntertainmentService extends Service { Performance performance = performerMap.get(performer.getObjectId()); if(performance == null) { - Log.e("EntertainerExperience", "Performer %s wasn't in performermap", performer); + Log.e("Performer %s wasn't in performermap", performer); return; } diff --git a/src/services/experience/ExperienceManager.java b/src/services/experience/ExperienceManager.java index 8632b8feb..bded45a5c 100644 --- a/src/services/experience/ExperienceManager.java +++ b/src/services/experience/ExperienceManager.java @@ -101,7 +101,7 @@ public final class ExperienceManager extends Manager { adjustHealth(creatureObject, newLevel); adjustAction(creatureObject, newLevel); // TODO NGE: system message health and action differences. @spam:level_up_stat_gain_# - Log.i(this, "%s leveled from %d to %d", creatureObject, oldLevel, newLevel); + Log.i("%s leveled from %d to %d", creatureObject, oldLevel, newLevel); } } } @@ -120,7 +120,7 @@ public final class ExperienceManager extends Manager { playerObject.setExperiencePoints(xpType, newXpTotal); creatureObject.setTotalLevelXp(newXpTotal); - Log.d(this, "%s gained %d %s XP", creatureObject, xpGained, xpType); + Log.d("%s gained %d %s XP", creatureObject, xpGained, xpType); // Show flytext above the creature that received XP, but only to them creatureObject.sendSelf(new ShowFlyText(creatureObject.getObjectId(), new OutOfBandPackage(new ProsePackage(new StringId("base_player", "prose_flytext_xp"), "DI", xpGained)), Scale.MEDIUM, new RGB(Color.magenta))); @@ -137,7 +137,7 @@ public final class ExperienceManager extends Manager { Integer xpNextLevel = levelXpMap.get(nextLevel); if (xpNextLevel == null) { - Log.e(this, "%s couldn't level up to %d because there's no XP requirement", creatureObject, nextLevel); + Log.e("%s couldn't level up to %d because there's no XP requirement", creatureObject, nextLevel); return currentLevel; } diff --git a/src/services/experience/ExpertiseService.java b/src/services/experience/ExpertiseService.java index 2c9a60d5d..51acefe25 100644 --- a/src/services/experience/ExpertiseService.java +++ b/src/services/experience/ExpertiseService.java @@ -108,7 +108,7 @@ public final class ExpertiseService extends Service { Map expertise = trees.get(treeId); if (expertise == null) { - Log.e(this, "Expertise %s refers to unknown tree with ID %d", skillName, treeId); + Log.e("Expertise %s refers to unknown tree with ID %d", skillName, treeId); return false; } @@ -146,7 +146,7 @@ public final class ExpertiseService extends Service { expertiseAbilities.put(skill, abilityChains); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return false; } } @@ -179,7 +179,7 @@ public final class ExpertiseService extends Service { for (String requestedSkill : requestedSkills) { if (getAvailablePoints(creatureObject) < 1) { - Log.i(this, "%s attempted to spend more expertise points than available to them", creatureObject); + Log.i("%s attempted to spend more expertise points than available to them", creatureObject); return; } @@ -196,14 +196,14 @@ public final class ExpertiseService extends Service { Expertise expertise = tree.get(requestedSkill); if (!expertise.getRequiredProfession().equals(profession)) { - Log.i(this, "%s attempted to train expertise skill %s as the wrong profession", creatureObject, requestedSkill); + Log.i("%s attempted to train expertise skill %s as the wrong profession", creatureObject, requestedSkill); continue; } int requiredTreePoints = (expertise.getTier() - 1) * 4; if (requiredTreePoints > getPointsInTree(tree, creatureObject)) { - Log.i(this, "%s attempted to train expertise skill %s without having unlocked the tier of the tree", creatureObject, requestedSkill); + Log.i("%s attempted to train expertise skill %s without having unlocked the tier of the tree", creatureObject, requestedSkill); continue; } diff --git a/src/services/experience/SkillManager.java b/src/services/experience/SkillManager.java index 91dd37646..786b84a7a 100644 --- a/src/services/experience/SkillManager.java +++ b/src/services/experience/SkillManager.java @@ -135,7 +135,7 @@ public final class SkillManager extends Manager { grantParentSkills(skillData, parentSkillName, target); grantRequiredSkills(skillData, target); } else if (!target.hasSkill(parentSkillName) || !hasRequiredSkills(skillData, target)) { - Log.i(this, "%s lacks required skill %s before being granted skill %s", target, parentSkillName, skillName); + Log.i("%s lacks required skill %s before being granted skill %s", target, parentSkillName, skillName); return; } @@ -192,7 +192,7 @@ public final class SkillManager extends Manager { private void changeRoleIcon(CreatureObject creature, int chosenIcon) { Set qualifyingSkills = roleIconMap.get(chosenIcon); if (qualifyingSkills == null) { - Log.w(this, "%s tried to use undefined role icon %d", creature, chosenIcon); + Log.w("%s tried to use undefined role icon %d", creature, chosenIcon); return; } Assert.notNull(creature.getPlayerObject()); @@ -203,7 +203,7 @@ public final class SkillManager extends Manager { return; } } - Log.e(this, "%s could not be given role icon %d - does not have qualifying skill! Qualifying: %s", creature, chosenIcon, qualifyingSkills); + Log.e("%s could not be given role icon %d - does not have qualifying skill! Qualifying: %s", creature, chosenIcon, qualifyingSkills); } private static class SkillData { diff --git a/src/services/experience/SkillTemplateService.java b/src/services/experience/SkillTemplateService.java index 46f3f5205..4f325c787 100644 --- a/src/services/experience/SkillTemplateService.java +++ b/src/services/experience/SkillTemplateService.java @@ -107,7 +107,7 @@ public final class SkillTemplateService extends Service { String[] templates = skillTemplates.get(profession); if (templates == null) { - Log.w(this, "%s tried to level up to %d with invalid profession %s", creatureObject, level, profession); + Log.w("%s tried to level up to %d with invalid profession %s", creatureObject, level, profession); return; } @@ -235,7 +235,7 @@ public final class SkillTemplateService extends Service { new GrantBadgeIntent(creature, "new_prof_crafting_droidengineer_master").broadcast(); break; default: - Log.e(this, "%s could not be granted a mastery badge because their profession %s is unrecognised", creature, profession); + Log.e("%s could not be granted a mastery badge because their profession %s is unrecognised", creature, profession); break; } } diff --git a/src/services/galaxy/ConnectionService.java b/src/services/galaxy/ConnectionService.java index b486c1dbc..0d276af4c 100644 --- a/src/services/galaxy/ConnectionService.java +++ b/src/services/galaxy/ConnectionService.java @@ -87,7 +87,7 @@ public class ConnectionService extends Service { try { success = updateService.awaitTermination(5, TimeUnit.SECONDS); } catch (InterruptedException e) { - Log.e(this, e); + Log.e(e); } return super.terminate() && success; } @@ -137,7 +137,7 @@ public class ConnectionService extends Service { private void logOut(Player p) { if (!zonedInPlayers.remove(p)) return; - Log.i("ConnectionService", "Logged out %s with character %s", p.getUsername(), p.getCharacterName()); + Log.i("Logged out %s with character %s", p.getUsername(), p.getCharacterName()); CoreManager.getGalaxy().decrementPopulationCount(); setPlayerFlag(p, PlayerFlags.LD); removeFromDisappear(p); @@ -148,7 +148,7 @@ public class ConnectionService extends Service { private void disappear(Player p, boolean newConnection, DisconnectReason reason) { if (p.getCreatureObject() == null) return; - Log.i("ConnectionService", "Disappeared %s with character %s with reason %s", p.getUsername(), p.getCharacterName(), reason); + Log.i("Disappeared %s with character %s with reason %s", p.getUsername(), p.getCharacterName(), reason); removeFromDisappear(p); Intent i = new PlayerEventIntent(p, PlayerEvent.PE_DISAPPEAR); diff --git a/src/services/galaxy/terminals/TerminalService.java b/src/services/galaxy/terminals/TerminalService.java index 61e566b97..6cfd064ac 100644 --- a/src/services/galaxy/terminals/TerminalService.java +++ b/src/services/galaxy/terminals/TerminalService.java @@ -79,7 +79,7 @@ public class TerminalService extends Service { templates.add(set.getString("iff")); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } return super.initialize(); @@ -124,15 +124,15 @@ public class TerminalService extends Service { if (set.next()) return set.getString("script"); else - Log.e("TerminalService", "Cannot find script for template: " + iff); + Log.e("Cannot find script for template: " + iff); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } finally { if (set != null) { try { set.close(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } diff --git a/src/services/galaxy/travel/TravelGroup.java b/src/services/galaxy/travel/TravelGroup.java index c2cf5c84e..fb5cc7c86 100644 --- a/src/services/galaxy/travel/TravelGroup.java +++ b/src/services/galaxy/travel/TravelGroup.java @@ -162,7 +162,7 @@ public class TravelGroup implements Runnable { } catch (InterruptedException e) { } catch (Exception e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/services/galaxy/travel/TravelService.java b/src/services/galaxy/travel/TravelService.java index 88ecc564b..75cb585ff 100644 --- a/src/services/galaxy/travel/TravelService.java +++ b/src/services/galaxy/travel/TravelService.java @@ -193,8 +193,8 @@ public class TravelService extends Service { loadTravelPoint(set, travelPlanet); } } catch (SQLException e) { - Log.e("TravelService", String.format("Failed to load a travel point for %s. %s", planetName, e.getLocalizedMessage())); - Log.e(this, e); + Log.e(String.format("Failed to load a travel point for %s. %s", planetName, e.getLocalizedMessage())); + Log.e(e); success = false; } } @@ -279,7 +279,7 @@ public class TravelService extends Service { List pointsForPlanet = new ArrayList<>(); Terrain to = Terrain.getTerrainFromName(req.getPlanetName()); if (to == null) { - Log.e(this, "Unknown terrain in PlanetTravelPointListRequest: %s", req.getPlanetName()); + Log.e("Unknown terrain in PlanetTravelPointListRequest: %s", req.getPlanetName()); return; } for (TravelGroup gt : travel.values()) @@ -326,7 +326,7 @@ public class TravelService extends Service { boolean roundTrip = i.isRoundTrip(); if (nearestPoint == null || destinationPoint == null) { - Log.w(this, "Unable to purchase ticket! Nearest Point: %s Destination Point: %s", nearestPoint, destinationPoint); + Log.w("Unable to purchase ticket! Nearest Point: %s Destination Point: %s", nearestPoint, destinationPoint); return; } @@ -403,12 +403,12 @@ public class TravelService extends Service { TravelPoint point = getNearestTravelPoint(player.getCreatureObject().getWorldLocation()); TravelGroup travel = null; if (point.getShuttle() == null) { - Log.w(this, "No travel point shuttle near player: %s", player.getCreatureObject().getWorldLocation()); + Log.w("No travel point shuttle near player: %s", player.getCreatureObject().getWorldLocation()); return; } travel = this.travel.get(point.getShuttle().getTemplate()); if (travel == null) { - Log.e(this, "Travel point is null for shuttle: " + point.getShuttle()); + Log.e("Travel point is null for shuttle: " + point.getShuttle()); return; } @@ -480,7 +480,7 @@ public class TravelService extends Service { TravelPoint nearestPoint = getNearestTravelPoint(worldLoc); double distanceToNearestPoint = worldLoc.distanceTo(nearestPoint.getCollector().getWorldLocation()); if (!isTicket(ticket)) { - Log.e(this, "%s attempted to use an object that isn't a ticket!", player); + Log.e("%s attempted to use an object that isn't a ticket!", player); } else if (nearestPoint.getGroup().getStatus() != ShuttleStatus.GROUNDED) { int time = nearestPoint.getGroup().getTimeRemaining(); new ChatBroadcastIntent(player, new ProsePackage(new StringId("travel/travel", "shuttle_board_delay"), "DI", time)).broadcast(); @@ -489,7 +489,7 @@ public class TravelService extends Service { new ChatBroadcastIntent(player, "@travel:wrong_shuttle").broadcast(); } else if (distanceToNearestPoint <= TICKET_USE_RADIUS) { // They can use their ticket if they're within range. - Log.i(this, "%s/%s is traveling from %s to %s", player.getUsername(), traveler.getObjectName(), nearestPoint.getName(), getDestinationPoint(ticket).getName()); + Log.i("%s/%s is traveling from %s to %s", player.getUsername(), traveler.getObjectName(), nearestPoint.getName(), getDestinationPoint(ticket).getName()); teleportAndDestroyTicket(getDestinationPoint(ticket), ticket, traveler); } else { new ChatBroadcastIntent(player, "@travel:boarding_too_far").broadcast(); @@ -506,7 +506,7 @@ public class TravelService extends Service { CreatureObject shuttle = (CreatureObject) object; if (pointForShuttle == null) { - Log.w(this, "No point for shuttle at location: " + object.getWorldLocation()); + Log.w("No point for shuttle at location: " + object.getWorldLocation()); return; } // Assign the shuttle to the nearest travel point @@ -519,7 +519,7 @@ public class TravelService extends Service { TravelPoint pointForCollector = getNearestTravelPoint(object.getWorldLocation()); if (pointForCollector == null) { - Log.w(this, "No point for collector at location: " + object.getWorldLocation()); + Log.w("No point for collector at location: " + object.getWorldLocation()); return; } diff --git a/src/services/map/CityService.java b/src/services/map/CityService.java index 72b456c69..6869656ee 100644 --- a/src/services/map/CityService.java +++ b/src/services/map/CityService.java @@ -76,7 +76,7 @@ public class CityService extends Service { list.add(new City(set.getString("city"), set.getInt("x"), set.getInt("z"), set.getInt("radius"))); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/services/network/HolocoreSessionManager.java b/src/services/network/HolocoreSessionManager.java index f90f0279a..4abe7d9c9 100644 --- a/src/services/network/HolocoreSessionManager.java +++ b/src/services/network/HolocoreSessionManager.java @@ -127,7 +127,7 @@ public class HolocoreSessionManager { if (callback != null) callback.onSessionStatusChanged(oldStatus, newStatus); } catch (Exception e) { - Log.e(this, e); + Log.e(e); } } diff --git a/src/services/network/InboundNetworkManager.java b/src/services/network/InboundNetworkManager.java index 87018d9b5..010507ef0 100644 --- a/src/services/network/InboundNetworkManager.java +++ b/src/services/network/InboundNetworkManager.java @@ -51,7 +51,7 @@ public class InboundNetworkManager extends Service { if (client.addToBuffer(data)) new InboundPacketPendingIntent(client).broadcast(); else - Log.d(this, "Not enough to process. Waiting. Data: %s", Arrays.toString(data)); + Log.d("Not enough to process. Waiting. Data: %s", Arrays.toString(data)); } public void onSessionCreated(NetworkClient client) { diff --git a/src/services/network/NetworkClientManager.java b/src/services/network/NetworkClientManager.java index 6de454850..d89064b12 100644 --- a/src/services/network/NetworkClientManager.java +++ b/src/services/network/NetworkClientManager.java @@ -81,9 +81,9 @@ public class NetworkClientManager extends Manager implements NetworkCallback { tcpServer.bind(); tcpServer.setCallback(this); } catch (IOException e) { - Log.e(this, e); + Log.e(e); if (e instanceof BindException) - Log.e(this, "Failed to bind to " + getBindPort()); + Log.e("Failed to bind to " + getBindPort()); return false; } return super.start(); diff --git a/src/services/network/PacketSender.java b/src/services/network/PacketSender.java index cf773df93..975b5eec2 100644 --- a/src/services/network/PacketSender.java +++ b/src/services/network/PacketSender.java @@ -46,7 +46,7 @@ public class PacketSender { if (addr instanceof InetSocketAddress) sendPacket((InetSocketAddress) addr, data); else - Log.e(this, "Unknown socket address: %s", addr); + Log.e("Unknown socket address: %s", addr); } public void sendPacket(InetSocketAddress addr, ByteBuffer data) { diff --git a/src/services/objects/ClientBuildoutService.java b/src/services/objects/ClientBuildoutService.java index 60c70f070..ff01d514e 100644 --- a/src/services/objects/ClientBuildoutService.java +++ b/src/services/objects/ClientBuildoutService.java @@ -91,7 +91,7 @@ public class ClientBuildoutService extends Service { objects = new HashMap<>(); } catch (SQLException e) { objects = new HashMap<>(); - Log.e(this, e); + Log.e(e); } StandardLog.onEndLoad(objects.size(), "client objects", startTime); return objects; @@ -109,7 +109,7 @@ public class ClientBuildoutService extends Service { } return loadObjects(areaId); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return new HashMap<>(); } } @@ -171,7 +171,7 @@ public class ClientBuildoutService extends Service { checkParent(buildouts, obj, set.getString("building_name"), set.getInt("cell_id")); buildouts.put(obj.getObjectId(), obj); } catch (NullPointerException e) { - Log.e(this, "File: %s", set.getString("template")); + Log.e("File: %s", set.getString("template")); } } @@ -181,7 +181,7 @@ public class ClientBuildoutService extends Service { statement.setString(1, buildingName); try (ResultSet set = statement.executeQuery()) { if (!set.next()) { - Log.e(this, "Unknown building name: %s", buildingName); + Log.e("Unknown building name: %s", buildingName); return; } long buildingId = set.getLong("object_id"); @@ -189,16 +189,16 @@ public class ClientBuildoutService extends Service { return; SWGObject buildingUncasted = objects.get(buildingId); if (buildingUncasted == null) { - Log.e(this, "Building not found in map: %s / %d", buildingName, buildingId); + Log.e("Building not found in map: %s / %d", buildingName, buildingId); return; } if (!(buildingUncasted instanceof BuildingObject)) { - Log.e(this, "Building is not an instance of BuildingObject: %s", buildingName); + Log.e("Building is not an instance of BuildingObject: %s", buildingName); return; } CellObject cell = ((BuildingObject) buildingUncasted).getCellByNumber(cellId); if (cell == null) { - Log.e(this, "Cell is not found! Building: %s Cell: %d", buildingName, cellId); + Log.e("Cell is not found! Building: %s Cell: %d", buildingName, cellId); return; } obj.moveToContainer(cell); diff --git a/src/services/objects/ObjectAwareness.java b/src/services/objects/ObjectAwareness.java index d0eb9cf4c..a9f09bfd1 100644 --- a/src/services/objects/ObjectAwareness.java +++ b/src/services/objects/ObjectAwareness.java @@ -200,12 +200,12 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { boolean firstZone = state == PlayerState.LOGGED_IN; player.setPlayerState(PlayerState.ZONING_IN); if (parent == null) { - Log.i(this, "Zoning in %s with character %s to %s %s", player.getUsername(), player.getCharacterName(), loc.getPosition(), loc.getTerrain()); + Log.i("Zoning in %s with character %s to %s %s", player.getUsername(), player.getCharacterName(), loc.getPosition(), loc.getTerrain()); } else { Assert.notNull(parent.getParent()); // Character must be in a cell, inside a building SWGObject superParent = parent.getSuperParent(); Point3D world = superParent.getLocation().getPosition(); - Log.i(this, "Zoning in %s with character %s at %s in %s/%s %s", player.getUsername(), player.getCharacterName(), loc.getPosition(), superParent, world, superParent.getTerrain()); + Log.i("Zoning in %s with character %s at %s in %s/%s %s", player.getUsername(), player.getCharacterName(), loc.getPosition(), superParent, world, superParent.getTerrain()); } resetAwarenessOnZone(creature, firstZone); creature.setLocation(loc); @@ -254,7 +254,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { private void handleCmdSceneReady(Player player, CmdSceneReady p) { Assert.test(player.getPlayerState() == PlayerState.ZONING_IN); player.setPlayerState(PlayerState.ZONED_IN); - Log.i("ZoneService", "%s with character %s zoned in from %s", player.getUsername(), player.getCharacterName(), p.getSocketAddress()); + Log.i("%s with character %s zoned in from %s", player.getUsername(), player.getCharacterName(), p.getSocketAddress()); new PlayerEventIntent(player, PlayerEvent.PE_ZONE_IN_SERVER).broadcast(); player.sendPacket(new CmdSceneReady()); } @@ -280,7 +280,7 @@ public class ObjectAwareness extends Service implements TerrainMapCallback { SWGObject parent = objectManager.getObjectById(dt.getCellId()); Assert.test(obj instanceof CreatureObject); if (parent == null) { - Log.w(this, "Unknown data transform parent! Obj: %d/%s Parent: %d", dt.getObjectId(), obj, dt.getCellId()); + Log.w("Unknown data transform parent! Obj: %d/%s Parent: %d", dt.getObjectId(), obj, dt.getCellId()); return; } Location requestedLocation = new Location(dt.getLocation()); diff --git a/src/services/objects/ObjectCreator.java b/src/services/objects/ObjectCreator.java index 5e8bc4074..47bcf296f 100644 --- a/src/services/objects/ObjectCreator.java +++ b/src/services/objects/ObjectCreator.java @@ -100,7 +100,7 @@ public final class ObjectCreator { try { obj = c.getConstructor(Long.TYPE).newInstance(objectId); } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException e) { - Log.e("ObjectCreator", e); + Log.e(e); obj = null; } if (obj == null) @@ -188,7 +188,7 @@ public final class ObjectCreator { case "tangible": return new TangibleObject(objectId); case "waypoint": return new WaypointObject(objectId); case "weapon": return new WeaponObject(objectId); - default: Log.e("ObjectCreator", "Unknown type: " + type); return null; + default: Log.e("Unknown type: " + type); return null; } } diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java index 83fb77493..c6cd62041 100644 --- a/src/services/objects/ObjectManager.java +++ b/src/services/objects/ObjectManager.java @@ -140,7 +140,7 @@ public class ObjectManager extends Manager { } obj.moveToContainer(parent); if (parent == null) - Log.e("ObjectManager", "Parent for %s is null! ParentID: %d", obj, id); + Log.e("Parent for %s is null! ParentID: %d", obj, id); } } @@ -240,7 +240,7 @@ public class ObjectManager extends Manager { synchronized (objectMap) { SWGObject replaced = objectMap.put(object.getObjectId(), object); if (replaced != null && replaced != object) - Log.e(this, "Replaced object in object map! Old: %s New: %s", replaced, object); + Log.e("Replaced object in object map! Old: %s New: %s", replaced, object); } } @@ -268,17 +268,17 @@ public class ObjectManager extends Manager { private void zoneInCharacter(PlayerManager playerManager, Player player, long characterId) { SWGObject creatureObj = getObjectById(characterId); if (creatureObj == null) { - Log.e("ObjectManager", "Failed to start zone - CreatureObject could not be fetched from database [Character: %d User: %s]", characterId, player.getUsername()); + Log.e("Failed to start zone - CreatureObject could not be fetched from database [Character: %d User: %s]", characterId, player.getUsername()); sendClientFatal(player, "Failed to zone", "You were not found in the database\nTry relogging to fix this problem", 10, TimeUnit.SECONDS); return; } if (!(creatureObj instanceof CreatureObject)) { - Log.e("ObjectManager", "Failed to start zone - Object is not a CreatureObject [Character: %d User: %s]", characterId, player.getUsername()); + Log.e("Failed to start zone - Object is not a CreatureObject [Character: %d User: %s]", characterId, player.getUsername()); sendClientFatal(player, "Failed to zone", "There has been an internal server error: Not a Creature.\nPlease delete your character and create a new one", 10, TimeUnit.SECONDS); return; } if (((CreatureObject) creatureObj).getPlayerObject() == null) { - Log.e("ObjectManager", "Failed to start zone - CreatureObject doesn't have a ghost [Character: %d User: %s", characterId, player.getUsername()); + Log.e("Failed to start zone - CreatureObject doesn't have a ghost [Character: %d User: %s", characterId, player.getUsername()); sendClientFatal(player, "Failed to zone", "There has been an internal server error: Null Ghost.\nPlease delete your character and create a new one", 10, TimeUnit.SECONDS); return; } diff --git a/src/services/objects/RadialService.java b/src/services/objects/RadialService.java index f0c65b123..46b99ab40 100644 --- a/src/services/objects/RadialService.java +++ b/src/services/objects/RadialService.java @@ -86,12 +86,12 @@ public class RadialService extends Service { if (target == null) return; if (!(requestor instanceof CreatureObject)) { - Log.w("RadialService", "Requestor of target: %s is not a creature object! %s", target, requestor); + Log.w("Requestor of target: %s is not a creature object! %s", target, requestor); return; } Player player = requestor.getOwner(); if (player == null) { - Log.w("RadialService", "Requestor of target: %s does not have an owner! %s", target, requestor); + Log.w("Requestor of target: %s does not have an owner! %s", target, requestor); return; } @@ -106,16 +106,16 @@ public class RadialService extends Service { private void onSelection(GalacticManager galacticManager, Player player, ObjectMenuSelect select) { SWGObject target = galacticManager.getObjectManager().getObjectById(select.getObjectId()); if (target == null) { - Log.e("RadialService", "Selection target [%d] does not exist!", select.getObjectId()); + Log.e("Selection target [%d] does not exist!", select.getObjectId()); return; } if (player == null) { - Log.e("RadialService", "Selection requestor does not exist! Target: [%d] %s", target.getObjectId(), target.getTemplate()); + Log.e("Selection requestor does not exist! Target: [%d] %s", target.getObjectId(), target.getTemplate()); return; } RadialItem selection = RadialItem.getFromId(select.getSelection()); if (selection == null) { - Log.e("RadialService", "RadialItem does not exist with selection id: %d", select.getSelection()); + Log.e("RadialItem does not exist with selection id: %d", select.getSelection()); return; } new RadialSelectionIntent(player, target, selection).broadcast(); diff --git a/src/services/objects/StaticItemService.java b/src/services/objects/StaticItemService.java index 8b4957451..a88fe40bc 100644 --- a/src/services/objects/StaticItemService.java +++ b/src/services/objects/StaticItemService.java @@ -79,7 +79,7 @@ public final class StaticItemService extends Service { if (!loadStaticItems()) return false; } else { - Log.i(this, "Static items have been disabled - none have been loaded"); + Log.i("Static items have been disabled - none have been loaded"); } return super.initialize(); } @@ -111,7 +111,7 @@ public final class StaticItemService extends Service { String type = resultSet.getString("type"); ObjectAttributes objectAttributes = createObjectAttributes(type, itemName, resultSet.getString("iff_template")); if (objectAttributes == null) { - Log.e(this, "Item %s was not loaded because the specified type %s is unknown", itemName, type); + Log.e("Item %s was not loaded because the specified type %s is unknown", itemName, type); continue; } @@ -126,11 +126,11 @@ public final class StaticItemService extends Service { objectAttributesMap.put(itemName, objectAttributes); } } catch (SQLException ex) { - Log.e(this, "Failed loading %s type attributes for item %s. Exception: %s", type, itemName, ex.getLocalizedMessage()); + Log.e("Failed loading %s type attributes for item %s. Exception: %s", type, itemName, ex.getLocalizedMessage()); } } } catch (SQLException ex) { - Log.e(this, ex); + Log.e(ex); } } @@ -158,7 +158,7 @@ public final class StaticItemService extends Service { private void unloadStaticItems() { objectAttributesMap.clear(); // Clear the cache. - Log.i(this, "Static items have been disabled"); + Log.i("Static items have been disabled"); } private void handleCreateStaticItemIntent(CreateStaticItemIntent csii) { @@ -192,7 +192,7 @@ public final class StaticItemService extends Service { switch(object.moveToContainer(container)) { // Server-generated object is added to the container case SUCCESS: - Log.i(this, "Successfully moved %s into container %s", itemName, container); + Log.i("Successfully moved %s into container %s", itemName, container); createdObjects[j] = object; break; default: @@ -201,18 +201,18 @@ public final class StaticItemService extends Service { new ObjectCreatedIntent(object).broadcast(); } else { - Log.w(this, "%s could not be loaded because IFF template %s is invalid", itemName, iffTemplate); + Log.w("%s could not be loaded because IFF template %s is invalid", itemName, iffTemplate); } } else { String errorMessage = String.format("%s could not be spawned because the item name is unknown", itemName); - Log.e(this, errorMessage); + Log.e(errorMessage); new ChatBroadcastIntent(requesterOwner, errorMessage).broadcast(); } } objectCreationHandler.success(createdObjects); } else { - Log.w(this, "No item names were specified in CreateStaticItemIntent - no objects were spawned into container %s", container); + Log.w("No item names were specified in CreateStaticItemIntent - no objects were spawned into container %s", container); } } @@ -511,7 +511,7 @@ public final class StaticItemService extends Service { case "acid": return DamageType.ELEMENTAL_ACID; case "electricity": return DamageType.ELEMENTAL_ELECTRICAL; default: - Log.e("StaticItemService", "Unknown damage type %s", damageTypeName); + Log.e("Unknown damage type %s", damageTypeName); return null; // TODO Unknown DamageType... now what? } } @@ -538,7 +538,7 @@ public final class StaticItemService extends Service { case "DIRECTIONAL_TARGET_WEAPON": category = WeaponType.DIRECTIONAL_TARGET_WEAPON; break; case "LIGHT_RIFLE": category = WeaponType.LIGHT_RIFLE; break; default: - Log.e(this, "Unrecognised weapon type %s at row %d", weaponType, resultSet.getRow()); + Log.e("Unrecognised weapon type %s at row %d", weaponType, resultSet.getRow()); // We return false here. That way, we don't store the // itemName in the Map and the item can never be spawned. return false; diff --git a/src/services/objects/UniformBoxService.java b/src/services/objects/UniformBoxService.java index 4f6b05368..17b7e4cb6 100644 --- a/src/services/objects/UniformBoxService.java +++ b/src/services/objects/UniformBoxService.java @@ -98,7 +98,7 @@ public class UniformBoxService extends Service { createItems(set, creature, inventory); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } diff --git a/src/services/player/CharacterCreationRestriction.java b/src/services/player/CharacterCreationRestriction.java index d44e11c4b..1d7b76926 100644 --- a/src/services/player/CharacterCreationRestriction.java +++ b/src/services/player/CharacterCreationRestriction.java @@ -123,7 +123,7 @@ public class CharacterCreationRestriction { final long time = now(); if (hackSuccess) { final String state = Arrays.toString(lastCreations.toArray(new Long[lastCreations.size()])); - Log.e(this, "Character created when not allowed! Current time/state: %s/%s", time, state); + Log.e("Character created when not allowed! Current time/state: %s/%s", time, state); } if (hitMax) lastCreations.pollLast(); diff --git a/src/services/player/CharacterCreationService.java b/src/services/player/CharacterCreationService.java index 1f4785bcf..d12302554 100644 --- a/src/services/player/CharacterCreationService.java +++ b/src/services/player/CharacterCreationService.java @@ -104,7 +104,7 @@ public class CharacterCreationService extends Service { nameGenerator.loadAllRules(); loadProfTemplates(); if (!nameFilter.load()) - Log.e(this, "Failed to load name filter!"); + Log.e("Failed to load name filter!"); return super.initialize(); } @@ -139,14 +139,14 @@ public class CharacterCreationService extends Service { } return false; } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return false; } finally { try { if (set != null) set.close(); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } } @@ -189,7 +189,7 @@ public class CharacterCreationService extends Service { Assert.notNull(creature.getPlayerObject()); Assert.test(creature.isPlayer()); Assert.test(creature.getObjectId() > 0); - Log.i(this, "%s created character %s from %s", player.getUsername(), create.getName(), create.getSocketAddress()); + Log.i("%s created character %s from %s", player.getUsername(), create.getName(), create.getSocketAddress()); player.sendPacket(new CreateCharacterSuccess(creature.getObjectId())); new PlayerEventIntent(player, PlayerEvent.PE_CREATE_CHARACTER).broadcast(); } @@ -215,7 +215,7 @@ public class CharacterCreationService extends Service { // Test for successful creation CreatureObject creature = createCharacter(objManager, player, create); if (creature == null) { - Log.e(this, "Failed to create CreatureObject!"); + Log.e("Failed to create CreatureObject!"); sendCharCreationFailure(player, create, ErrorMessage.NAME_DECLINED_INTERNAL_ERROR); return null; } @@ -227,7 +227,7 @@ public class CharacterCreationService extends Service { } // Test for successful database insertion if (!createCharacterInDb(creature, create.getName(), player)) { - Log.e(this, "Failed to create character %s for user %s with server error from %s", create.getName(), player.getUsername(), create.getSocketAddress()); + Log.e("Failed to create character %s for user %s with server error from %s", create.getName(), player.getUsername(), create.getSocketAddress()); new DestroyObjectIntent(creature).broadcast(); sendCharCreationFailure(player, create, ErrorMessage.NAME_DECLINED_INTERNAL_ERROR); return null; @@ -254,7 +254,7 @@ public class CharacterCreationService extends Service { default: break; } - Log.e("ZoneService", "Failed to create character %s for user %s with error %s and reason %s from %s", create.getName(), player.getUsername(), err, reason, create.getSocketAddress()); + Log.e("Failed to create character %s for user %s with error %s and reason %s from %s", create.getName(), player.getUsername(), err, reason, create.getSocketAddress()); player.sendPacket(new CreateCharacterFailure(reason)); } @@ -269,7 +269,7 @@ public class CharacterCreationService extends Service { createCharacter.setInt(4, player.getUserId()); return createCharacter.executeUpdate() == 1; } catch (SQLException e) { - Log.e(this, e); + Log.e(e); return false; } } @@ -284,7 +284,7 @@ public class CharacterCreationService extends Service { return set.getInt("count"); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } return 0; @@ -317,7 +317,7 @@ public class CharacterCreationService extends Service { String spawnLocation = getConfig(ConfigFile.PRIMARY).getString("PRIMARY-SPAWN-LOCATION", "tat_moseisley"); SpawnInformation info = insertion.generateSpawnLocation(spawnLocation); if (info == null) { - Log.e("CharacterCreationService", "Failed to get spawn information for location: " + spawnLocation); + Log.e("Failed to get spawn information for location: " + spawnLocation); return null; } CharacterCreation creation = new CharacterCreation(objManager, profTemplates.get(create.getClothes()), create); @@ -341,7 +341,7 @@ public class CharacterCreationService extends Service { synchronized (lockedNames) { unlockName(player); lockedNames.put(firstName, player); - Log.i("ZoneService", "Locked name %s for user %s", firstName, player.getUsername()); + Log.i("Locked name %s for user %s", firstName, player.getUsername()); } return true; } @@ -358,7 +358,7 @@ public class CharacterCreationService extends Service { } if (fName != null) { if (lockedNames.remove(fName) != null) - Log.i("ZoneService", "Unlocked name %s for user %s", fName, player.getUsername()); + Log.i("Unlocked name %s for user %s", fName, player.getUsername()); } } } diff --git a/src/services/player/LoginService.java b/src/services/player/LoginService.java index b19fc3871..c2ee47b2c 100644 --- a/src/services/player/LoginService.java +++ b/src/services/player/LoginService.java @@ -110,7 +110,7 @@ public class LoginService extends Service { return set.getLong("id"); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } return 0; @@ -144,9 +144,9 @@ public class LoginService extends Service { boolean success = obj != null && deleteCharacter(obj); if (success) { new DestroyObjectIntent(obj).broadcast(); - Log.i(this, "Deleted character %s for user %s", ((CreatureObject)obj).getObjectName(), player.getUsername()); + Log.i("Deleted character %s for user %s", ((CreatureObject)obj).getObjectName(), player.getUsername()); } else { - Log.e(this, "Could not delete character! Character: ID: " + request.getPlayerId() + " / " + obj); + Log.e("Could not delete character! Character: ID: " + request.getPlayerId() + " / " + obj); } player.sendPacket(new DeleteCharacterResponse(success)); } @@ -181,14 +181,14 @@ public class LoginService extends Service { onInvalidUserPass(player, id, null); } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); onLoginServerError(player, id); } } } private void onLoginClientVersionError(Player player, LoginClientId id) { - Log.i(this, "%s cannot login due to invalid version code: %s, expected %s from %s", player.getUsername(), id.getVersion(), REQUIRED_VERSION, id.getSocketAddress()); + Log.i("%s cannot login due to invalid version code: %s, expected %s from %s", player.getUsername(), id.getVersion(), REQUIRED_VERSION, id.getSocketAddress()); String type = "Login Failed!"; String message = "Invalid Client Version Code: " + id.getVersion(); player.sendPacket(new ErrorMessage(type, message, false)); @@ -209,7 +209,7 @@ public class LoginService extends Service { } player.setPlayerState(PlayerState.LOGGED_IN); sendLoginSuccessPacket(player); - Log.i(this, "%s connected to the login server from %s", player.getUsername(), id.getSocketAddress()); + Log.i("%s connected to the login server from %s", player.getUsername(), id.getSocketAddress()); new LoginEventIntent(player.getNetworkId(), LoginEvent.LOGIN_SUCCESS).broadcast(); } @@ -217,7 +217,7 @@ public class LoginService extends Service { String type = "Login Failed!"; String message = "Sorry, you're banned!"; player.sendPacket(new ErrorMessage(type, message, false)); - Log.i(this, "%s cannot login due to a ban, from %s", player.getUsername(), id.getSocketAddress()); + Log.i("%s cannot login due to a ban, from %s", player.getUsername(), id.getSocketAddress()); player.setPlayerState(PlayerState.DISCONNECTED); new LoginEventIntent(player.getNetworkId(), LoginEvent.LOGIN_FAIL_BANNED).broadcast(); } @@ -227,7 +227,7 @@ public class LoginService extends Service { String message = getUserPassError(set, id.getUsername(), id.getPassword()); player.sendPacket(new ErrorMessage(type, message, false)); player.sendPacket(new LoginIncorrectClientId(getServerString(), REQUIRED_VERSION)); - Log.i(this, "%s cannot login due to invalid user/pass from %s", id.getUsername(), id.getSocketAddress()); + Log.i("%s cannot login due to invalid user/pass from %s", id.getUsername(), id.getSocketAddress()); player.setPlayerState(PlayerState.DISCONNECTED); new LoginEventIntent(player.getNetworkId(), LoginEvent.LOGIN_FAIL_INVALID_USER_PASS).broadcast(); } @@ -237,7 +237,7 @@ public class LoginService extends Service { String message = "Server Error."; player.sendPacket(new ErrorMessage(type, message, false)); player.setPlayerState(PlayerState.DISCONNECTED); - Log.e(this, "%s cannot login due to server error, from %s", id.getUsername(), id.getSocketAddress()); + Log.e("%s cannot login due to server error, from %s", id.getUsername(), id.getSocketAddress()); new LoginEventIntent(player.getNetworkId(), LoginEvent.LOGIN_FAIL_SERVER_ERROR).broadcast(); } @@ -312,7 +312,7 @@ public class LoginService extends Service { } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } return characters.toArray(new SWGCharacter[characters.size()]); @@ -324,7 +324,7 @@ public class LoginService extends Service { deleteCharacter.setLong(1, obj.getObjectId()); return deleteCharacter.executeUpdate() > 0; } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } return false; } diff --git a/src/services/player/TerrainZoneInsertion.java b/src/services/player/TerrainZoneInsertion.java index 9eecc3ffe..61d9677a9 100644 --- a/src/services/player/TerrainZoneInsertion.java +++ b/src/services/player/TerrainZoneInsertion.java @@ -55,7 +55,7 @@ public class TerrainZoneInsertion { Location l = generateRandomLocation(Terrain.getTerrainFromName(set.getString("terrain")), set.getDouble("x"), set.getDouble("y"), set.getDouble("z"), set.getDouble("radius")); return new SpawnInformation(!building.isEmpty(), l, set.getLong("object_id"), set.getString("cell")); } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } return null; } diff --git a/src/services/player/ZoneManager.java b/src/services/player/ZoneManager.java index d966e4c7b..e2153204c 100644 --- a/src/services/player/ZoneManager.java +++ b/src/services/player/ZoneManager.java @@ -141,10 +141,10 @@ public class ZoneManager extends Manager { commitHistory += "\n"; } } catch (GitAPIException e) { - Log.e(this, e); + Log.e(e); } } catch (IOException e) { - Log.e(this, "Failed to open %s to read commit history", repoDir); + Log.e("Failed to open %s to read commit history", repoDir); // An exception is thrown if bash isn't installed. // https://www.eclipse.org/forums/index.php/t/1031740/ } @@ -184,14 +184,14 @@ public class ZoneManager extends Manager { case "yellow": waypoint.setColor(WaypointColor.YELLOW); break; case "purple": waypoint.setColor(WaypointColor.PURPLE); break; case "white": waypoint.setColor(WaypointColor.WHITE); break; - default: Log.e(this, "Don't know color %s", p.getColor()); break; + default: Log.e("Don't know color %s", p.getColor()); break; } ghost.updateWaypoint(waypoint); } private void handleClientIdMsg(Player player, ClientIdMsg clientId) { - Log.i("ZoneService", "%s connected to the zone server from %s", player.getUsername(), clientId.getSocketAddress()); + Log.i("%s connected to the zone server from %s", player.getUsername(), clientId.getSocketAddress()); player.setPlayerServer(PlayerServer.ZONE); player.sendPacket(new HeartBeat()); player.sendPacket(new AccountFeatureBits()); diff --git a/src/services/player/creation/CharacterCreation.java b/src/services/player/creation/CharacterCreation.java index aef3bc8e1..ee3de1179 100644 --- a/src/services/player/creation/CharacterCreation.java +++ b/src/services/player/creation/CharacterCreation.java @@ -94,12 +94,12 @@ public class CharacterCreation { private CreatureObject createCreatureBuilding(String template, SpawnInformation info) { SWGObject parent = objManager.getObjectById(info.buildingId); if (parent == null || !(parent instanceof BuildingObject)) { - Log.e(this, "Invalid parent! Either null or not a building: %s BUID: %d", parent, info.buildingId); + Log.e("Invalid parent! Either null or not a building: %s BUID: %d", parent, info.buildingId); return null; } CellObject cell = ((BuildingObject) parent).getCellByName(info.cell); if (cell == null) { - Log.e(this, "Invalid cell! Cell does not exist: %s B-Template: %s BUID: %d", info.cell, parent.getTemplate(), info.buildingId); + Log.e("Invalid cell! Cell does not exist: %s B-Template: %s BUID: %d", info.cell, parent.getTemplate(), info.buildingId); return null; } SWGObject obj = ObjectCreator.createObjectFromTemplate(template); diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java index 69261d0e7..7f01c8cca 100644 --- a/src/services/spawn/SpawnerService.java +++ b/src/services/spawn/SpawnerService.java @@ -127,7 +127,7 @@ public final class SpawnerService extends Service { Spawner spawner = spawnerMap.remove(killedAIObject); if(spawner == null) { - Log.e(this, "Killed AI object %s has no linked Spawner - it cannot respawn!", killedAIObject); + Log.e("Killed AI object %s has no linked Spawner - it cannot respawn!", killedAIObject); return; } @@ -147,7 +147,7 @@ public final class SpawnerService extends Service { } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } @@ -161,7 +161,7 @@ public final class SpawnerService extends Service { int spawnId = set.getInt("spawn_id"); if (minRespawnDelay > maxRespawnDelay) { - Log.e(this, "Spawner on %s at with ID %d has a minimum respawn time larger than the maximum respawn time", terrain, spawnId); + Log.e("Spawner on %s at with ID %d has a minimum respawn time larger than the maximum respawn time", terrain, spawnId); return; } @@ -174,10 +174,10 @@ public final class SpawnerService extends Service { SWGObject cellObject = null; if (buildingId != 0 && cellId == 0) { - Log.e(this, "No cell ID specified for spawner with ID %d on terrain %s", spawnId, terrain); + Log.e("No cell ID specified for spawner with ID %d on terrain %s", spawnId, terrain); return; } else if (buildingId == 0 && cellId != 0) { - Log.w(this, "Unnecessary cell ID specified for spawner with ID %d on terrain %s", spawnId, terrain); + Log.w("Unnecessary cell ID specified for spawner with ID %d on terrain %s", spawnId, terrain); return; } @@ -185,14 +185,14 @@ public final class SpawnerService extends Service { SWGObject building = objectManager.getObjectById(buildingId); if (!(building instanceof BuildingObject)) { - Log.w(this, "Skipping spawner with ID %d on terrain %s - building_id %d didn't reference a BuildingObject!", spawnId, terrain, buildingId); + Log.w("Skipping spawner with ID %d on terrain %s - building_id %d didn't reference a BuildingObject!", spawnId, terrain, buildingId); return; } cellObject = ((BuildingObject) building).getCellByNumber(cellId); if (cellObject == null) { - Log.e(this, "Spawner with ID %d on terrain %s - building %d didn't have cell ID %d!", spawnId, terrain, buildingId, cellId); + Log.e("Spawner with ID %d on terrain %s - building %d didn't have cell ID %d!", spawnId, terrain, buildingId, cellId); return; } } @@ -203,7 +203,7 @@ public final class SpawnerService extends Service { int maxAction = 0; switch(difficultyChar) { - default: Log.w(this, "An unknown creature difficulty of %s was set for spawner with ID %d on terrain %s. Using default NORMAL", difficultyChar, spawnId, terrain); + default: Log.w("An unknown creature difficulty of %s was set for spawner with ID %d on terrain %s. Using default NORMAL", difficultyChar, spawnId, terrain); case "N": difficulty = CreatureDifficulty.NORMAL; maxHealth = set.getInt("HP"); @@ -307,7 +307,7 @@ public final class SpawnerService extends Service { creature.addOptionFlags(OptionFlag.INVULNERABLE); break; default: - Log.w(this, "An unknown attackable type of %s was specified for %s", flagString, creature.getObjectName()); + Log.w("An unknown attackable type of %s was specified for %s", flagString, creature.getObjectName()); break; } } diff --git a/src/services/spawn/StaticService.java b/src/services/spawn/StaticService.java index 57aec2e31..7d0634f03 100644 --- a/src/services/spawn/StaticService.java +++ b/src/services/spawn/StaticService.java @@ -98,7 +98,7 @@ public class StaticService extends Service { } } } catch (SQLException e) { - Log.e(this, e); + Log.e(e); } } return objects; @@ -128,7 +128,7 @@ public class StaticService extends Service { else if (building instanceof BuildingObject) createObjectInParent(((BuildingObject) building).getCellByName(cell)); else - Log.e("StaticService", "Parent object with cell specified is not a BuildingObject!"); + Log.e("Parent object with cell specified is not a BuildingObject!"); } private SWGObject createObjectInParent(SWGObject parent) { diff --git a/src/services/sui/SuiService.java b/src/services/sui/SuiService.java index 040c0d786..8455869e1 100644 --- a/src/services/sui/SuiService.java +++ b/src/services/sui/SuiService.java @@ -93,21 +93,21 @@ public class SuiService extends Service { private void handleSuiEventNotification(Player player, SuiEventNotification p) { List activeWindows = windows.get(player.getNetworkId()); if (activeWindows == null || activeWindows.size() <= 0) { - Log.w("SuiService:SuiEventNotification", "There are no active windows for %s!", player); + Log.w("There are no active windows for %s!", player); return; } SuiBaseWindow window = getWindowById(activeWindows, p.getWindowId()); if (window == null) { - Log.w("SuiService:SuiEventNotification", "Received window ID %d that is not assigned to the player %s", p.getWindowId(), player); + Log.w("Received window ID %d that is not assigned to the player %s", p.getWindowId(), player); return; } SuiComponent component = window.getSubscriptionByIndex(p.getEventIndex()); if (component == null) { - Log.w("SuiService:SuiEventNotification", "SuiWindow %s retrieved null subscription from supplied event index %d", window, p.getEventIndex()); + Log.w("SuiWindow %s retrieved null subscription from supplied event index %d", window, p.getEventIndex()); return; } @@ -135,7 +135,7 @@ public class SuiService extends Service { try { Scripts.invoke(script, callback, player, player.getCreatureObject(), event, parameters); } catch (FileNotFoundException ex) { - Log.e(this, "Callback script %s not found", script); + Log.e("Callback script %s not found", script); } } else if (window.hasJavaCallback(callback)) { ISuiCallback suiCallback = window.getJavaCallback(callback); @@ -169,12 +169,12 @@ public class SuiService extends Service { List activeWindows = windows.get(player.getNetworkId()); if (activeWindows == null) { - Log.w("SuiService:CloseWindow", "Tried to close window id %d for player %s but it doesn't exist in the active windows.", id, player); + Log.w("Tried to close window id %d for player %s but it doesn't exist in the active windows.", id, player); return; } if (!activeWindows.remove(window)) { - Log.w("SuiService:CloseWindow", "Tried to close window id %d for player %s but it doesn't exist in the active windows.", id, player); + Log.w("Tried to close window id %d for player %s but it doesn't exist in the active windows.", id, player); return; } @@ -185,7 +185,7 @@ public class SuiService extends Service { List activeWindows = windows.get(player.getNetworkId()); SuiBaseWindow window = activeWindows.get(windowId); if (window == null) { - Log.w("SuiService:CloseWindow", "Cannot close window with id %d as it doesn't exist in player %s active windows", windowId, player); + Log.w("Cannot close window with id %d as it doesn't exist in player %s active windows", windowId, player); return; } diff --git a/src/utilities/CrcDatabaseGenerator.java b/src/utilities/CrcDatabaseGenerator.java index 2d5b79f8e..8cc648109 100644 --- a/src/utilities/CrcDatabaseGenerator.java +++ b/src/utilities/CrcDatabaseGenerator.java @@ -96,7 +96,7 @@ public class CrcDatabaseGenerator { } }); } catch (IOException e) { - Log.e("CrcDatabaseGenerator", e); + Log.e(e); } } diff --git a/src/utilities/Encoder.java b/src/utilities/Encoder.java index 22157acee..6d2dccad4 100644 --- a/src/utilities/Encoder.java +++ b/src/utilities/Encoder.java @@ -65,7 +65,7 @@ public class Encoder { } else if (object instanceof String){ throw new UnsupportedOperationException("You must specify a String type!"); } else { - Log.e("Encoder", "Do not know how to encode instance type " + object.getClass().getName()); + Log.e("Do not know how to encode instance type " + object.getClass().getName()); } } return null; diff --git a/src/utilities/IntentFactory.java b/src/utilities/IntentFactory.java index 5bc0ea8be..587bfe467 100644 --- a/src/utilities/IntentFactory.java +++ b/src/utilities/IntentFactory.java @@ -106,7 +106,7 @@ public final class IntentFactory { */ public static void sendSystemMessage(Player target, String stf, Object ... objects) { if (objects.length % 2 != 0) - Log.e("ProsePackage", "Sent a ProsePackage chat message with an uneven number of object arguments for StringId %s", stf); + Log.e("Sent a ProsePackage chat message with an uneven number of object arguments for StringId %s", stf); Object [] prose = new Object[objects.length + 2]; prose[0] = "StringId"; prose[1] = new StringId(stf); diff --git a/src/utilities/Scripts.java b/src/utilities/Scripts.java index e36d39324..4e65eb425 100644 --- a/src/utilities/Scripts.java +++ b/src/utilities/Scripts.java @@ -57,7 +57,7 @@ public class Scripts { ENGINE.eval("var SuiButtons = Java.type('resources.sui.SuiButtons')"); ENGINE.eval("var SuiEvent = Java.type('resources.sui.SuiEvent')"); } catch (ScriptException e) { - Log.e("Scripts", e); + Log.e(e); } } @@ -78,9 +78,9 @@ public class Scripts { ENGINE.eval(new InputStreamReader(new FileInputStream(SCRIPTS + script + EXTENSION), StandardCharsets.UTF_8)); return (T) INVOCABLE.invokeFunction(function, args); } catch (ScriptException | NoSuchMethodException t) { - Log.e("Scripts", "Error invoking script: " + script + " with function: " + function); - Log.e("Scripts", " Args: " + Arrays.toString(args)); - Log.e("Scripts", t); + Log.e("Error invoking script: " + script + " with function: " + function); + Log.e(" Args: " + Arrays.toString(args)); + Log.e(t); return null; } } diff --git a/src/utilities/namegen/SWGNameGenerator.java b/src/utilities/namegen/SWGNameGenerator.java index 46aaf7836..626df03d6 100644 --- a/src/utilities/namegen/SWGNameGenerator.java +++ b/src/utilities/namegen/SWGNameGenerator.java @@ -209,7 +209,7 @@ public class SWGNameGenerator { return (rule != null); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return (rule != null); @@ -223,7 +223,7 @@ public class SWGNameGenerator { try { success = populateRule(rule, reader); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } return (success ? rule : null); diff --git a/test/resources/objects/awareness/MapCallback.java b/test/resources/objects/awareness/MapCallback.java index 4e21e1378..ae6c431a8 100644 --- a/test/resources/objects/awareness/MapCallback.java +++ b/test/resources/objects/awareness/MapCallback.java @@ -60,7 +60,7 @@ class MapCallback implements TerrainMapCallback { @Override public void onMoveFailure(SWGObject obj) { failedMove.incrementAndGet(); - Log.e(this, "Move failed!"); + Log.e("Move failed!"); } public void set(int withinRange, int outOfRange, int successful, int failed) { diff --git a/test/resources/objects/awareness/TestAwarenessHandler.java b/test/resources/objects/awareness/TestAwarenessHandler.java index 915950608..c7c6641be 100644 --- a/test/resources/objects/awareness/TestAwarenessHandler.java +++ b/test/resources/objects/awareness/TestAwarenessHandler.java @@ -170,7 +170,7 @@ public class TestAwarenessHandler { timeout--; } } catch (InterruptedException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/test/resources/objects/awareness/TestTerrainMap.java b/test/resources/objects/awareness/TestTerrainMap.java index 343953f92..d7d26ffe7 100644 --- a/test/resources/objects/awareness/TestTerrainMap.java +++ b/test/resources/objects/awareness/TestTerrainMap.java @@ -122,7 +122,7 @@ public class TestTerrainMap { MapCallback callback = new MapCallback() { public void onWithinRange(SWGObject obj, SWGObject inRange) { if (obj.equals(creature) && !withinRange.remove(inRange)) { - Log.e(this, "Not in list: %s", inRange); + Log.e("Not in list: %s", inRange); onlyWithinRange.set(false); } } @@ -164,7 +164,7 @@ public class TestTerrainMap { timeout--; } } catch (InterruptedException e) { - Log.e(this, e); + Log.e(e); } } diff --git a/test/resources/services/TestConfig.java b/test/resources/services/TestConfig.java index dd06a620f..4ba803346 100644 --- a/test/resources/services/TestConfig.java +++ b/test/resources/services/TestConfig.java @@ -49,7 +49,7 @@ public class TestConfig { try { Assert.assertTrue(file.createNewFile()); } catch (IOException e) { - Log.e(this, e); + Log.e(e); } } Config c = new Config(file);