Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Code cleanup: protect all copy constructors (#10750)

Browse source 
* apply regex to change public copy constructors to protected
* cleanup code using now protected constructors
* fix manaBuilder weird casting of Mana into ConditionalMana
This commit is contained in:
Susucre 2023-08-05 01:34:58 +02:00 • committed by GitHub
parent b04b13d530
commit f75b1c9f0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1565 changed files with 2412 additions and 2731 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Mage/src/main/java/mage/abilities/mana/ManaOptions.java
View file

@ -9,7 +9,6 @@ import mage.game.events.GameEvent;
import mage.game.events.ManaEvent;
import mage.game.events.TappedForManaEvent;
import mage.players.Player;
import mage.util.TreeNode;
import org.apache.log4j.Logger;
import java.util.*;
@ -26,7 +25,6 @@ import java.util.*;
* <p>
* A LinkedHashSet is used to get the performance benefits of automatic de-duplication of the Mana
* to avoid performance issues related with manual de-duplication (see https://github.com/magefree/mage/issues/7710).
*
*/
public class ManaOptions extends LinkedHashSet<Mana> {
@ -35,7 +33,7 @@ public class ManaOptions extends LinkedHashSet<Mana> {
public ManaOptions() {
}
public ManaOptions(final ManaOptions options) {
protected ManaOptions(final ManaOptions options) {
for (Mana mana : options) {
this.add(mana.copy());
}
@ -172,7 +170,7 @@ public class ManaOptions extends LinkedHashSet<Mana> {
checkManaReplacementAndTriggeredMana(ability, game, netMana);
for (Mana triggeredManaVariation : getTriggeredManaVariations(game, ability, netMana)) {
for (Mana mana : copy) {
Mana newMana = new Mana(mana);
Mana newMana = mana.copy();
newMana.add(triggeredManaVariation);
this.add(newMana);
wasUsable = true;
@ -214,7 +212,7 @@ public class ManaOptions extends LinkedHashSet<Mana> {
checkManaReplacementAndTriggeredMana(ability, game, netMana);
for (Mana triggeredManaVariation : getTriggeredManaVariations(game, ability, netMana)) {
for (Mana mana : copy) {
Mana newMana = new Mana(mana);
Mana newMana = mana.copy();
newMana.add(triggeredManaVariation);
this.add(newMana);
wasUsable = true;
@ -315,7 +313,7 @@ public class ManaOptions extends LinkedHashSet<Mana> {
this.clear();
for (Mana triggeredMana : triggeredNetMana) {
for (Mana mana : copy) {
Mana newMana = new Mana(mana);
Mana newMana = mana.copy();
newMana.add(triggeredMana);
this.add(newMana);
}
@ -364,7 +362,7 @@ public class ManaOptions extends LinkedHashSet<Mana> {
this.clear();
for (Mana addMana : options) {
for (Mana mana : copy) {
Mana newMana = new Mana(mana);
Mana newMana = mana.copy();
newMana.add(addMana);
this.add(newMana);
}
@ -604,33 +602,33 @@ public class ManaOptions extends LinkedHashSet<Mana> {
/**
* Utility function to get a Mana from ManaOptions at the specified position.
* Since the implementation uses a LinkedHashSet the ordering of the items is preserved.
*
* <p>
* NOTE: Do not use in tight loops as performance of the lookup is much worse than
* for ArrayList (the previous superclass of ManaOptions).
* for ArrayList (the previous superclass of ManaOptions).
*/
public Mana getAtIndex(int i) {
if (i < 0 || i >= this.size()) {
throw new IndexOutOfBoundsException();
}
Iterator<Mana> itr = this.iterator();
while(itr.hasNext()) {
if (i == 0) {
return itr.next();
} else {
itr.next(); // Ignore the value
i--;
}
}
return null; // Not sure how we'd ever get here, but leave just in case since IDE complains.
if (i < 0 || i >= this.size()) {
throw new IndexOutOfBoundsException();
}
Iterator<Mana> itr = this.iterator();
while (itr.hasNext()) {
if (i == 0) {
return itr.next();
} else {
itr.next(); // Ignore the value
i--;
}
}
return null; // Not sure how we'd ever get here, but leave just in case since IDE complains.
}
}
/**
* from: https://stackoverflow.com/a/35000727/7983747
*
* @author Gili Tzabari
*/
final class Comparators
{
final class Comparators {
/**
* Verify that a comparator is transitive.
*
@ -640,8 +638,8 @@ final class Comparators
* @throws AssertionError if the comparator is not transitive
*/
public static <T> void verifyTransitivity(Comparator<T> comparator, Collection<T> elements) {
for (T first: elements) {
for (T second: elements) {
for (T first : elements) {
for (T second : elements) {
int result1 = comparator.compare(first, second);
int result2 = comparator.compare(second, first);
if (result1 != -result2 && !(result1 == 0 && result1 == result2)) {
@ -653,12 +651,12 @@ final class Comparators
}
}
}
for (T first: elements) {
for (T second: elements) {
for (T first : elements) {
for (T second : elements) {
int firstGreaterThanSecond = comparator.compare(first, second);
if (firstGreaterThanSecond <= 0)
continue;
for (T third: elements) {
for (T third : elements) {
int secondGreaterThanThird = comparator.compare(second, third);
if (secondGreaterThanThird <= 0)
continue;
@ -676,5 +674,7 @@ final class Comparators
}
}
}
private Comparators() {}
private Comparators() {
}
}