From 1e52e960f59e3c2c383d5d02a4aaa492dd988dc1 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Sat, 14 May 2011 13:35:12 -0300 Subject: [PATCH] Code cleanup Signed-off-by: Rogiel --- .../armor/AbstractGradeAArmorTemplate.java | 3 +-- .../l2jserver/game/net/Lineage2Connection.java | 1 + .../model/id/factory/IDFactoryModule.java | 2 +- .../model/id/template/CharacterTemplateID.java | 2 +- .../model/id/template/ItemTemplateID.java | 5 ++--- .../model/id/template/SkillTemplateID.java | 5 ++--- .../model/template/AbstractTemplate.java | 1 + .../l2jserver/model/world/AbstractActor.java | 1 + .../l2jserver/model/world/AbstractObject.java | 2 ++ .../CharacterCalculatedAttributes.java | 18 ++++++++++++++++++ .../world/event/WorldEventDispatcherImpl.java | 1 + .../transformer/impl/DoubleTransformer.java | 2 +- .../transformer/impl/IntegerTransformer.java | 2 +- .../transformer/impl/ShortTransformer.java | 2 +- .../model/id/factory/IDFactoryTest.java | 1 - 15 files changed, 34 insertions(+), 14 deletions(-) diff --git a/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java b/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java index a34d986e9..cbccc1cd4 100644 --- a/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java +++ b/data/script/template/script/template/item/armor/AbstractGradeAArmorTemplate.java @@ -21,8 +21,7 @@ public abstract class AbstractGradeAArmorTemplate extends ArmorTemplate @Override public void penalty(Equiper user) { - if (!(user instanceof Levelable) && !(user instanceof Castable) - && !(user instanceof Equiper)) + if (!(user instanceof Levelable) && !(user instanceof Castable)) return; final Levelable levelable = (Levelable) user; final Castable castable = (Castable) user; diff --git a/src/main/java/com/l2jserver/game/net/Lineage2Connection.java b/src/main/java/com/l2jserver/game/net/Lineage2Connection.java index e37a3dc35..ffdf21cae 100644 --- a/src/main/java/com/l2jserver/game/net/Lineage2Connection.java +++ b/src/main/java/com/l2jserver/game/net/Lineage2Connection.java @@ -145,6 +145,7 @@ public class Lineage2Connection { /** * Get the channel + * * @return the channel */ public Channel getChannel() { diff --git a/src/main/java/com/l2jserver/model/id/factory/IDFactoryModule.java b/src/main/java/com/l2jserver/model/id/factory/IDFactoryModule.java index 4010901ef..76445ccf4 100644 --- a/src/main/java/com/l2jserver/model/id/factory/IDFactoryModule.java +++ b/src/main/java/com/l2jserver/model/id/factory/IDFactoryModule.java @@ -7,8 +7,8 @@ import com.google.inject.assistedinject.FactoryModuleBuilder; import com.l2jserver.model.id.object.allocator.BitSetIDAllocator; import com.l2jserver.model.id.object.allocator.IDAllocator; import com.l2jserver.model.id.object.factory.CharacterIDFactory; -import com.l2jserver.model.id.object.factory.ItemIDFactory; import com.l2jserver.model.id.object.factory.CharacterIDFactory.CharacterIDGuiceFactory; +import com.l2jserver.model.id.object.factory.ItemIDFactory; import com.l2jserver.model.id.object.factory.ItemIDFactory.ItemIDGuiceFactory; import com.l2jserver.model.id.template.factory.CharacterTemplateIDFactory; import com.l2jserver.model.id.template.factory.ItemTemplateIDFactory; 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 0f580d275..185cb734c 100644 --- a/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java @@ -27,6 +27,6 @@ public class CharacterTemplateID extends TemplateID { @Override public CharacterTemplate getTemplate() { - return (CharacterTemplate) templateService.getTemplate(this); + return templateService.getTemplate(this); } } 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 4add4462c..72e3f76d1 100644 --- a/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/ItemTemplateID.java @@ -7,8 +7,7 @@ import com.l2jserver.model.template.ItemTemplate; import com.l2jserver.service.game.template.TemplateService; /** - * An {@link TemplateID} instance representing an {@link ItemTemplate} - * object + * An {@link TemplateID} instance representing an {@link ItemTemplate} object * * @author Rogiel */ @@ -26,6 +25,6 @@ public class ItemTemplateID extends TemplateID { @Override public ItemTemplate getTemplate() { - return (ItemTemplate) templateService.getTemplate(this); + return templateService.getTemplate(this); } } 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 0d42adcfc..f0d768cf6 100644 --- a/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java +++ b/src/main/java/com/l2jserver/model/id/template/SkillTemplateID.java @@ -7,8 +7,7 @@ import com.l2jserver.model.template.SkillTemplate; import com.l2jserver.service.game.template.TemplateService; /** - * An {@link TemplateID} instance representing an {@link SkillTemplate} - * object + * An {@link TemplateID} instance representing an {@link SkillTemplate} object * * @author Rogiel */ @@ -26,6 +25,6 @@ public class SkillTemplateID extends TemplateID { @Override public SkillTemplate getTemplate() { - return (SkillTemplate) templateService.getTemplate(this); + return templateService.getTemplate(this); } } diff --git a/src/main/java/com/l2jserver/model/template/AbstractTemplate.java b/src/main/java/com/l2jserver/model/template/AbstractTemplate.java index 24ccb9b34..e268e2a8b 100644 --- a/src/main/java/com/l2jserver/model/template/AbstractTemplate.java +++ b/src/main/java/com/l2jserver/model/template/AbstractTemplate.java @@ -18,6 +18,7 @@ public abstract class AbstractTemplate implements Template { /** * Creates a new instance + * * @param id */ protected AbstractTemplate(TemplateID id) { diff --git a/src/main/java/com/l2jserver/model/world/AbstractActor.java b/src/main/java/com/l2jserver/model/world/AbstractActor.java index 4f41999bb..ecc641790 100644 --- a/src/main/java/com/l2jserver/model/world/AbstractActor.java +++ b/src/main/java/com/l2jserver/model/world/AbstractActor.java @@ -191,6 +191,7 @@ public abstract class AbstractActor extends AbstractObject implements Actor { /** * @return the active effects on this actor */ + @Override public ActorEffects getEffects() { return effects; } diff --git a/src/main/java/com/l2jserver/model/world/AbstractObject.java b/src/main/java/com/l2jserver/model/world/AbstractObject.java index 8df97d480..e45d0c946 100644 --- a/src/main/java/com/l2jserver/model/world/AbstractObject.java +++ b/src/main/java/com/l2jserver/model/world/AbstractObject.java @@ -13,10 +13,12 @@ public abstract class AbstractObject implements WorldObject { */ protected ObjectID id; + @Override public ObjectID getID() { return id; } + @Override public void setID(ObjectID id) { if (this.id != null) throw new IllegalStateException("ID is already set!"); diff --git a/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java b/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java index 9c4898bb7..37e0576e5 100644 --- a/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java +++ b/src/main/java/com/l2jserver/model/world/character/CharacterCalculatedAttributes.java @@ -25,74 +25,92 @@ public class CharacterCalculatedAttributes implements CharacterAttributes { this.baseAttributes = this.character.getBaseAttributes(); } + @Override public int getIntelligence() { return baseAttributes.getIntelligence(); } + @Override public int getStrength() { return baseAttributes.getStrength(); } + @Override public int getConcentration() { return baseAttributes.getConcentration(); } + @Override public int getMentality() { return baseAttributes.getMentality(); } + @Override public int getDexterity() { return baseAttributes.getDexterity(); } + @Override public int getWitness() { return baseAttributes.getWitness(); } + @Override public int getPhysicalAttack() { return baseAttributes.getPhysicalAttack(); } + @Override public int getMagicalAttack() { return baseAttributes.getMagicalAttack(); } + @Override public int getPhysicalDefense() { return baseAttributes.getPhysicalDefense(); } + @Override public int getMagicalDefense() { return baseAttributes.getMagicalDefense(); } + @Override public int getAttackSpeed() { return baseAttributes.getAttackSpeed(); } + @Override public int getCastSpeed() { return baseAttributes.getCastSpeed(); } + @Override public int getAccuracy() { return baseAttributes.getAccuracy(); } + @Override public int getCriticalChance() { return baseAttributes.getCriticalChance(); } + @Override public int getEvasionChance() { return baseAttributes.getEvasionChance(); } + @Override public int getMoveSpeed() { return baseAttributes.getMoveSpeed(); } + @Override public int getMaxWeigth() { return baseAttributes.getMaxWeigth(); } + @Override public boolean canCraft() { return baseAttributes.canCraft(); } diff --git a/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java b/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java index 56e2a04c0..e5ac9fa0d 100644 --- a/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java +++ b/src/main/java/com/l2jserver/service/game/world/event/WorldEventDispatcherImpl.java @@ -44,6 +44,7 @@ public class WorldEventDispatcherImpl implements WorldEventDispatcher { }, 0, 50); } + @Override public void dispatch(WorldEvent event) { log.debug("Queing dispatch for event {}", event); events.add(event); diff --git a/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java index 3bdf2ccc3..f0e2e07f8 100644 --- a/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java +++ b/src/main/java/com/l2jserver/util/transformer/impl/DoubleTransformer.java @@ -9,7 +9,7 @@ import com.l2jserver.util.transformer.Transformer; */ public class DoubleTransformer implements Transformer { public static final DoubleTransformer SHARED_INSTANCE = new DoubleTransformer(); - + @Override public String transform(Double value) { return Double.toString(value); diff --git a/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java index 8a795d8f6..a5bac4fc2 100644 --- a/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java +++ b/src/main/java/com/l2jserver/util/transformer/impl/IntegerTransformer.java @@ -9,7 +9,7 @@ import com.l2jserver.util.transformer.Transformer; */ public class IntegerTransformer implements Transformer { public static final IntegerTransformer SHARED_INSTANCE = new IntegerTransformer(); - + @Override public String transform(Integer value) { return Integer.toString(value); diff --git a/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java b/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java index c72dac476..1f827a15e 100644 --- a/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java +++ b/src/main/java/com/l2jserver/util/transformer/impl/ShortTransformer.java @@ -9,7 +9,7 @@ import com.l2jserver.util.transformer.Transformer; */ public class ShortTransformer implements Transformer { public static final ShortTransformer SHARED_INSTANCE = new ShortTransformer(); - + @Override public String transform(Short value) { return Short.toString(value); diff --git a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java index c950a21dc..e3cf26d76 100644 --- a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java +++ b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java @@ -9,7 +9,6 @@ import com.google.inject.Guice; import com.google.inject.Injector; import com.l2jserver.db.dao.DAOModuleMySQL5; import com.l2jserver.model.id.ID; -import com.l2jserver.model.id.factory.IDFactoryModule; import com.l2jserver.model.id.object.CharacterID; import com.l2jserver.model.id.object.factory.CharacterIDFactory; import com.l2jserver.model.world.L2Character;