Clean up javadoc - Githubissues

kitodo / kitodo-ugh

Kitodo.UGH Library

2 stars 10 forks source link

Clean up javadoc #51

Closed matthias-ronge closed 7 years ago

matthias-ronge commented 7 years ago

Non-functional change, just improve javadoc

henning-gerhardt commented 7 years ago

two remarks:

some new lines containing trailing white spaces at end of line
some changed javadoc parts are indent by tab others by space

matthias-ronge commented 7 years ago

The file is totally mixed, spaces and tabs. I can change all the javadoc to spaces. But, what about the code. Change or keep?

henning-gerhardt commented 7 years ago

Yes, I know :( Maybe first commit should the change of indent to space everywhere in the file then change the javadoc comments.

henning-gerhardt commented 7 years ago

Maybe this changes should be done without other changes pending as pull requests as now there is at least two conflicts and maybe pr #53 contains even more conflicts.

matthias-ronge commented 7 years ago

That’s the drawback of using one branch for one thing …

matthias-ronge commented 7 years ago

I just rebased the branch, but GitHub seems not to take notice of it.

stweil commented 7 years ago

Did you run git push -f?

henning-gerhardt commented 7 years ago

Maybe rebase base branch was not up to date? GitHub graphical network overview shows that branch was derivated at base c039d30 but current 2.x branch is on aa27a2d.

matthias-ronge commented 7 years ago

For whatever reason Eclipse’s fetch from upstream fetches from origin, this is why I didn’t get the new HEAD. I tried another rebase but it fails with so many conflicts that this wasn’t an option. So here is a manual merge.

henning-gerhardt commented 7 years ago

Good to know that Eclipse is not so a good GIT tool. Maybe it is time to switch to a GIT console application ;) I will merge this changes now.