Code cleanup

Signed-off-by: Rogiel <rogiel@rogiel.com>

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)
+		if (!(user instanceof Levelable) && !(user instanceof Castable))
-				&& !(user instanceof Equiper))
 			return;
 		final Levelable levelable = (Levelable) user;
 		final Castable castable = (Castable) user;

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() {

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;

src/main/java/com/l2jserver/model/id/template/CharacterTemplateID.java

@@ -27,6 +27,6 @@ public class CharacterTemplateID extends TemplateID<CharacterTemplate> {
 
 	@Override
 	public CharacterTemplate getTemplate() {
-		return (CharacterTemplate) templateService.getTemplate(this);
+		return templateService.getTemplate(this);
 	}
 }

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}
+ * An {@link TemplateID} instance representing an {@link ItemTemplate} object
- * object
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
@@ -26,6 +25,6 @@ public class ItemTemplateID extends TemplateID<ItemTemplate> {
 
 	@Override
 	public ItemTemplate getTemplate() {
-		return (ItemTemplate) templateService.getTemplate(this);
+		return templateService.getTemplate(this);
 	}
 }

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}
+ * An {@link TemplateID} instance representing an {@link SkillTemplate} object
- * object
  * 
  * @author <a href="http://www.rogiel.com">Rogiel</a>
  */
@@ -26,6 +25,6 @@ public class SkillTemplateID extends TemplateID<SkillTemplate> {
 
 	@Override
 	public SkillTemplate getTemplate() {
-		return (SkillTemplate) templateService.getTemplate(this);
+		return templateService.getTemplate(this);
 	}
 }

src/main/java/com/l2jserver/model/template/AbstractTemplate.java

@@ -18,6 +18,7 @@ public abstract class AbstractTemplate<T> implements Template<T> {
 
 	/**
 	 * Creates a new instance
+	 * 
 	 * @param id
 	 */
 	protected AbstractTemplate(TemplateID<?> id) {

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;
 	}

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!");

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();
 	}

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);

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<Double> {
 	public static final DoubleTransformer SHARED_INSTANCE = new DoubleTransformer();
-	
+
 	@Override
 	public String transform(Double value) {
 		return Double.toString(value);

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<Integer> {
 	public static final IntegerTransformer SHARED_INSTANCE = new IntegerTransformer();
-	
+
 	@Override
 	public String transform(Integer value) {
 		return Integer.toString(value);

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<Short> {
 	public static final ShortTransformer SHARED_INSTANCE = new ShortTransformer();
-	
+
 	@Override
 	public String transform(Short value) {
 		return Short.toString(value);

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;