Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

Change copyright comment in java files from /** */ style to /* */. #143

Merged
merged 8 commits into from
May 16, 2017

Conversation

sjoerdtalsma
Copy link
Contributor

@sjoerdtalsma sjoerdtalsma commented May 15, 2017

This avoids automatically adding <P> between the paragraphs every time an IDE (like IntelliJ) auto-formats the code.

This avoids automatically adding <P> between the paragraphs every time
an IDE (like IntelliJ) auto-formats the code.
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
Copy link
Member

Choose a reason for hiding this comment

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

this is not recommended by many style checks

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, must've been a side-effect from my IntelliJ settings, I'll correct this!

Copy link
Member

@pavolloffay pavolloffay left a comment

Choose a reason for hiding this comment

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

I would prefer to fix only license comments in this PR, and define checkstyle in another one. If we don't define checkstyle e.g. order of imports, comment style code will be different in every PR

* @see ActiveSpanSource
* @see Tracer#activeSpan()
*/
/**
Copy link
Member

Choose a reason for hiding this comment

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

Did you change this manually?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, must have been an IntelliJ autoformat.
By the way, I agree with you on the license-only commit; that was my intention, the formatting 'came free' by the tooling 😉

@sjoerdtalsma
Copy link
Contributor Author

I'll change the code to "license-only" and try to revert all formatting changes, please don't merge yet.

@sjoerdtalsma
Copy link
Contributor Author

Looks like the accidental auto-import changes were finally reverted.
Sorry guys: turns out I had "Optimize imports" flag on at "before commit" and since all Java files were touched by the license plugin this problem got re-introduced several times even after I explicitly reverted the import changes 🤦‍♂️

@coveralls
Copy link

Coverage Status

Coverage remained the same at 64.026% when pulling f0640a5 on sjoerdtalsma:license-singlestar into bb95eeb on opentracing:master.

@yurishkuro yurishkuro merged commit 6f6743b into opentracing:master May 16, 2017
@sjoerdtalsma sjoerdtalsma deleted the license-singlestar branch May 16, 2017 19:36
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants