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

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

Merged
merged 3 commits into from
Apr 1, 2018

Conversation

koppor
Copy link
Member

@koppor koppor commented Mar 31, 2018

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
Copy link
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
Copy link
Member Author

koppor commented Mar 31, 2018

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
Copy link
Member

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

@koppor koppor mentioned this pull request Mar 31, 2018
8 tasks
@Siedlerchr
Copy link
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]

…or-annotations

# Conflicts:
#	src/test/java/org/jabref/gui/importer/fetcher/OAI2HandlerFetcherTest.java
@koppor
Copy link
Member Author

koppor commented Apr 1, 2018

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
Copy link
Member Author

koppor commented Apr 1, 2018

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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants