External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

GUI: deck legality improves:

Browse source 
* Fixed wrong sorting;
 * Added tooltip errors limit (#6854);
 * Added tooltip size restrictions (#6854);
This commit is contained in:
Oleg Agafonov 2020-08-17 02:55:51 +04:00
parent a9627e6101
commit fcaacd8c1e
2 changed files with 41 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Mage/src/main/java/mage/cards/decks/DeckValidator.java
View file

@ -51,15 +51,19 @@ public abstract class DeckValidator implements Serializable {
return this.errorsList;
}
public List<DeckValidatorError> getErrorsListSorted() {
return getErrorsListSorted(Integer.MAX_VALUE);
}
/**
* Get errors list sorted by error type and texts
*
* @return
*/
public List<DeckValidatorError> getErrorsListSorted() {
public List<DeckValidatorError> getErrorsListSorted(int maxErrors) {
List<DeckValidatorError> list = new ArrayList<>(this.getErrorsList());
Collections.sort(list, new Comparator<DeckValidatorError>() {
list.sort(new Comparator<DeckValidatorError>() {
@Override
public int compare(DeckValidatorError e1, DeckValidatorError e2) {
int res = 0;
@ -67,22 +71,31 @@ public abstract class DeckValidator implements Serializable {
// sort by error type
Integer order1 = e1.getErrorType().getSortOrder();
Integer order2 = e2.getErrorType().getSortOrder();
res = order2.compareTo(order1);
res = order1.compareTo(order2);
// sort by group
if (res != 0) {
res = e2.getGroup().compareTo(e1.getGroup());
if (res == 0) {
res = e1.getGroup().compareTo(e2.getGroup());
}
// sort by message
if (res != 0) {
res = e2.getMessage().compareTo(e1.getMessage());
if (res == 0) {
res = e1.getMessage().compareTo(e2.getMessage());
}
return res;
}
});
if (list.size() <= maxErrors) {
return list;
} else {
int otherErrorsCount = list.size() - maxErrors;
list = list.stream().limit(maxErrors).collect(Collectors.toList());
list.add(new DeckValidatorError(DeckValidatorErrorType.OTHER, "...",
"and more " + otherErrorsCount + " error" + (otherErrorsCount > 1 ? "s" : "")));
}
return list;
}