From 566c4e20376c21336751c7845527ff2d1bc7b134 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Thu, 26 May 2011 13:46:47 -0300 Subject: [PATCH] Fixed compiler warnings Signed-off-by: Rogiel --- .../mysql5/com/l2jserver/db/dao/mysql5/MySQL5ClanDAO.java | 1 + .../l2jserver/game/net/codec/Lineage2FrameDecoder.java | 5 ----- .../l2jserver/game/net/codec/Lineage2PacketWriter.java | 8 -------- .../game/net/packet/client/CharacterRequestActionUse.java | 2 ++ .../packet/client/CharacterValidatePositionPacket.java | 1 + .../game/net/packet/client/RequestShortcutRegistry.java | 6 ++++++ .../model/world/actor/calculator/ActorCalculator.java | 1 + src/main/java/com/l2jserver/service/AbstractService.java | 1 + .../l2jserver/service/admin/AdministratorServiceImpl.java | 4 +++- .../com/l2jserver/service/game/AttackServiceImpl.java | 3 +++ .../java/com/l2jserver/service/game/ai/AIServiceImpl.java | 4 ++++ .../com/l2jserver/service/game/npc/NPCServiceImpl.java | 1 + .../l2jserver/service/game/spawn/SpawnServiceImpl.java | 8 -------- .../com/l2jserver/util/calculator/PercentFunction.java | 4 +++- .../l2jserver/util/jaxb/CharacterTemplateIDAdapter.java | 3 +-- .../com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java | 4 ++-- .../com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java | 3 +-- .../util/jaxb/TeleportationTemplateIDAdapter.java | 3 +-- .../impl/compiled/PrecompiledScriptCompilerTest.java | 4 +++- .../l2jserver/model/template/NPCOldTemplateConverter.java | 3 ++- 20 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/dao/mysql5/com/l2jserver/db/dao/mysql5/MySQL5ClanDAO.java b/src/dao/mysql5/com/l2jserver/db/dao/mysql5/MySQL5ClanDAO.java index 5458012e2..3893246fd 100644 --- a/src/dao/mysql5/com/l2jserver/db/dao/mysql5/MySQL5ClanDAO.java +++ b/src/dao/mysql5/com/l2jserver/db/dao/mysql5/MySQL5ClanDAO.java @@ -50,6 +50,7 @@ public class MySQL5ClanDAO extends AbstractMySQL5DAO implements /** * The {@link CharacterID} factory */ + @SuppressWarnings("unused") private final CharacterIDProvider charIdFactory; /** diff --git a/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java b/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java index b0c144ccb..e7b53ae45 100644 --- a/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java +++ b/src/main/java/com/l2jserver/game/net/codec/Lineage2FrameDecoder.java @@ -23,8 +23,6 @@ import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.frame.FrameDecoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This decoder parses Lineage II frames. Each frame is has a header of 2 bytes @@ -35,9 +33,6 @@ import org.slf4j.LoggerFactory; public class Lineage2FrameDecoder extends FrameDecoder { private static final int HEADER_SIZE = 2; - private static final Logger logger = LoggerFactory - .getLogger(Lineage2FrameDecoder.class); - @Override protected Object decode(ChannelHandlerContext ctx, Channel channel, ChannelBuffer oldBuffer) throws Exception { diff --git a/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java b/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java index a53e6efa0..f38a58c3e 100644 --- a/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java +++ b/src/main/java/com/l2jserver/game/net/codec/Lineage2PacketWriter.java @@ -23,8 +23,6 @@ import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelHandlerContext; import org.jboss.netty.handler.codec.oneone.OneToOneEncoder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.l2jserver.game.net.Lineage2Connection; import com.l2jserver.game.net.packet.ServerPacket; @@ -42,12 +40,6 @@ public class Lineage2PacketWriter extends OneToOneEncoder { */ public static final String HANDLER_NAME = "packet.writer"; - /** - * The logger - */ - private static final Logger log = LoggerFactory - .getLogger(Lineage2PacketWriter.class); - /** * The active Lineage 2 connection */ diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java index 79e5ad3b0..dccaf9b32 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterRequestActionUse.java @@ -80,7 +80,9 @@ public class CharacterRequestActionUse extends AbstractClientPacket { } } + @SuppressWarnings("unused") private boolean ctrlPressed; + @SuppressWarnings("unused") private boolean shiftPressed; @Inject diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java b/src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java index a8daeb154..e237c6629 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CharacterValidatePositionPacket.java @@ -41,6 +41,7 @@ public class CharacterValidatePositionPacket extends AbstractClientPacket { private final CharacterService charService; private Point point; + @SuppressWarnings("unused") private int extra; // vehicle id @Inject diff --git a/src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java b/src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java index f299c1733..82511a0e5 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/RequestShortcutRegistry.java @@ -48,14 +48,20 @@ public class RequestShortcutRegistry extends AbstractClientPacket { /** * The shortcut type */ + @SuppressWarnings("unused") private int type; /** * The shortcut ID */ + @SuppressWarnings("unused") private int id; + @SuppressWarnings("unused") private int slot; + @SuppressWarnings("unused") private int page; + @SuppressWarnings("unused") private int lvl; + @SuppressWarnings("unused") private int characterType; @Override diff --git a/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java b/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java index 5a0006a2d..c924831cb 100644 --- a/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java +++ b/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java @@ -22,6 +22,7 @@ import com.l2jserver.model.world.Actor; * @author Rogiel */ public class ActorCalculator { + @SuppressWarnings("unused") private final Actor actor; public ActorCalculator(Actor actor) { diff --git a/src/main/java/com/l2jserver/service/AbstractService.java b/src/main/java/com/l2jserver/service/AbstractService.java index 348751972..d1ef57f40 100644 --- a/src/main/java/com/l2jserver/service/AbstractService.java +++ b/src/main/java/com/l2jserver/service/AbstractService.java @@ -41,6 +41,7 @@ public abstract class AbstractService implements Service { this.running = true; } catch (ServiceStartException e) { this.running = false; + throw e; } } diff --git a/src/main/java/com/l2jserver/service/admin/AdministratorServiceImpl.java b/src/main/java/com/l2jserver/service/admin/AdministratorServiceImpl.java index 74b77a8b4..813449fed 100644 --- a/src/main/java/com/l2jserver/service/admin/AdministratorServiceImpl.java +++ b/src/main/java/com/l2jserver/service/admin/AdministratorServiceImpl.java @@ -18,6 +18,7 @@ package com.l2jserver.service.admin; import java.util.List; +import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.AbstractService; @@ -27,7 +28,8 @@ import com.l2jserver.service.AbstractService; */ public class AdministratorServiceImpl extends AbstractService implements AdministratorService { - private List online; + @SuppressWarnings("unused") + private List online; @Override public void command(L2Character character, String command, String... args) { diff --git a/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java b/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java index 932a12c4b..8842223b0 100644 --- a/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java @@ -39,6 +39,7 @@ public class AttackServiceImpl extends AbstractService implements AttackService * The {@link WorldEventDispatcher} is used to dispatch attack events to the * world */ + @SuppressWarnings("unused") private final WorldEventDispatcher eventDispatcher; @Inject @@ -66,10 +67,12 @@ public class AttackServiceImpl extends AbstractService implements AttackService /** * The attacker */ + @SuppressWarnings("unused") private final Actor attacker; /** * The target */ + @SuppressWarnings("unused") private final Actor target; public AttackCallable(Actor attacker, Actor target) { diff --git a/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java b/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java index d0a65e90e..977eb7156 100644 --- a/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/ai/AIServiceImpl.java @@ -40,18 +40,22 @@ public class AIServiceImpl extends AbstractService implements AIService { /** * The {@link WorldService} */ + @SuppressWarnings("unused") private final WorldService worldService; /** * The {@link WorldService} event dispatcher */ + @SuppressWarnings("unused") private final WorldEventDispatcher eventDispatcher; /** * The {@link ThreadService} */ + @SuppressWarnings("unused") private final ThreadService threadService; /** * The {@link NetworkService} */ + @SuppressWarnings("unused") private final NetworkService networkService; @Inject diff --git a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java index 0ef92ddbe..689457d4a 100644 --- a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -56,6 +56,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService { /** * The {@link CharacterService} */ + @SuppressWarnings("unused") private final CharacterService characterService; /** diff --git a/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java b/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java index b7028a8fc..75e44f928 100644 --- a/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/spawn/SpawnServiceImpl.java @@ -16,9 +16,6 @@ */ package com.l2jserver.service.game.spawn; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.l2jserver.game.net.Lineage2Connection; @@ -50,11 +47,6 @@ import com.l2jserver.util.dimensional.Point; */ @Depends({ WorldService.class }) public class SpawnServiceImpl extends AbstractService implements SpawnService { - /** - * The logger - */ - private final Logger log = LoggerFactory.getLogger(this.getClass()); - /** * The {@link WorldService} */ diff --git a/src/main/java/com/l2jserver/util/calculator/PercentFunction.java b/src/main/java/com/l2jserver/util/calculator/PercentFunction.java index 68dd000a5..0a6979d71 100644 --- a/src/main/java/com/l2jserver/util/calculator/PercentFunction.java +++ b/src/main/java/com/l2jserver/util/calculator/PercentFunction.java @@ -16,13 +16,15 @@ */ package com.l2jserver.util.calculator; +import com.l2jserver.model.world.Actor; + /** * This function performs a multiplication:
chain value * * (value / 100)
* * @author Rogiel */ -public class PercentFunction extends MultiplicationFunction { +public class PercentFunction extends MultiplicationFunction { /** * The value */ diff --git a/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java index 8ca17f4bc..6d117b4a4 100644 --- a/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/CharacterTemplateIDAdapter.java @@ -21,11 +21,10 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; import com.google.inject.Inject; import com.l2jserver.model.id.template.CharacterTemplateID; import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider; -import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; import com.l2jserver.model.world.character.CharacterClass; /** - * TODO this should use an {@link ItemTemplateIDProvider}! + * This class is an JAXB Adapter for {@link CharacterTemplateIDProvider} * * @author Rogiel */ diff --git a/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java index 5fb82db94..1884479ee 100644 --- a/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java @@ -23,7 +23,7 @@ import com.l2jserver.model.id.template.ItemTemplateID; import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; /** - * TODO this should use an {@link ItemTemplateIDProvider}! + * This class is an JAXB Adapter for {@link ItemTemplateIDProvider} * * @author Rogiel */ @@ -43,7 +43,7 @@ public class ItemTemplateIDAdapter extends XmlAdapter { public ItemTemplateID unmarshal(Integer v) throws Exception { if (v == 0) return null; - if(provider == null) + if (provider == null) return new ItemTemplateID(v, null); return provider.createID(v); } diff --git a/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java index b511c5ae9..b480ac579 100644 --- a/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java @@ -20,11 +20,10 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; import com.google.inject.Inject; import com.l2jserver.model.id.template.NPCTemplateID; -import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider; /** - * TODO this should use an {@link ItemTemplateIDProvider}! + * This class is an JAXB Adapter for {@link NPCTemplateIDProvider} * * @author Rogiel */ diff --git a/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java index 8943f69ce..d05e88f3d 100644 --- a/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java @@ -20,11 +20,10 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; import com.google.inject.Inject; import com.l2jserver.model.id.template.TeleportationTemplateID; -import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider; import com.l2jserver.model.id.template.provider.TeleportationTemplateIDProvider; /** - * TODO this should use an {@link ItemTemplateIDProvider}! + * This class is an JAXB Adapter for {@link TeleportationTemplateIDProvider} * * @author Rogiel */ diff --git a/src/test/java/com/l2jserver/service/game/scripting/impl/compiled/PrecompiledScriptCompilerTest.java b/src/test/java/com/l2jserver/service/game/scripting/impl/compiled/PrecompiledScriptCompilerTest.java index 26488b60c..35a7e4eb8 100644 --- a/src/test/java/com/l2jserver/service/game/scripting/impl/compiled/PrecompiledScriptCompilerTest.java +++ b/src/test/java/com/l2jserver/service/game/scripting/impl/compiled/PrecompiledScriptCompilerTest.java @@ -36,8 +36,10 @@ public class PrecompiledScriptCompilerTest { @Test public void testCompileIterableOfFile() { final PrecompiledScriptCompiler compiler = new PrecompiledScriptCompiler(); + @SuppressWarnings("unchecked") final CompilationResult result = compiler.compile(FileUtils.listFiles( - new File("target/scripts/script/template"), new String[] { "class" }, true)); + new File("target/scripts/script/template"), + new String[] { "class" }, true)); System.out.println(result.getCompiledClasses()[0]); } } diff --git a/src/tool/java/com/l2jserver/model/template/NPCOldTemplateConverter.java b/src/tool/java/com/l2jserver/model/template/NPCOldTemplateConverter.java index c3ef97679..d3e448837 100644 --- a/src/tool/java/com/l2jserver/model/template/NPCOldTemplateConverter.java +++ b/src/tool/java/com/l2jserver/model/template/NPCOldTemplateConverter.java @@ -81,6 +81,7 @@ public class NPCOldTemplateConverter { private static String[] generateJavaClass(ResultSet rs) throws SQLException { String npcName = ""; + @SuppressWarnings("unused") String npcClass = ""; String npcTitle = ""; String npcType = ""; @@ -189,7 +190,7 @@ public class NPCOldTemplateConverter { return ""; if (l2j.contains("VillageMaster")) return (l2j.replaceAll("VillageMaster", "") + "VillageMaster"); - if(l2j.contains("Npc")) + if (l2j.contains("Npc")) l2j = l2j.replaceAll("Npc", ""); return l2j; }