From ebb2b2a81a4959b660a9f51673d80b42ae2c4daf Mon Sep 17 00:00:00 2001 From: Rogiel Date: Wed, 15 Jun 2011 12:26:12 -0300 Subject: [PATCH] Implemented ShortcutID and fixed compile warnings Signed-off-by: Rogiel --- data/sample/skill.xml | 8 +- .../net/packet/client/CM_ADMIN_COMMAND.java | 1 + .../com/l2jserver/model/game/Shortcut.java | 6 +- .../java/com/l2jserver/model/id/FriendID.java | 14 +++ .../com/l2jserver/model/id/ShortcutID.java | 94 +++++++++++++++++++ .../game/admin/AdministratorServiceImpl.java | 3 +- .../service/game/npc/NPCServiceImpl.java | 1 + .../gameguard/GameGuardServiceImpl.java | 2 + 8 files changed, 122 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/l2jserver/model/id/ShortcutID.java diff --git a/data/sample/skill.xml b/data/sample/skill.xml index 05a8434ca..e1ff3b9de 100644 --- a/data/sample/skill.xml +++ b/data/sample/skill.xml @@ -1,8 +1,10 @@ - + - - + + + + diff --git a/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java b/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java index 28dd5b06e..b87cb31c8 100644 --- a/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java +++ b/src/main/java/com/l2jserver/game/net/packet/client/CM_ADMIN_COMMAND.java @@ -43,6 +43,7 @@ public class CM_ADMIN_COMMAND extends AbstractClientPacket { /** * The command */ + @SuppressWarnings("unused") private String command; @Inject diff --git a/src/main/java/com/l2jserver/model/game/Shortcut.java b/src/main/java/com/l2jserver/model/game/Shortcut.java index 371bf925d..0ebbc1143 100644 --- a/src/main/java/com/l2jserver/model/game/Shortcut.java +++ b/src/main/java/com/l2jserver/model/game/Shortcut.java @@ -17,6 +17,7 @@ package com.l2jserver.model.game; import com.l2jserver.model.AbstractModel; +import com.l2jserver.model.id.ShortcutID; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.ItemID; import com.l2jserver.model.id.template.SkillTemplateID; @@ -25,10 +26,9 @@ import com.l2jserver.model.world.L2Character; /** * An shortcut in Lineage II game interface * - * @author Rogiel
- * TODO create the shortcut id + * @author Rogiel */ -public class Shortcut extends AbstractModel { +public class Shortcut extends AbstractModel { /** * The character id */ diff --git a/src/main/java/com/l2jserver/model/id/FriendID.java b/src/main/java/com/l2jserver/model/id/FriendID.java index ad6b3b440..4d3ced80f 100644 --- a/src/main/java/com/l2jserver/model/id/FriendID.java +++ b/src/main/java/com/l2jserver/model/id/FriendID.java @@ -41,4 +41,18 @@ public class FriendID extends AbstractCompoundID { @Assisted("id2") CharacterID id2) { super(id1, id2); } + + /** + * @return the character ID + */ + public CharacterID getCharacterID() { + return getID1(); + } + + /** + * @return the friend ID + */ + public CharacterID getFriendID() { + return getID2(); + } } diff --git a/src/main/java/com/l2jserver/model/id/ShortcutID.java b/src/main/java/com/l2jserver/model/id/ShortcutID.java new file mode 100644 index 000000000..b3452c308 --- /dev/null +++ b/src/main/java/com/l2jserver/model/id/ShortcutID.java @@ -0,0 +1,94 @@ +/* + * This file is part of l2jserver . + * + * l2jserver is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * l2jserver 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with l2jserver. If not, see . + */ +package com.l2jserver.model.id; + +import com.google.inject.Inject; +import com.google.inject.assistedinject.Assisted; +import com.l2jserver.model.game.Shortcut; +import com.l2jserver.model.id.compound.AbstractCompoundID; +import com.l2jserver.model.id.object.CharacterID; +import com.l2jserver.model.id.object.ItemID; +import com.l2jserver.model.id.template.SkillTemplateID; + +/** + * Each {@link Shortcut} is identified by an {@link ID}. + * + * @author Rogiel + */ +public class ShortcutID extends AbstractCompoundID> { + /** + * Creates a new instance + * + * @param id1 + * the first id + * @param id2 + * the second id + */ + @Inject + public ShortcutID(@Assisted("id1") CharacterID id1, + @Assisted("id2") ID id2) { + super(id1, id2); + } + + /** + * @return the character ID + */ + public CharacterID getCharacterID() { + return getID1(); + } + + /** + * @return the shortcut target ID + */ + public ID getTargetID() { + return getID2(); + } + + /** + * @return true if the {@link #getTargetID()} returns an + * {@link SkillTemplateID} + */ + public boolean isSkill() { + return getID2() instanceof SkillTemplateID; + } + + /** + * @return return the {@link #getTargetID()} casted to + * {@link SkillTemplateID} + * @throws ClassCastException + * if {@link #isSkill()} returns null. + */ + public SkillTemplateID getSkillID() { + return (SkillTemplateID) getTargetID(); + } + + /** + * @return true if the {@link #getTargetID()} returns an {@link ItemID} + */ + public boolean isItem() { + return getID2() instanceof ItemID; + } + + /** + * @return return the {@link #getTargetID()} casted to {@link ItemID} + * @throws ClassCastException + * if {@link #isItem()} returns null. + */ + public ItemID getItemID() { + return (ItemID) getTargetID(); + } +} diff --git a/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java b/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java index 0d259124d..f01b97063 100644 --- a/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/admin/AdministratorServiceImpl.java @@ -19,6 +19,7 @@ package com.l2jserver.service.game.admin; import java.util.List; import com.l2jserver.game.net.Lineage2Connection; +import com.l2jserver.game.net.packet.server.SM_HTML; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.world.L2Character; import com.l2jserver.service.AbstractService; @@ -36,6 +37,6 @@ public class AdministratorServiceImpl extends AbstractService implements @Override public void command(Lineage2Connection conn, L2Character character, String command, String... args) { - conn.sendCommunityHTML(new AdminHomeTemplate()); + conn.write(new SM_HTML(null, new AdminHomeTemplate())); } } 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 2da98e254..38f4ef3eb 100644 --- a/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/npc/NPCServiceImpl.java @@ -72,6 +72,7 @@ public class NPCServiceImpl extends AbstractService implements NPCService { /** * The {@link CharacterService} */ + @SuppressWarnings("unused") private final CharacterService characterService; /** * The {@link ThreadService} diff --git a/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java b/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java index a60026bde..3ef62d19b 100644 --- a/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java +++ b/src/main/java/com/l2jserver/service/network/gameguard/GameGuardServiceImpl.java @@ -45,6 +45,7 @@ public class GameGuardServiceImpl extends AbstractService implements /** * The valid GG SHA1 response */ + @SuppressWarnings("unused") private static final byte[] VALID_KEY_SHA1 = { (byte) 0x88, 0x40, 0x1c, (byte) 0xa7, (byte) 0x83, 0x42, (byte) 0xe9, 0x15, (byte) 0xde, (byte) 0xc3, 0x68, (byte) 0xf6, 0x2d, 0x23, (byte) 0xf1, 0x3f, @@ -59,6 +60,7 @@ public class GameGuardServiceImpl extends AbstractService implements *

* Access must be synchronized externally. */ + @SuppressWarnings("unused") private MessageDigest digester; @Override