-
Notifications
You must be signed in to change notification settings - Fork 65
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
RAD-375 Order report templates by title #496
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@achabill I am pretty sure you did run 'mvn clean package' after you finished with you pull request. But I also think you ran it after you had already committed your changes hence you did not notice that though the build passed. mvn clean package had properly formatted your code for you but you did not commit again. I just pulled your branch and ran 'mvn clean package' and you code was properly formatted. Please if after committing your code you run 'mvn clean package' and 'git status' shows you modified files, please commit them before pushing as these might be formatting changes that mvn has done for you.
RAD-375: Source formatting on PR openmrs#496
@@ -20,12 +20,15 @@ | |||
/** | |||
* {@code GlobalProperty} property for the DICOM UID component used to describe the org root. | |||
* | |||
* <p>Refer to DICOM Standard DICOM PS3.5 Chapter 9 Unique Identifiers.</p> | |||
* <p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@achabill why are these in your diff?
you should not have 21 files in your diff. only 3 MrrtReportTemplateServiceComponentTestDataset.xml, HibernateMrrtReportTemplateDAO.java, MrrtReportTemplateServiceComponentTest.java
* @see MrrtReportTemplateService#getMrrtReportTemplate(Integer) | ||
* @verifies get template with given id | ||
*/ | ||
* @see MrrtReportTemplateService#getMrrtReportTemplate(Integer) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these javadocs modifications should also not be in the diff.
@achabill the changes of the xml dataset, the hibernateDAO and the service test are now as wanted but you still have these formatting changes that you need to get rid of. formatting is done by the maven formatter plugin for java files. so if you run "mvn clean install" it will format them accordingly. |
@teleivo I do a |
@achabill please make your diff only contain the files you worked onnas already said. Read up in git and how to edit your commit and its changes. It night be that you made these formatting changes in your IDE and that they are not xaught by the maven formatter Plugin. |
RAD-375: Source formatting on PR openmrs#496 formatting changes
Description
Related Issue
see https://issues.openmrs.org/browse/RAD-375
Checklist:
git pull --rebase upstream master
.mvn clean package
right before creating this pull request andadded all formatting changes to my commit.