Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace addAll with param ctor #1771

Closed
wants to merge 1 commit into from

Conversation

grimreaper
Copy link
Member

No description provided.

Copy link
Contributor

@thpr thpr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor tweaks

choices.addAll(baseSet.getContainedObjects());
RETAIN: for (Iterator<T> it = choices.iterator(); it.hasNext();)
Set<T> choices = new HashSet<>(baseSet.getContainedObjects());
RETAIN: for (Iterator<T> it = choices.iterator(); it.hasNext();)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you have this indented as before, please?

final List<BonusObj> aList = new ArrayList<>();

aList.addAll(BonusUtilities.getBonusFromList(getBonusList(pc), aType,
final List<BonusObj> aList = new ArrayList<>(BonusUtilities.getBonusFromList(getBonusList(pc), aType,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

line length issue, please rewrap

@@ -1295,8 +1295,8 @@ public String getHTMLInfo(KitFacade kitFacade)
infoText.appendI18nElement("in_requirements", aString); //$NON-NLS-1$
}

List<BaseKit> sortedObjects = new ArrayList<>();
sortedObjects.addAll(kit.getSafeListFor(ListKey.KIT_TASKS));
List<BaseKit> sortedObjects = new ArrayList<>(kit.getSafeListFor(ListKey.KIT_TASKS));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrapping length?

@@ -300,8 +300,8 @@ public static String getSAToken(PCTemplate template, PlayerCharacter pc)
List<SpecialAbility> saList = new ArrayList<>();
saList.addAll(display.getResolvedUserSpecialAbilities(template));
saList.addAll(display.getResolvedSpecialAbilities(template));
List<PCTemplate> subList = new ArrayList<>();
subList.addAll(template.getConditionalTemplates(display.getTotalLevels(), display.totalHitDice()));
List<PCTemplate> subList = new ArrayList<>(template.getConditionalTemplates(display.getTotalLevels(), display.totalHitDice()));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wrapping length

@grimreaper
Copy link
Member Author

wrapping fixed; rebased

@@ -375,8 +375,7 @@ public String getInfo(PlayerCharacter aPC)
info.append(" <b>Requirements</b>: ").append(aString);
}

List<BaseKit> sortedObjects = new ArrayList<>();
sortedObjects.addAll(getSafeListFor(ListKey.KIT_TASKS));
List<BaseKit> sortedObjects = new ArrayList<>(getSafeListFor(ListKey.KIT_TASKS));
Collections.sort(sortedObjects, new ObjectTypeComparator());

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep in mind, this clashes a bit with your other PR with the list.sort() calls.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my recent PRs were automated. I have some non-automate coming up too though.

Copy link
Contributor

@thpr thpr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please resolve the merge conflict and address the one comment, then this is good

@@ -6146,9 +6146,8 @@ private void resolveLanguages()
int currentBonusLang = thePC.getDetailedAssociationCount(langbonus);
boolean foundLang = currentBonusLang > 0;

Set<Language> foundLanguages = new HashSet<>();
Set<Language> foundLanguages = new HashSet<>(thePC.getLanguageSet());
//Captures Auto (AUTO:LANG) and Persistent choices (ADD ex ability and CHOOSE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment is now out of place and needs to be moved above the construction

@grimreaper
Copy link
Member Author

tweaks completed

@thpr
Copy link
Contributor

thpr commented Nov 21, 2016

Can you remove data/pathfinder/homebrew/eax_custom please?

@grimreaper grimreaper closed this Jan 14, 2017
@grimreaper grimreaper deleted the eax/collect/collect branch January 17, 2017 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants