Skip to content

Remove all @author comments and empty method/class comments#3911

Merged
koppor merged 3 commits into
maintable-betafrom
remove-author-annotations
Apr 1, 2018
Merged

Remove all @author comments and empty method/class comments#3911
koppor merged 3 commits into
maintable-betafrom
remove-author-annotations

Conversation

@koppor

@koppor koppor commented Mar 31, 2018

Copy link
Copy Markdown
Member

This removes all @author patterns as we do not track author ship by these annotations, but with the version control system git.

Some other obsolete headers were also removed (e.g., $Id).

@Siedlerchr

Siedlerchr commented Mar 31, 2018

Copy link
Copy Markdown
Member

I would propose you take the maintable-beta branch as base branch, otherwise we will be getting tons of conflicts

@koppor koppor changed the base branch from master to maintable-beta March 31, 2018 10:18
@koppor koppor force-pushed the remove-author-annotations branch from 012d363 to 2bd87a7 Compare March 31, 2018 10:27
@koppor

koppor commented Mar 31, 2018

Copy link
Copy Markdown
Member Author

For users of IntelliJ, there is a cool dialog helping to resolve conflicts. 🌞 I'll however based it again on the maintable-beta branch.

grafik

@Siedlerchr

Siedlerchr commented Mar 31, 2018

Copy link
Copy Markdown
Member

For merging I stick to http://meldmerge.org/

@koppor koppor mentioned this pull request Mar 31, 2018
Closed
8 tasks
@Siedlerchr

Siedlerchr commented Mar 31, 2018

Copy link
Copy Markdown
Member

Please fix conflict and checkstyle error:;
:checkstyleMain[ant:checkstyle] [ERROR] /home/travis/build/JabRef/jabref/src/main/java/org/jabref/logic/layout/format/CurrentDate.java:21: 'METHOD_DEF' has more than 1 empty lines before. [EmptyLineSeparator]

koppor added 2 commits April 1, 2018 11:18
@koppor
Merge remote-tracking branch 'origin/maintable-beta' into remove-auth…
78b21cf 
…or-annotations

# Conflicts:
#	src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java
@koppor
Fix checkstyle
8f979ac
@koppor

koppor commented Apr 1, 2018

Copy link
Copy Markdown
Member Author

I don't know, why Travis fails:

  JUnit Jupiter:LocalizationTest:testUnsetLanguageTranslation()
    MethodSource [className = 'org.jabref.logic.l10n.LocalizationTest', methodName = 'testUnsetLanguageTranslation', methodParameterTypes = '']
    => org.opentest4j.AssertionFailedError: expected: <&Groups> but was: <Groups>
       org.junit.jupiter.api.AssertionUtils.fail(AssertionUtils.java:52)
       org.junit.jupiter.api.AssertEquals.failNotEqual(AssertEquals.java:197)
       org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:186)
       org.junit.jupiter.api.AssertEquals.assertEquals(AssertEquals.java:181)
       org.junit.jupiter.api.Assertions.assertEquals(Assertions.java:486)
       org.jabref.logic.l10n.LocalizationTest.testUnsetLanguageTranslation(LocalizationTest.java:95)
       sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
       sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
       sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
       java.lang.reflect.Method.invoke(Method.java:498)
       [...]

I think, I only changed comments?!

@koppor

koppor commented Apr 1, 2018

Copy link
Copy Markdown
Member Author

The errors are from the maintable-beta branch (see https://travis-ci.org/JabRef/jabref/jobs/360715639). So, I just merge to move forward.

@koppor koppor merged commit 3ccb902 into maintable-beta Apr 1, 2018
@koppor koppor deleted the remove-author-annotations branch April 1, 2018 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tobiasdiez tobiasdiez tobiasdiez approved these changes

+1 more reviewer

@stefan-kolb stefan-kolb stefan-kolb approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@koppor @Siedlerchr @stefan-kolb @tobiasdiez