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

JXR-135: IT and some refactoring #6

Merged
merged 6 commits into from
Jul 30, 2018
Merged

Conversation

avasiljeva
Copy link
Contributor

@avasiljeva avasiljeva commented Jul 27, 2018

The provided solution will produce proper names for inner classes of one level, what should cover majority of cases.
Covering all possible levels of inner classes is more complicated, but could be built on top of this work.

P.S. I also did minor cleanup while looking through the files (like introducing diamond operator etc).

@rfscholte
Copy link
Contributor

Hi Alina,

Karl Heinz already picked one of the other PRs for JXR-135. However, the refactoring part is worth adopting. If you can isolate that part, I'm willing to merge those too.

@khmarbaise
Copy link
Member

Ah sorry have realized that...

@avasiljeva
Copy link
Contributor Author

Yes, I have seen that another pull request, nice!
Sure, I will isolate the refactoring.
Thanks.

# Conflicts:
#	maven-jxr/src/main/java/org/apache/maven/jxr/pacman/JavaFileImpl.java
#	maven-jxr/src/test/java/org/apache/maven/jxr/pacman/JavaFileImplTest.java
@avasiljeva
Copy link
Contributor Author

avasiljeva commented Jul 30, 2018

Done: pulled last changes from master, eliminated my partial solution from JavaFileImpl keeping IT for JXR-135 (hope it is useful to see the real output for nested inner classes) and refactoring.
Please review.

@avasiljeva avasiljeva changed the title JXR-135 Partial solution: supporting one level of inner class nesting JXR-135 IT and some refactoring Jul 30, 2018
@avasiljeva avasiljeva changed the title JXR-135 IT and some refactoring JXR-135: IT and some refactoring Jul 30, 2018
@rfscholte rfscholte merged commit 6ccfa75 into apache:master Jul 30, 2018
pzygielo pushed a commit to pzygielo/maven-jxr that referenced this pull request Aug 7, 2022
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