Permalink
Browse files

Find remaining org.jdom. references and replace with org.jdom2.

  • Loading branch information...
1 parent 3d76842 commit 58790e78b37b83966388290c8312289ba2221cad @rolfl rolfl committed Aug 5, 2011
Showing with 91 additions and 91 deletions.
  1. +1 −1 contrib/src/java/org/jdom2/contrib/beans/BeanMapper.java
  2. +1 −1 contrib/src/java/org/jdom2/contrib/beans/JDOMBean.java
  3. +1 −1 contrib/src/java/org/jdom2/contrib/beans/TestBean.java
  4. +1 −1 contrib/src/java/org/jdom2/contrib/beans/TestIndexed.java
  5. +1 −1 contrib/src/java/org/jdom2/contrib/input/ResultSetBuilder.java
  6. +4 −4 contrib/src/java/org/jdom2/contrib/input/scanner/XPathMatcher.java
  7. +5 −5 core/src/java/org/jdom2/Attribute.java
  8. +4 −4 core/src/java/org/jdom2/CDATA.java
  9. +1 −1 core/src/java/org/jdom2/Comment.java
  10. +8 −8 core/src/java/org/jdom2/Content.java
  11. +1 −1 core/src/java/org/jdom2/ContentList.java
  12. +1 −1 core/src/java/org/jdom2/DescendantIterator.java
  13. +2 −2 core/src/java/org/jdom2/Document.java
  14. +5 −5 core/src/java/org/jdom2/Element.java
  15. +16 −16 core/src/java/org/jdom2/JDOMFactory.java
  16. +3 −3 core/src/java/org/jdom2/Parent.java
  17. +1 −1 core/src/java/org/jdom2/ProcessingInstruction.java
  18. +4 −4 core/src/java/org/jdom2/Text.java
  19. +1 −1 core/src/java/org/jdom2/filter/ElementFilter.java
  20. +2 −2 core/src/java/org/jdom2/input/DOMBuilder.java
  21. +5 −5 core/src/java/org/jdom2/input/SAXBuilder.java
  22. +2 −2 core/src/java/org/jdom2/input/SAXHandler.java
  23. +2 −2 core/src/java/org/jdom2/output/DOMOutputter.java
  24. +1 −1 core/src/java/org/jdom2/output/Format.java
  25. +3 −3 core/src/java/org/jdom2/output/SAXOutputter.java
  26. +2 −2 core/src/java/org/jdom2/transform/JDOMResult.java
  27. +5 −5 core/src/java/org/jdom2/transform/JDOMSource.java
  28. +4 −4 core/src/java/org/jdom2/xpath/XPath.java
  29. +1 −1 test/src/java/org/jdom2/test/cases/Alltests.java
  30. +1 −1 test/src/java/org/jdom2/test/cases/TestComment.java
  31. +1 −1 test/src/java/org/jdom2/test/generate/Main.java
  32. +1 −1 test/src/java/org/jdom2/test/generate/TestCaseGenerator.java
@@ -153,7 +153,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* <pre> BeanMapper mapper = new BeanMapper();
* mapper.addMapping("birthdate", "dob"); // element mapping
* mapper.addMapping("age", "dob", "age"); // attribute mapping
- * mapper.setBeanPackage("org.jdom.contrib.beans");
+ * mapper.setBeanPackage("org.jdom2.contrib.beans");
* </pre>
* <h3>Converting Bean to JDOM</h3>
* <pre>Document doc = mapper.toDocument(alex);</pre>
@@ -185,7 +185,7 @@ public String getFileRoot() {
}
/**
- * Load a file, parse it with JDOM, return a org.jdom.Document.
+ * Load a file, parse it with JDOM, return a org.jdom2.Document.
* If the file has already been parsed, return the previously
* cached object. If the file has changed, ignore the previously
* parsed version and reload. <p>
@@ -104,7 +104,7 @@ public static void main(String[] args) throws java.beans.IntrospectionException,
mapper.addMapping("birthdate", "dob"); // element mapping
mapper.addMapping("age", "dob", "age"); // attribute mapping
- mapper.setBeanPackage("org.jdom.contrib.beans");
+ mapper.setBeanPackage("org.jdom2.contrib.beans");
// test bean->jdom
@@ -121,7 +121,7 @@ public String toString() {
public static void main(String[] args) throws java.beans.IntrospectionException, java.io.IOException, BeanMapperException {
BeanMapper mapper = new BeanMapper();
- mapper.setBeanPackage("org.jdom.contrib.beans");
+ mapper.setBeanPackage("org.jdom2.contrib.beans");
TestIndexed pizza = new TestIndexed();
pizza.setName("Abominable");
@@ -215,7 +215,7 @@ public Document build() throws JDOMException {
columnName[index] = rsmd.getColumnName(index+1);
}
- // build the org.jdom.Document out of the result set
+ // build the org.jdom2.Document out of the result set
String name;
String value;
Element entry;
@@ -71,7 +71,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* <p>
* This class also plays the role of factory for concrete
* implementations: The system property
- * "<code>org.jdom.XPathMatcher.class</code>" shall contain the
+ * "<code>org.jdom2.XPathMatcher.class</code>" shall contain the
* fully-qualified name of a concrete subclass of XPatchMatcher with
* a public {@link #XPathMatcher two argument constructor}. If this
* property is not defined, the default concrete implementation
@@ -91,16 +91,16 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* name of the implementation class to use.
* <p>
* The property name is:
- * "<code>org.jdom.XPathMatcher.class</code>".</p>
+ * "<code>org.jdom2.XPathMatcher.class</code>".</p>
*/
private final static String IMPLEMENTATION_CLASS_PROPERTY =
- "org.jdom.XPathMatcher.class";
+ "org.jdom2.XPathMatcher.class";
/**
* The default implementation class to use if none was configured.
*/
private final static String DEFAULT_IMPLEMENTATION_CLASS =
- "org.jdom.contrib.input.scanner.JakartaRegExpXPathMatcher";
+ "org.jdom2.contrib.input.scanner.JakartaRegExpXPathMatcher";
/**
* The constructor to instanciate a new XPathMatcher concrete
@@ -193,7 +193,7 @@ protected Attribute() {}
* namespace. Attributes cannot be in a default namespace.
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}).
+ * {@link org.jdom2.Verifier#checkCharacterData}).
*/
public Attribute(final String name, final String value, final Namespace namespace) {
this(name, value, UNDECLARED_TYPE, namespace);
@@ -213,7 +213,7 @@ public Attribute(final String name, final String value, final Namespace namespac
* namespace. Attributes cannot be in a default namespace.
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}) or
+ * {@link org.jdom2.Verifier#checkCharacterData}) or
* if the given attribute type is not one of the
* supported types.
*/
@@ -239,7 +239,7 @@ public Attribute(final String name, final String value, final int type, final Na
* attribute name.
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}).
+ * {@link org.jdom2.Verifier#checkCharacterData}).
*/
public Attribute(final String name, final String value) {
this(name, value, UNDECLARED_TYPE, Namespace.NO_NAMESPACE);
@@ -261,7 +261,7 @@ public Attribute(final String name, final String value) {
* attribute name.
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}) or
+ * {@link org.jdom2.Verifier#checkCharacterData}) or
* if the given attribute type is not one of the
* supported types.
*/
@@ -477,7 +477,7 @@ public String getValue() {
* @return <code>Attribute</code> - this Attribute modified.
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}).
+ * {@link org.jdom2.Verifier#checkCharacterData}).
*/
public Attribute setValue(final String value) {
final String reason = Verifier.checkCharacterData(value);
@@ -83,7 +83,7 @@ protected CDATA() { }
* @param string the node's character content.
* @throws IllegalDataException if <code>str</code> contains an
* illegal character such as a vertical tab (as determined
- * by {@link org.jdom.Verifier#checkCharacterData})
+ * by {@link org.jdom2.Verifier#checkCharacterData})
* or the CDATA end delimiter <code>]]&gt;</code>.
*/
public CDATA(final String string) {
@@ -97,7 +97,7 @@ public CDATA(final String string) {
* @return the object on which the method was invoked
* @throws IllegalDataException if <code>str</code> contains an
* illegal character such as a vertical tab (as determined
- * by {@link org.jdom.Verifier#checkCharacterData})
+ * by {@link org.jdom2.Verifier#checkCharacterData})
* or the CDATA end delimiter <code>]]&gt;</code>.
*/
public Text setText(final String str) {
@@ -127,7 +127,7 @@ public Text setText(final String str) {
* @param str character content to append.
* @throws IllegalDataException if <code>str</code> contains an
* illegal character such as a vertical tab (as determined
- * by {@link org.jdom.Verifier#checkCharacterData})
+ * by {@link org.jdom2.Verifier#checkCharacterData})
* or the CDATA end delimiter <code>]]&gt;</code>.
*/
public void append(final String str) {
@@ -184,7 +184,7 @@ public void append(final Text text) {
* <code>CDATA</code> node, suitable for debugging. If the XML
* representation of the <code>CDATA</code> node is desired,
* either <code>{@link #getText}</code> or
- * {@link org.jdom.output.XMLOutputter#output(CDATA, java.io.Writer)}</code>
+ * {@link org.jdom2.output.XMLOutputter#output(CDATA, java.io.Writer)}</code>
* should be used.
*
* @return <code>String</code> - information about this node.
@@ -122,7 +122,7 @@ public Comment setText(String text) {
* This returns a <code>String</code> representation of the
* <code>Comment</code>, suitable for debugging. If the XML
* representation of the <code>Comment</code> is desired,
- * {@link org.jdom.output.XMLOutputter#outputString(Comment)}
+ * {@link org.jdom2.output.XMLOutputter#outputString(Comment)}
* should be used.
*
* @return <code>String</code> - information about the
@@ -58,15 +58,15 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
/**
* Superclass for JDOM objects which can be legal child content
- * of {@link org.jdom.Parent} nodes.
+ * of {@link org.jdom2.Parent} nodes.
*
- * @see org.jdom.Comment
- * @see org.jdom.DocType
- * @see org.jdom.Element
- * @see org.jdom.EntityRef
- * @see org.jdom.Parent
- * @see org.jdom.ProcessingInstruction
- * @see org.jdom.Text
+ * @see org.jdom2.Comment
+ * @see org.jdom2.DocType
+ * @see org.jdom2.Element
+ * @see org.jdom2.EntityRef
+ * @see org.jdom2.Parent
+ * @see org.jdom2.ProcessingInstruction
+ * @see org.jdom2.Text
*
* @author Bradley S. Huffman
* @author Jason Hunter
@@ -131,7 +131,7 @@ public void add(int index, Object obj) {
}
/**
- * @see org.jdom.ContentList#add(int, org.jdom.Content)
+ * @see org.jdom2.ContentList#add(int, org.jdom2.Content)
*/
private void documentCanContain(int index, Content child) throws IllegalAddException {
if (child instanceof Element) {
@@ -133,7 +133,7 @@ public Object next() {
}
/**
- * Detaches the last {@link org.jdom.Content} returned by the last call to
+ * 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
* iteration and all children, siblings, and any node following the
* removed node (in document order) will be visited.
@@ -600,7 +600,7 @@ public Document setContent(Content child) {
* This returns a <code>String</code> representation of the
* <code>Document</code>, suitable for debugging. If the XML
* representation of the <code>Document</code> is desired,
- * {@link org.jdom.output.XMLOutputter#outputString(Document)}
+ * {@link org.jdom2.output.XMLOutputter#outputString(Document)}
* should be used.
*
* @return <code>String</code> - information about the
@@ -725,7 +725,7 @@ public Parent getParent() {
/**
- * @see org.jdom.Parent#getDocument()
+ * @see org.jdom2.Parent#getDocument()
*/
public Document getDocument() {
return this;
@@ -617,7 +617,7 @@ public String getChildTextNormalize(final String name, final Namespace ns) {
* @throws IllegalDataException if the assigned text contains an illegal
* character such as a vertical tab (as
* determined by {@link
- * org.jdom.Verifier#checkCharacterData})
+ * org.jdom2.Verifier#checkCharacterData})
*/
public Element setText(final String text) {
content.clear();
@@ -789,7 +789,7 @@ public Parent setContent(final int index, final Collection newContent) {
* @return this element modified
* @throws IllegalDataException if <code>str</code> contains an
* illegal character such as a vertical tab (as determined
- * by {@link org.jdom.Verifier#checkCharacterData})
+ * by {@link org.jdom2.Verifier#checkCharacterData})
*/
public Element addContent(final String str) {
return addContent(new Text(str));
@@ -1114,7 +1114,7 @@ public Element setAttributes(final List newAttributes) {
* attribute name.
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}).
+ * {@link org.jdom2.Verifier#checkCharacterData}).
*/
public Element setAttribute(final String name, final String value) {
final Attribute attribute = getAttribute(name);
@@ -1143,7 +1143,7 @@ public Element setAttribute(final String name, final String value) {
* namespace
* @throws IllegalDataException if the given attribute value is
* illegal character data (as determined by
- * {@link org.jdom.Verifier#checkCharacterData}).
+ * {@link org.jdom2.Verifier#checkCharacterData}).
* @throws IllegalAddException if the attribute namespace prefix
* collides with another namespace prefix on the element.
*/
@@ -1221,7 +1221,7 @@ public boolean removeAttribute(final Attribute attribute) {
* This returns a <code>String</code> representation of the
* <code>Element</code>, suitable for debugging. If the XML
* representation of the <code>Element</code> is desired,
- * {@link org.jdom.output.XMLOutputter#outputString(Element)}
+ * {@link org.jdom2.output.XMLOutputter#outputString(Element)}
* should be used.
* </p>
*
@@ -74,7 +74,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* <p>
* This will create a new <code>Attribute</code> with the
* specified (local) name and value, and in the provided
- * <code>{@link org.jdom.Namespace}</code>.
+ * <code>{@link org.jdom2.Namespace}</code>.
* </p>
*
* @param name <code>String</code> name of <code>Attribute</code>.
@@ -85,7 +85,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
/**
* This will create a new <code>Attribute</code> with the
* specified (local) name, value, and type, and in the provided
- * <code>{@link org.jdom.Namespace}</code>.
+ * <code>{@link org.jdom2.Namespace}</code>.
*
* @param name <code>String</code> name of <code>Attribute</code>.
* @param value <code>String</code> value for new attribute.
@@ -98,11 +98,11 @@ public Attribute attribute(String name, String value,
/**
* This will create a new <code>Attribute</code> with the
* specified (local) name and value, and does not place
- * the attribute in a <code>{@link org.jdom.Namespace}</code>.
+ * the attribute in a <code>{@link org.jdom2.Namespace}</code>.
* <p>
* <b>Note</b>: This actually explicitly puts the
* <code>Attribute</code> in the "empty" <code>Namespace</code>
- * (<code>{@link org.jdom.Namespace#NO_NAMESPACE}</code>).
+ * (<code>{@link org.jdom2.Namespace#NO_NAMESPACE}</code>).
* </p>
*
* @param name <code>String</code> name of <code>Attribute</code>.
@@ -113,11 +113,11 @@ public Attribute attribute(String name, String value,
/**
* This will create a new <code>Attribute</code> with the
* specified (local) name, value and type, and does not place
- * the attribute in a <code>{@link org.jdom.Namespace}</code>.
+ * the attribute in a <code>{@link org.jdom2.Namespace}</code>.
* <p>
* <b>Note</b>: This actually explicitly puts the
* <code>Attribute</code> in the "empty" <code>Namespace</code>
- * (<code>{@link org.jdom.Namespace#NO_NAMESPACE}</code>).
+ * (<code>{@link org.jdom2.Namespace#NO_NAMESPACE}</code>).
* </p>
*
* @param name <code>String</code> name of <code>Attribute</code>.
@@ -195,9 +195,9 @@ public DocType docType(String elementName,
/**
* This will create a new <code>Document</code>,
- * with the supplied <code>{@link org.jdom.Element}</code>
+ * with the supplied <code>{@link org.jdom2.Element}</code>
* as the root element and the supplied
- * <code>{@link org.jdom.DocType}</code> declaration.
+ * <code>{@link org.jdom2.DocType}</code> declaration.
*
* @param rootElement <code>Element</code> for document root.
* @param docType <code>DocType</code> declaration.
@@ -206,9 +206,9 @@ public DocType docType(String elementName,
/**
* This will create a new <code>Document</code>,
- * with the supplied <code>{@link org.jdom.Element}</code>
+ * with the supplied <code>{@link org.jdom2.Element}</code>
* as the root element and the supplied
- * <code>{@link org.jdom.DocType}</code> declaration.
+ * <code>{@link org.jdom2.DocType}</code> declaration.
*
* @param rootElement <code>Element</code> for document root.
* @param docType <code>DocType</code> declaration.
@@ -218,8 +218,8 @@ public DocType docType(String elementName,
/**
* This will create a new <code>Document</code>,
- * with the supplied <code>{@link org.jdom.Element}</code>
- * as the root element, and no <code>{@link org.jdom.DocType}</code>
+ * with the supplied <code>{@link org.jdom2.Element}</code>
+ * as the root element, and no <code>{@link org.jdom2.DocType}</code>
* declaration.
*
* @param rootElement <code>Element</code> for document root
@@ -231,7 +231,7 @@ public DocType docType(String elementName,
/**
* This will create a new <code>Element</code>
* with the supplied (local) name, and define
- * the <code>{@link org.jdom.Namespace}</code> to be used.
+ * the <code>{@link org.jdom2.Namespace}</code> to be used.
*
* @param name <code>String</code> name of element.
* @param namespace <code>Namespace</code> to put element in.
@@ -240,7 +240,7 @@ public DocType docType(String elementName,
/**
* This will create an <code>Element</code> in no
- * <code>{@link org.jdom.Namespace}</code>.
+ * <code>{@link org.jdom2.Namespace}</code>.
*
* @param name <code>String</code> name of element.
*/
@@ -249,7 +249,7 @@ public DocType docType(String elementName,
/**
* This will create a new <code>Element</code> with
* the supplied (local) name, and specifies the URI
- * of the <code>{@link org.jdom.Namespace}</code> the <code>Element</code>
+ * of the <code>{@link org.jdom2.Namespace}</code> the <code>Element</code>
* should be in, resulting it being unprefixed (in the default
* namespace).
*
@@ -262,7 +262,7 @@ public DocType docType(String elementName,
/**
* This will create a new <code>Element</code> with
* the supplied (local) name, and specifies the prefix and URI
- * of the <code>{@link org.jdom.Namespace}</code> the <code>Element</code>
+ * of the <code>{@link org.jdom2.Namespace}</code> the <code>Element</code>
* should be in.
*
* @param name <code>String</code> name of element.
@@ -62,9 +62,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* Superclass for JDOM objects which are allowed to contain
* {@link Content} content.
*
- * @see org.jdom.Content
- * @see org.jdom.Document
- * @see org.jdom.Element
+ * @see org.jdom2.Content
+ * @see org.jdom2.Document
+ * @see org.jdom2.Element
*
* @author Bradley S. Huffman
* @author Jason Hunter
Oops, something went wrong.

0 comments on commit 58790e7

Please sign in to comment.