1
0
mirror of https://github.com/Rogiel/l2jserver2 synced 2025-12-08 08:23:11 +00:00

Fix Java 7 compiler warnings

Adds @SafeVarargs annotation to non-problematic varargs.
This commit is contained in:
2011-10-09 13:01:50 -03:00
parent 2e6fdb20bb
commit 6f680acd2c
16 changed files with 35 additions and 22 deletions

View File

@@ -44,6 +44,7 @@ public class WorldObjectIterator<T extends WorldObject> implements Iterator<T> {
* @param ids
* the {@link ObjectID} var-arg
*/
@SafeVarargs
public WorldObjectIterator(ObjectID<T>... ids) {
this(new ArrayIterator<ObjectID<T>>(ids));
}

View File

@@ -29,6 +29,7 @@ public class ActorCalculator extends
* @param calculators
* the calculators
*/
@SafeVarargs
public ActorCalculator(
Calculator<ActorCalculatorContext, StatType>... calculators) {
super(StatType.class, calculators);

View File

@@ -149,7 +149,6 @@ public abstract class ActorStats<T extends ActorCalculatorContext> {
* @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,

View File

@@ -263,7 +263,6 @@ public class CharacterStats extends ActorStats<CharacterCalculatorContext> {
/**
* The character calculator
*/
@SuppressWarnings("unchecked")
private static final CharacterCalculator calculator = new CharacterCalculator();
/**
@@ -300,7 +299,6 @@ public class CharacterStats extends ActorStats<CharacterCalculatorContext> {
/**
* Setups the default formulas
*/
@SuppressWarnings("unchecked")
private void setup() {
calculator.addNoSort(BASE_HP_FORMULA, BASE_MP_FORMULA, BASE_CP_FORMULA);

View File

@@ -31,6 +31,7 @@ public class CharacterCalculator extends ActorCalculator {
* @param calculators
* the calculators
*/
@SafeVarargs
public CharacterCalculator(
Calculator<ActorCalculatorContext, StatType>... calculators) {
super(calculators);

View File

@@ -215,7 +215,6 @@ public class NPCStats extends ActorStats<NPCCalculatorContext> {
* @param npc
* the npc
*/
@SuppressWarnings("unchecked")
public NPCStats(NPC npc) {
super();
this.npc = npc;

View File

@@ -39,6 +39,7 @@ public class AndFilter<O extends WorldObject> implements WorldObjectFilter<O> {
* @param filters
* filters to be used with <tt>AND</tt> operator
*/
@SafeVarargs
public AndFilter(WorldObjectFilter<O>... filters) {
this.filters = filters;
}

View File

@@ -39,6 +39,7 @@ public class OrFilter<O extends WorldObject> implements WorldObjectFilter<O> {
* @param filters
* filters to be used with <tt>OR</tt> operator
*/
@SafeVarargs
public OrFilter(WorldObjectFilter<O>... filters) {
this.filters = filters;
}

View File

@@ -33,6 +33,7 @@ public final class WorldFilters {
* the filters
* @return the {@link AndFilter}
*/
@SafeVarargs
public static final <O extends WorldObject> WorldObjectFilter<O> and(
WorldObjectFilter<O>... filters) {
return new AndFilter<O>(filters);
@@ -47,6 +48,7 @@ public final class WorldFilters {
* the filters
* @return the {@link OrFilter}
*/
@SafeVarargs
public static final <O extends WorldObject> WorldObjectFilter<O> or(
WorldObjectFilter<O>... filters) {
return new OrFilter<O>(filters);

View File

@@ -81,6 +81,7 @@ public class ComplexCalculator<T extends CalculatorContext, V extends Enum<V>>
* @param functions
* the calculator functions
*/
@SafeVarargs
public ComplexCalculator(V value, Function<T, V>... functions) {
super(0x00, value);
this.functions = new EnumMap<V, List<Function<T, V>>>(
@@ -97,6 +98,7 @@ public class ComplexCalculator<T extends CalculatorContext, V extends Enum<V>>
* @param functions
* the calculator functions
*/
@SafeVarargs
public ComplexCalculator(Class<V> type, Function<T, V>... functions) {
this(type);
add(functions);
@@ -133,7 +135,8 @@ public class ComplexCalculator<T extends CalculatorContext, V extends Enum<V>>
* @param functions
* the functions to be added
*/
public void add(Function<T, V>... functions) {
@SafeVarargs
public final void add(Function<T, V>... functions) {
for (final Function<T, V> func : functions) {
getList(func.type()).add(func);
}
@@ -149,7 +152,8 @@ public class ComplexCalculator<T extends CalculatorContext, V extends Enum<V>>
* @param functions
* the functions to be added
*/
public void addNoSort(Function<T, V>... functions) {
@SafeVarargs
public final void addNoSort(Function<T, V>... functions) {
for (final Function<T, V> func : functions) {
getList(func.type()).add(func);
}

View File

@@ -48,6 +48,7 @@ public class SimpleCalculator<T extends CalculatorContext, V extends Enum<V>>
* @param functions
* the calculator functions
*/
@SafeVarargs
public SimpleCalculator(V value, Function<T, V>... functions) {
super(0x00, value);
this.value = value;