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

Include cumulative fixes from jdom-2.0.x branch #190

Merged
merged 51 commits into from
Jul 2, 2021
Merged

Include cumulative fixes from jdom-2.0.x branch #190

merged 51 commits into from
Jul 2, 2021

Conversation

rolfl
Copy link
Collaborator

@rolfl rolfl commented Jul 2, 2021

Many of these commits were merged in to both jdom-2.0.x branch and also master. Makes this PR look larger than it actually is.

I pulled both the jdom-2.0.x and master branch in to tmp-cleanup in order to untangle some conflicts. The result should be a clean combination back in to master branch.

jdom-2.0.x branch should be decommissioned after this is merged.

rolfl and others added 30 commits March 31, 2013 22:53
COde was trying to be too clever about value duplication. As a result, the enumberator values were trying to reference each other before they were initialized.
Fix is to just do things simpler. Much simpler.
…test class so may not be desirable for permanent inclusion)
…content outside the root element. Not able to reproduce with my StAX libraries, but the fix is 'safe'.
StAX is a *poor* specification, and the default implementations of StAX are broken too.
Now it does a Copy-Constructor clone instead of changing final instance fields.
…st case to 2.x anyway - even though code works.
Originally the enum would initialize all three factories on firs use.
Now the initialization will happen on a per-factory basis. It is still
a lazy singleton concept. On my computer this saves as much as 200ms on
JDOM startup
rolfl and others added 21 commits February 14, 2015 21:58
JDOM 1.x managed to handle badly-built DOM documents that had implied
namespaces in place.
Report prolog whitespace - allow the Document level content to include whitespace, not just Doctype, root element, comments, PI's, etc.
All character encodings are required to be specified with ASCII names,
making the ENGLISH locale appropreiate.
Conflicts:
	core/src/java/org/jdom2/input/StAXStreamBuilder.java
	core/src/java/org/jdom2/input/sax/TextBuffer.java
	core/src/java/org/jdom2/output/support/AbstractStAXStreamProcessor.java
Also includes test case for #173 that was missed in previous commit
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.

3 participants