diff --git a/src/magic/model/choice/MagicDeclareBlockersChoice.java b/src/magic/model/choice/MagicDeclareBlockersChoice.java index acb3597f57..b51e3b88e7 100644 --- a/src/magic/model/choice/MagicDeclareBlockersChoice.java +++ b/src/magic/model/choice/MagicDeclareBlockersChoice.java @@ -57,7 +57,7 @@ public class MagicDeclareBlockersChoice extends MagicChoice { blocker.setBlockedCreature(null); } attacker.permanent.removeBlockingCreatures(); - result.add(creatures.toArray(new MagicCombatCreature[creatures.size()])); + result.add(creatures.toArray(new MagicCombatCreature[0])); } } } diff --git a/src/magic/model/score/MagicMultipleScoreRanking.java b/src/magic/model/score/MagicMultipleScoreRanking.java index 421ebcd3a3..19d1478d00 100644 --- a/src/magic/model/score/MagicMultipleScoreRanking.java +++ b/src/magic/model/score/MagicMultipleScoreRanking.java @@ -9,12 +9,10 @@ import java.util.TreeSet; public class MagicMultipleScoreRanking implements MagicScoreRanking { private static final Comparator BEST_COMPARATOR=new Comparator() { - @Override public int compare(final MagicScoreResult result1,final MagicScoreResult result2) { - final int sdif=result2.getScore()-result1.getScore(); - if (sdif!=0) { + if (sdif != 0) { return sdif; } return result1.getPosition()-result2.getPosition(); @@ -22,12 +20,10 @@ public class MagicMultipleScoreRanking implements MagicScoreRanking { }; private static final Comparator WORST_COMPARATOR=new Comparator() { - @Override public int compare(final MagicScoreResult result1,final MagicScoreResult result2) { - final int sdif=result1.getScore()-result2.getScore(); - if (sdif!=0) { + if (sdif != 0) { return sdif; } return result1.getPosition()-result2.getPosition(); @@ -40,19 +36,18 @@ public class MagicMultipleScoreRanking implements MagicScoreRanking { private int worstScore; public MagicMultipleScoreRanking(final int maxSize,final boolean best) { - this.best=best; - results=new TreeSet(best?BEST_COMPARATOR:WORST_COMPARATOR); + results=new TreeSet(best ? BEST_COMPARATOR : WORST_COMPARATOR); left=maxSize; } public boolean addScore(final int score) { - - return left==0?(best?score>worstScore:score worstScore + : score < worstScore) + :true; } public void addScoreResult(final MagicScoreResult result) { - results.add(result); if (left==0) { results.remove(results.last()); @@ -64,7 +59,6 @@ public class MagicMultipleScoreRanking implements MagicScoreRanking { @Override public Collection getResults() { - return new ArrayList(results); } -} \ No newline at end of file +}