From 6f680acd2c68a2e2ddbcb01d4dd261bdc3816194 Mon Sep 17 00:00:00 2001 From: Rogiel Date: Sun, 9 Oct 2011 13:01:50 -0300 Subject: [PATCH] Fix Java 7 compiler warnings Adds @SafeVarargs annotation to non-problematic varargs. --- l2jserver2-gameserver/LICENSE => LICENSE | 0 .../database/AbstractJDBCDatabaseService.java | 1 + .../AbstractOrientDatabaseService.java | 1 + .../com/l2jserver/util/ArrayIterator.java | 1 + l2jserver2-gameserver/data/sample/char.xml | 34 ++++++++++--------- .../object/iterator/WorldObjectIterator.java | 1 + .../actor/calculator/ActorCalculator.java | 1 + .../model/world/actor/stat/ActorStats.java | 1 - .../model/world/character/CharacterStats.java | 2 -- .../calculator/CharacterCalculator.java | 1 + .../l2jserver/model/world/npc/NPCStats.java | 1 - .../service/game/world/filter/AndFilter.java | 1 + .../service/game/world/filter/OrFilter.java | 1 + .../game/world/filter/WorldFilters.java | 2 ++ .../util/calculator/ComplexCalculator.java | 8 +++-- .../util/calculator/SimpleCalculator.java | 1 + 16 files changed, 35 insertions(+), 22 deletions(-) rename l2jserver2-gameserver/LICENSE => LICENSE (100%) diff --git a/l2jserver2-gameserver/LICENSE b/LICENSE similarity index 100% rename from l2jserver2-gameserver/LICENSE rename to LICENSE diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java index d470ee46e..25baace41 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractJDBCDatabaseService.java @@ -474,6 +474,7 @@ public abstract class AbstractJDBCDatabaseService extends AbstractService * @param objects * the object list */ + @SafeVarargs public InsertUpdateQuery(T... objects) { this(new ArrayIterator(objects)); } diff --git a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java index 7b3c6f3e6..20492682e 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/service/database/AbstractOrientDatabaseService.java @@ -357,6 +357,7 @@ public abstract class AbstractOrientDatabaseService extends AbstractService * @param objects * the object list */ + @SafeVarargs public InsertUpdateQuery(T... objects) { this(new ArrayIterator(objects)); } diff --git a/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java b/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java index 1894cac1b..5d9f4e66d 100644 --- a/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java +++ b/l2jserver2-common/src/main/java/com/l2jserver/util/ArrayIterator.java @@ -43,6 +43,7 @@ public class ArrayIterator implements Iterator { * @param objects * the objects */ + @SafeVarargs public ArrayIterator(T... objects) { this.objects = objects; } diff --git a/l2jserver2-gameserver/data/sample/char.xml b/l2jserver2-gameserver/data/sample/char.xml index 5009568c0..7122564d7 100644 --- a/l2jserver2-gameserver/data/sample/char.xml +++ b/l2jserver2-gameserver/data/sample/char.xml @@ -1,23 +1,25 @@ - - - - - - - - - - + + + + + + + + + - - + + - - 100 + + + 81900 - - + + diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java index aeb9f46f3..222a8a7be 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/id/object/iterator/WorldObjectIterator.java @@ -44,6 +44,7 @@ public class WorldObjectIterator implements Iterator { * @param ids * the {@link ObjectID} var-arg */ + @SafeVarargs public WorldObjectIterator(ObjectID... ids) { this(new ArrayIterator>(ids)); } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java index f0abb8336..3b7739c36 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/calculator/ActorCalculator.java @@ -29,6 +29,7 @@ public class ActorCalculator extends * @param calculators * the calculators */ + @SafeVarargs public ActorCalculator( Calculator... calculators) { super(StatType.class, calculators); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java index 425037afc..f02d2ae0e 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/actor/stat/ActorStats.java @@ -149,7 +149,6 @@ public abstract class ActorStats { * @param calculator * the calculator */ - @SuppressWarnings("unchecked") protected void addTo(ActorCalculator calculator) { calculator.addNoSort(HP_BONUS_FORMULA, MP_BONUS_FORMULA, RUN_SPEED_BONUS_FORMULA, WALK_SPEED_BONUS_FORMULA, diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java index 6b74f77d3..5cc65a325 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/CharacterStats.java @@ -263,7 +263,6 @@ public class CharacterStats extends ActorStats { /** * The character calculator */ - @SuppressWarnings("unchecked") private static final CharacterCalculator calculator = new CharacterCalculator(); /** @@ -300,7 +299,6 @@ public class CharacterStats extends ActorStats { /** * Setups the default formulas */ - @SuppressWarnings("unchecked") private void setup() { calculator.addNoSort(BASE_HP_FORMULA, BASE_MP_FORMULA, BASE_CP_FORMULA); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java index 0f9a324a3..3bb098fa3 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/character/calculator/CharacterCalculator.java @@ -31,6 +31,7 @@ public class CharacterCalculator extends ActorCalculator { * @param calculators * the calculators */ + @SafeVarargs public CharacterCalculator( Calculator... calculators) { super(calculators); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java index f6f00bacb..aebf89ce8 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/model/world/npc/NPCStats.java @@ -215,7 +215,6 @@ public class NPCStats extends ActorStats { * @param npc * the npc */ - @SuppressWarnings("unchecked") public NPCStats(NPC npc) { super(); this.npc = npc; diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java index 10715b50c..63833c5e4 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/AndFilter.java @@ -39,6 +39,7 @@ public class AndFilter implements WorldObjectFilter { * @param filters * filters to be used with AND operator */ + @SafeVarargs public AndFilter(WorldObjectFilter... filters) { this.filters = filters; } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java index dbe2a6dd4..5e8e78606 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/OrFilter.java @@ -39,6 +39,7 @@ public class OrFilter implements WorldObjectFilter { * @param filters * filters to be used with OR operator */ + @SafeVarargs public OrFilter(WorldObjectFilter... filters) { this.filters = filters; } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java index a2359f0ef..cbad48688 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/service/game/world/filter/WorldFilters.java @@ -33,6 +33,7 @@ public final class WorldFilters { * the filters * @return the {@link AndFilter} */ + @SafeVarargs public static final WorldObjectFilter and( WorldObjectFilter... filters) { return new AndFilter(filters); @@ -47,6 +48,7 @@ public final class WorldFilters { * the filters * @return the {@link OrFilter} */ + @SafeVarargs public static final WorldObjectFilter or( WorldObjectFilter... filters) { return new OrFilter(filters); diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java index c21ba67e0..df5eb6ba7 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/ComplexCalculator.java @@ -81,6 +81,7 @@ public class ComplexCalculator> * @param functions * the calculator functions */ + @SafeVarargs public ComplexCalculator(V value, Function... functions) { super(0x00, value); this.functions = new EnumMap>>( @@ -97,6 +98,7 @@ public class ComplexCalculator> * @param functions * the calculator functions */ + @SafeVarargs public ComplexCalculator(Class type, Function... functions) { this(type); add(functions); @@ -133,7 +135,8 @@ public class ComplexCalculator> * @param functions * the functions to be added */ - public void add(Function... functions) { + @SafeVarargs + public final void add(Function... functions) { for (final Function func : functions) { getList(func.type()).add(func); } @@ -149,7 +152,8 @@ public class ComplexCalculator> * @param functions * the functions to be added */ - public void addNoSort(Function... functions) { + @SafeVarargs + public final void addNoSort(Function... functions) { for (final Function func : functions) { getList(func.type()).add(func); } diff --git a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java index c94c5183f..e243eec3f 100644 --- a/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java +++ b/l2jserver2-gameserver/src/main/java/com/l2jserver/util/calculator/SimpleCalculator.java @@ -48,6 +48,7 @@ public class SimpleCalculator> * @param functions * the calculator functions */ + @SafeVarargs public SimpleCalculator(V value, Function... functions) { super(0x00, value); this.value = value;