From 665e82c97af54f6d42c673bb746abfa4dff4dcf7 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Fri, 16 Sep 2011 13:58:41 -0300 Subject: [PATCH] Clean up in the entire source code Major clean up in the source code reformatting it and organizing imports. --- .../com/l2jserver/plugin/PluginLoader.java | 3 +++ .../ai/com/l2jserver/game/ai/MonsterAI.java | 1 + .../java/com/l2jserver/L2JGameServerMain.java | 4 ++- .../com/l2jserver/game/ai/desires/Desire.java | 2 ++ .../game/ai/desires/DesireIteratorFilter.java | 3 ++- .../ai/desires/DesireIteratorHandler.java | 3 ++- .../game/net/Lineage2PipelineFactory.java | 10 +++++--- .../com/l2jserver/model/game/Shortcut.java | 3 ++- src/main/java/com/l2jserver/model/id/ID.java | 3 ++- .../l2jserver/model/id/object/ActorID.java | 3 ++- .../model/id/object/CharacterID.java | 6 +++-- .../com/l2jserver/model/id/object/ClanID.java | 6 +++-- .../com/l2jserver/model/id/object/ItemID.java | 6 +++-- .../com/l2jserver/model/id/object/PetID.java | 6 +++-- .../model/id/template/ActorTemplateID.java | 9 ++++--- .../id/template/CharacterTemplateID.java | 6 +++-- .../model/id/template/ItemTemplateID.java | 6 +++-- .../model/id/template/NPCTemplateID.java | 6 +++-- .../model/id/template/SkillTemplateID.java | 6 +++-- .../id/template/TeleportationTemplateID.java | 6 +++-- .../template/character/CharacterRace.java | 3 ++- .../java/com/l2jserver/model/world/Item.java | 3 ++- .../l2jserver/model/world/L2Character.java | 1 + .../java/com/l2jserver/model/world/NPC.java | 12 ++++++--- .../java/com/l2jserver/model/world/Pet.java | 3 ++- .../com/l2jserver/model/world/Player.java | 3 ++- .../model/world/PositionableObject.java | 3 ++- .../model/world/actor/ActorExperience.java | 3 ++- .../character/CharacterShortcutContainer.java | 1 + .../calculator/CharacterCalculator.java | 3 ++- .../CharacterCalculatorContext.java | 4 ++- .../calculator/CharacterFormula.java | 6 +++-- .../calculator/MaximumCPAddCalculator.java | 1 + .../calculator/MaximumCPBonusCalculator.java | 1 + .../calculator/MaximumHPAddCalculator.java | 1 + .../npc/calculator/NPCCalculatorContext.java | 4 ++- .../l2jserver/service/ServiceException.java | 2 +- .../service/ServiceRestartException.java | 2 +- .../service/ServiceStartException.java | 2 +- .../service/ServiceStopException.java | 2 +- .../com/l2jserver/service/cache/Cache.java | 6 +++-- .../l2jserver/service/cache/CacheService.java | 6 +++-- .../service/cache/EhCacheService.java | 3 ++- .../service/cache/IgnoreCaching.java | 1 + .../service/cache/MethodInvocation.java | 6 +++-- .../service/cache/SoftCacheService.java | 17 +++++++------ .../service/database/AbstractDAO.java | 3 ++- .../database/jdbc/AbstractJDBCDAO.java | 3 ++- .../database/jdbc/JDBCCharacterFriendDAO.java | 9 ++++--- .../service/database/jdbc/JDBCItemDAO.java | 12 ++++++--- .../jdbc/h2/H2CharacterFriendDAO.java | 9 ++++--- .../service/database/jdbc/h2/H2ItemDAO.java | 12 ++++++--- .../service/database/jdbc/h2/H2NPCDAO.java | 9 ++++--- .../jdbc/mysql5/MySQL5CharacterFriendDAO.java | 9 ++++--- .../database/jdbc/mysql5/MySQL5ItemDAO.java | 12 ++++++--- .../database/jdbc/mysql5/MySQL5NPCDAO.java | 9 ++++--- .../service/game/AttackServiceImpl.java | 20 +++++++++------ .../service/game/DuelServiceImpl.java | 2 +- .../service/game/GameTimeServiceImpl.java | 2 +- ...aracterAlreadyRunningServiceException.java | 3 ++- ...aracterAlreadyWalkingServiceException.java | 3 ++- .../CharacterInJailServiceException.java | 3 ++- .../CharacterInvalidNameException.java | 6 ++--- .../CharacterNameAlreadyExistsException.java | 3 ++- .../CharacterNotInJailServiceException.java | 3 ++- .../character/CharacterServiceException.java | 2 +- .../game/chat/DatabaseChatLoggingService.java | 6 +++-- .../service/game/chat/SimpleChatService.java | 3 ++- .../com/l2jserver/service/game/map/Tile.java | 6 +++-- .../game/map/pathing/AStarPathingService.java | 2 +- .../map/pathing/MapperPathingService.java | 6 +++-- .../classlistener/DefaultClassListener.java | 3 ++- .../game/world/CachedWorldIDService.java | 15 +++++++---- .../world/filter/impl/KnownListFilter.java | 3 ++- .../service/network/NettyNetworkService.java | 25 +++++++++++-------- .../broadcast/BroadcastServiceImpl.java | 6 +++-- .../PseudoRandomBlowfishKeygenService.java | 4 +-- .../keygen/SecureBlowfishKeygenService.java | 4 +-- .../java/com/l2jserver/util/RGBColor.java | 17 +++++++++---- .../util/calculator/ComplexCalculator.java | 2 ++ .../util/calculator/SimpleCalculator.java | 2 ++ .../util/jaxb/CoordinateAdapter.java | 10 +++++--- .../util/jaxb/ItemTemplateIDAdapter.java | 3 ++- .../util/jaxb/NPCTemplateIDAdapter.java | 3 ++- .../util/jaxb/SkillTemplateIDAdapter.java | 3 ++- .../jaxb/TeleportationTemplateIDAdapter.java | 3 ++- .../transformer/impl/PathTransformer.java | 2 +- .../com/l2jserver/tool/EndianessTest.java | 1 + 88 files changed, 305 insertions(+), 155 deletions(-) diff --git a/data/plugin/com/l2jserver/plugin/PluginLoader.java b/data/plugin/com/l2jserver/plugin/PluginLoader.java index 10c0dcbf5..e6b392899 100644 --- a/data/plugin/com/l2jserver/plugin/PluginLoader.java +++ b/data/plugin/com/l2jserver/plugin/PluginLoader.java @@ -42,6 +42,9 @@ public class PluginLoader implements Loader, Unloader { /** * Returns list of suitable Template classes to load/unload * + * @param classes + * loaded classes + * * @return list of Template classes to load/unload */ @SuppressWarnings({ "unchecked", "unused" }) diff --git a/data/script/ai/com/l2jserver/game/ai/MonsterAI.java b/data/script/ai/com/l2jserver/game/ai/MonsterAI.java index ad1ace790..784cc3980 100644 --- a/data/script/ai/com/l2jserver/game/ai/MonsterAI.java +++ b/data/script/ai/com/l2jserver/game/ai/MonsterAI.java @@ -26,6 +26,7 @@ import com.l2jserver.model.world.NPC; public class MonsterAI extends NPCAI { /** * @param creature + * the creature */ protected MonsterAI(NPC creature) { super(creature); diff --git a/src/main/java/com/l2jserver/L2JGameServerMain.java b/src/main/java/com/l2jserver/L2JGameServerMain.java index 46e258f1b..f3279307f 100644 --- a/src/main/java/com/l2jserver/L2JGameServerMain.java +++ b/src/main/java/com/l2jserver/L2JGameServerMain.java @@ -38,7 +38,9 @@ import com.l2jserver.service.network.keygen.BlowfishKeygenService; public class L2JGameServerMain { /** * Main method - * @param args no arguments are used + * + * @param args + * no arguments are used */ public static void main(String[] args) { final L2JGameServer server = new L2JGameServer(); diff --git a/src/main/java/com/l2jserver/game/ai/desires/Desire.java b/src/main/java/com/l2jserver/game/ai/desires/Desire.java index ab867079e..6868a235a 100644 --- a/src/main/java/com/l2jserver/game/ai/desires/Desire.java +++ b/src/main/java/com/l2jserver/game/ai/desires/Desire.java @@ -30,6 +30,7 @@ public interface Desire extends Comparable { * * @return hashcode for this object */ + @Override int hashCode(); /** @@ -39,6 +40,7 @@ public interface Desire extends Comparable { * another object to compare with * @return result of object comparation */ + @Override boolean equals(Object obj); /** diff --git a/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java b/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java index 14451345e..67b628403 100644 --- a/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java +++ b/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorFilter.java @@ -24,7 +24,8 @@ package com.l2jserver.game.ai.desires; public interface DesireIteratorFilter { /** * This method is called each time for every desire that is in the queue.
- *
{@link java.util.ConcurrentModificationException} will be thrown by + *
+ * {@link java.util.ConcurrentModificationException} will be thrown by * {@link com.l2jserver.game.ai.desires.DesireQueue#iterateDesires(DesireIteratorHandler, DesireIteratorFilter[])} * if any of the following methods will be called from here: *
    diff --git a/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java b/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java index 4ca87f648..8e8297779 100644 --- a/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java +++ b/src/main/java/com/l2jserver/game/ai/desires/DesireIteratorHandler.java @@ -33,7 +33,8 @@ public interface DesireIteratorHandler { /** * This method is called each time for every desire that is in the queue.
    * Remove of desire must be handeled by iterator.remove();
    - *
    {@link java.util.ConcurrentModificationException} will be thrown by + *
    + * {@link java.util.ConcurrentModificationException} will be thrown by * {@link com.l2jserver.game.ai.desires.DesireQueue#iterateDesires(DesireIteratorHandler, DesireIteratorFilter[])} * if any of the following methods will be called from here: *
      diff --git a/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java b/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java index 3605f6724..945710f46 100644 --- a/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java +++ b/src/main/java/com/l2jserver/game/net/Lineage2PipelineFactory.java @@ -59,9 +59,13 @@ public class Lineage2PipelineFactory implements ChannelPipelineFactory { /** * Creates a new instance of this pipeline - * @param injector the {@link Guice} {@link Injector} - * @param networkService the network service - * @param worldService the world service + * + * @param injector + * the {@link Guice} {@link Injector} + * @param networkService + * the network service + * @param worldService + * the world service */ @Inject public Lineage2PipelineFactory(Injector injector, diff --git a/src/main/java/com/l2jserver/model/game/Shortcut.java b/src/main/java/com/l2jserver/model/game/Shortcut.java index 950c2dd68..118f50a5b 100644 --- a/src/main/java/com/l2jserver/model/game/Shortcut.java +++ b/src/main/java/com/l2jserver/model/game/Shortcut.java @@ -94,7 +94,8 @@ public class Shortcut extends AbstractModel { public final int id; /** - * @param id the numeric id + * @param id + * the numeric id */ ShortcutType(int id) { this.id = id; diff --git a/src/main/java/com/l2jserver/model/id/ID.java b/src/main/java/com/l2jserver/model/id/ID.java index 2721b843e..35d5c673c 100644 --- a/src/main/java/com/l2jserver/model/id/ID.java +++ b/src/main/java/com/l2jserver/model/id/ID.java @@ -33,7 +33,8 @@ public abstract class ID { protected final T id; /** - * @param id the raw id + * @param id + * the raw id */ @Inject protected ID(T id) { diff --git a/src/main/java/com/l2jserver/model/id/object/ActorID.java b/src/main/java/com/l2jserver/model/id/object/ActorID.java index 18e4f9edd..0933cc9e6 100644 --- a/src/main/java/com/l2jserver/model/id/object/ActorID.java +++ b/src/main/java/com/l2jserver/model/id/object/ActorID.java @@ -34,7 +34,8 @@ import com.l2jserver.model.world.Actor; */ public abstract class ActorID extends ObjectID { /** - * @param id the raw id + * @param id + * the raw id */ @Inject public ActorID(@Assisted int id) { diff --git a/src/main/java/com/l2jserver/model/id/object/CharacterID.java b/src/main/java/com/l2jserver/model/id/object/CharacterID.java index ce5bbec19..578990d0f 100644 --- a/src/main/java/com/l2jserver/model/id/object/CharacterID.java +++ b/src/main/java/com/l2jserver/model/id/object/CharacterID.java @@ -38,8 +38,10 @@ public final class CharacterID extends ActorID { private transient final CharacterDAO characterDao; /** - * @param id the raw id - * @param characterDao the character DAO + * @param id + * the raw id + * @param characterDao + * the character DAO */ @Inject public CharacterID(@Assisted int id, CharacterDAO characterDao) { diff --git a/src/main/java/com/l2jserver/model/id/object/ClanID.java b/src/main/java/com/l2jserver/model/id/object/ClanID.java index 56e287674..37b4deaba 100644 --- a/src/main/java/com/l2jserver/model/id/object/ClanID.java +++ b/src/main/java/com/l2jserver/model/id/object/ClanID.java @@ -38,8 +38,10 @@ public final class ClanID extends ObjectID { private final ClanDAO clanDao; /** - * @param id the raw id - * @param clanDao the clan DAO + * @param id + * the raw id + * @param clanDao + * the clan DAO */ @Inject protected ClanID(@Assisted int id, ClanDAO clanDao) { diff --git a/src/main/java/com/l2jserver/model/id/object/ItemID.java b/src/main/java/com/l2jserver/model/id/object/ItemID.java index 6168ca05b..ddd8d2661 100644 --- a/src/main/java/com/l2jserver/model/id/object/ItemID.java +++ b/src/main/java/com/l2jserver/model/id/object/ItemID.java @@ -38,8 +38,10 @@ public final class ItemID extends ObjectID { private final ItemDAO itemDao; /** - * @param id the raw id - * @param itemDao the item DAO + * @param id + * the raw id + * @param itemDao + * the item DAO */ @Inject protected ItemID(@Assisted int id, ItemDAO itemDao) { diff --git a/src/main/java/com/l2jserver/model/id/object/PetID.java b/src/main/java/com/l2jserver/model/id/object/PetID.java index 9c6f8d5a5..72609cb56 100644 --- a/src/main/java/com/l2jserver/model/id/object/PetID.java +++ b/src/main/java/com/l2jserver/model/id/object/PetID.java @@ -37,8 +37,10 @@ public final class PetID extends ActorID { private final PetDAO petDao; /** - * @param id the raw id - * @param petDao the pet DAO + * @param id + * the raw id + * @param petDao + * the pet DAO */ @Inject protected PetID(int id, PetDAO petDao) { diff --git a/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java b/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java index f6df6c493..00852cab1 100644 --- a/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/ActorTemplateID.java @@ -28,7 +28,8 @@ import com.l2jserver.service.game.template.TemplateService; * An {@link TemplateID} instance representing an {@link ActorTemplate} object * * @param - * the type of {@link ActorTemplate} this {@link TemplateID} represents + * the type of {@link ActorTemplate} this {@link TemplateID} + * represents * @author Rogiel */ public class ActorTemplateID> extends @@ -39,8 +40,10 @@ public class ActorTemplateID> extends private transient final TemplateService templateService; /** - * @param id the raw id - * @param templateService the template service + * @param id + * the raw id + * @param templateService + * the template service */ @Inject protected ActorTemplateID(@Assisted int id, TemplateService templateService) { diff --git a/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java b/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java index b084632e9..84ef4a54d 100644 --- a/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java @@ -30,8 +30,10 @@ import com.l2jserver.service.game.template.TemplateService; */ public class CharacterTemplateID extends ActorTemplateID { /** - * @param id the raw id - * @param templateService the template service + * @param id + * the raw id + * @param templateService + * the template service */ @Inject public CharacterTemplateID(@Assisted int id, TemplateService templateService) { diff --git a/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java b/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java index 3ab158bf0..f8b4c8327 100644 --- a/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java @@ -37,8 +37,10 @@ public class ItemTemplateID extends TemplateID { private final TemplateService templateService; /** - * @param id the raw id - * @param templateService the template service + * @param id + * the raw id + * @param templateService + * the template service */ @Inject public ItemTemplateID(@Assisted int id, TemplateService templateService) { diff --git a/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java b/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java index d36da5b15..e50a1fb98 100644 --- a/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/NPCTemplateID.java @@ -33,8 +33,10 @@ import com.l2jserver.util.jaxb.NPCTemplateIDAdapter; @XmlJavaTypeAdapter(value = NPCTemplateIDAdapter.class) public class NPCTemplateID extends ActorTemplateID { /** - * @param id the raw id - * @param templateService the template service + * @param id + * the raw id + * @param templateService + * the template service */ @Inject public NPCTemplateID(@Assisted int id, TemplateService templateService) { diff --git a/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java b/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java index 5ba8c6bdc..f3917a23d 100644 --- a/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java @@ -34,8 +34,10 @@ public class SkillTemplateID extends TemplateID { private final TemplateService templateService; /** - * @param id the raw id - * @param templateService the template service + * @param id + * the raw id + * @param templateService + * the template service */ @Inject public SkillTemplateID(@Assisted int id, TemplateService templateService) { diff --git a/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java b/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java index b9dad0f7b..0659a1e27 100644 --- a/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/TeleportationTemplateID.java @@ -40,8 +40,10 @@ public class TeleportationTemplateID extends private final TemplateService templateService; /** - * @param id the raw id - * @param templateService the template service + * @param id + * the raw id + * @param templateService + * the template service */ @Inject public TeleportationTemplateID(@Assisted int id, diff --git a/src/main/java/com/l2jserver/model/template/character/CharacterRace.java b/src/main/java/com/l2jserver/model/template/character/CharacterRace.java index fc2f9eee2..fb451d1e3 100644 --- a/src/main/java/com/l2jserver/model/template/character/CharacterRace.java +++ b/src/main/java/com/l2jserver/model/template/character/CharacterRace.java @@ -14,7 +14,8 @@ public enum CharacterRace { public final int id; /** - * @param id the race numeric id + * @param id + * the race numeric id */ CharacterRace(int id) { this.id = id; diff --git a/src/main/java/com/l2jserver/model/world/Item.java b/src/main/java/com/l2jserver/model/world/Item.java index f44e5c9fe..5026eb39c 100644 --- a/src/main/java/com/l2jserver/model/world/Item.java +++ b/src/main/java/com/l2jserver/model/world/Item.java @@ -70,7 +70,8 @@ public class Item extends PositionableObject { private long count = 1; /** - * @param templateID the item template id + * @param templateID + * the item template id */ public Item(ItemTemplateID templateID) { this.templateID = templateID; diff --git a/src/main/java/com/l2jserver/model/world/L2Character.java b/src/main/java/com/l2jserver/model/world/L2Character.java index a5f4868a4..951f1a3be 100644 --- a/src/main/java/com/l2jserver/model/world/L2Character.java +++ b/src/main/java/com/l2jserver/model/world/L2Character.java @@ -361,6 +361,7 @@ public class L2Character extends Player { /** * @return the stats */ + @Override public CharacterStats getStats() { return stats; } diff --git a/src/main/java/com/l2jserver/model/world/NPC.java b/src/main/java/com/l2jserver/model/world/NPC.java index 1a6dbc700..d9c4192b9 100644 --- a/src/main/java/com/l2jserver/model/world/NPC.java +++ b/src/main/java/com/l2jserver/model/world/NPC.java @@ -101,8 +101,10 @@ public class NPC extends Actor { } /** - * @param maxHP the maximum HP - * @throws UnsupportedOperationException always + * @param maxHP + * the maximum HP + * @throws UnsupportedOperationException + * always */ public void setMaxHP(double maxHP) { throw new UnsupportedOperationException(); @@ -116,8 +118,10 @@ public class NPC extends Actor { } /** - * @param maxMP the maximum MP - * @throws UnsupportedOperationException always + * @param maxMP + * the maximum MP + * @throws UnsupportedOperationException + * always */ public void setMaxMP(double maxMP) { throw new UnsupportedOperationException(); diff --git a/src/main/java/com/l2jserver/model/world/Pet.java b/src/main/java/com/l2jserver/model/world/Pet.java index f13c4bdf9..ca69b89e7 100644 --- a/src/main/java/com/l2jserver/model/world/Pet.java +++ b/src/main/java/com/l2jserver/model/world/Pet.java @@ -37,7 +37,8 @@ public class Pet extends Player { private ItemID itemID; /** - * @param templateID the pet template id + * @param templateID + * the pet template id */ public Pet(ActorTemplateID templateID) { super(templateID); diff --git a/src/main/java/com/l2jserver/model/world/Player.java b/src/main/java/com/l2jserver/model/world/Player.java index e01314aab..5ae297b49 100644 --- a/src/main/java/com/l2jserver/model/world/Player.java +++ b/src/main/java/com/l2jserver/model/world/Player.java @@ -26,7 +26,8 @@ import com.l2jserver.model.id.template.ActorTemplateID; */ public abstract class Player extends Actor { /** - * @param templateID the actor template id + * @param templateID + * the actor template id */ public Player(ActorTemplateID templateID) { super(templateID); diff --git a/src/main/java/com/l2jserver/model/world/PositionableObject.java b/src/main/java/com/l2jserver/model/world/PositionableObject.java index b585003c6..053e01858 100644 --- a/src/main/java/com/l2jserver/model/world/PositionableObject.java +++ b/src/main/java/com/l2jserver/model/world/PositionableObject.java @@ -55,7 +55,8 @@ public abstract class PositionableObject extends AbstractObject { } /** - * @param coord sets the current position + * @param coord + * sets the current position */ public void setPosition(Coordinate coord) { desireUpdate(); diff --git a/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java b/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java index 85f99b1e0..c81a49bd5 100644 --- a/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java +++ b/src/main/java/com/l2jserver/model/world/actor/ActorExperience.java @@ -79,7 +79,8 @@ public enum ActorExperience { public final int level; /** - * @param experience the minimum experience for the level + * @param experience + * the minimum experience for the level */ ActorExperience(long experience) { this.experience = experience; diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java b/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java index 7aea32082..cefdbc418 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterShortcutContainer.java @@ -139,6 +139,7 @@ public class CharacterShortcutContainer implements Iterable { /** * Compares two shortcut slots + * * @author Rogiel */ public static class ShortcutSlotComparator implements Comparator, diff --git a/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java b/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java index 4f1fa7400..0f9a324a3 100644 --- a/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java +++ b/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java @@ -28,7 +28,8 @@ import com.l2jserver.util.calculator.Calculator; */ public class CharacterCalculator extends ActorCalculator { /** - * @param calculators the calculators + * @param calculators + * the calculators */ public CharacterCalculator( Calculator... calculators) { diff --git a/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java b/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java index c81e8c7c0..1689c8c5a 100644 --- a/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java +++ b/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculatorContext.java @@ -32,7 +32,9 @@ public class CharacterCalculatorContext extends ActorCalculatorContext { /** * Creates a new context - * @param character the character + * + * @param character + * the character */ public CharacterCalculatorContext(L2Character character) { super(character); diff --git a/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java b/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java index bb3de0d2e..74d77cf03 100644 --- a/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java +++ b/src/main/java/com/l2jserver/model/world/character/calculator/CharacterFormula.java @@ -25,8 +25,10 @@ import com.l2jserver.model.world.actor.stat.StatType; */ public abstract class CharacterFormula extends CharacterCalculatorFunction { /** - * @param order the calculation order - * @param type the stat type + * @param order + * the calculation order + * @param type + * the stat type */ public CharacterFormula(int order, StatType type) { super(order, type); diff --git a/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java b/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java index e8f136a42..1a371f508 100644 --- a/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java +++ b/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPAddCalculator.java @@ -41,6 +41,7 @@ public class MaximumCPAddCalculator extends CharacterFormula { super(0x100, StatType.MAX_CP); } + @Override protected double calculate(L2Character c, CharacterTemplate t, double value) { int lvl = c.getLevel() - t.getMinimumLevel(); double mod = t.getBaseCPModifier() * lvl; diff --git a/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java b/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java index cc44010f4..cc4b7da7c 100644 --- a/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java +++ b/src/main/java/com/l2jserver/model/world/character/calculator/MaximumCPBonusCalculator.java @@ -42,6 +42,7 @@ public class MaximumCPBonusCalculator extends CharacterFormula { super(0x100, StatType.MAX_CP); } + @Override protected double calculate(L2Character c, CharacterTemplate t, double value) { return value * BaseStats.CON.calculateBonus(c.getStats().getConcentration()); diff --git a/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java b/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java index 5d7ef7e3f..4735b4422 100644 --- a/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java +++ b/src/main/java/com/l2jserver/model/world/character/calculator/MaximumHPAddCalculator.java @@ -41,6 +41,7 @@ public class MaximumHPAddCalculator extends CharacterFormula { super(0x100, StatType.MAX_HP); } + @Override public double calculate(L2Character c, CharacterTemplate t, double value) { int lvl = c.getLevel() - t.getMinimumLevel(); double mod = t.getBaseHPModifier() * lvl; diff --git a/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java b/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java index 91887965c..3ae0740d3 100644 --- a/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java +++ b/src/main/java/com/l2jserver/model/world/npc/calculator/NPCCalculatorContext.java @@ -32,7 +32,9 @@ public class NPCCalculatorContext extends ActorCalculatorContext { /** * Creates a new calculator context - * @param npc the {@link NPC} + * + * @param npc + * the {@link NPC} */ public NPCCalculatorContext(NPC npc) { super(npc); diff --git a/src/main/java/com/l2jserver/service/ServiceException.java b/src/main/java/com/l2jserver/service/ServiceException.java index 8c353a294..37f5bad39 100644 --- a/src/main/java/com/l2jserver/service/ServiceException.java +++ b/src/main/java/com/l2jserver/service/ServiceException.java @@ -28,7 +28,7 @@ public abstract class ServiceException extends L2Exception { * The Java Serialization API serial */ private static final long serialVersionUID = 1L; - + /** * Creates a new instance of this exception */ diff --git a/src/main/java/com/l2jserver/service/ServiceRestartException.java b/src/main/java/com/l2jserver/service/ServiceRestartException.java index 2151e1d79..986dceb7a 100644 --- a/src/main/java/com/l2jserver/service/ServiceRestartException.java +++ b/src/main/java/com/l2jserver/service/ServiceRestartException.java @@ -27,7 +27,7 @@ public class ServiceRestartException extends ServiceException { * The Java Serialization API serial */ private static final long serialVersionUID = 1L; - + /** * Creates a new instance of this exception */ diff --git a/src/main/java/com/l2jserver/service/ServiceStartException.java b/src/main/java/com/l2jserver/service/ServiceStartException.java index 9864c7027..15be54222 100644 --- a/src/main/java/com/l2jserver/service/ServiceStartException.java +++ b/src/main/java/com/l2jserver/service/ServiceStartException.java @@ -26,7 +26,7 @@ public class ServiceStartException extends ServiceException { * The Java Serialization API serial */ private static final long serialVersionUID = 1L; - + /** * Creates a new instance of this exception */ diff --git a/src/main/java/com/l2jserver/service/ServiceStopException.java b/src/main/java/com/l2jserver/service/ServiceStopException.java index 56c907345..408de3f96 100644 --- a/src/main/java/com/l2jserver/service/ServiceStopException.java +++ b/src/main/java/com/l2jserver/service/ServiceStopException.java @@ -26,7 +26,7 @@ public class ServiceStopException extends ServiceException { * The Java Serialization API serial */ private static final long serialVersionUID = 1L; - + /** * Creates a new instance of this exception */ diff --git a/src/main/java/com/l2jserver/service/cache/Cache.java b/src/main/java/com/l2jserver/service/cache/Cache.java index 07c75c8e5..aa17c4108 100644 --- a/src/main/java/com/l2jserver/service/cache/Cache.java +++ b/src/main/java/com/l2jserver/service/cache/Cache.java @@ -20,8 +20,10 @@ package com.l2jserver.service.cache; * This interface represents a Map structure for cache usage. * * @author Rogiel - * @param the key type - * @param the value type + * @param + * the key type + * @param + * the value type */ public interface Cache extends Iterable { /** diff --git a/src/main/java/com/l2jserver/service/cache/CacheService.java b/src/main/java/com/l2jserver/service/cache/CacheService.java index d7c8674e8..93365e313 100644 --- a/src/main/java/com/l2jserver/service/cache/CacheService.java +++ b/src/main/java/com/l2jserver/service/cache/CacheService.java @@ -56,7 +56,8 @@ public interface CacheService extends Service { * the cache value type * @param name * the cache name - * @param size the maximum cache size + * @param size + * the maximum cache size * @size the maximum cache size * @return the created cache */ @@ -73,7 +74,8 @@ public interface CacheService extends Service { * the cache value type * @param name * the cache name - * @param size the maximum cache size + * @param size + * the maximum cache size * @size the maximum cache size * @return the created cache */ diff --git a/src/main/java/com/l2jserver/service/cache/EhCacheService.java b/src/main/java/com/l2jserver/service/cache/EhCacheService.java index eb61f5048..c6dafe10e 100644 --- a/src/main/java/com/l2jserver/service/cache/EhCacheService.java +++ b/src/main/java/com/l2jserver/service/cache/EhCacheService.java @@ -180,7 +180,8 @@ public class EhCacheService extends AbstractService implements CacheService { private final net.sf.ehcache.Cache cache; /** - * @param cache the backing cache + * @param cache + * the backing cache */ public EhCacheFacade(net.sf.ehcache.Cache cache) { this.cache = cache; diff --git a/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java b/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java index 92560f6f6..7b8bdeb76 100644 --- a/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java +++ b/src/main/java/com/l2jserver/service/cache/IgnoreCaching.java @@ -24,6 +24,7 @@ import java.lang.annotation.Target; /** * Indicate to the proxy that this method should not be cached. + * * @author Rogiel */ @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/l2jserver/service/cache/MethodInvocation.java b/src/main/java/com/l2jserver/service/cache/MethodInvocation.java index b2678a1b0..0244be805 100644 --- a/src/main/java/com/l2jserver/service/cache/MethodInvocation.java +++ b/src/main/java/com/l2jserver/service/cache/MethodInvocation.java @@ -35,8 +35,10 @@ class MethodInvocation { private final Object[] args; /** - * @param method the method invoked - * @param args the invocation arguments + * @param method + * the method invoked + * @param args + * the invocation arguments */ public MethodInvocation(Method method, Object[] args) { this.method = method; diff --git a/src/main/java/com/l2jserver/service/cache/SoftCacheService.java b/src/main/java/com/l2jserver/service/cache/SoftCacheService.java index 113c072fd..b665650b4 100644 --- a/src/main/java/com/l2jserver/service/cache/SoftCacheService.java +++ b/src/main/java/com/l2jserver/service/cache/SoftCacheService.java @@ -43,7 +43,7 @@ public class SoftCacheService extends AbstractService implements CacheService { * The logger */ private final Logger log = LoggerFactory.getLogger(this.getClass()); - + /** * The interface cache */ @@ -61,7 +61,7 @@ public class SoftCacheService extends AbstractService implements CacheService { Preconditions.checkNotNull(instance, "instance"); Preconditions.checkArgument(interfaceType.isInterface(), "interfaceType is not an interface"); - + log.debug("Decorating {} with cache", interfaceType); @SuppressWarnings("unchecked") @@ -101,7 +101,8 @@ public class SoftCacheService extends AbstractService implements CacheService { @Override public Cache createEternalCache(String name, int size) { - log.debug("Creating eternal cache {} with minimum size of {}", name, size); + log.debug("Creating eternal cache {} with minimum size of {}", name, + size); return new EternalCache(name); } @@ -130,11 +131,13 @@ public class SoftCacheService extends AbstractService implements CacheService { * value object) * * @author Rogiel - * @param the key type - * @param the value type + * @param + * the key type + * @param + * the value type */ - private class SoftCache extends AbstractReferenceCache implements - Cache { + private class SoftCache extends AbstractReferenceCache + implements Cache { /** * This class is a {@link SoftReference} with additional responsibility * of holding key object diff --git a/src/main/java/com/l2jserver/service/database/AbstractDAO.java b/src/main/java/com/l2jserver/service/database/AbstractDAO.java index db2973218..26d13225f 100644 --- a/src/main/java/com/l2jserver/service/database/AbstractDAO.java +++ b/src/main/java/com/l2jserver/service/database/AbstractDAO.java @@ -42,7 +42,8 @@ public abstract class AbstractDAO, I extends ID> protected final DatabaseService database; /** - * @param database the database service + * @param database + * the database service */ @Inject protected AbstractDAO(DatabaseService database) { diff --git a/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java index 8356157f0..640fea5bc 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java @@ -41,7 +41,8 @@ public abstract class AbstractJDBCDAO, I extends ID> protected final JDBCDatabaseService database; /** - * @param database the database service + * @param database + * the database service */ @Inject protected AbstractJDBCDAO(DatabaseService database) { diff --git a/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java index 84fac44b5..a01e4b7e2 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java @@ -64,9 +64,12 @@ public abstract class JDBCCharacterFriendDAO extends + "_friend"; /** - * @param database the database service - * @param idProvider the frind id provider - * @param charIdProvider the character id provider + * @param database + * the database service + * @param idProvider + * the frind id provider + * @param charIdProvider + * the character id provider */ @Inject public JDBCCharacterFriendDAO(DatabaseService database, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java index b88e13527..f447ba6b7 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java @@ -80,10 +80,14 @@ public abstract class JDBCItemDAO extends AbstractJDBCDAO public static final String COORD_Z = "coord_z"; /** - * @param database the database service - * @param idFactory the item id provider - * @param templateIdFactory the item template id provider - * @param charIdFactory the character id provider + * @param database + * the database service + * @param idFactory + * the item id provider + * @param templateIdFactory + * the item template id provider + * @param charIdFactory + * the character id provider */ @Inject public JDBCItemDAO(DatabaseService database, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java index 0b113c8cf..19ce8c48c 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java @@ -31,9 +31,12 @@ import com.l2jserver.service.database.jdbc.JDBCCharacterFriendDAO; public class H2CharacterFriendDAO extends JDBCCharacterFriendDAO implements CharacterFriendDAO { /** - * @param database the database service - * @param idProvider the frind id provider - * @param charIdProvider the character id provider + * @param database + * the database service + * @param idProvider + * the frind id provider + * @param charIdProvider + * the character id provider */ @Inject public H2CharacterFriendDAO(DatabaseService database, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java index e9b18ab05..ecb83abac 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java @@ -31,10 +31,14 @@ import com.l2jserver.service.database.jdbc.JDBCItemDAO; */ public class H2ItemDAO extends JDBCItemDAO implements ItemDAO { /** - * @param database the database service - * @param idFactory the item id provider - * @param templateIdFactory the item template id provider - * @param charIdFactory the character id provider + * @param database + * the database service + * @param idFactory + * the item id provider + * @param templateIdFactory + * the item template id provider + * @param charIdFactory + * the character id provider */ @Inject public H2ItemDAO(DatabaseService database, ItemIDProvider idFactory, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java index 804d3ca4c..cf0656ecf 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java @@ -31,9 +31,12 @@ import com.l2jserver.service.database.jdbc.JDBCNPCDAO; */ public class H2NPCDAO extends JDBCNPCDAO implements NPCDAO { /** - * @param database the database service - * @param idProvider the npc id provider - * @param templateIdProvider the npc template id provider + * @param database + * the database service + * @param idProvider + * the npc id provider + * @param templateIdProvider + * the npc template id provider */ @Inject public H2NPCDAO(DatabaseService database, NPCIDProvider idProvider, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java index 0471e4010..d464e71c3 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java @@ -31,9 +31,12 @@ import com.l2jserver.service.database.jdbc.JDBCCharacterFriendDAO; public class MySQL5CharacterFriendDAO extends JDBCCharacterFriendDAO implements CharacterFriendDAO { /** - * @param database the database service - * @param idProvider the frind id provider - * @param charIdProvider the character id provider + * @param database + * the database service + * @param idProvider + * the frind id provider + * @param charIdProvider + * the character id provider */ @Inject public MySQL5CharacterFriendDAO(DatabaseService database, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java index bf636e7da..5bddd63d2 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java @@ -31,10 +31,14 @@ import com.l2jserver.service.database.jdbc.JDBCItemDAO; */ public class MySQL5ItemDAO extends JDBCItemDAO implements ItemDAO { /** - * @param database the database service - * @param idFactory the item id provider - * @param templateIdFactory the item template id provider - * @param charIdFactory the character id provider + * @param database + * the database service + * @param idFactory + * the item id provider + * @param templateIdFactory + * the item template id provider + * @param charIdFactory + * the character id provider */ @Inject public MySQL5ItemDAO(DatabaseService database, ItemIDProvider idFactory, diff --git a/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java index 496b599fe..534e4f24d 100644 --- a/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java +++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java @@ -31,9 +31,12 @@ import com.l2jserver.service.database.jdbc.JDBCNPCDAO; */ public class MySQL5NPCDAO extends JDBCNPCDAO implements NPCDAO { /** - * @param database the database service - * @param idProvider the npc id provider - * @param templateIdProvider the npc template id provider + * @param database + * the database service + * @param idProvider + * the npc id provider + * @param templateIdProvider + * the npc template id provider */ @Inject public MySQL5NPCDAO(DatabaseService database, NPCIDProvider idProvider, diff --git a/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java b/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java index 72dc67573..fe6505dd0 100644 --- a/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/AttackServiceImpl.java @@ -69,9 +69,12 @@ public class AttackServiceImpl extends AbstractService implements AttackService private final WorldEventDispatcher eventDispatcher; /** - * @param threadService the thread service - * @param npcService the npc service - * @param eventDispatcher the world service event dispatcher + * @param threadService + * the thread service + * @param npcService + * the npc service + * @param eventDispatcher + * the world service event dispatcher */ @Inject public AttackServiceImpl(ThreadService threadService, @@ -107,8 +110,10 @@ public class AttackServiceImpl extends AbstractService implements AttackService private final Actor target; /** - * @param attacker the attacker - * @param target the target + * @param attacker + * the attacker + * @param target + * the target */ public AttackCallable(Actor attacker, Actor target) { this.attacker = attacker; @@ -125,8 +130,9 @@ public class AttackServiceImpl extends AbstractService implements AttackService // TODO calculate miss // TODO calculate critical // TODO calculate soulshot - - log.debug("Attack dealt {} damage, but only {} is effective", damage, dealDamage); + + log.debug("Attack dealt {} damage, but only {} is effective", + damage, dealDamage); // reduce target life target.setHP(target.getHP() - dealDamage); diff --git a/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java b/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java index d219569da..af837d694 100644 --- a/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/DuelServiceImpl.java @@ -33,7 +33,7 @@ public class DuelServiceImpl extends AbstractService implements DuelService { */ @SuppressWarnings("unused") private final Logger log = LoggerFactory.getLogger(this.getClass()); - + @Override public void start(L2Character character1, L2Character character2) { // TODO Auto-generated method stub diff --git a/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java b/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java index 2fc0dbe40..c1112d5ab 100644 --- a/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java +++ b/src/main/java/com/l2jserver/service/game/GameTimeServiceImpl.java @@ -33,7 +33,7 @@ public class GameTimeServiceImpl extends AbstractService implements */ @SuppressWarnings("unused") private final Logger log = LoggerFactory.getLogger(this.getClass()); - + @Override public int getGameTime() { return (int) (System.currentTimeMillis() % GAME_DAY) / 1000; diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java b/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java index 1e2c1ec2f..a67bb6bff 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyRunningServiceException.java @@ -26,4 +26,5 @@ public class CharacterAlreadyRunningServiceException extends /** * The Java Serialization API serial */ - private static final long serialVersionUID = 1L;} \ No newline at end of file + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java b/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java index 0bb1d1d32..badaed82e 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterAlreadyWalkingServiceException.java @@ -26,4 +26,5 @@ public class CharacterAlreadyWalkingServiceException extends /** * The Java Serialization API serial */ - private static final long serialVersionUID = 1L;} \ No newline at end of file + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java b/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java index 2d40dcdb5..ac912b849 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterInJailServiceException.java @@ -25,4 +25,5 @@ public class CharacterInJailServiceException extends CharacterServiceException { /** * The Java Serialization API serial */ - private static final long serialVersionUID = 1L;} \ No newline at end of file + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java b/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java index 6eb2ca8db..6c2d96778 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterInvalidNameException.java @@ -21,9 +21,9 @@ package com.l2jserver.service.game.character; * * @author Rogiel */ -public class CharacterInvalidNameException extends - CharacterServiceException { +public class CharacterInvalidNameException extends CharacterServiceException { /** * The Java Serialization API serial */ - private static final long serialVersionUID = 1L;} \ No newline at end of file + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java b/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java index cbe5d412d..a8a423d76 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterNameAlreadyExistsException.java @@ -26,4 +26,5 @@ public class CharacterNameAlreadyExistsException extends /** * The Java Serialization API serial */ - private static final long serialVersionUID = 1L;} \ No newline at end of file + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java b/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java index e7197bb8e..001c6e180 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterNotInJailServiceException.java @@ -26,4 +26,5 @@ public class CharacterNotInJailServiceException extends /** * The Java Serialization API serial */ - private static final long serialVersionUID = 1L;} \ No newline at end of file + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java b/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java index cee2df35a..e5338ac8a 100644 --- a/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java +++ b/src/main/java/com/l2jserver/service/game/character/CharacterServiceException.java @@ -26,7 +26,7 @@ public class CharacterServiceException extends ServiceException { * The Java Serialization API serial */ private static final long serialVersionUID = 1L; - + /** * Creates a new instance of this exception */ diff --git a/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java b/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java index 3d4980321..51f924835 100644 --- a/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java +++ b/src/main/java/com/l2jserver/service/game/chat/DatabaseChatLoggingService.java @@ -45,8 +45,10 @@ public class DatabaseChatLoggingService extends AbstractService implements private final CharacterIDProvider charIdProvider; /** - * @param chatMessageDao the chat message DAO - * @param charIdProvider the character id provider + * @param chatMessageDao + * the chat message DAO + * @param charIdProvider + * the character id provider */ @Inject protected DatabaseChatLoggingService(ChatMessageDAO chatMessageDao, diff --git a/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java b/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java index d641632f4..96702ba12 100644 --- a/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java +++ b/src/main/java/com/l2jserver/service/game/chat/SimpleChatService.java @@ -329,7 +329,8 @@ public class SimpleChatService extends AbstractService implements ChatService { private final CharacterID character; /** - * @param character the target character {@link ID} + * @param character + * the target character {@link ID} */ public PrivateChatChannelImpl(CharacterID character) { Preconditions.checkNotNull(character, "character"); diff --git a/src/main/java/com/l2jserver/service/game/map/Tile.java b/src/main/java/com/l2jserver/service/game/map/Tile.java index 0a2a8c4cb..4741954de 100644 --- a/src/main/java/com/l2jserver/service/game/map/Tile.java +++ b/src/main/java/com/l2jserver/service/game/map/Tile.java @@ -34,8 +34,10 @@ public class Tile { private final byte flags; /** - * @param point the file point - * @param flags the tile flags + * @param point + * the file point + * @param flags + * the tile flags */ public Tile(Point point, byte flags) { this.point = point; diff --git a/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java b/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java index 2aa32f021..f68737254 100644 --- a/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java +++ b/src/main/java/com/l2jserver/service/game/map/pathing/AStarPathingService.java @@ -40,7 +40,7 @@ public class AStarPathingService extends AbstractService implements */ @SuppressWarnings("unused") private final Logger log = LoggerFactory.getLogger(this.getClass()); - + @Override public Path findPath(PositionableObject object, Point3D point) { return null; diff --git a/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java b/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java index 0b550b44e..249a10064 100644 --- a/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java +++ b/src/main/java/com/l2jserver/service/game/map/pathing/MapperPathingService.java @@ -185,8 +185,10 @@ public class MapperPathingService extends AbstractService implements private final Point3D target; /** - * @param source the source point - * @param target the taget point + * @param source + * the source point + * @param target + * the taget point */ public VoidPath(Point3D source, Point3D target) { this.source = source; diff --git a/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java b/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java index 4300030c8..750cf8dd7 100644 --- a/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java +++ b/src/main/java/com/l2jserver/service/game/scripting/classlistener/DefaultClassListener.java @@ -32,7 +32,8 @@ public class DefaultClassListener implements ClassListener { private final Injector injector; /** - * @param injector the {@link Guice} {@link Injector} + * @param injector + * the {@link Guice} {@link Injector} */ public DefaultClassListener(Injector injector) { this.injector = injector; diff --git a/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java b/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java index 42f95fe90..3085629bd 100644 --- a/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java +++ b/src/main/java/com/l2jserver/service/game/world/CachedWorldIDService.java @@ -85,11 +85,16 @@ public class CachedWorldIDService extends AbstractService implements private boolean loaded = false; /** - * @param cacheService the cache service - * @param allocator the id allocator - * @param characterDao the character DAO - * @param itemDao the item dao - * @param npcDao the NPC dao + * @param cacheService + * the cache service + * @param allocator + * the id allocator + * @param characterDao + * the character DAO + * @param itemDao + * the item dao + * @param npcDao + * the NPC dao */ @Inject public CachedWorldIDService(CacheService cacheService, diff --git a/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java b/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java index 205e16703..58fc833c9 100644 --- a/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java +++ b/src/main/java/com/l2jserver/service/game/world/filter/impl/KnownListFilter.java @@ -34,7 +34,8 @@ public class KnownListFilter extends AndFilter { public static final int KNOWNLIST_RANGE = 2000; /** - * @param object the object to locate known objects + * @param object + * the object to locate known objects */ @SuppressWarnings("unchecked") public KnownListFilter(PositionableObject object) { diff --git a/src/main/java/com/l2jserver/service/network/NettyNetworkService.java b/src/main/java/com/l2jserver/service/network/NettyNetworkService.java index 928b1ec58..c0db80315 100644 --- a/src/main/java/com/l2jserver/service/network/NettyNetworkService.java +++ b/src/main/java/com/l2jserver/service/network/NettyNetworkService.java @@ -58,7 +58,7 @@ public class NettyNetworkService extends AbstractService implements * The logger */ private final Logger log = LoggerFactory.getLogger(this.getClass()); - + /** * The {@link WorldService} instance */ @@ -87,9 +87,12 @@ public class NettyNetworkService extends AbstractService implements private Set clients = CollectionFactory.newSet(); /** - * @param configService the configuration service - * @param injector the {@link Guice} {@link Injector} - * @param worldService the world service + * @param configService + * the configuration service + * @param injector + * the {@link Guice} {@link Injector} + * @param worldService + * the world service */ @Inject public NettyNetworkService(ConfigurationService configService, @@ -113,9 +116,9 @@ public class NettyNetworkService extends AbstractService implements @Override public void register(final Lineage2Client client) { Preconditions.checkNotNull(client, "client"); - + log.debug("Registering client: {}", client); - + clients.add(client); client.getChannel().getCloseFuture() .addListener(new ChannelFutureListener() { @@ -130,7 +133,7 @@ public class NettyNetworkService extends AbstractService implements @Override public void unregister(Lineage2Client client) { Preconditions.checkNotNull(client, "client"); - + log.debug("Unregistering client: {}", client); clients.remove(client); } @@ -138,9 +141,9 @@ public class NettyNetworkService extends AbstractService implements @Override public Lineage2Client discover(CharacterID character) { Preconditions.checkNotNull(character, "character"); - + log.debug("Discovering client object for {}", character); - + for (final Lineage2Client client : clients) { if (character.equals(client.getCharacterID())) return client; @@ -151,9 +154,9 @@ public class NettyNetworkService extends AbstractService implements @Override public void broadcast(ServerPacket packet) { Preconditions.checkNotNull(packet, "packet"); - + log.debug("Broadcasting {} packet to all connected clients", packet); - + channel.write(packet); } diff --git a/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java b/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java index d03825dd8..c7b81843e 100644 --- a/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java +++ b/src/main/java/com/l2jserver/service/network/broadcast/BroadcastServiceImpl.java @@ -79,8 +79,10 @@ public class BroadcastServiceImpl extends AbstractService implements private final WorldEventDispatcher eventDispatcher; /** - * @param worldService the world service - * @param eventDispatcher the world service event disptacher + * @param worldService + * the world service + * @param eventDispatcher + * the world service event disptacher */ @Inject public BroadcastServiceImpl(WorldService worldService, diff --git a/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java b/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java index f69178acd..ddf23a217 100644 --- a/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java +++ b/src/main/java/com/l2jserver/service/network/keygen/PseudoRandomBlowfishKeygenService.java @@ -37,7 +37,7 @@ public class PseudoRandomBlowfishKeygenService extends AbstractService * The logger */ private final Logger log = LoggerFactory.getLogger(this.getClass()); - + /** * The random number generator */ @@ -51,7 +51,7 @@ public class PseudoRandomBlowfishKeygenService extends AbstractService @Override public byte[] generate() { log.debug("Generating a new key"); - + final byte[] key = new byte[16]; // randomize the 8 first bytes for (int i = 0; i < key.length; i++) { diff --git a/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java b/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java index 830120847..b6df67d4a 100644 --- a/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java +++ b/src/main/java/com/l2jserver/service/network/keygen/SecureBlowfishKeygenService.java @@ -38,7 +38,7 @@ public class SecureBlowfishKeygenService extends AbstractService implements * The logger */ private final Logger log = LoggerFactory.getLogger(this.getClass()); - + /** * The random number generator */ @@ -52,7 +52,7 @@ public class SecureBlowfishKeygenService extends AbstractService implements @Override public byte[] generate() { log.debug("Generating a new key"); - + final byte[] key = new byte[16]; // randomize the 8 first bytes for (int i = 0; i < key.length; i++) { diff --git a/src/main/java/com/l2jserver/util/RGBColor.java b/src/main/java/com/l2jserver/util/RGBColor.java index 790639f9e..5e8bb0a8b 100644 --- a/src/main/java/com/l2jserver/util/RGBColor.java +++ b/src/main/java/com/l2jserver/util/RGBColor.java @@ -37,9 +37,13 @@ public class RGBColor { /** * Creates a new RGB (red-green-blue) color - * @param r the red byte - * @param g the green byte - * @param b the blue byte + * + * @param r + * the red byte + * @param g + * the green byte + * @param b + * the blue byte */ protected RGBColor(byte r, byte g, byte b) { this.red = r; @@ -88,7 +92,9 @@ public class RGBColor { /** * Creates an {@link RGBColor} from an byte array - * @param rgb the RGB byte array + * + * @param rgb + * the RGB byte array * @return the {@link RGBColor} */ public static RGBColor fromByteArray(byte[] rgb) { @@ -96,7 +102,8 @@ public class RGBColor { } /** - * @param color the color integer + * @param color + * the color integer * @return the {@link RGBColor} */ public static RGBColor fromInteger(int color) { diff --git a/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java b/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java index 405c59978..c21ba67e0 100644 --- a/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java +++ b/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java @@ -245,6 +245,7 @@ public class ComplexCalculator> functions.clear(); } + @Override public double calculate(V v, T ctx, double value) { for (final Function function : getList(v)) { value = function.calculate(ctx, value); @@ -257,6 +258,7 @@ public class ComplexCalculator> return 0; } + @Override public double calculate(V v, T ctx) { return calculate(v, ctx, 0); } diff --git a/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java b/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java index 91134a44e..c94c5183f 100644 --- a/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java +++ b/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java @@ -55,6 +55,7 @@ public class SimpleCalculator> Arrays.sort(this.functions, FunctionOrderComparator.SHARED_INSTANCE); } + @Override public double calculate(V v, T ctx, double value) { if (v != this.value) return value; @@ -64,6 +65,7 @@ public class SimpleCalculator> return value; } + @Override public double calculate(V v, T ctx) { return calculate(ctx, 0); } diff --git a/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java b/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java index 074249162..68ac7be72 100644 --- a/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/CoordinateAdapter.java @@ -49,6 +49,7 @@ public class CoordinateAdapter extends /** * Internal usage class: class used to read coordinate data from XML file + * * @author Rogiel */ protected static class CoordinateElement { @@ -75,9 +76,12 @@ public class CoordinateAdapter extends } /** - * @param x the x cord - * @param y the y cord - * @param z the z cord + * @param x + * the x cord + * @param y + * the y cord + * @param z + * the z cord */ public CoordinateElement(int x, int y, int z) { super(); diff --git a/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java index 2cca0deb4..cd017a0c5 100644 --- a/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/ItemTemplateIDAdapter.java @@ -41,7 +41,8 @@ public class ItemTemplateIDAdapter extends XmlAdapter { } /** - * @param provider the item template id provider + * @param provider + * the item template id provider */ @Inject public ItemTemplateIDAdapter(ItemTemplateIDProvider provider) { diff --git a/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java index 6425e9f10..1e1b70ead 100644 --- a/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/NPCTemplateIDAdapter.java @@ -42,7 +42,8 @@ public class NPCTemplateIDAdapter extends XmlAdapter { } /** - * @param provider the {@link NPC} template id provider + * @param provider + * the {@link NPC} template id provider */ @Inject public NPCTemplateIDAdapter(NPCTemplateIDProvider provider) { diff --git a/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java index a9e821e5a..4e8ea443f 100644 --- a/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/SkillTemplateIDAdapter.java @@ -43,7 +43,8 @@ public class SkillTemplateIDAdapter extends } /** - * @param provider the {@link Skill} template id provider + * @param provider + * the {@link Skill} template id provider */ @Inject public SkillTemplateIDAdapter(SkillTemplateIDProvider provider) { diff --git a/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java b/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java index ec5b890c1..3cb97ae0d 100644 --- a/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java +++ b/src/main/java/com/l2jserver/util/jaxb/TeleportationTemplateIDAdapter.java @@ -42,7 +42,8 @@ public class TeleportationTemplateIDAdapter extends } /** - * @param provider the teleportation template id provider + * @param provider + * the teleportation template id provider */ @Inject public TeleportationTemplateIDAdapter( diff --git a/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java index 49d205d87..1442fc3c8 100644 --- a/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java +++ b/src/main/java/com/l2jserver/util/transformer/impl/PathTransformer.java @@ -34,7 +34,7 @@ public class PathTransformer implements Transformer { @Override public String transform(Path value) { - if(value == null) + if (value == null) return ""; return value.toString(); } diff --git a/src/tool/java/com/l2jserver/tool/EndianessTest.java b/src/tool/java/com/l2jserver/tool/EndianessTest.java index 872c896fb..d5bba02b5 100644 --- a/src/tool/java/com/l2jserver/tool/EndianessTest.java +++ b/src/tool/java/com/l2jserver/tool/EndianessTest.java @@ -23,6 +23,7 @@ import java.util.Arrays; public class EndianessTest { /** * @param args + * the arguments */ public static void main(String[] args) { final ByteBuffer bigEndian = ByteBuffer.allocate(8);