6873 shapefiles zip folders #7279
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pdurbin
approved these changes
Sep 22, 2020
…tomatically to the test class (#6873).
I often hesitate to fix existing formatting, because it "inflates" the diff and makes it harder to see the actual functional changes in the commit... But there were so many random extra tabs in that method - in some, but not all lines - that it was hard to view in Netbeans. |
|
@landreev yeah, what I'd rather see eventually is some sort of enforcement of a house style but for now with whitespace changes come in I make use of this button in GitHub to hide them while reviewing:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Preserves folders found in shape file zip archives.
Which issue(s) this PR closes:
Closes #6873
Special notes for your reviewer:
The changes to FileUtil.java are mostly tabs and whitespaces - the formatting of the method I had to change was seriously off, I couldn't resist fixing it; actual code changes are relatively small there.
Suggestions on how to test this:
There's a test file provided in the issue: https://github.com/IQSS/dataverse/files/4588466/files.zip . It has 4 files constituting a shape set, plus 2 extra files. All files are in subfolders, that would be dropped by the application as it is now, but should be preserved by the code in the PR.
Does this PR introduce a user interface change? If mockups are available, please link/include them here:
Is there a release notes update needed for this change?:
Additional documentation: