Skip to content

Diff Cleanup#792

Merged
datasedai merged 10 commits intolocationtech:masterfrom
dcy2003:diff-cleanup
May 18, 2016
Merged

Diff Cleanup#792
datasedai merged 10 commits intolocationtech:masterfrom
dcy2003:diff-cleanup

Conversation

@dcy2003
Copy link
Copy Markdown
Contributor

@dcy2003 dcy2003 commented May 17, 2016

This diff is massive and I would highly encourage someone to pull down my branch and take it for a ride locally prior to merging...

Contains fixes for #591. Specifically formatter plugin was brought up to date and templates were updated to Mars format with same values. Formatting now appears to work correctly from command line when not skipped (which by the way, is now done via -Dformatter.skip=true instead of -DskipFormat=true).

Contains a massive format of the codebase to put files in this format.

Also normalizes all line endings via dos2unix which was not done correctly with #755

@dcy2003 dcy2003 added this to the 0.9.2 milestone May 17, 2016
.max(
minAxis[i]
+ (minCenterDistanceFactor * (rand.nextInt(Integer.MAX_VALUE) % (range[i] / minCenterDistanceFactor))),
minAxis[i]);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This looks really bizarre ... is this the correct formatting?

@datasedai
Copy link
Copy Markdown
Contributor

Reviewed, didn't see anything major, but could you update the docs in "Building -> Tools" to update the skipFormat command that we always copy/paste always?

@datasedai datasedai merged commit 2bcf690 into locationtech:master May 18, 2016
@dcy2003 dcy2003 deleted the diff-cleanup branch May 25, 2016 13:01
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.

2 participants