Attachment 10318 Details for Bug 61148 – patch for o.e.jdt.core

[patch] patch for o.e.jdt.core

jdt-core-jdom-deprecation-patch4-20040505.txt (text/plain), 68.71 KB, created by Jim des Rivieres

on 2004-05-05 19:23:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jim des Rivieres

Created: 2004-05-05 19:23:12 EDT

Size: 68.71 KB

patch

obsolete

>Index: model/org/eclipse/jdt/core/jdom/DOMFactory.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/DOMFactory.java,v
>retrieving revision 1.19
>diff -u -r1.19 DOMFactory.java
>--- model/org/eclipse/jdt/core/jdom/DOMFactory.java	13 Jan 2004 15:48:44 -0000	1.19
>+++ model/org/eclipse/jdt/core/jdom/DOMFactory.java	5 May 2004 23:08:02 -0000
>@@ -11,8 +11,7 @@
> package org.eclipse.jdt.core.jdom;
> 
> import org.eclipse.jdt.internal.compiler.util.Util;
>-import org.eclipse.jdt.internal.core.jdom.DOMBuilder;
>-import org.eclipse.jdt.internal.core.jdom.SimpleDOMBuilder;
>+import org.eclipse.jdt.internal.core.jdom.*;
> 
> /**
> * Standard implementation of <code>IDOMFactory</code>, and the only means
>@@ -20,6 +19,9 @@
> * 
> * This class may be instantiated; it is not intended to be subclassed.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public class DOMFactory implements IDOMFactory {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMCompilationUnit.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMCompilationUnit.java,v
>retrieving revision 1.11
>diff -u -r1.11 IDOMCompilationUnit.java
>--- model/org/eclipse/jdt/core/jdom/IDOMCompilationUnit.java	11 Feb 2004 15:59:32 -0000	1.11
>+++ model/org/eclipse/jdt/core/jdom/IDOMCompilationUnit.java	5 May 2004 23:08:02 -0000
>@@ -18,6 +18,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMCompilationUnit extends IDOMNode {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMFactory.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMFactory.java,v
>retrieving revision 1.13
>diff -u -r1.13 IDOMFactory.java
>--- model/org/eclipse/jdt/core/jdom/IDOMFactory.java	31 Mar 2004 11:20:33 -0000	1.13
>+++ model/org/eclipse/jdt/core/jdom/IDOMFactory.java	5 May 2004 23:08:02 -0000
>@@ -47,6 +47,9 @@
> * 
> *
> * @see IDOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMFactory {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMField.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMField.java,v
>retrieving revision 1.8
>diff -u -r1.8 IDOMField.java
>--- model/org/eclipse/jdt/core/jdom/IDOMField.java	11 Feb 2004 15:59:32 -0000	1.8
>+++ model/org/eclipse/jdt/core/jdom/IDOMField.java	5 May 2004 23:08:02 -0000
>@@ -18,6 +18,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMField extends IDOMMember {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMImport.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMImport.java,v
>retrieving revision 1.10
>diff -u -r1.10 IDOMImport.java
>--- model/org/eclipse/jdt/core/jdom/IDOMImport.java	23 Apr 2004 14:02:43 -0000	1.10
>+++ model/org/eclipse/jdt/core/jdom/IDOMImport.java	5 May 2004 23:08:02 -0000
>@@ -17,6 +17,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMImport extends IDOMNode {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMInitializer.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMInitializer.java,v
>retrieving revision 1.8
>diff -u -r1.8 IDOMInitializer.java
>--- model/org/eclipse/jdt/core/jdom/IDOMInitializer.java	11 Feb 2004 15:59:32 -0000	1.8
>+++ model/org/eclipse/jdt/core/jdom/IDOMInitializer.java	5 May 2004 23:08:03 -0000
>@@ -17,6 +17,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMInitializer extends IDOMMember {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMMember.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMMember.java,v
>retrieving revision 1.9
>diff -u -r1.9 IDOMMember.java
>--- model/org/eclipse/jdt/core/jdom/IDOMMember.java	11 Feb 2004 15:59:32 -0000	1.9
>+++ model/org/eclipse/jdt/core/jdom/IDOMMember.java	5 May 2004 23:08:03 -0000
>@@ -21,6 +21,9 @@
> * @see IDOMMethod
> * @see IDOMField
> * @see IDOMInitializer
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMMember extends IDOMNode {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMMethod.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMMethod.java,v
>retrieving revision 1.11
>diff -u -r1.11 IDOMMethod.java
>--- model/org/eclipse/jdt/core/jdom/IDOMMethod.java	31 Mar 2004 11:20:33 -0000	1.11
>+++ model/org/eclipse/jdt/core/jdom/IDOMMethod.java	5 May 2004 23:08:03 -0000
>@@ -20,6 +20,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMMethod extends IDOMMember {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMNode.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMNode.java,v
>retrieving revision 1.8
>diff -u -r1.8 IDOMNode.java
>--- model/org/eclipse/jdt/core/jdom/IDOMNode.java	11 Feb 2004 15:59:32 -0000	1.8
>+++ model/org/eclipse/jdt/core/jdom/IDOMNode.java	5 May 2004 23:08:03 -0000
>@@ -54,6 +54,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMNode extends Cloneable {
> 
>Index: model/org/eclipse/jdt/core/jdom/IDOMPackage.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMPackage.java,v
>retrieving revision 1.8
>diff -u -r1.8 IDOMPackage.java
>--- model/org/eclipse/jdt/core/jdom/IDOMPackage.java	11 Feb 2004 15:59:32 -0000	1.8
>+++ model/org/eclipse/jdt/core/jdom/IDOMPackage.java	5 May 2004 23:08:03 -0000
>@@ -16,6 +16,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMPackage extends IDOMNode {
> /**
>Index: model/org/eclipse/jdt/core/jdom/IDOMType.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/IDOMType.java,v
>retrieving revision 1.10
>diff -u -r1.10 IDOMType.java
>--- model/org/eclipse/jdt/core/jdom/IDOMType.java	31 Mar 2004 11:20:33 -0000	1.10
>+++ model/org/eclipse/jdt/core/jdom/IDOMType.java	5 May 2004 23:08:03 -0000
>@@ -24,6 +24,9 @@
> * 
> * This interface is not intended to be implemented by clients.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public interface IDOMType extends IDOMMember {
> /**
>Index: model/org/eclipse/jdt/core/jdom/package.html
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/core/jdom/package.html,v
>retrieving revision 1.4
>diff -u -r1.4 package.html
>--- model/org/eclipse/jdt/core/jdom/package.html	31 Mar 2004 11:20:33 -0000	1.4
>+++ model/org/eclipse/jdt/core/jdom/package.html	5 May 2004 23:08:03 -0000
>@@ -1,22 +1,24 @@
> <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
> <html>
>+
> <head>
>- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>- <meta name="Author" content="IBM">
>- <meta name="GENERATOR" content="Mozilla/4.75 [en] (Windows NT 5.0; U) [Netscape]">
>- <title>Package-level Javadoc</title>
>+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
>+<meta name="Author" content="IBM">
>+<meta name="GENERATOR" content="Microsoft FrontPage 4.0">
>+<meta name="ProgId" content="FrontPage.Editor.Document">
>+<title>Package-level Javadoc</title>
> </head>
>+
> <body>
>-Provides a support for Java document manipulation
>-through the JDOM model.
>-<h2>
>-Package Specification</h2>
>-This package provides a support for Java document manipulation throught
>-the JDOM model.
>-
>-The JDOM was made obsolete by the addition in 2.0 of the more
>-powerful, fine-grained DOM/AST API found in the 
>-<code>org.eclipse.jdt.core.dom</code> package.
>-
>+
>+Provides a support for Java document manipulation through the JDOM model.
>+<h2>Package Specification</h2>
>+This package provides a support for Java document manipulation through the JDOM
>+model.
>+The JDOM was made obsolete by the addition in 2.0 of the more powerful,
>+fine-grained DOM/AST API found in the <code>org.eclipse.jdt.core.dom</code>
>+package.
>+
> </body>
>+
> </html>
>Index: model/org/eclipse/jdt/internal/core/CompilationUnit.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CompilationUnit.java,v
>retrieving revision 1.174
>diff -u -r1.174 CompilationUnit.java
>--- model/org/eclipse/jdt/internal/core/CompilationUnit.java	28 Apr 2004 15:05:32 -0000	1.174
>+++ model/org/eclipse/jdt/internal/core/CompilationUnit.java	5 May 2004 23:08:05 -0000
>@@ -18,7 +18,7 @@
> import org.eclipse.jdt.core.compiler.*;
> import org.eclipse.jdt.core.compiler.IProblem;
> import org.eclipse.jdt.core.dom.AST;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.ASTVisitor;
> import org.eclipse.jdt.internal.compiler.IProblemFactory;
> import org.eclipse.jdt.internal.compiler.SourceElementParser;
>@@ -425,7 +425,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode(IDOMNode)
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	String elementName = getElementName();
> 	if (node.getNodeType() == IDOMNode.COMPILATION_UNIT && elementName != null ) {
>Index: model/org/eclipse/jdt/internal/core/CopyElementsOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyElementsOperation.java,v
>retrieving revision 1.23
>diff -u -r1.23 CopyElementsOperation.java
>--- model/org/eclipse/jdt/internal/core/CopyElementsOperation.java	13 Jan 2004 15:48:42 -0000	1.23
>+++ model/org/eclipse/jdt/internal/core/CopyElementsOperation.java	5 May 2004 23:08:05 -0000
>@@ -21,9 +21,7 @@
> import org.eclipse.jdt.core.IParent;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
> import org.eclipse.jdt.internal.compiler.util.Util;
> 
>@@ -126,11 +124,21 @@
> 		IMember member = (IMember)element;
> 		ICompilationUnit cu = member.getCompilationUnit();
> 		String cuSource = cu.getSource();
>-		IDOMCompilationUnit domCU = new DOMFactory().createCompilationUnit(cuSource, cu.getElementName());
>-		IDOMNode node = ((JavaElement)element).findNode(domCU);
>-		source = new String(node.getCharacters());
>+		String cuName = cu.getElementName();
>+		source = computeSourceForElement(element, cuSource, cuName);
> 		this.sources.put(element, source);
> 	}
>+	return source;
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private String computeSourceForElement(IJavaElement element, String cuSource, String cuName) {
>+	String source;
>+	IDOMCompilationUnit domCU = new DOMFactory().createCompilationUnit(cuSource, cuName);
>+	IDOMNode node = ((JavaElement)element).findNode(domCU);
>+	source = new String(node.getCharacters());
> 	return source;
> }
> /**
>Index: model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java,v
>retrieving revision 1.77
>diff -u -r1.77 CopyResourceElementsOperation.java
>--- model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java	8 Apr 2004 20:50:48 -0000	1.77
>+++ model/org/eclipse/jdt/internal/core/CopyResourceElementsOperation.java	5 May 2004 23:08:06 -0000
>@@ -61,7 +61,9 @@
> 	/**
> 	 * The <code>DOMFactory</code> used to manipulate the source code of
> 	 * <code>ICompilationUnit</code>.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected DOMFactory fFactory;
> 	/**
> 	 * A collection of renamed compilation units. These cus do
>@@ -83,6 +85,13 @@
> 	 */
> 	public CopyResourceElementsOperation(IJavaElement[] resourcesToCopy, IJavaElement[] destContainers, boolean force) {
> 		super(resourcesToCopy, destContainers, force);
>+		initializeDOMFactory();
>+	}
>+	/**
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
>+	private void initializeDOMFactory() {
> 		fFactory = new DOMFactory();
> 	}
> 	/**
>@@ -378,7 +387,9 @@
> 	 *
> 	 * @exception JavaModelException if the operation is unable to
> 	 * complete
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	private void processPackageFragmentResource(IPackageFragment source, IPackageFragmentRoot root, String newName) throws JavaModelException {
> 		try {
> 			String newFragName = (newName == null) ? source.getElementName() : newName;
>@@ -540,7 +551,9 @@
> 	 * declaration as necessary.
> 	 *
> 	 * @return the new source
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	private String updatedContent(ICompilationUnit cu, IPackageFragment dest, String newName) throws JavaModelException {
> 		String currPackageName = cu.getParent().getElementName();
> 		String destPackageName = dest.getElementName();
>@@ -562,7 +575,9 @@
> 	}
> 	/**
> 	 * Makes sure that <code>cu</code> declares to be in the <code>pkgName</code> package.
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	private void updatePackageStatement(IDOMCompilationUnit domCU, String pkgName) {
> 		boolean defaultPackage = pkgName.equals(IPackageFragment.DEFAULT_PACKAGE_NAME);
> 		boolean seenPackageNode = false;
>@@ -625,7 +640,9 @@
> 	}
> 		/**
> 		 * Renames the main type in <code>cu</code>.
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
> 		 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 		private void updateTypeName(ICompilationUnit cu, IDOMCompilationUnit domCU, String oldName, String newName) throws JavaModelException {
> 			if (newName != null) {
> 				if (fRenamedCompilationUnits == null) {
>Index: model/org/eclipse/jdt/internal/core/CreateElementInCUOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateElementInCUOperation.java,v
>retrieving revision 1.30
>diff -u -r1.30 CreateElementInCUOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateElementInCUOperation.java	23 Jan 2004 14:24:35 -0000	1.30
>+++ model/org/eclipse/jdt/internal/core/CreateElementInCUOperation.java	5 May 2004 23:08:06 -0000
>@@ -19,10 +19,8 @@
> import org.eclipse.jdt.core.IJavaModelStatus;
> import org.eclipse.jdt.core.IJavaModelStatusConstants;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>-import org.eclipse.jdt.internal.core.jdom.DOMNode;
>+import org.eclipse.jdt.core.jdom.*;
>+import org.eclipse.jdt.internal.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -39,7 +37,9 @@
> public abstract class CreateElementInCUOperation extends JavaModelOperation {
> 	/**
> 	 * The compilation unit DOM used for this operation
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected IDOMCompilationUnit fCUDOM;
> 	/**
> 	 * A constant meaning to position the new element
>@@ -79,7 +79,9 @@
> 	protected boolean fCreationOccurred = true;
> 	/**
> 	 * The element that is being created.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected DOMNode fCreatedElement;
> 	/**
> 	 * The position of the element that is being created.
>@@ -141,7 +143,7 @@
> 				if (buffer == null) return;
> 				char[] bufferContents = buffer.getCharacters();
> 				if (bufferContents == null) return;
>-				char[] elementContents = Util.normalizeCRs(fCreatedElement.getCharacters(), bufferContents);
>+				char[] elementContents = Util.normalizeCRs(getCreatedElementCharacters(), bufferContents);
> 				switch (fReplacementLength) {
> 					case -1 : 
> 						// element is append at the end
>@@ -176,12 +178,25 @@
> 		}
> 	}
> 	/**
>+	 * Returns the current contents of the created document fragment as a
>+	 * character array.
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
>+	private char[] getCreatedElementCharacters() {
>+		return fCreatedElement.getCharacters();
>+	}
>+	/**
> 	 * Returns a JDOM document fragment for the element being created.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected abstract IDOMNode generateElementDOM() throws JavaModelException;
> 	/**
> 	 * Returns the DOM with the new source to use for the given compilation unit.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected void generateNewCompilationUnitDOM(ICompilationUnit cu) throws JavaModelException {
> 		IBuffer buffer = cu.getBuffer();
> 		if (buffer == null) return;
>@@ -245,8 +260,10 @@
> 	 * based on the position settings of this operation.
> 	 *
> 	 * @see createAfter(IJavaElement)
>-	 * @see createBefore(IJavaElement);
>+	 * @see createBefore(IJavaElement)
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected void insertDOMNode(IDOMNode parent, IDOMNode child) {
> 		if (fInsertionPolicy != INSERT_LAST) {
> 			IDOMNode sibling = ((JavaElement)fAnchorElement).findNode(fCUDOM);
>@@ -263,8 +280,8 @@
> 		}
> 		//add as the last element of the parent
> 		parent.addChild(child);
>-		fCreatedElement = (DOMNode)child;
>-		fInsertionPosition = ((DOMNode)parent).getInsertionPosition();
>+		fCreatedElement = (org.eclipse.jdt.internal.core.jdom.DOMNode)child;
>+		fInsertionPosition = ((org.eclipse.jdt.internal.core.jdom.DOMNode)parent).getInsertionPosition();
> 	//	fInsertionPosition = lastChild == null ? ((DOMNode)parent).getInsertionPosition() : lastChild.getInsertionPosition();
> 		fReplacementLength = parent.getParent() == null ? -1 : 0;
> 	}
>Index: model/org/eclipse/jdt/internal/core/CreateFieldOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateFieldOperation.java,v
>retrieving revision 1.21
>diff -u -r1.21 CreateFieldOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateFieldOperation.java	13 Jan 2004 15:48:43 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/CreateFieldOperation.java	5 May 2004 23:08:06 -0000
>@@ -15,9 +15,7 @@
> import org.eclipse.jdt.core.IJavaModelStatusConstants;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMField;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -43,7 +41,9 @@
> }
> /**
> * @see CreateTypeMemberOperation#generateElementDOM
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateElementDOM() throws JavaModelException {
> 	if (fDOMNode == null) {
> 		fDOMNode = (new DOMFactory()).createField(fSource);
>@@ -66,7 +66,7 @@
> * @see CreateElementInCUOperation#generateResultHandle
> */
> protected IJavaElement generateResultHandle() {
>-	return getType().getField(fDOMNode.getName());
>+	return getType().getField(getDOMNodeName());
> }
> /**
> * @see CreateElementInCUOperation#getMainTaskName()
>@@ -100,11 +100,18 @@
> */
> protected IJavaModelStatus verifyNameCollision() {
> 	IType type= getType();
>-	if (type.getField(fDOMNode.getName()).exists()) {
>+	if (type.getField(getDOMNodeName()).exists()) {
> 		return new JavaModelStatus(
> 			IJavaModelStatusConstants.NAME_COLLISION, 
>-			Util.bind("status.nameCollision", fDOMNode.getName())); //$NON-NLS-1$
>+			Util.bind("status.nameCollision", getDOMNodeName())); //$NON-NLS-1$
> 	}
> 	return JavaModelStatus.VERIFIED_OK;
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private String getDOMNodeName() {
>+	return fDOMNode.getName();
> }
> }
>Index: model/org/eclipse/jdt/internal/core/CreateImportOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateImportOperation.java,v
>retrieving revision 1.21
>diff -u -r1.21 CreateImportOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateImportOperation.java	13 Jan 2004 15:48:43 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/CreateImportOperation.java	5 May 2004 23:08:06 -0000
>@@ -19,9 +19,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaConventions;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMImport;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -57,7 +55,9 @@
> }
> /**
> * @see CreateTypeMemberOperation#generateElementDOM
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateElementDOM() {
> 	if (fCUDOM.getChild(fImportName) == null) {
> 		DOMFactory factory = new DOMFactory();
>Index: model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java,v
>retrieving revision 1.20
>diff -u -r1.20 CreateInitializerOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java	13 Jan 2004 15:48:42 -0000	1.20
>+++ model/org/eclipse/jdt/internal/core/CreateInitializerOperation.java	5 May 2004 23:08:07 -0000
>@@ -14,9 +14,7 @@
> import org.eclipse.jdt.core.IJavaModelStatusConstants;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMInitializer;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -47,7 +45,9 @@
> }
> /**
> * @see CreateTypeMemberOperation#generateElementDOM
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateElementDOM() throws JavaModelException {
> 	if (fDOMNode == null) {
> 		fDOMNode = (new DOMFactory()).createInitializer(fSource);
>Index: model/org/eclipse/jdt/internal/core/CreateMethodOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateMethodOperation.java,v
>retrieving revision 1.20
>diff -u -r1.20 CreateMethodOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateMethodOperation.java	13 Jan 2004 15:48:42 -0000	1.20
>+++ model/org/eclipse/jdt/internal/core/CreateMethodOperation.java	5 May 2004 23:08:07 -0000
>@@ -16,9 +16,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.Signature;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMMethod;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -42,10 +40,12 @@
> /**
> * Returns the type signatures of the parameter types of the
> * current <code>DOMMethod</code>
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected String[] convertDOMMethodTypesToSignatures() {
> 	if (fParameterTypes == null) {
>-		if (fDOMNode != null) {
>+		if (isDOMNodeNull()) {
> 			String[] domParameterTypes = ((IDOMMethod)fDOMNode).getParameterTypes();
> 			if (domParameterTypes != null) {
> 				fParameterTypes = new String[domParameterTypes.length];
>@@ -61,7 +61,9 @@
> }
> /**
> * @see CreateTypeMemberOperation#generateElementDOM
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateElementDOM() throws JavaModelException {
> 	if (fDOMNode == null) {
> 		fDOMNode = (new DOMFactory()).createMethod(fSource);
>@@ -72,7 +74,7 @@
> 				throw new JavaModelException(new JavaModelStatus(IJavaModelStatusConstants.INVALID_CONTENTS));
> 			}
> 		}
>-		if (fAlteredName != null && fDOMNode != null) {
>+		if (fAlteredName != null && isDOMNodeNull()) {
> 			fDOMNode.setName(fAlteredName);
> 		}
> 	}
>@@ -86,13 +88,28 @@
> */
> protected IJavaElement generateResultHandle() {
> 	String[] types = convertDOMMethodTypesToSignatures();
>+	String name = computeName();
>+	return getType().getMethod(name, types);
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private String computeName() {
> 	String name;
> 	if (((IDOMMethod) fDOMNode).isConstructor()) {
> 		name = fDOMNode.getParent().getName();
> 	} else {
>-		name = fDOMNode.getName();
>+		name = getDOMNodeName();
> 	}
>-	return getType().getMethod(name, types);
>+	return name;
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private String getDOMNodeName() {
>+	return fDOMNode.getName();
> }
> /**
> * @see CreateElementInCUOperation#getMainTaskName()
>@@ -104,9 +121,9 @@
> * @see CreateTypeMemberOperation#verifyNameCollision
> */
> protected IJavaModelStatus verifyNameCollision() {
>-	if (fDOMNode != null) {
>+	if (isDOMNodeNull()) {
> 		IType type = getType();
>-		String name = fDOMNode.getName();
>+		String name = getDOMNodeName();
> 		if (name == null) { //constructor
> 			name = type.getElementName();
> 		}
>@@ -118,5 +135,12 @@
> 		}
> 	}
> 	return JavaModelStatus.VERIFIED_OK;
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private boolean isDOMNodeNull() {
>+	return fDOMNode != null;
> }
> }
>Index: model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java,v
>retrieving revision 1.19
>diff -u -r1.19 CreatePackageDeclarationOperation.java
>--- model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java	13 Jan 2004 15:48:42 -0000	1.19
>+++ model/org/eclipse/jdt/internal/core/CreatePackageDeclarationOperation.java	5 May 2004 23:08:07 -0000
>@@ -20,10 +20,8 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaConventions;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>-import org.eclipse.jdt.core.jdom.IDOMPackage;
>-import org.eclipse.jdt.internal.core.jdom.DOMNode;
>+import org.eclipse.jdt.core.jdom.*;
>+import org.eclipse.jdt.internal.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -50,7 +48,9 @@
> }
> /**
> * @see CreateTypeMemberOperation#generateElementDOM
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateElementDOM() throws JavaModelException {
> 	IJavaElement[] children = getCompilationUnit().getChildren();
> 	//look for an existing package declaration
>@@ -61,7 +61,7 @@
> 			if (!pack.getName().equals(fName)) {
> 				 // get the insertion position before setting the name, as this makes it a detailed node
> 				 // thus the start position is always 0
>-				DOMNode node = (DOMNode)pack;
>+				DOMNode node = (org.eclipse.jdt.internal.core.jdom.DOMNode)pack;
> 				fInsertionPosition = node.getStartPosition();
> 				fReplacementLength = node.getEndPosition() - fInsertionPosition + 1;
> 				pack.setName(fName);
>Index: model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java,v
>retrieving revision 1.21
>diff -u -r1.21 CreateTypeMemberOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java	13 Jan 2004 15:48:43 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/CreateTypeMemberOperation.java	5 May 2004 23:08:07 -0000
>@@ -17,9 +17,7 @@
> import org.eclipse.jdt.core.IJavaModelStatusConstants;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.Util;
> 
> /**
>@@ -39,8 +37,10 @@
> 	protected String fAlteredName;
> 	/**
> 	 * The JDOM document fragment representing the element that
>-	 * this operation created. 
>+	 * this operation created.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	 protected IDOMNode fDOMNode;
> /**
> * When executed, this operation will create a type member
>@@ -53,7 +53,9 @@
> }
> /**
> * @see CreateElementInCUOperation#generateNewCompilationUnitDOM
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected void generateNewCompilationUnitDOM(ICompilationUnit cu) throws JavaModelException {
> 	IBuffer buffer = cu.getBuffer();
> 	if (buffer == null) return;
>@@ -67,7 +69,7 @@
> 		//#findNode does not work for autogenerated CUs as the contents are empty
> 		parent = fCUDOM;
> 	}
>-	IDOMNode child = generateElementDOM();
>+	IDOMNode child = deprecatedGenerateElementDOM();
> 	if (child != null) {
> 		insertDOMNode(parent, child);
> 	}
>@@ -76,7 +78,9 @@
> /**
> * Generates a <code>IDOMNode</code> based on the source of this operation
> * when there is likely a syntax error in the source.
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateSyntaxIncorrectDOM() {
> 	//create some dummy source to generate a dom node
> 	StringBuffer buff = new StringBuffer();
>@@ -129,7 +133,7 @@
> 	if (!force) {
> 		//check for name collisions
> 		try {
>-			generateElementDOM();
>+			deprecatedGenerateElementDOM();
> 		} catch (JavaModelException jme) {
> 			return jme.getJavaModelStatus();
> 		}
>@@ -137,6 +141,13 @@
> 	}
> 	
> 	return JavaModelStatus.VERIFIED_OK;
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private IDOMNode deprecatedGenerateElementDOM() throws JavaModelException {
>+	return generateElementDOM();
> }
> /**
> * Verify for a name collision in the destination container.
>Index: model/org/eclipse/jdt/internal/core/CreateTypeOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/CreateTypeOperation.java,v
>retrieving revision 1.25
>diff -u -r1.25 CreateTypeOperation.java
>--- model/org/eclipse/jdt/internal/core/CreateTypeOperation.java	13 Jan 2004 15:48:42 -0000	1.25
>+++ model/org/eclipse/jdt/internal/core/CreateTypeOperation.java	5 May 2004 23:08:07 -0000
>@@ -16,9 +16,7 @@
> import org.eclipse.jdt.core.IJavaModelStatusConstants;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>-import org.eclipse.jdt.core.jdom.IDOMType;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -40,7 +38,9 @@
> }
> /**
> * @see CreateElementInCUOperation#generateElementDOM()
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected IDOMNode generateElementDOM() throws JavaModelException {
> 	if (fDOMNode == null) {
> 		fDOMNode = (new DOMFactory()).createType(fSource);
>@@ -67,9 +67,9 @@
> 	IJavaElement parent= getParentElement();
> 	switch (parent.getElementType()) {
> 		case IJavaElement.COMPILATION_UNIT:
>-			return ((ICompilationUnit)parent).getType(fDOMNode.getName());
>+			return ((ICompilationUnit)parent).getType(getDOMNodeName());
> 		case IJavaElement.TYPE:
>-			return ((IType)parent).getType(fDOMNode.getName());
>+			return ((IType)parent).getType(getDOMNodeName());
> 		// Note: creating local/anonymous type is not supported 
> 	}
> 	return null;
>@@ -97,21 +97,28 @@
> 	IJavaElement parent = getParentElement();
> 	switch (parent.getElementType()) {
> 		case IJavaElement.COMPILATION_UNIT:
>-			if (((ICompilationUnit) parent).getType(fDOMNode.getName()).exists()) {
>+			if (((ICompilationUnit) parent).getType(getDOMNodeName()).exists()) {
> 				return new JavaModelStatus(
> 					IJavaModelStatusConstants.NAME_COLLISION, 
>-					Util.bind("status.nameCollision", fDOMNode.getName())); //$NON-NLS-1$
>+					Util.bind("status.nameCollision", getDOMNodeName())); //$NON-NLS-1$
> 			}
> 			break;
> 		case IJavaElement.TYPE:
>-			if (((IType) parent).getType(fDOMNode.getName()).exists()) {
>+			if (((IType) parent).getType(getDOMNodeName()).exists()) {
> 				return new JavaModelStatus(
> 					IJavaModelStatusConstants.NAME_COLLISION, 
>-					Util.bind("status.nameCollision", fDOMNode.getName())); //$NON-NLS-1$
>+					Util.bind("status.nameCollision", getDOMNodeName())); //$NON-NLS-1$
> 			}
> 			break;
> 		// Note: creating local/anonymous type is not supported 
> 	}
> 	return JavaModelStatus.VERIFIED_OK;
>+}
>+/**
>+ * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+ */
>+// TODO - JDOM - remove once model ported off of JDOM
>+private String getDOMNodeName() {
>+	return fDOMNode.getName();
> }
> }
>Index: model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java,v
>retrieving revision 1.34
>diff -u -r1.34 DeleteElementsOperation.java
>--- model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java	13 Jan 2004 15:48:42 -0000	1.34
>+++ model/org/eclipse/jdt/internal/core/DeleteElementsOperation.java	5 May 2004 23:08:07 -0000
>@@ -21,9 +21,7 @@
> import org.eclipse.jdt.core.IRegion;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.compiler.CharOperation;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.internal.core.jdom.DOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -47,7 +45,9 @@
> 	/**
> 	 * The <code>DOMFactory</code> used to manipulate the source code of
> 	 * <code>ICompilationUnit</code>s.
>+	 * @deprecated JDOM is obsolete 
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected DOMFactory factory;
> 	/**
> 	 * When executed, this operation will delete the given elements. The elements
>@@ -56,10 +56,18 @@
> 	 */
> 	public DeleteElementsOperation(IJavaElement[] elementsToDelete, boolean force) {
> 		super(elementsToDelete, force);
>-		factory = new DOMFactory();
>+		initDOMFactory();
> 	}
> 	
> 	/**
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
>+	private void initDOMFactory() {
>+		factory = new DOMFactory();
>+	}
>+
>+	/**
> 	 * @see MultiOperation
> 	 */
> 	protected String getMainTaskName() {
>@@ -116,12 +124,8 @@
> 			if (e.exists()) {
> 				char[] contents = buffer.getCharacters();
> 				if (contents == null) continue;
>-				IDOMCompilationUnit cuDOM = factory.createCompilationUnit(contents, cu.getElementName());
>-				DOMNode node = (DOMNode)((JavaElement) e).findNode(cuDOM);
>-				if (node == null) Assert.isTrue(false, "Failed to locate " + e.getElementName() + " in " + cuDOM.getName()); //$NON-NLS-1$//$NON-NLS-2$
>-
>-				int startPosition = node.getStartPosition();
>-				buffer.replace(startPosition, node.getEndPosition() - startPosition + 1, CharOperation.NO_CHAR);
>+				String cuName = cu.getElementName();
>+				replaceElementInBuffer(buffer, e, cuName);
> 				delta.removed(e);
> 				if (e.getElementType() == IJavaElement.IMPORT_DECLARATION) {
> 					numberOfImports--;
>@@ -139,6 +143,19 @@
> 			}
> 		}
> 	}
>+	/**
>+	 * @deprecated marked deprecated to suppress JDOM-related deprecation warnings
>+	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
>+	private void replaceElementInBuffer(IBuffer buffer, IJavaElement elementToRemove, String cuName) {
>+		IDOMCompilationUnit cuDOM = factory.createCompilationUnit(buffer.getCharacters(), cuName);
>+		org.eclipse.jdt.internal.core.jdom.DOMNode node = (org.eclipse.jdt.internal.core.jdom.DOMNode)((JavaElement) elementToRemove).findNode(cuDOM);
>+		if (node == null) Assert.isTrue(false, "Failed to locate " + elementToRemove.getElementName() + " in " + cuDOM.getName()); //$NON-NLS-1$//$NON-NLS-2$
>+
>+		int startPosition = node.getStartPosition();
>+		buffer.replace(startPosition, node.getEndPosition() - startPosition + 1, CharOperation.NO_CHAR);
>+	}
>+
> 	/**
> 	 * @see MultiOperation
> 	 * This method first group the elements by <code>ICompilationUnit</code>,
>Index: model/org/eclipse/jdt/internal/core/ImportDeclaration.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/ImportDeclaration.java,v
>retrieving revision 1.27
>diff -u -r1.27 ImportDeclaration.java
>--- model/org/eclipse/jdt/internal/core/ImportDeclaration.java	19 Apr 2004 17:10:46 -0000	1.27
>+++ model/org/eclipse/jdt/internal/core/ImportDeclaration.java	5 May 2004 23:08:09 -0000
>@@ -13,7 +13,7 @@
> import org.eclipse.jdt.core.*;
> import org.eclipse.jdt.core.IImportDeclaration;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> 
> /**
> * Handle for an import declaration. Info object is a ImportDeclarationElementInfo.
>@@ -36,7 +36,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	return (node.getNodeType() == IDOMNode.IMPORT) && getElementName().equals(node.getName());
> }
>Index: model/org/eclipse/jdt/internal/core/Initializer.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Initializer.java,v
>retrieving revision 1.30
>diff -u -r1.30 Initializer.java
>--- model/org/eclipse/jdt/internal/core/Initializer.java	13 Jan 2004 15:48:43 -0000	1.30
>+++ model/org/eclipse/jdt/internal/core/Initializer.java	5 May 2004 23:08:09 -0000
>@@ -18,7 +18,7 @@
> import org.eclipse.jdt.core.ISourceRange;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -40,7 +40,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	if (node.getNodeType() == IDOMNode.INITIALIZER) {
> 		try {
>Index: model/org/eclipse/jdt/internal/core/JavaElement.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/JavaElement.java,v
>retrieving revision 1.88
>diff -u -r1.88 JavaElement.java
>--- model/org/eclipse/jdt/internal/core/JavaElement.java	5 May 2004 14:18:23 -0000	1.88
>+++ model/org/eclipse/jdt/internal/core/JavaElement.java	5 May 2004 23:08:09 -0000
>@@ -18,8 +18,7 @@
> import org.eclipse.core.runtime.*;
> import org.eclipse.core.runtime.jobs.ISchedulingRule;
> import org.eclipse.jdt.core.*;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.MementoTokenizer;
> import org.eclipse.jdt.internal.core.util.Util;
> 
>@@ -126,7 +125,9 @@
> 	/**
> 	 * Returns true if this <code>JavaElement</code> is equivalent to the given
> 	 * <code>IDOMNode</code>.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected boolean equalsDOMNode(IDOMNode node) {
> 		return false;
> 	}
>@@ -170,7 +171,9 @@
> 	/**
> 	 * Returns the <code>IDOMNode</code> that corresponds to this <code>JavaElement</code>
> 	 * or <code>null</code> if there is no corresponding node.
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	public IDOMNode findNode(IDOMCompilationUnit dom) {
> 		int type = getElementType();
> 		if (type == IJavaElement.COMPILATION_UNIT || 
>@@ -202,7 +205,9 @@
> 		}
> 	}
> 	/**
>+	 * @deprecated JDOM is obsolete
> 	 */
>+ // TODO - JDOM - remove once model ported off of JDOM
> 	protected IDOMNode followPath(ArrayList path, int position, IDOMNode node) {
> 	
> 		if (equalsDOMNode(node)) {
>Index: model/org/eclipse/jdt/internal/core/Member.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/Member.java,v
>retrieving revision 1.28
>diff -u -r1.28 Member.java
>--- model/org/eclipse/jdt/internal/core/Member.java	19 Apr 2004 17:10:46 -0000	1.28
>+++ model/org/eclipse/jdt/internal/core/Member.java	5 May 2004 23:08:10 -0000
>@@ -22,7 +22,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.Signature;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.impl.Constant;
> import org.eclipse.jdt.internal.compiler.lookup.TypeIds;
> import org.eclipse.jdt.internal.core.util.MementoTokenizer;
>@@ -93,7 +93,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	return getElementName().equals(node.getName());
> }
>Index: model/org/eclipse/jdt/internal/core/PackageDeclaration.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/PackageDeclaration.java,v
>retrieving revision 1.22
>diff -u -r1.22 PackageDeclaration.java
>--- model/org/eclipse/jdt/internal/core/PackageDeclaration.java	13 Jan 2004 15:48:42 -0000	1.22
>+++ model/org/eclipse/jdt/internal/core/PackageDeclaration.java	5 May 2004 23:08:11 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.jdt.core.*;
> import org.eclipse.jdt.core.IPackageDeclaration;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> 
> /**
> * @see IPackageDeclaration
>@@ -28,7 +28,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	return (node.getNodeType() == IDOMNode.PACKAGE) && getElementName().equals(node.getName());
> }
>Index: model/org/eclipse/jdt/internal/core/SourceField.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceField.java,v
>retrieving revision 1.28
>diff -u -r1.28 SourceField.java
>--- model/org/eclipse/jdt/internal/core/SourceField.java	13 Jan 2004 15:48:42 -0000	1.28
>+++ model/org/eclipse/jdt/internal/core/SourceField.java	5 May 2004 23:08:12 -0000
>@@ -15,7 +15,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.Signature;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> 
> /**
> * @see IField
>@@ -35,7 +35,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	return (node.getNodeType() == IDOMNode.FIELD) && super.equalsDOMNode(node);
> }
>Index: model/org/eclipse/jdt/internal/core/SourceMethod.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceMethod.java,v
>retrieving revision 1.32
>diff -u -r1.32 SourceMethod.java
>--- model/org/eclipse/jdt/internal/core/SourceMethod.java	19 Apr 2004 17:10:46 -0000	1.32
>+++ model/org/eclipse/jdt/internal/core/SourceMethod.java	5 May 2004 23:08:12 -0000
>@@ -16,8 +16,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.JavaModelException;
> import org.eclipse.jdt.core.Signature;
>-import org.eclipse.jdt.core.jdom.IDOMMethod;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.Util;
> 
> /**
>@@ -52,7 +51,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	if (node.getNodeType() == IDOMNode.METHOD) {
> 		try {
>@@ -219,7 +220,9 @@
> /**
> * Returns <code>true</code> if the signature of this <code>SourceMethod</code> matches that of the given
> * <code>IDOMMethod</code>, otherwise <code>false</code>. 
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean signatureEquals(IDOMMethod method) {
> 	String[] otherTypes= method.getParameterTypes();
> 	String[] types= getParameterTypes();
>Index: model/org/eclipse/jdt/internal/core/SourceType.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/SourceType.java,v
>retrieving revision 1.86
>diff -u -r1.86 SourceType.java
>--- model/org/eclipse/jdt/internal/core/SourceType.java	28 Apr 2004 15:06:04 -0000	1.86
>+++ model/org/eclipse/jdt/internal/core/SourceType.java	5 May 2004 23:08:12 -0000
>@@ -17,7 +17,7 @@
> import org.eclipse.jdt.core.*;
> import org.eclipse.jdt.core.compiler.*;
> import org.eclipse.jdt.core.compiler.IProblem;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.core.search.SearchEngine;
> import org.eclipse.jdt.internal.codeassist.CompletionEngine;
> import org.eclipse.jdt.internal.codeassist.ISearchableNameEnvironment;
>@@ -134,7 +134,9 @@
> }
> /**
> * @see JavaElement#equalsDOMNode
>+ * @deprecated JDOM is obsolete
> */
>+// TODO - JDOM - remove once model ported off of JDOM
> protected boolean equalsDOMNode(IDOMNode node) {
> 	return (node.getNodeType() == IDOMNode.TYPE) && super.equalsDOMNode(node);
> }
>Index: model/org/eclipse/jdt/internal/core/jdom/AbstractDOMBuilder.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/AbstractDOMBuilder.java,v
>retrieving revision 1.14
>diff -u -r1.14 AbstractDOMBuilder.java
>--- model/org/eclipse/jdt/internal/core/jdom/AbstractDOMBuilder.java	13 Jan 2004 15:48:44 -0000	1.14
>+++ model/org/eclipse/jdt/internal/core/jdom/AbstractDOMBuilder.java	5 May 2004 23:08:14 -0000
>@@ -12,13 +12,15 @@
> 
> import java.util.Stack;
> 
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
> import org.eclipse.jdt.internal.core.util.ReferenceInfoAdapter;
> 
> /**
> * An abstract DOM builder that contains shared functionality of DOMBuilder and SimpleDOMBuilder.
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public class AbstractDOMBuilder extends ReferenceInfoAdapter implements ILineStartFinder {
> 	/**
>@@ -149,7 +151,7 @@
> */
> public void enterCompilationUnit() {
> 	if (fBuildingCU) {
>-	 	IDOMCompilationUnit cu= new DOMCompilationUnit(fDocument, new int[] {0, fDocument.length - 1});
>+ 		IDOMCompilationUnit cu= new DOMCompilationUnit(fDocument, new int[] {0, fDocument.length - 1});
> 		fStack.push(cu);
> 	}
> }
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMBuilder.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMBuilder.java,v
>retrieving revision 1.23
>diff -u -r1.23 DOMBuilder.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMBuilder.java	13 Jan 2004 15:48:44 -0000	1.23
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMBuilder.java	5 May 2004 23:08:14 -0000
>@@ -28,8 +28,10 @@
> * DOMFactory to hide the implmentation of node creation and the
> * public Requestor API methods.
> * 
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
>-
> public class DOMBuilder extends AbstractDOMBuilder implements IDocumentElementRequestor {
> 	
> 	/**
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java,v
>retrieving revision 1.24
>diff -u -r1.24 DOMCompilationUnit.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java	13 Jan 2004 15:48:44 -0000	1.24
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMCompilationUnit.java	5 May 2004 23:08:14 -0000
>@@ -14,9 +14,7 @@
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.IPackageFragment;
> import org.eclipse.jdt.core.compiler.CharOperation;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>-import org.eclipse.jdt.core.jdom.IDOMType;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> import org.eclipse.jdt.internal.core.util.Util;
>@@ -25,6 +23,9 @@
> *
> * @see IDOMCompilationUnit
> * @see DOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> class DOMCompilationUnit extends DOMNode implements IDOMCompilationUnit, SuffixConstants {
> 
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMField.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMField.java,v
>retrieving revision 1.21
>diff -u -r1.21 DOMField.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMField.java	13 Jan 2004 15:48:44 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMField.java	5 May 2004 23:08:15 -0000
>@@ -15,9 +15,7 @@
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.compiler.CharOperation;
>-import org.eclipse.jdt.core.jdom.DOMException;
>-import org.eclipse.jdt.core.jdom.IDOMField;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.Util;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> /**
>@@ -25,6 +23,9 @@
> *
> * @see IDOMField
> * @see DOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> class DOMField extends DOMMember implements IDOMField {
> 	
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMImport.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMImport.java,v
>retrieving revision 1.18
>diff -u -r1.18 DOMImport.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMImport.java	31 Mar 2004 11:20:33 -0000	1.18
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMImport.java	5 May 2004 23:08:15 -0000
>@@ -13,8 +13,7 @@
> import org.eclipse.jdt.core.Flags;
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.IJavaElement;
>-import org.eclipse.jdt.core.jdom.IDOMImport;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.Util;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> 
>@@ -23,8 +22,11 @@
> *
> * @see IDOMImport
> * @see DOMNode
>- * TODO (jerome) - add implementation support for 1.5 features
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
>+// TODO (jerome) - add implementation support for 1.5 features
> class DOMImport extends DOMNode implements IDOMImport {
> 	/**
> 	 * Indicates if this import is an on demand type import
>@@ -166,7 +168,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMImport#getFlags()
>+ * @see IDOMImport#getFlags()
> * @since 3.0
> */
> public int getFlags() {
>@@ -174,7 +176,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMImport#setFlags(int)
>+ * @see IDOMImport#setFlags(int)
> * @since 3.0
> */
> public void setFlags(int flags) {
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java,v
>retrieving revision 1.20
>diff -u -r1.20 DOMInitializer.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java	13 Jan 2004 15:48:44 -0000	1.20
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMInitializer.java	5 May 2004 23:08:15 -0000
>@@ -13,8 +13,7 @@
> import org.eclipse.jdt.core.IJavaElement;
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.compiler.CharOperation;
>-import org.eclipse.jdt.core.jdom.IDOMInitializer;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.Util;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> /**
>@@ -22,6 +21,9 @@
> *
> * @see IDOMInitializer
> * @see DOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> class DOMInitializer extends DOMMember implements IDOMInitializer {
> 
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMMember.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMember.java,v
>retrieving revision 1.21
>diff -u -r1.21 DOMMember.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMMember.java	13 Jan 2004 15:48:44 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMMember.java	5 May 2004 23:08:16 -0000
>@@ -12,7 +12,7 @@
> 
> import org.eclipse.jdt.core.Flags;
> import org.eclipse.jdt.core.compiler.CharOperation;
>-import org.eclipse.jdt.core.jdom.IDOMMember;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.env.IConstants;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> /**
>@@ -20,8 +20,10 @@
> *
> * @see IDOMMember
> * @see DOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
>-
> abstract class DOMMember extends DOMNode implements IDOMMember {
> 
> 	/**
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java,v
>retrieving revision 1.21
>diff -u -r1.21 DOMMethod.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java	31 Mar 2004 11:20:33 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMMethod.java	5 May 2004 23:08:16 -0000
>@@ -14,8 +14,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.Signature;
> import org.eclipse.jdt.core.compiler.CharOperation;
>-import org.eclipse.jdt.core.jdom.IDOMMethod;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.Util;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> /**
>@@ -23,8 +22,11 @@
> *
> * @see IDOMMethod
> * @see DOMNode
>- * TODO (jerome) - add implementation support for 1.5 features
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
>+// TODO (jerome) - add implementation support for 1.5 features
> class DOMMethod extends DOMMember implements IDOMMethod {
> 
> 	/**
>@@ -728,7 +730,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMMethod#setDefault(java.lang.String)
>+ * @see IDOMMethod#setDefault(java.lang.String)
> * @since 3.0
> */
> public void setDefault(String defaultValue) {
>@@ -736,7 +738,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMMethod#getDefault()
>+ * @see IDOMMethod#getDefault()
> * @since 3.0
> */
> public String getDefault() {
>@@ -744,7 +746,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMMethod#getTypeParameters()
>+ * @see IDOMMethod#getTypeParameters()
> * @since 3.0
> */
> public String[] getTypeParameters() {
>@@ -752,7 +754,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMMethod#setTypeParameters(java.lang.String[])
>+ * @see IDOMMethod#setTypeParameters(java.lang.String[])
> * @since 3.0
> */
> public void setTypeParameters(String[] typeParameters) {
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMNode.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMNode.java,v
>retrieving revision 1.21
>diff -u -r1.21 DOMNode.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMNode.java	13 Jan 2004 15:48:44 -0000	1.21
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMNode.java	5 May 2004 23:08:16 -0000
>@@ -12,12 +12,7 @@
> 
> import java.util.Enumeration;
> 
>-import org.eclipse.jdt.core.jdom.DOMException;
>-import org.eclipse.jdt.core.jdom.DOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>-import org.eclipse.jdt.core.jdom.IDOMFactory;
>-import org.eclipse.jdt.core.jdom.IDOMMethod;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> import org.eclipse.jdt.internal.core.util.Util;
> 
>@@ -53,6 +48,9 @@
> * node. 
> *
> * @see IDOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public abstract class DOMNode implements IDOMNode {
> 
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java,v
>retrieving revision 1.18
>diff -u -r1.18 DOMPackage.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java	13 Jan 2004 15:48:44 -0000	1.18
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMPackage.java	5 May 2004 23:08:16 -0000
>@@ -12,8 +12,7 @@
> 
> import org.eclipse.jdt.core.ICompilationUnit;
> import org.eclipse.jdt.core.IJavaElement;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>-import org.eclipse.jdt.core.jdom.IDOMPackage;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.util.Util;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
> 
>@@ -22,6 +21,9 @@
> *
> * @see IDOMPackage
> * @see DOMNode
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> class DOMPackage extends DOMNode implements IDOMPackage {
> 
>Index: model/org/eclipse/jdt/internal/core/jdom/DOMType.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/DOMType.java,v
>retrieving revision 1.32
>diff -u -r1.32 DOMType.java
>--- model/org/eclipse/jdt/internal/core/jdom/DOMType.java	31 Mar 2004 11:20:33 -0000	1.32
>+++ model/org/eclipse/jdt/internal/core/jdom/DOMType.java	5 May 2004 23:08:17 -0000
>@@ -17,9 +17,7 @@
> import org.eclipse.jdt.core.IType;
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.core.compiler.InvalidInputException;
>-import org.eclipse.jdt.core.jdom.IDOMMethod;
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>-import org.eclipse.jdt.core.jdom.IDOMType;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.parser.Scanner;
> import org.eclipse.jdt.internal.compiler.parser.TerminalTokens;
> import org.eclipse.jdt.internal.core.util.CharArrayBuffer;
>@@ -29,8 +27,11 @@
> *
> * @see IDOMType
> * @see DOMNode
>- * TODO (jerome) - add implementation support for 1.5 features
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */ 
>+// TODO (jerome) - add implementation support for 1.5 features
> /* package */ class DOMType extends DOMMember implements IDOMType {
> 
> 	private static final String[] EMPTY_SUPERINTERFACES = new String[] {};
>@@ -735,7 +736,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMType#getTypeParameters()
>+ * @see IDOMType#getTypeParameters()
> * @since 3.0
> */
> public String[] getTypeParameters() {
>@@ -743,7 +744,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMType#isEnum()
>+ * @see IDOMType#isEnum()
> * @since 3.0
> */
> public boolean isEnum() {
>@@ -751,7 +752,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMType#isAnnotation()
>+ * @see IDOMType#isAnnotation()
> * @since 3.0
> */
> public boolean isAnnotation() {
>@@ -759,7 +760,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMType#setEnum(boolean)
>+ * @see IDOMType#setEnum(boolean)
> * @since 3.0
> */
> public void setEnum(boolean b) {
>@@ -772,7 +773,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMType#setAnnotation(boolean)
>+ * @see IDOMType#setAnnotation(boolean)
> * @since 3.0
> */
> public void setAnnotation(boolean b) {
>@@ -786,7 +787,7 @@
> }
> 
> /**
>- * @see org.eclipse.jdt.core.jdom.IDOMType#setTypeParameters(java.lang.String[])
>+ * @see IDOMType#setTypeParameters(java.lang.String[])
> * @since 3.0
> */
> public void setTypeParameters(String[] typeParameters) {
>Index: model/org/eclipse/jdt/internal/core/jdom/SiblingEnumeration.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SiblingEnumeration.java,v
>retrieving revision 1.6
>diff -u -r1.6 SiblingEnumeration.java
>--- model/org/eclipse/jdt/internal/core/jdom/SiblingEnumeration.java	13 Jan 2004 15:48:44 -0000	1.6
>+++ model/org/eclipse/jdt/internal/core/jdom/SiblingEnumeration.java	5 May 2004 23:08:17 -0000
>@@ -12,15 +12,17 @@
> 
> import java.util.Enumeration;
> 
>-import org.eclipse.jdt.core.jdom.IDOMNode;
>+import org.eclipse.jdt.core.jdom.*;
> 
> /**
> * SiblingEnumeration provides an enumeration on a linked list
> * of sibling DOM nodes.
> *
> * @see java.util.Enumeration
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
>-
> /* package */ class SiblingEnumeration implements Enumeration {
> 
> 	/**
>Index: model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java
>===================================================================
>RCS file: /data/cvs/eclipse/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java,v
>retrieving revision 1.31
>diff -u -r1.31 SimpleDOMBuilder.java
>--- model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java	13 Jan 2004 15:48:44 -0000	1.31
>+++ model/org/eclipse/jdt/internal/core/jdom/SimpleDOMBuilder.java	5 May 2004 23:08:17 -0000
>@@ -15,7 +15,7 @@
> import org.eclipse.jdt.core.JavaCore;
> import org.eclipse.jdt.core.compiler.CharOperation;
> import org.eclipse.jdt.core.compiler.IProblem;
>-import org.eclipse.jdt.core.jdom.IDOMCompilationUnit;
>+import org.eclipse.jdt.core.jdom.*;
> import org.eclipse.jdt.internal.compiler.ISourceElementRequestor;
> import org.eclipse.jdt.internal.compiler.SourceElementParser;
> import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
>@@ -23,6 +23,9 @@
> import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
> /**
> * A DOM builder that uses the SourceElementParser
>+ * @deprecated The JDOM was made obsolete by the addition in 2.0 of the more
>+ * powerful, fine-grained DOM/AST API found in the 
>+ * org.eclipse.jdt.core.dom package.
> */
> public class SimpleDOMBuilder extends AbstractDOMBuilder implements ISourceElementRequestor {
>

Actions: View | Diff

Attachments on bug 61148: 10318 | 10319 | 10320 | 10812