1.5 #20
Merged
1.5 #20
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
Various issues in code now correctly accounted for.
Per user Ryan, added source to javac to prevent java 7 issues.
Interfaces declaired public shoudl not then declare methods as public as that is already true. Some of the interfaces were already correct.
Getters for boolean needed to be is* Junit tests were still junit style 3 and needed upgraded to full 4 version Arrays should not return null, fixed throughout and fixed piece of code only checking for null on getTokens to now check for null && greater than 0. Various other cleanup items noted by PMD.
Fixes for git hub windows usage.
Conflicts: .gitignore Source/JNA/build/build.xml
|
OK - Looks like the final Merge simply reverted all the primary changes. Sorry if this causes any issue. My intent was to back out what I was preparing to do and simply get the line endings normalized then do bits and pieces of the above as some were already pulled from Ryan's requests and/or there are a few breaking changes I want to separate out into their own commit. So this likely will be ok but will look like these changes occurred when in fact they did then were backed out. |
|
I am going to assume this goes in the right direction and merge it :) |
dblock
added a commit
that referenced
this pull request
Aug 19, 2012
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.
All the initial commits here should be nothing. It took me some time to get things to rebase properly. It retained the commits I backed out from 1.5 branch. The only thing in here of note is trying to get line endings normalized. As there are now many less files due to third party stuff this is worth taking. The commit for that only included 71 file changes to which is shown here. The remainder of the items were backed out and will be added to another pull request. At the moment, everything looks ok with my local copy. I'm not sure how to make the other commits not show up. Locally, it only shows line normalization then a merge fix that resulted for the earlier items. Once the line normalization is committed, my base should be correct so that I can add the additional changes I mentioned earlier in the week. The commits here note that so you could get an early look at those even though they won't pull since I reverted them. If that doesn't appear to be the case, let me know. Maybe I should simply delete 1.5 on my end and start it over?