Skip to content

Commit

Permalink
Merge pull request #168 from smoothreggae/pr/fix-apostrophe-abuse
Browse files Browse the repository at this point in the history
fix apostrophe abuse
  • Loading branch information
hunterhacker committed Dec 27, 2017
2 parents 2c4bf20 + 58ae5a6 commit 09dae5d
Show file tree
Hide file tree
Showing 24 changed files with 29 additions and 29 deletions.
Expand Up @@ -261,7 +261,7 @@ public static String checkCharacterData(final String text) {
lowx = false;
} else {
// Likely this character can't be easily displayed
// because it's a control so we use it's hexadecimal
// because it's a control so we use its hexadecimal
// representation in the reason.
return String.format("0x%04x is not a legal XML character",
(int)text.charAt(i));
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/Attribute.java
Expand Up @@ -719,7 +719,7 @@ public boolean getBooleanValue() throws DataConversionException {
* 'default' Namespace that is not the empty Namespace (e.g.
* xmlns="someurl") and this Attribute is also in the default Namespace (has
* no prefix - but for Attributes that means the Namespace URL is ""), then
* this Attribute has a different namespace scope from it's parent Element
* this Attribute has a different namespace scope from its parent Element
* because it does not include the 'someurl' Namespace.
* <p>
* In the above conditions (no-prefix Attribute in an Element with a
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/CDATA.java
Expand Up @@ -86,7 +86,7 @@ protected CDATA() {

/**
* This constructor creates a new <code>CDATA</code> node, with the
* supplied string value as it's character content.
* supplied string value as its character content.
*
* @param string the node's character content.
* @throws IllegalDataException if <code>str</code> contains an
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/DescendantIterator.java
Expand Up @@ -177,7 +177,7 @@ public Content next() {

/**
* Detaches the last {@link org.jdom2.Content} returned by the last call to
* next from it's parent. <b>Note</b>: this <b>does not</b> affect
* next from its parent. <b>Note</b>: this <b>does not</b> affect
* iteration and all children, siblings, and any node following the
* removed node (in document order) will be visited.
*/
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/Document.java
Expand Up @@ -749,7 +749,7 @@ public Parent getParent() {

/**
* Always returns this Document Instance
* @return 'this' because this Document is it's own Document
* @return 'this' because this Document is its own Document
*/
@Override
public Document getDocument() {
Expand Down
4 changes: 2 additions & 2 deletions core/src/java/org/jdom2/Element.java
Expand Up @@ -1707,9 +1707,9 @@ public boolean removeChildren(final String cname, final Namespace ns) {
* encountered for this Element then {@link Namespace#NO_NAMESPACE} is
* included.
* </ul>
* The Element's Namespace scope consist of it's inherited Namespaces and
* The Element's Namespace scope consist of its inherited Namespaces and
* any modifications to that scope derived from the Element itself. If the
* element is detached then it's inherited scope consists of just
* element is detached then its inherited scope consists of just
* If an element has no parent then
* <p>
* Note that the Element's Namespace will always be reported first.
Expand Down
4 changes: 2 additions & 2 deletions core/src/java/org/jdom2/Parent.java
Expand Up @@ -195,9 +195,9 @@ public interface Parent extends Cloneable, NamespaceAware, Serializable {
Content removeContent(int index);

/**
* Obtain a deep, unattached copy of this parent and it's children.
* Obtain a deep, unattached copy of this parent and its children.
*
* @return a deep copy of this parent and it's children.
* @return a deep copy of this parent and its children.
*/
Object clone();

Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/Text.java
Expand Up @@ -100,7 +100,7 @@ protected Text() {

/**
* This constructor creates a new <code>Text</code> node, with the
* supplied string value as it's character content.
* supplied string value as its character content.
*
* @param str the node's character content.
* @throws IllegalDataException if <code>str</code> contains an
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/input/SAXBuilder.java
Expand Up @@ -609,7 +609,7 @@ public XMLFilter getXMLFilter() {
* XMLReaders that may be created, and these may (depending on SAXBuilder
* usage) be accessed concurrently. It is the responsibility of the JDOM
* user to ensure that if the XMLFilter is not thread-safe then neither the
* SAXBuilder nor any of it's SAXEngines are accessed concurrently.
* SAXBuilder nor any of its SAXEngines are accessed concurrently.
*
* @param xmlFilter
* the XMLFilter to use
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/located/LocatedCDATA.java
Expand Up @@ -71,7 +71,7 @@ public class LocatedCDATA extends CDATA implements Located {

/**
* This constructor creates a new <code>LocatedCDATA</code> node, with the
* supplied string value as it's character content.
* supplied string value as its character content.
*
* @param str the node's character content.
* @throws IllegalDataException if <code>str</code> contains an
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/located/LocatedText.java
Expand Up @@ -68,7 +68,7 @@ public class LocatedText extends Text implements Located {

/**
* This constructor creates a new <code>Text</code> node, with the
* supplied string value as it's character content.
* supplied string value as its character content.
*
* @param str the node's character content.
* @throws IllegalDataException if <code>str</code> contains an
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/output/StAXEventOutputter.java
Expand Up @@ -260,7 +260,7 @@ public void setFormat(Format newFormat) {
/**
* Returns the current format in use by the StAXStreamOutputter. Note the Format
* object returned is <b>not</b> a clone of the one used internally, thus,
* an StAXStreamOutputter instance is able to have it's Format changed by changing
* an StAXStreamOutputter instance is able to have its Format changed by changing
* the settings on the Format instance returned by this method.
*
* @return the current Format instance used by this StAXStreamOutputter.
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/output/StAXStreamOutputter.java
Expand Up @@ -236,7 +236,7 @@ public void setFormat(Format newFormat) {
/**
* Returns the current format in use by the StAXStreamOutputter. Note the Format
* object returned is <b>not</b> a clone of the one used internally, thus,
* an StAXStreamOutputter instance is able to have it's Format changed by changing
* an StAXStreamOutputter instance is able to have its Format changed by changing
* the settings on the Format instance returned by this method.
*
* @return the current Format instance used by this StAXStreamOutputter.
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/output/StAXStreamReader.java
Expand Up @@ -232,7 +232,7 @@ public void setFormat(Format newFormat) {
/**
* Returns the current format in use by the XMLOutputter. Note the Format
* object returned is <b>not</b> a clone of the one used internally, thus,
* an XMLOutputter instance is able to have it's Format changed by changing
* an XMLOutputter instance is able to have its Format changed by changing
* the settings on the Format instance returned by this method.
*
* @return the current Format instance used by this XMLOutputter.
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/output/XMLOutputter.java
Expand Up @@ -341,7 +341,7 @@ public void setFormat(Format newFormat) {
/**
* Returns the current format in use by the XMLOutputter. Note the Format
* object returned is <b>not</b> a clone of the one used internally, thus,
* an XMLOutputter instance is able to have it's Format changed by changing
* an XMLOutputter instance is able to have its Format changed by changing
* the settings on the Format instance returned by this method.
*
* @return the current Format instance used by this XMLOutputter.
Expand Down
Expand Up @@ -70,7 +70,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* <p>
* The JDOM content can be loosely categorised in to 'Text-like' content
* (consisting of Text, CDATA, and EntityRef), and everything else. This
* distinction is significant for for this class and it's sub-classes.
* distinction is significant for for this class and its sub-classes.
* <p>
* There will be text manipulation, and some (but not necessarily
* all) Text-like content will be returned as text() instead of next().
Expand Down
Expand Up @@ -500,7 +500,7 @@ protected void printDocType(final XMLEventConsumer out, final FormatStack fstack
}
sw.write(">");

// DocType does not write it's own EOL
// DocType does not write its own EOL
// for compatibility reasons. Only
// when output from inside a Content set.
// write(out, fstack.getLineSeparator());
Expand Down
Expand Up @@ -438,7 +438,7 @@ protected void printDocType(final XMLStreamWriter out, final FormatStack fstack,
}
sw.write(">");

// DocType does not write it's own EOL
// DocType does not write its own EOL
// for compatibility reasons. Only
// when output from inside a Content set.
// write(out, fstack.getLineSeparator());
Expand Down
4 changes: 2 additions & 2 deletions core/src/java/org/jdom2/output/support/FormatStack.java
Expand Up @@ -66,7 +66,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* <p>
* This class is intended as a working-class for in the various outputter
* implementations. It is inly public so that people extending the
* Abstract*Processor classes can take advantage of it's functionality.
* Abstract*Processor classes can take advantage of its functionality.
* <p>
* The value this class adds is:
* <ul>
Expand Down Expand Up @@ -472,4 +472,4 @@ public void pop() {
depth--;
}

}
}
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/output/support/WalkerPRESERVE.java
Expand Up @@ -61,7 +61,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
import org.jdom2.Content;

/**
* This Walker implementation walks a list of Content in it's original RAW
* This Walker implementation walks a list of Content in its original RAW
* format. There is no text manipulation, and all content will be returned as
* the input type. In other words, next() will never be null, and text() will
* always be null.
Expand Down
2 changes: 1 addition & 1 deletion core/src/java/org/jdom2/util/NamespaceStack.java
Expand Up @@ -551,7 +551,7 @@ private final void pushStack(final Namespace mns, Namespace[] newscope,
newscope = ArrayCopy.copyOf(newscope, newscope.length);
}
// we need to take the Namespace at position 0, and insert it
// in it's place later in the array.
// in its place later in the array.
// we need to take the mns from later in the array, and move it
// to the front.
final Namespace tmp = newscope[0];
Expand Down
2 changes: 1 addition & 1 deletion test/src/java/org/jdom2/test/cases/TestAttribute.java
Expand Up @@ -720,7 +720,7 @@ public void test_TCM__OrgJdomNamespace_getNamespace() {
}

/**
* Test that an Attribute returns it's correct name.
* Test that an Attribute returns its correct name.
*/
@Test
public void test_TCM__String_getName() {
Expand Down
6 changes: 3 additions & 3 deletions test/src/java/org/jdom2/test/cases/TestElement.java
Expand Up @@ -926,7 +926,7 @@ public void test_TCM__OrgJdomAttribute_getAttribute_String_OrgJdomNamespace() {
}

/**
* Test that an element returns the reference to it's enclosing document
* Test that an element returns the reference to its enclosing document
*/
@Test
public void test_TCM__OrgJdomDocument_getDocument() {
Expand Down Expand Up @@ -1161,7 +1161,7 @@ public void test_TCM__OrgJdomElement_getCopy_String_OrgJdomNamespace() {
}

/**
* Test test that a child element can return it's parent.
* Test test that a child element can return its parent.
*/
@Test
public void test_TCM__OrgJdomElement_getParent() {
Expand Down Expand Up @@ -1642,7 +1642,7 @@ public void test_TCM__OrgJdomElement_setText_String() {
}

/**
* Test that the Element returns it's primary namespace
* Test that the Element returns its primary namespace
*/
@Test
public void test_TCM__OrgJdomNamespace_getNamespace() {
Expand Down
Expand Up @@ -1235,7 +1235,7 @@ public void testDeepNesting() {
// most test systems use the XMLOutputter in raw mode to output
// the results of the conversion. In Raw mode the XMLOutputter will
// not make pretty content outside of the root element (but it will
// put the XMLDeclaration on it's own line).
// put the XMLDeclaration on its own line).
// so, in the cases where the actual pretty format is used, we add
// this newline after the DocType...
pretty.append(lf);
Expand Down

0 comments on commit 09dae5d

Please sign in to comment.