Initial checkin of the revised look and feel of the WSDL Editor.
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java
deleted file mode 100644
index c554e60..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/Logger.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.wsdl.ui"; //$NON-NLS-1$
-	
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java
deleted file mode 100644
index bf9327f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/StructuredTextViewerConfigurationWSDL.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-
-public class StructuredTextViewerConfigurationWSDL extends StructuredTextViewerConfigurationXML {
-	public IHyperlinkDetector[] getHyperlinkDetectors(ISourceViewer sourceViewer) {
-		if (sourceViewer == null || !fPreferenceStore.getBoolean(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_HYPERLINKS_ENABLED))
-			return null;
-
-		List allDetectors = new ArrayList(0);
-		// add WSDL Hyperlink detector
-		allDetectors.add(new WSDLHyperlinkDetector());
-
-		IHyperlinkDetector[] superDetectors = super.getHyperlinkDetectors(sourceViewer);
-		for (int m = 0; m < superDetectors.length; m++) {
-			IHyperlinkDetector detector = superDetectors[m];
-			if (!allDetectors.contains(detector)) {
-				allDetectors.add(detector);
-			}
-		}
-		return (IHyperlinkDetector[]) allDetectors.toArray(new IHyperlinkDetector[0]);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
deleted file mode 100644
index a18f890..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditor.java
+++ /dev/null
@@ -1,778 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.INavigationLocation;
-import org.eclipse.ui.INavigationLocationProvider;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextSelectionNavigationLocation;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.contentoutline.ConfigurableContentOutlinePage;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.actions.WSDLMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.GenerateBindingOnSaveDialog;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLGraphViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLEditPartFactory;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLModelAdapterFactory;
-import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterContentProvider;
-import org.eclipse.wst.wsdl.ui.internal.outline.ModelAdapterLabelProvider;
-import org.eclipse.wst.wsdl.ui.internal.properties.section.WSDLTabbedPropertySheetPage;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLNodeAssociationProvider;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLResourceUtil;
-import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewer;
-import org.eclipse.wst.wsdl.ui.internal.viewers.WSDLDetailsViewerProvider;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-// public class WSDLEditor extends StructuredTextMultiPageEditorPart
-// implements
-// INavigationLocationProvider
-public class WSDLEditor extends WSDLMultiPageEditorPart implements INavigationLocationProvider, ITabbedPropertySheetPageContributor {
-	protected StructuredTextEditor textEditor;
-	protected WSDLGraphViewer graphViewer;
-	protected WSDLDetailsViewer detailsViewer;
-	protected WSDLSelectionManager selectionManager;
-	protected SashForm sashForm;
-	int graphPageIndex;
-	protected WSDLModelAdapter modelAdapter;
-	protected WSDLEditorResourceChangeHandler resourceChangeHandler;
-	// Used for Cut, Copy, Paste actions. This acts as a copy, cut, paste
-	// clipboard
-	protected WSDLElement clipboardElement;
-	private IPropertySheetPage fPropertySheetPage;
-	private IContentOutlinePage fContentOutlinePage;
-	private SourceEditorSelectionListener fSourceEditorSelectionListener;
-	private WSDLSelectionManagerSelectionListener fWSDLSelectionListener;
-
-	/**
-	 * Listener on SSE's outline page's selections that converts DOM
-	 * selections into wsdl selections and notifies WSDL selection manager
-	 */
-	class OutlineTreeSelectionChangeListener implements ISelectionChangedListener, IDoubleClickListener {
-		private ISelectionProvider fProvider = null;
-
-		public OutlineTreeSelectionChangeListener() {
-			super();
-		}
-		
-		void connect(IContentOutlinePage provider) {
-			fProvider = provider;
-			fProvider.addSelectionChangedListener(OutlineTreeSelectionChangeListener.this);
-			if (provider instanceof ConfigurableContentOutlinePage) {
-				((ConfigurableContentOutlinePage) provider).addDoubleClickListener(OutlineTreeSelectionChangeListener.this);
-			}
-		}
-		
-		void disconnect() {
-			fProvider.removeSelectionChangedListener(OutlineTreeSelectionChangeListener.this);
-			if (fProvider instanceof ConfigurableContentOutlinePage) {
-				((ConfigurableContentOutlinePage) fProvider).removeDoubleClickListener(OutlineTreeSelectionChangeListener.this);
-			}
-			fProvider = null;
-		}
-
-		private ISelection getWSDLSelection(ISelection selection) {
-			ISelection sel = null;
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				Object o = structuredSelection.getFirstElement();
-
-				// TODO ...
-				// we need to implement a selectionManagerMapping
-				// extension point
-				// so that extensions can specify how they'd like to map
-				// view objects
-				// to selection objects
-				//                                        
-				// if (o instanceof Element)
-				// {
-				// try
-				// {
-				// Object modelObject =
-				// WSDLEditorUtil.getInstance().findModelObjectForElement(wsdlEditor.getDefinition(),
-				// (Element)o);
-				// if (modelObject != null && !(modelObject instanceof
-				// UnknownExtensibilityElement))
-				// {
-				// o = modelObject;
-				// }
-				// }
-				// catch (Exception e)
-				// {
-				// }
-				// }
-				if (o != null)
-					sel = new StructuredSelection(o);
-			}
-			return sel;
-		}
-
-		public void doubleClick(DoubleClickEvent event) {
-			/*
-			 * Selection in outline tree changed so set outline tree's
-			 * selection into editor's selection and say it came from outline
-			 * tree
-			 */
-			if (getSelectionManager() != null && getSelectionManager().enableNotify) {
-				ISelection selection = getWSDLSelection(event.getSelection());
-				if (selection != null) {
-					getSelectionManager().setSelection(selection, fProvider);
-				}
-
-				if(getTextEditor() != null && selection instanceof IStructuredSelection) {
-					int start = -1;
-					int length = 0;
-					Object o = ((IStructuredSelection)selection).getFirstElement();
-					if (o != null)
-						o = WSDLEditorUtil.getInstance().getNodeForObject(o);
-					if (o instanceof IndexedRegion) {
-						start = ((IndexedRegion) o).getStartOffset();
-						length = ((IndexedRegion) o).getEndOffset() - start;
-					}
-					if(start > -1) {
-						getTextEditor().selectAndReveal(start, length);
-					}
-				}
-			}
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			/*
-			 * Selection in outline tree changed so set outline tree's
-			 * selection into editor's selection and say it came from outline
-			 * tree
-			 */
-			if (getSelectionManager() != null && getSelectionManager().enableNotify) {
-				ISelection selection = getWSDLSelection(event.getSelection());
-				if (selection != null) {
-					getSelectionManager().setSelection(selection, fProvider);
-				}
-			}
-		}
-	}
-	private OutlineTreeSelectionChangeListener fOutlineTreeListener = null;
-
-	/**
-	 * Listener on SSE's source editor's selections that converts DOM
-	 * selections into wsdl selections and notifies WSDL selection manager
-	 */
-	private class SourceEditorSelectionListener implements ISelectionChangedListener {
-		/**
-		 * Determines WSDL node based on object (DOM node)
-		 * 
-		 * @param object
-		 * @return
-		 */
-		private Object getWSDLNode(Object object) {
-			// get the element node
-			Element element = null;
-			if (object instanceof Node) {
-				Node node = (Node) object;
-				if (node != null) {
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						element = (Element) node;
-					}
-					else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-						element = ((Attr) node).getOwnerElement();
-					}
-				}
-			}
-			Object o = element;
-			if (element != null) {
-				Object modelObject = WSDLEditorUtil.getInstance().findModelObjectForElement(getDefinition(), element);
-				if (modelObject != null) {
-					o = modelObject;
-				}
-			}
-			return o;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection selection = event.getSelection();
-			if (selection instanceof IStructuredSelection) {
-				List wsdlSelections = new ArrayList();
-				for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-					Object domNode = i.next();
-					Object wsdlNode = getWSDLNode(domNode);
-					if (wsdlNode != null) {
-						wsdlSelections.add(wsdlNode);
-					}
-				}
-
-				if (!wsdlSelections.isEmpty()) {
-					StructuredSelection wsdlSelection = new StructuredSelection(wsdlSelections);
-					getSelectionManager().setSelection(wsdlSelection, getTextEditor().getSelectionProvider());
-				}
-			}
-		}
-	}
-
-	/**
-	 * Listener on WSDL's selection manager's selections that converts WSDL
-	 * selections into DOM selections and notifies SSE's selection provider
-	 */
-	private class WSDLSelectionManagerSelectionListener implements ISelectionChangedListener {
-		/**
-		 * Determines DOM node based on object (wsdl node)
-		 * 
-		 * @param object
-		 * @return
-		 */
-		private Object getObjectForOtherModel(Object object) {
-			Node node = null;
-
-			if (object instanceof Node) {
-				node = (Node) object;
-			} 
-            else if (object instanceof String){
-              // The string is expected to be a URI fragment used to identify a WSDL element.
-              // The URI fragment should be relative to the definition being edited in this editor.
-              
-              String uriFragment = (String)object;
-              EObject eObject = getDefinition().eResource().getEObject(uriFragment);
-
-              if (eObject != null) {
-                node = ((WSDLElement)eObject).getElement();
-              }
-            }
-			else {
-				node = WSDLEditorUtil.getInstance().getNodeForObject(object);
-			}
-
-			// the text editor can only accept sed nodes!
-			//
-			if (!(node instanceof IDOMNode)) {
-				node = null;
-			}
-			return node;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			// do not fire selection in source editor if selection event came
-			// from source editor
-			if (event.getSource() != getTextEditor().getSelectionProvider()) {
-				ISelection selection = event.getSelection();
-				if (selection instanceof IStructuredSelection) {
-					List otherModelObjectList = new ArrayList();
-					for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();) {
-						Object modelObject = i.next();
-						Object otherModelObject = getObjectForOtherModel(modelObject);
-						if (otherModelObject != null) {
-							otherModelObjectList.add(otherModelObject);
-						}
-					}
-					if (!otherModelObjectList.isEmpty()) {
-						StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-						getTextEditor().getSelectionProvider().setSelection(nodeSelection);
-					}
-				}
-			}
-		}
-	}
-
-	public WSDLEditor() {
-		selectionManager = new WSDLSelectionManager();
-	}
-
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		super.init(site, input);
-		try {
-			IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				page.showView("org.eclipse.ui.views.PropertySheet");
-			}
-		}
-		catch (PartInitException partInitException) {
-		}
-		catch (Exception exception) {
-		}
-	}
-
-	public Object getAdapter(Class key) {
-		Object result = null;
-		if (key == ISelectionProvider.class) {
-			result = selectionManager;
-		}
-		else if (IPropertySheetPage.class.equals(key)) {
-			if (fPropertySheetPage == null || fPropertySheetPage.getControl() == null || fPropertySheetPage.getControl().isDisposed()) {
-				fPropertySheetPage = new WSDLTabbedPropertySheetPage(this, this);
-				((WSDLTabbedPropertySheetPage) fPropertySheetPage).setSelectionManager(getSelectionManager());
-
-			}
-			return fPropertySheetPage;
-		}
-		else if (IContentOutlinePage.class.equals(key)) {
-			if (fContentOutlinePage == null || fContentOutlinePage.getControl() == null || fContentOutlinePage.getControl().isDisposed()) {
-				fContentOutlinePage = (IContentOutlinePage) super.getAdapter(key);
-				if (fContentOutlinePage != null) {
-					fOutlineTreeListener = new OutlineTreeSelectionChangeListener();
-					fOutlineTreeListener.connect(fContentOutlinePage);
-				}
-			}
-			result = fContentOutlinePage;
-		}
-		else {
-			result = super.getAdapter(key);
-		}
-		return result;
-	}
-
-	public void dispose() {
-		// call the extensibleOutlineProvider's inputChanged method a null
-		// viewer
-		// so that the outline's contentprovider/adapters don't attempt to
-		// update
-		// the viewer
-		// after the editor closes
-		// extensibleOutlineProvider.inputChanged(null, null, null);
-		if (resourceChangeHandler != null) {
-			resourceChangeHandler.dispose();
-		}
-
-		ISelectionProvider provider = getTextEditor().getSelectionProvider();
-		if (provider instanceof IPostSelectionProvider) {
-			((IPostSelectionProvider) provider).removePostSelectionChangedListener(fSourceEditorSelectionListener);
-		}
-		else {
-			provider.removeSelectionChangedListener(fSourceEditorSelectionListener);
-		}
-		if (fOutlineTreeListener != null) {
-			fOutlineTreeListener.disconnect();
-			fOutlineTreeListener = null;
-		}
-		getSelectionManager().removeSelectionChangedListener(fWSDLSelectionListener);
-		super.dispose();
-	}
-
-	public WSDLSelectionManager getSelectionManager() {
-		return selectionManager;
-	}
-
-	public WSDLGraphViewer getGraphViewer() {
-		return graphViewer;
-	}
-
-	public IStructuredModel getStructuredModel() {
-		return textEditor.getModel();
-		// IDocument doc =
-		// textEditor.getDocumentProvider().getDocument(getEditorInput());
-		// IModelManager modelManager = ModelManagerImpl.getInstance();
-		// return modelManager.getModelForRead((IStructuredDocument) doc);
-	}
-
-	public Document getXMLDocument() {
-		return ((IDOMModel) getStructuredModel()).getDocument();
-	}
-
-	public Definition getDefinition() {
-		return modelAdapter != null ? modelAdapter.getDefinition() : null;
-	}
-
-	/**
-	 * Creates the pages of this multi-page editor.
-	 * <p>
-	 * Subclasses of <code>MultiPageEditor</code> must implement this
-	 * method.
-	 * </p>
-	 */
-	protected void createPages() {
-		try {
-			if (resourceChangeHandler == null) {
-				resourceChangeHandler = new WSDLEditorResourceChangeHandler(this);
-				resourceChangeHandler.attach();
-			}
-			createSourcePage();
-			addSourcePage();
-			// create the wsdl model
-			//
-			lookupOrCreateWSDLModel();
-			createAndAddGraphPage();
-
-			// get the type of page and set the active page to show
-			int pageIndexToShow = getDefaultPageIndex();
-			setActivePage(pageIndexToShow);
-			Definition definition = getDefinition();
-            if (definition != null) {
-                getSelectionManager().setSelection(new StructuredSelection(definition));
-            } else {
-              getSelectionManager().setSelection(new StructuredSelection());
-            }
-
-			// added selection listeners after setting selection to avoid
-			// navigation exception
-			ISelectionProvider provider = getTextEditor().getSelectionProvider();
-			fSourceEditorSelectionListener = new SourceEditorSelectionListener();
-			if (provider instanceof IPostSelectionProvider) {
-				((IPostSelectionProvider) provider).addPostSelectionChangedListener(fSourceEditorSelectionListener);
-			}
-			else {
-				provider.addSelectionChangedListener(fSourceEditorSelectionListener);
-			}
-			fWSDLSelectionListener = new WSDLSelectionManagerSelectionListener();
-			getSelectionManager().addSelectionChangedListener(fWSDLSelectionListener);
-		}
-		catch (PartInitException e) {
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		// TODO: add a catch block here for any exception the design page
-		// throws and
-		// convert it into a more informative message.
-	}
-
-	protected void lookupOrCreateWSDLModel() {
-		try {
-			Document document = ((IDOMModel) getModel()).getDocument();
-			if (document instanceof INodeNotifier) {
-				INodeNotifier notifier = (INodeNotifier) document;
-				modelAdapter = (WSDLModelAdapter) notifier.getAdapterFor(WSDLModelAdapter.class);
-				if (modelAdapter == null) {
-					modelAdapter = new WSDLModelAdapter();
-					notifier.addAdapter(modelAdapter);
-                    modelAdapter.createDefinition(document.getDocumentElement(), document);
-				}
-			}
-		}
-		catch (Exception e) {
-		}
-	}
-
-	protected int getDefaultPageIndex() {
-		if (WSDLEditorPlugin.getInstance().getDefaultPage().equals(WSDLEditorPlugin.GRAPH_PAGE)) {
-			if (graphPageIndex != -1) {
-				return graphPageIndex;
-			}
-		}
-		return sourcePageIndex;
-	}
-
-	/**
-	 * @see org.eclipse.wst.wsdl.ui.WSDLMultiPageEditorPart#createTextEditor()
-	 */
-	protected StructuredTextEditor createTextEditor() {
-		textEditor = new StructuredTextEditor();
-		return textEditor;
-	}
-
-	/**
-	 * create our own
-	 */
-	protected void createSourcePage() throws PartInitException {
-		super.createSourcePage();
-		textEditor = getTextEditor();
-	}
-
-	int sourcePageIndex = -1;
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	protected void addSourcePage() throws PartInitException {
-		sourcePageIndex = addPage(textEditor, getEditorInput());
-		setPageText(sourcePageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE"));
-		// the update's critical, to get viewer selection manager and
-		// highlighting to
-		// work
-		textEditor.update();
-	}
-
-	int[] weights;
-
-	public void setDesignWeights(int[] weights, boolean updateSourceDesign) {
-		this.weights = weights;
-		if (updateSourceDesign) {
-			sashForm.setWeights(weights);
-		}
-	}
-
-	protected void pageChange(int arg) {
-		super.pageChange(arg);
-		if (getPageText(arg).equals(WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE"))) // TRANSLATE
-		// !
-		{
-			// update the input
-		}
-		else if (getPageText(arg).equals(WSDLEditorPlugin.getWSDLString("_UI_TAB_GRAPH"))) // TRANSLATE
-		// !
-		{
-			// update the input
-		}
-	}
-
-	static private Color dividerColor;
-
-	/**
-	 * Creates the graph page and adds it to the multi-page editor.
-	 */
-	protected void createAndAddGraphPage() throws PartInitException {
-		// create the graph page
-		sashForm = new SashForm(getContainer(), SWT.BORDER);
-		sashForm.setLayoutData(new GridData(GridData.FILL_BOTH));
-		sashForm.setOrientation(SWT.VERTICAL);
-		graphPageIndex = addPage(sashForm);
-		setPageText(graphPageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_GRAPH"));
-		// create the graph viewer
-		graphViewer = new WSDLGraphViewer(this);
-		graphViewer.createControl(sashForm);
-		// detailsViewer = new WSDLDetailsViewer(this);
-		// detailsViewer.createControl(sashForm);
-		//
-		// sashForm.setWeights(weights);
-		if (dividerColor == null) {
-			dividerColor = new Color(getContainer().getDisplay(), 143, 141, 138);
-		}
-		getContainer().addPaintListener(new PaintListener() {
-			/**
-			 * @see org.eclipse.swt.events.PaintListener#paintControl(PaintEvent)
-			 */
-			public void paintControl(PaintEvent e) {
-				Object source = e.getSource();
-				if (source instanceof Composite) {
-					Composite comp = (Composite) source;
-					Rectangle boundary = comp.getClientArea();
-					e.gc.setForeground(dividerColor);
-					e.gc.drawLine(boundary.x, boundary.y, boundary.x + boundary.width, boundary.y);
-					setDesignWeights(sashForm.getWeights(), true);
-				}
-			}
-		});
-	}
-
-	public void setFocus() {
-		super.setFocus();
-		int activePage = getActivePage();
-		if (activePage == sourcePageIndex) {
-			WSDLEditorPlugin.getInstance().setDefaultPage(WSDLEditorPlugin.SOURCE_PAGE);
-		}
-		else {
-			WSDLEditorPlugin.getInstance().setDefaultPage(WSDLEditorPlugin.GRAPH_PAGE);
-		}
-	}
-
-	//
-	//
-	public static class BuiltInWSDLEditorExtension implements WSDLEditorExtension {
-		public boolean isExtensionTypeSupported(int type) {
-			return type == OUTLINE_TREE_CONTENT_PROVIDER || type == OUTLINE_LABEL_PROVIDER || type == EDIT_PART_FACTORY || type == DETAILS_VIEWER_PROVIDER || type == MENU_ACTION_CONTRIBUTOR || type == NODE_RECONCILER || type == NODE_ASSOCIATION_PROVIDER;
-		}
-
-		public boolean isApplicable(Object object) {
-			return (object instanceof WSDLElement && !(object instanceof XSDSchemaExtensibilityElement)) || (object instanceof WSDLGroupObject);
-		}
-
-		public Object createExtensionObject(int type, WSDLEditor wsdlEditor) {
-			Object result = null;
-			switch (type) {
-				case OUTLINE_TREE_CONTENT_PROVIDER : {
-					result = new ModelAdapterContentProvider(WSDLModelAdapterFactory.getWSDLModelAdapterFactory());
-					break;
-				}
-				case OUTLINE_LABEL_PROVIDER : {
-					result = new ModelAdapterLabelProvider(WSDLModelAdapterFactory.getWSDLModelAdapterFactory());
-					break;
-				}
-				case DETAILS_VIEWER_PROVIDER : {
-					result = new WSDLDetailsViewerProvider();
-					break;
-				}
-				case MENU_ACTION_CONTRIBUTOR : {
-					result = new WSDLMenuActionContributor(wsdlEditor);
-					break;
-				}
-				case NODE_ASSOCIATION_PROVIDER : {
-					result = new WSDLNodeAssociationProvider();
-					break;
-				}
-				case EDIT_PART_FACTORY : {
-					result = new WSDLEditPartFactory();
-					break;
-				}
-			}
-			return result;
-		}
-	}
-
-	public void reloadDependencies() {
-		try {
-			getGraphViewer().getComponentViewer().setPreserveExpansionEnabled(true);
-			Definition definition = getDefinition();
-			if (definition != null) {
-				WSDLResourceUtil.reloadDirectives(definition);
-				ComponentReferenceUtil.updateBindingReferences(definition);
-				ComponentReferenceUtil.updatePortTypeReferences(definition);
-				ComponentReferenceUtil.updateMessageReferences(definition);
-				ComponentReferenceUtil.updateSchemaReferences(definition);
-				// the line below simply causes a notification in order to
-				// update our
-				// views
-				//
-				definition.setDocumentationElement(definition.getDocumentationElement());
-			}
-		}
-		finally {
-			getGraphViewer().getComponentViewer().setPreserveExpansionEnabled(false);
-		}
-	}
-
-    public INavigationLocation createEmptyNavigationLocation() {
-		return new InternalTextSelectionNavigationLocation(textEditor, false);
-	}
-
-	public INavigationLocation createNavigationLocation() {
-		return new InternalTextSelectionNavigationLocation(textEditor, true);
-	}
-
-	static class InternalTextSelectionNavigationLocation extends TextSelectionNavigationLocation {
-		public InternalTextSelectionNavigationLocation(ITextEditor part, boolean initialize) {
-			super(part, initialize);
-		}
-
-		protected IEditorPart getEditorPart() {
-			IEditorPart part = super.getEditorPart();
-			if (part instanceof WSDLEditor) {
-				part = ((WSDLEditor) part).getTextEditor();
-			}
-			return part;
-		}
-
-		public String getText() {
-			// ISSUE: how to get title?
-			// IEditorPart part = getEditorPart();
-			// if (part instanceof WSDLTextEditor) {
-			// return ((WSDLTextEditor) part).getWSDLEditor().getTitle();
-			// }
-			// else {
-			// return super.getText();
-			// }
-			return super.getText();
-		}
-	}
-
-	// Returns the element currently on the copy, cut, paste clipboard
-	public WSDLElement getClipboardContents() {
-		return clipboardElement;
-	}
-
-	public void setClipboardContents(WSDLElement element) {
-		clipboardElement = element;
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySheetPageContributor#getContributorId()
-	 */
-	public String getContributorId() {
-		return "org.eclipse.wst.wsdl.ui.internal.WSDLEditor";
-		// return getSite().getId();
-	}
-
-	/*
-	 * We override this method so we can hook in our automatic Binding
-	 * generation. We will generate the Binding after a save is executed (If
-	 * this preference has been set to true).
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		try {
-			// Display prompt message
-			boolean continueRegeneration = false;
-			if (WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean("Prompt Regenerate Binding on save")) {
-				Shell shell = Display.getCurrent().getActiveShell();
-				GenerateBindingOnSaveDialog dialog = new GenerateBindingOnSaveDialog(shell);
-
-				int rValue = dialog.open();
-				if (rValue == SWT.YES) {
-					continueRegeneration = true;
-				}
-				else if (rValue == SWT.NO) {
-					continueRegeneration = false;
-				}
-				else if (rValue == SWT.CANCEL) {
-					return;
-				}
-				else {
-					System.out.println("\nNothing: " + rValue);
-				}
-			}
-			else {
-				continueRegeneration = WSDLEditorPlugin.getInstance().getPluginPreferences().getBoolean(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"));
-			}
-
-			if (continueRegeneration) {
-				Iterator bindingsIt = getDefinition().getEBindings().iterator();
-				while (bindingsIt.hasNext()) {
-					Binding binding = (Binding) bindingsIt.next();
-					BindingGenerator generator = new BindingGenerator(binding.getEnclosingDefinition(), binding);
-					generator.setOverwrite(false);
-					generator.generateBinding();
-				}
-
-				// Little hack to 'redraw' connecting lines in the graph
-				// viewer
-				getDefinition().setQName(getDefinition().getQName());
-			}
-		}
-		catch (Exception e) {
-			// e.printStackTrace();
-		}
-		super.doSave(monitor);
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
deleted file mode 100644
index 708afef..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorPlugin.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.ExtensibilityItemTreeProviderRegistry;
-import org.eclipse.wst.wsdl.ui.internal.extension.NSKeyedExtensionRegistry;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-public class WSDLEditorPlugin extends AbstractUIPlugin //, IPluginHelper
-{
-  public static final String DEFAULT_PAGE = "org.eclipse.wst.wsdl.ui.internal.defaultpage";
-  public static final String GRAPH_PAGE = "org.eclipse.wst.wsdl.ui.internal.graphpage";
-  public static final String SOURCE_PAGE = "org.eclipse.wst.wsdl.ui.internal.sourcepage";
-
-  public final static String PLUGIN_ID = "org.eclipse.wst.wsdl.ui";
-  public final static String XSD_EDITOR_ID = "org.eclipse.wst.xsd.ui.XSDEditor"; 
-  
-  public final static String DEFAULT_TARGET_NAMESPACE = "http://www.example.org";
-  
-  public static int DEPENDECIES_CHANGED_POLICY_PROMPT = 0;
-  public static int DEPENDECIES_CHANGED_POLICY_IGNORE = 1;
-  public static int DEPENDECIES_CHANGED_POLICY_RELOAD = 2;
-
-  protected static WSDLEditorPlugin instance;
-  //  protected XMLSchemaPackage xmlschemaPackage;
-//  private static MsgLogger myMsgLogger;
-
-  private WSDLEditorExtensionRegistry wsdlEditorExtensionRegistry;
-  private NSKeyedExtensionRegistry extensiblityElementFilterRegistry;
-  private ExtensibilityItemTreeProviderRegistry treeProviderRegistry;
-  private NSKeyedExtensionRegistry propertyDescriptorProviderRegistry;
-  private NSKeyedExtensionRegistry propertySourceProviderRegistry;
-  private NSKeyedExtensionRegistry propertySectionDescriptorProviderRegistry;
-  private NSKeyedExtensionRegistry detailsViewerProviderRegistry;  
-  //private static Hashtable grayedImageMap = new Hashtable();
-  private int dependenciesChangedPolicy = DEPENDECIES_CHANGED_POLICY_RELOAD;
-
-  
-  public static void logMessage(String message)
-  {
-  }
-
-  /**
-   * Resources helper.
-   */
-
-  public WSDLEditorPlugin()
-  {
-    super();
-    instance = this;
-
-    // TODO... remove this code when we add 'dependenciesChangedPolicy'
-    // to an editor preferences page
-    try
-    {
-      String string = getWSDLString("_DEBUG_UPDATE_POLICY");
-      int policy = Integer.parseInt(string);
-      if (policy >= 0 && policy <= DEPENDECIES_CHANGED_POLICY_RELOAD)
-      {
-        dependenciesChangedPolicy = policy;
-      }
-    }
-    catch (Exception e)
-    {
-    }
-  }
-  
-  
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-   */
-  public void start(BundleContext context) throws Exception 
-  {
-	super.start(context);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-   */
-  public void stop(BundleContext context) throws Exception 
-  {
-	super.stop(context);
-  }
-
-  public WSDLEditorExtensionRegistry getWSDLEditorExtensionRegistry()
-  {
-    if (wsdlEditorExtensionRegistry == null)
-    {
-      wsdlEditorExtensionRegistry = new WSDLEditorExtensionRegistry();
-      new InternalEditorExtensionRegistryReader(wsdlEditorExtensionRegistry).readRegistry();
-    }
-    return wsdlEditorExtensionRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getDetailsViewerProviderRegistry()
-  {
-    if (detailsViewerProviderRegistry == null)
-    {
-	  detailsViewerProviderRegistry = new NSKeyedExtensionRegistry();
-      new DetailsViewerProviderRegistryReader(detailsViewerProviderRegistry).readRegistry();
-    }
-    return detailsViewerProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getExtensiblityElementFilterRegistry()
-  {
-    if (extensiblityElementFilterRegistry == null)
-    {
-      extensiblityElementFilterRegistry = new NSKeyedExtensionRegistry();
-      new ElementContentFilterExtensionRegistryReader(extensiblityElementFilterRegistry).readRegistry();
-    }
-    return extensiblityElementFilterRegistry;
-  }
-
-  public ExtensibilityItemTreeProviderRegistry getExtensibilityItemTreeProviderRegistry()
-  {
-    if (treeProviderRegistry == null)
-    {
-      treeProviderRegistry = new ExtensibilityItemTreeProviderRegistry();
-      new ExtensibilityItemTreeProviderRegistryReader(treeProviderRegistry).readRegistry();
-    }
-    return treeProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertyDescriptorProviderRegistry()
-  {
-    if (propertyDescriptorProviderRegistry == null)
-    {
-      propertyDescriptorProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertyDescriptorProviderRegistryReader(propertyDescriptorProviderRegistry).readRegistry();
-    }
-    return propertyDescriptorProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertySourceProviderRegistry()
-  {
-    if (propertySourceProviderRegistry == null)
-    {
-      propertySourceProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertySourceProviderRegistryReader(propertySourceProviderRegistry).readRegistry();
-    }
-    return propertySourceProviderRegistry;
-  }
-
-  public NSKeyedExtensionRegistry getPropertySectionDescriptorProviderRegistry()
-  {
-    if (propertySectionDescriptorProviderRegistry == null)
-    {
-      propertySectionDescriptorProviderRegistry = new NSKeyedExtensionRegistry();
-      new PropertySectionDescriptorProviderRegistry(propertySectionDescriptorProviderRegistry).readRegistry();
-    }
-    return propertySectionDescriptorProviderRegistry;
-  }
-
-  /**
-   * Get the Install URL
-   */
-  public static URL getInstallURL()
-  {
-	try
-	{
-	  return FileLocator.resolve(instance.getBundle().getEntry("/"));
-	}
-	catch (IOException e)
-	{
-	  return null;
-	}
-  }
-
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key)
-  {	  
-    return Platform.getResourceBundle(Platform.getBundle(PLUGIN_ID)).getString(key);
-  }
-
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key, String arg0)
-  {
-    return MessageFormat.format(getWSDLString(key), new Object [] { arg0 });
-  }
-  
-  /**
-   * Get resource string
-   */
-  public static String getWSDLString(String key, String arg0, String arg1)
-  {
-    return MessageFormat.format(getWSDLString(key), new Object [] { arg0, arg1 });
-  }
-
-  /**
-   * Return the plugin physical directory location
-   */
-  public static IPath getPluginLocation()
-  {
-    try
-    {
-      IPath installPath = new Path(getInstallURL().toExternalForm()).removeTrailingSeparator();
-      String installStr = FileLocator.toFileURL(new URL(installPath.toString())).getFile();
-      return new Path(installStr);
-    }
-    catch (IOException e)
-    {
-      //System.out.println("WSDLEditorPlugin.getPluginLocation() exception.." + e);
-    }
-    return null;
-  }
-
-  protected Hashtable imageDescriptorCache = new Hashtable();
-
-  protected ImageDescriptor internalGetImageDescriptor(String key)
-  {
-    ImageDescriptor imageDescriptor = (ImageDescriptor) imageDescriptorCache.get(key);
-    if (imageDescriptor == null)
-    {
-      imageDescriptor = ImageDescriptor.createFromFile(WSDLEditorPlugin.class, key);
-      if (imageDescriptor != null)
-      {
-        imageDescriptorCache.put(key, imageDescriptor);
-      }
-    }
-    return imageDescriptor;
-  }
-
-  public static ImageDescriptor getImageDescriptor(String key)
-  {
-    return getInstance().internalGetImageDescriptor(key);
-  }
-
-  public Image getImage(String iconName)
-  {
-    ImageRegistry imageRegistry = getImageRegistry();
-    
-    if (imageRegistry.get(iconName) != null)
-    {
-      return imageRegistry.get(iconName);
-    }
-    else
-    {
-      imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
-      return imageRegistry.get(iconName);
-    }
-  }
-  
-  /*
-    public Image getImage(String key, boolean isGrayed)
-    { 
-      Image image = null;
-      if (!isGrayed)
-      {
-        image = super.getImage(key);
-      }                             
-      else
-      {
-        image = (Image)grayedImageMap.get(key);
-        if (image == null)
-        {
-          Image colorImage = super.getImage(key);
-          if (colorImage != null)
-          {
-            image = new Image(Display.getCurrent(), colorImage, SWT.IMAGE_GRAY);//SWT.IMAGE_DISABLE);
-            grayedImageMap.put(key, image);
-          }
-        }
-      }
-      return image;
-    }
-  */
-
-  /**
-   * Get the metadata directory for this plugin
-   */
-  public static String getMetaDataDirectory()
-  {
-    return getInstance().getStateLocation().toOSString();
-  }
-
-  /**
-   * Get the singleton instance.
-   */
-  public static WSDLEditorPlugin getInstance()
-  {
-    return instance;
-  }
-
-  public IWorkspace getWorkspace()
-  {
-    return ResourcesPlugin.getWorkspace();
-  }
-
-  public static Shell getShell()
-  {
-    return getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.plugin.AbstractUIPlugin#initializeDefaultPreferences(org.eclipse.jface.preference.IPreferenceStore)
-   */
-  protected void initializeDefaultPreferences(IPreferenceStore store)
-  {
-    store.setDefault(DEFAULT_PAGE, GRAPH_PAGE);
-    
-    // WSDLPreferencePage prefs
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"), DEFAULT_TARGET_NAMESPACE);
-    store.setDefault(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING"), false);
-    store.setDefault("Prompt Regenerate Binding on save", false);	// TODO: Externalize
-    // Do we need this preference below?  Look at WSDLPreferencePage.java
-//    store.setDefault("Defualt Location:", "http://www.example.com");
-  }
-  
-  /**
-   * setDefaultPage
-   * Set the default page to open when the editor starts. Maintains the state
-   * when WSAD is shutdown and restarted.
-   * @param page
-   */
-  public void setDefaultPage(String page)
-  {
-    getPreferenceStore().setValue(DEFAULT_PAGE, page);
-  }
-
-  public String getDefaultPage()
-  {
-    return getPreferenceStore().getString(DEFAULT_PAGE);
-  }
-
-  public int getDependenciesChangedPolicy()
-  {
-    //return getPreferenceStore().getInt(DEPENDECIES_CHANGED_POLICY);
-    return dependenciesChangedPolicy;
-  }
-}
-
-class BaseRegistryReader
-{
-  protected static final String PLUGIN_ID = "org.eclipse.wst.wsdl.ui";
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry(String extensionPointId)
-  {
-	IExtensionRegistry extensionRegistry = Platform.getExtensionRegistry();
-	IExtensionPoint point = extensionRegistry.getExtensionPoint(PLUGIN_ID, extensionPointId);
-
-    if (point != null)
-    {
-      IConfigurationElement[] elements = point.getConfigurationElements();
-      for (int i = 0; i < elements.length; i++)
-      {
-        readElement(elements[i]);
-      }
-    }
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each internal editor extension
- */
-class InternalEditorExtensionRegistryReader extends BaseRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "internalEditorExtensions";
-  protected static final String TAG_NAME = "internalEditorExtension";
-  protected static final String ATT_CLASS = "class";
-  protected WSDLEditorExtensionRegistry registry;
-
-  public InternalEditorExtensionRegistryReader(WSDLEditorExtensionRegistry registry)
-  {
-    this.registry = registry;
-  }
-
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    super.readRegistry(EXTENSION_POINT_ID);
-  }
-
-  /**
-   * readElement()
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(TAG_NAME))
-    {
-      String className = element.getAttribute(ATT_CLASS);
-      if (className != null)
-      {
-        try
-        {
-          Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getContributor().getName());
-          registry.add(bundle, className);
-        }
-        catch (Exception e)
-        {
-        }
-      }
-    }
-  }
-}
-
-/**
- * 
- */
-abstract class NSKeyedExtensionRegistryReader extends BaseRegistryReader
-{
-  protected static final String ATT_NAME_SPACE = "namespace";
-  protected String extensionPointId;
-  protected String tagName;
-  protected String[] attributeNames;
-  protected NSKeyedExtensionRegistry nsKeyedExtensionRegistry;
-
-  private NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this.extensionPointId = extensionPointId;
-    this.tagName = tagName;
-    this.nsKeyedExtensionRegistry = nsKeyedExtensionRegistry;
-  }
-
-  public NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, String attributeName, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this(extensionPointId, tagName, nsKeyedExtensionRegistry);
-    attributeNames = new String[1];
-    attributeNames[0] = attributeName;
-  }
-
-  public NSKeyedExtensionRegistryReader(String extensionPointId, String tagName, String[] attributeNames, NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    this(extensionPointId, tagName, nsKeyedExtensionRegistry);
-    this.attributeNames = attributeNames;
-  }
-  /**
-   * read from plugin registry and parse it.
-   */
-  public void readRegistry()
-  {
-    super.readRegistry(extensionPointId);
-  }
-
-  /**
-   * readElement()
-   */
-  protected void readElement(IConfigurationElement element)
-  {
-    if (element.getName().equals(tagName))
-    {
-      String namespace = element.getAttribute(ATT_NAME_SPACE);
-      if (namespace != null)
-      {
-    	Bundle bundle = Platform.getBundle(element.getDeclaringExtension().getContributor().getName());
-        if (attributeNames.length == 1)
-        {
-          String className = element.getAttribute(attributeNames[0]);
-          if (className != null)
-          {
-            nsKeyedExtensionRegistry.put(namespace, className, bundle);
-          }
-        }
-        else
-        {
-          HashMap map = new HashMap();
-          for (int i = 0; i < attributeNames.length; i++)
-          {
-            String attributeName = attributeNames[i];
-            String className = element.getAttribute(attributeName);
-            if (className != null && className.length() > 0)
-            {
-              map.put(attributeName, className);
-            }
-          }
-          nsKeyedExtensionRegistry.put(namespace, map, bundle);
-        }
-      }
-    }
-  }
-}
-
-/**
- * This class reads the plugin manifests and registers each extensibility item tree provider
- */
-class ExtensibilityItemTreeProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "extensibilityItemTreeProviders";
-  protected static final String TAG_NAME = "extensibilityItemTreeProvider";
-  protected static final String[] ATT_NAMES = { "labelProviderClass", "contentProviderClass" };
-
-  public ExtensibilityItemTreeProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, ATT_NAMES, nsKeyedExtensionRegistry);
-  }
-}
-
-/**
- * 
- */
-class ElementContentFilterExtensionRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "extensibilityElementFilter";
-  protected static final String TAG_NAME = "extensibilityElementFilter";
-
-  public ElementContentFilterExtensionRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-}
-
-/**
- * 
- */
-class PropertyDescriptorProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertyDescriptorProvider";
-  protected static final String TAG_NAME = "propertyDescriptorProvider";
-
-  public PropertyDescriptorProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-class PropertySourceProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertySourceProvider";
-  protected static final String TAG_NAME = "propertySourceProvider";
-
-  public PropertySourceProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-class PropertySectionDescriptorProviderRegistry extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "propertySectionDescriptorProvider";
-  protected static final String TAG_NAME = "propertySectionDescriptorProvider";
-
-  public PropertySectionDescriptorProviderRegistry(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
-
-/**
- * 
- */
-class DetailsViewerProviderRegistryReader extends NSKeyedExtensionRegistryReader
-{
-  protected static final String EXTENSION_POINT_ID = "detailsViewerProviders";
-  protected static final String TAG_NAME = "detailsViewerProvider";
-
-  public DetailsViewerProviderRegistryReader(NSKeyedExtensionRegistry nsKeyedExtensionRegistry)
-  {
-    super(EXTENSION_POINT_ID, TAG_NAME, "class", nsKeyedExtensionRegistry);
-  }
-
-  protected void readElement(IConfigurationElement element)
-  {
-    super.readElement(element);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java
deleted file mode 100644
index 9eb610b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLEditorResourceChangeHandler.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.wsdl.Definition;
-
-
-public class WSDLEditorResourceChangeHandler
-{
-  protected WSDLEditor wsdlEditor;
-  protected boolean isUpdateRequired;
-  protected InternalResourceChangeListener resourceChangeListener;
-  protected InternalPartListener partListener;
-
-  public WSDLEditorResourceChangeHandler(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor;
-    resourceChangeListener = new InternalResourceChangeListener();
-    partListener = new InternalPartListener();
-  }
-
-  public void attach()
-  {
-    ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener);
-    wsdlEditor.getSite().getWorkbenchWindow().getPartService().addPartListener(partListener);
-  }
-
-  public void dispose()
-  {
-    ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-    wsdlEditor.getSite().getWorkbenchWindow().getPartService().removePartListener(partListener);
-  }
-
-  protected Map computeDependencyMap()
-  {
-    Map map = new HashMap();
-    Definition definition = wsdlEditor.getDefinition();
-    ResourceSet resourceSet = definition.eResource().getResourceSet();
-    for (Iterator i = resourceSet.getResources().iterator(); i.hasNext();)
-    {
-      Resource resource = (Resource)i.next();
-      if (resource != definition.eResource())
-      {
-        String uri = resource.getURI().toString();
-        if (map.get(uri) == null)
-        {
-          map.put(uri, uri);
-        }
-      }
-    }
-    return map;
-  }
-
-  public void performReload()
-  {
-  	boolean doReload = false;  	
-	int policy = WSDLEditorPlugin.getInstance().getDependenciesChangedPolicy();
-	
-  	if (policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_PROMPT)
-  	{
-		doReload = MessageDialog.openQuestion(wsdlEditor.getSite().getShell(), WSDLEditorPlugin.getWSDLString("_UI_DEPENDENCIES_CHANGED"), WSDLEditorPlugin.getWSDLString("_UI_DEPENDENCIES_CHANGED_REFRESH"));  	
-  	}
-  	else if (policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_RELOAD)
-  	{
-  		doReload = true;
-  	}
-  	
-    if (doReload)
-    {    
-      wsdlEditor.reloadDependencies();
-    }  
-  }
-  
-  public boolean isListeningToResourceChanges()
-  {
-  	int policy = WSDLEditorPlugin.getInstance().getDependenciesChangedPolicy();
-  	return policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_PROMPT ||
-  		   policy == WSDLEditorPlugin.DEPENDECIES_CHANGED_POLICY_RELOAD;
-  }
-
-
-  class InternalResourceChangeListener implements IResourceChangeListener, IResourceDeltaVisitor
-  {
-    protected List list = new ArrayList();
-    protected boolean isPending = false;
-    protected int count = 0;
-
-    public void resourceChanged(IResourceChangeEvent event)
-    {      	
-      Display display = Display.getCurrent();
-      	     	
-      if (display != null && isListeningToResourceChanges() && !isUpdateRequired)
-      {
-        if (event.getType() == IResourceChangeEvent.POST_CHANGE)
-        {
-          IResourceDelta[] deltas = event.getDelta().getAffectedChildren();
-          for (int i = 0; i < deltas.length; i++)
-          {
-            try
-            {
-              deltas[i].accept(this);
-            }
-            catch (Exception e)
-            {
-            }
-          }
-        }
-        if (list.size() > 0)
-        {
-          if (!isPending)
-          {
-            isPending = true;
-            display.timerExec(2000, new TimerEvent());
-          }
-        }
-      }
-    }
-
-    public boolean visit(IResourceDelta delta) throws CoreException
-    {
-      IResource resource = delta.getResource();
-      if (resource.getType() == IResource.FILE)
-      {
-        if (!list.contains(resource))
-        {
-          list.add(resource);
-        }
-      }
-      return true;
-    }
-
-    class TimerEvent implements Runnable
-    {
-      public TimerEvent()
-      {
-        //System.out.println("NewTimerEvent(" + wsdlEditor.getDefinition().eResource().getURI() + ") " + count);      	
-      }
-
-      public void run()
-      {
-//        for (Iterator i = list.iterator(); i.hasNext();)
-//        {
-//          IResource resource = (IResource)i.next();
-//          String platformPath = URI.createPlatformResourceURI(resource.getFullPath().toString()).toString();
-//        }
-
-        Map dependencyMap = computeDependencyMap();
-
-        for (Iterator i = list.iterator(); i.hasNext();)
-        {
-          IResource resource = (IResource)i.next();
-          String platformPath = URI.createPlatformResourceURI(resource.getFullPath().toString()).toString();
-          if (dependencyMap.get(platformPath) != null)
-          {
-            isUpdateRequired = true;
-            if (wsdlEditor.getSite().getWorkbenchWindow().getPartService().getActivePart() == wsdlEditor)
-            {
-              isUpdateRequired = false;
-              performReload();
-            }
-          }
-        }
-
-        isPending = false;
-        list = new ArrayList();
-      }
-    }
-  }
-
-  class InternalPartListener implements IPartListener
-  {
-    public void partActivated(IWorkbenchPart part)
-    {
-      if (part == wsdlEditor)
-      {     
-        if (isUpdateRequired)
-        {
-          isUpdateRequired = false;
-          performReload();
-        }
-      }
-    }
-
-    public void partBroughtToTop(IWorkbenchPart part)
-    {
-    }
-
-    public void partClosed(IWorkbenchPart part)
-    {
-    }
-
-   
-    public void partDeactivated(IWorkbenchPart part)
-    {
-    }
-
-    public void partOpened(IWorkbenchPart part)
-    {
-    }
-  }
-
-
-}
-
-/*
-class DependencyVisitor
-{
-	public void visitImport(Import theImport)
-	{
-		if (theImport.getEDefinition() != null)
-		{
-			visitDefinition(theImport.getEDefinition());
-		}
-		else if (theImport.getESchema() != null)
-		{
-			visitSchema(theImport.getESchema());
-		}
-	}
-
-	public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-	{
-		XSDSchema referencedSchema = directive.getResolvedSchema();
-		if (referencedSchema != null)
-		{
-			visitSchema(referencedSchema);
-		}
-	}
-
-	public void visitDefinition(Definition definition)
-	{
-		if (definition != null)
-		{
-			for (Iterator i = definition.getEImports().iterator(); i.hasNext();)
-			{
-				visitImport((Import)i.next());
-			}
-			Types types = definition.getETypes();
-			if (types != null)
-			{
-
-				for (Iterator i = types.getEExtensibilityElements().iterator(); i.hasNext();)
-				{
-					Object o = i.next();
-					if (o instanceof XSDSchemaExtensibilityElement)
-					{
-						XSDSchemaExtensibilityElement e = (XSDSchemaExtensibilityElement)o;
-						if (e.getEXSDSchema() != null)
-						{
-							visitSchema(e.getEXSDSchema());
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void visitSchema(XSDSchema schema)
-	{
-		for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-		{
-			Object o = i.next();
-			if (o instanceof XSDSchemaDirective)
-			{
-				visitXSDSchemaDirective((XSDSchemaDirective)o);
-			}
-		}
-	}
-}
-
-class ReloadDependencyVisitor extends DependencyVisitor
-{
-	public void visitImport(Import theImport)
-	{
-		ComponentHandler handler = WSDLReconciler.getReconciler(theImport);
-		Element element = WSDLUtil.getInstance().getElementForObject(theImport);
-		if (element != null && handler != null)
-		{
-			handler.reconcile(wsdlEditor.getDefinition(), theImport, element);
-		}
-	}
-
-	public void visitXSDSchemaDirective(XSDSchemaDirective directive)
-	{
-
-	}
-}*/
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java
deleted file mode 100644
index fc37ece..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlink.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.xsd.ui.internal.Logger;
-
-/**
- * WSDLHyperlink knows how to open links from wsdl files.
- * 
- * @see WSDLHyperlinkDetector
- */
-public class WSDLHyperlink implements IHyperlink
-{
-  private IRegion fRegion;
-  private String fResource;
-  private String fSpec;
-
-  public WSDLHyperlink(IRegion region, String resource, String spec)
-  {
-    fRegion = region;
-    fResource = resource;
-    fSpec = spec;
-  }
-
-  public IRegion getHyperlinkRegion()
-  {
-    return fRegion;
-  }
-
-  public String getTypeLabel()
-  {
-    return null;
-  }
-
-  public String getHyperlinkText()
-  {
-    return null;
-  }
-
-  public void open()
-  {
-    /*
-     * ISSUE: There are cleaner ways to find the right file based on a URI
-     * string and cleaner ways to find which editor to open for the file. See
-     * other IHyperlink and IHyperlinkDetector implementors for examples.
-     */
-    String pattern = "platform:/resource";
-    if (fResource != null && fResource.startsWith(pattern))
-    {
-      Path path = new Path(fResource.substring(pattern.length()));
-      IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-
-      IWorkbenchPage workbenchPage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-
-      IEditorPart editorPart = workbenchPage.getActiveEditor();
-
-      // When using the cursor or the mouse to move around in the text
-      // editor, the location history is not updated, so we make sure we keep
-      // a reference to where we are. If we use other navigation means, like the
-      // outline view, this call will not add a new location history entry, as
-      // it is the same as the last location set through the outline driven
-      // navigation.
-
-      boolean sameEditor = editorPart.getEditorInput() instanceof IFileEditorInput && ((IFileEditorInput) editorPart.getEditorInput()).getFile().equals(file);
-
-      workbenchPage.getNavigationHistory().markLocation(editorPart);
-
-      if (!sameEditor)
-      {
-        try
-        {
-          // The target is in a different file, so open the target's enclosing
-          // resource in it's own editor. Let the workbench decide what editor
-          // to open based on the file's content type.
-
-          editorPart = IDE.openEditor(workbenchPage, file, true);
-        }
-        catch (PartInitException e)
-        {
-          Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-          return;
-        }
-      }
-
-      // Attempt to retrieve the target editor's selection manager and try to
-      // change the selection to the thing (schema component, wsdl element, etc)
-      // pointed to by fSpec.
-
-      ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-
-      if (selectionProvider != null)
-      {
-        selectionProvider.setSelection(new StructuredSelection(fSpec));
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java
deleted file mode 100644
index fdf9e51..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLHyperlinkDetector.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.wsdl.ui.internal;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.text.WSDLModelAdapter;
-import org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.BaseHyperlinkDetector;
-
-/**
- * Detects hyperlinks for WSDL files. Used by the WSDL text editor to provide a
- * "Go to declaration" functionality similar with the one provided by the Java
- * editor.
- */
-public class WSDLHyperlinkDetector extends BaseHyperlinkDetector
-{
-  /*
-   * (non-Javadoc)
-   */
-  protected IHyperlink createHyperlink(IDocument document, IDOMNode node, IRegion region)
-  {
-    // Here we're trying to find the target component's resource and spec.
-
-    Definition definition = getDefinition(document);
-    OpenOnSelectionHelper helper = new OpenOnSelectionHelper(definition);
-    String[] targetData = helper.computeSpecification(node);
-
-    if (targetData != null)
-    {
-      String resource = targetData[0];
-      String spec = targetData[1];
-      return new WSDLHyperlink(region, resource, spec);
-    }
-
-    return null;
-  }
-
-  /**
-   * Gets the definition from document
-   * 
-   * @param document
-   * @return Definition
-   */
-  private Definition getDefinition(IDocument document)
-  {
-    Definition definition = null;
-    IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-    if (model != null)
-    {
-      try
-      {
-        if (model instanceof IDOMModel)
-        {
-          IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-          if (domDoc != null)
-          {
-            WSDLModelAdapter modelAdapter = (WSDLModelAdapter) domDoc.getAdapterFor(WSDLModelAdapter.class);
-            // ISSUE: if adapter does not already exist for domDoc getAdapterFor
-            // will create one. So why is this null check/creation needed?
-            if (modelAdapter == null)
-            {
-              modelAdapter = new WSDLModelAdapter();
-              domDoc.addAdapter(modelAdapter);
-              modelAdapter.createDefinition(domDoc.getDocumentElement(), domDoc);
-            }
-            definition = modelAdapter.getDefinition();
-          }
-        }
-      }
-      finally
-      {
-        model.releaseFromRead();
-      }
-    }
-    return definition;
-  }
-
-  /*
-   * (non-Javadoc)
-   */
-  protected boolean isLinkableAttribute(String name)
-  {
-    boolean isLinkable = name.equals(WSDLConstants.BINDING_ATTRIBUTE) || 
-    name.equals(WSDLConstants.ELEMENT_ATTRIBUTE) || 
-    name.equals(WSDLConstants.TYPE_ATTRIBUTE) || 
-    name.equals(WSDLConstants.MESSAGE_ATTRIBUTE); 
-    return isLinkable;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
deleted file mode 100644
index 32e4c1f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLMultiPageEditorPart.java
+++ /dev/null
@@ -1,653 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.events.ShellAdapter;
-import org.eclipse.swt.events.ShellEvent;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.wst.common.ui.provisional.editors.PostMultiPageEditorSite;
-import org.eclipse.wst.common.ui.provisional.editors.PostSelectionMultiPageEditorPart;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorMessages;
-
-public class WSDLMultiPageEditorPart extends PostSelectionMultiPageEditorPart implements IPropertyListener {
-
-	/**
-	 * 
-	 */
-	public WSDLMultiPageEditorPart() {
-		super();
-	}
-
-	/**
-	 * Internal part activation listener
-	 */
-	class PartListener extends ShellAdapter implements IPartListener {
-		private IWorkbenchPart fActivePart;
-		private boolean fIsHandlingActivation = false;
-
-		private void handleActivation() {
-
-			if (fIsHandlingActivation)
-				return;
-
-			if (fActivePart == WSDLMultiPageEditorPart.this) {
-				fIsHandlingActivation = true;
-				try {
-					safelySanityCheckState();
-				}
-				finally {
-					fIsHandlingActivation = false;
-				}
-			}
-		}
-
-		/**
-		 * @see IPartListener#partActivated(IWorkbenchPart)
-		 */
-		public void partActivated(IWorkbenchPart part) {
-			fActivePart = part;
-			handleActivation();
-		}
-
-		/**
-		 * @see IPartListener#partBroughtToTop(IWorkbenchPart)
-		 */
-		public void partBroughtToTop(IWorkbenchPart part) {
-		}
-
-		/**
-		 * @see IPartListener#partClosed(IWorkbenchPart)
-		 */
-		public void partClosed(IWorkbenchPart part) {
-		}
-
-		/**
-		 * @see IPartListener#partDeactivated(IWorkbenchPart)
-		 */
-		public void partDeactivated(IWorkbenchPart part) {
-			fActivePart = null;
-		}
-
-		/**
-		 * @see IPartListener#partOpened(IWorkbenchPart)
-		 */
-		public void partOpened(IWorkbenchPart part) {
-		}
-
-		/*
-		 * @see ShellListener#shellActivated(ShellEvent)
-		 */
-		public void shellActivated(ShellEvent e) {
-			handleActivation();
-		}
-	}
-
-	class TextInputListener implements ITextInputListener {
-		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
-		}
-
-		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
-		}
-	}
-
-	/** The source page index. */
-	private int fSourcePageIndex;
-	/** The text editor. */
-	private StructuredTextEditor fTextEditor;
-
-	private PartListener partListener;
-
-
-	/*
-	 * This method is just to make firePropertyChanged accessbible from some
-	 * (anonomous) inner classes.
-	 */
-	protected void _firePropertyChange(int property) {
-		super.firePropertyChange(property);
-	}
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	protected void addSourcePage() throws PartInitException {
-		try {
-			fSourcePageIndex = addPage(fTextEditor, getEditorInput());
-			setPageText(fSourcePageIndex, WSDLEditorPlugin.getWSDLString("_UI_TAB_SOURCE")); //$NON-NLS-1$
-			// the update's critical, to get viewer selection manager and
-			// highlighting to work
-			fTextEditor.update();
-
-			firePropertyChange(PROP_TITLE);
-
-			// Changes to the Text Viewer's document instance should also
-			// force an
-			// input refresh
-			fTextEditor.getTextViewer().addTextInputListener(new TextInputListener());
-		}
-		catch (PartInitException e) {
-			// dispose editor
-			dispose();
-
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createPages()
-	 */
-	protected void createPages() {
-		try {
-			// source page MUST be created before design page, now
-			createSourcePage();
-			addSourcePage();
-			setActivePage();
-
-			// future_TODO: add a catch block here for any exception the
-			// design
-			// page throws and convert it into a more informative message.
-		}
-		catch (PartInitException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createSite(org.eclipse.ui.IEditorPart)
-	 */
-	protected IEditorSite createSite(IEditorPart editor) {
-		IEditorSite site = null;
-		if (editor == fTextEditor) {
-			site = new PostMultiPageEditorSite(this, editor) {
-				/**
-				 * @see org.eclipse.ui.part.MultiPageEditorSite#getActionBarContributor()
-				 */
-				public IEditorActionBarContributor getActionBarContributor() {
-					IEditorActionBarContributor contributor = super.getActionBarContributor();
-//					IEditorActionBarContributor multiContributor = WSDLMultiPageEditorPart.this.getEditorSite().getActionBarContributor();
-					// if (multiContributor instanceof
-					// XMLMultiPageEditorActionBarContributor) {
-					// contributor = ((XMLMultiPageEditorActionBarContributor)
-					// multiContributor).sourceViewerActionContributor;
-					// }
-					return contributor;
-				}
-
-				public String getId() {
-					// sets this id so nested editor is considered xml source
-					// page
-					return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
-				}
-			};
-		}
-		else {
-			site = super.createSite(editor);
-		}
-		return site;
-	}
-
-	/**
-	 * Creates the source page of the multi-page editor.
-	 */
-	protected void createSourcePage() throws PartInitException {
-		fTextEditor = createTextEditor();
-		fTextEditor.setEditorPart(this);
-
-		// Set the SourceViewerConfiguration now so the text editor won't use
-		// the default configuration first
-		// and switch to the StructuredTextViewerConfiguration later.
-		// DMW removed setSourceViewerConfiguration 3/26/2003 since added
-		// createPartControl to our text editor.
-		// fTextEditor.setSourceViewerConfiguration();
-		fTextEditor.addPropertyListener(this);
-	}
-
-	/**
-	 * Method createTextEditor.
-	 * 
-	 * @return StructuredTextEditor
-	 */
-	protected StructuredTextEditor createTextEditor() {
-		return new StructuredTextEditor();
-	}
-
-	public void dispose() {
-		IWorkbenchWindow window = getSite().getWorkbenchWindow();
-		window.getPartService().removePartListener(partListener);
-		window.getShell().removeShellListener(partListener);
-
-		getSite().getPage().removePartListener(partListener);
-		if (fTextEditor != null) {
-			fTextEditor.removePropertyListener(this);
-		}
-
-		// moved to last when added window ... seems like
-		// we'd be in danger of losing some data, like site,
-		// or something.
-		super.dispose();
-	}
-
-	/*
-	 * (non-Javadoc) Saves the contents of this editor. <p> Subclasses must
-	 * override this method to implement the open-save-close lifecycle for an
-	 * editor. For greater details, see <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		fTextEditor.doSave(monitor);
-		// // this is a temporary way to force validation.
-		// // when the validator is a workbench builder, the following lines
-		// can be removed
-		// if (fDesignViewer != null)
-		// fDesignViewer.saveOccurred();
-
-	}
-
-	/*
-	 * (non-Javadoc) Saves the contents of this editor to another object. <p>
-	 * Subclasses must override this method to implement the open-save-close
-	 * lifecycle for an editor. For greater details, see <code> IEditorPart
-	 * </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void doSaveAs() {
-		fTextEditor.doSaveAs();
-		// 253619
-		// following used to be executed here, but is
-		// now called "back" from text editor (since
-		// mulitiple paths to the performSaveAs in StructuredTextEditor.
-		// doSaveAsForStructuredTextMulitPagePart();
-	}
-
-	private void editorInputIsAcceptable(IEditorInput input) throws PartInitException {
-		if (input instanceof IFileEditorInput) {
-			// verify that it can be opened
-			CoreException[] coreExceptionArray = new CoreException[1];
-			if (fileDoesNotExist((IFileEditorInput) input, coreExceptionArray)) {
-				CoreException coreException = coreExceptionArray[0];
-				if (coreException.getStatus().getCode() == IResourceStatus.FAILED_READ_LOCAL) {
-					// I'm assuming this is always 'does not exist'
-					// we'll refresh local go mimic behavior of default
-					// editor, where the
-					// troublesome file is refreshed (and will cause it to
-					// 'disappear' from Navigator.
-					try {
-						((IFileEditorInput) input).getFile().refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());
-					}
-					catch (CoreException ce) {
-						// very unlikely
-						Logger.logException(ce);
-					}
-					throw new PartInitException(NLS.bind(XMLEditorMessages.Resource__does_not_exist, (new Object[]{input.getName()})));
-				}
-				else {
-					throw new PartInitException(NLS.bind(XMLEditorMessages.Editor_could_not_be_open, (new Object[]{input.getName()})));
-				}
-			}
-		}
-		else if (input instanceof IStorageEditorInput) {
-			InputStream contents = null;
-			try {
-				contents = ((IStorageEditorInput) input).getStorage().getContents();
-			}
-			catch (CoreException noStorageExc) {
-			}
-			if (contents == null) {
-				throw new PartInitException(NLS.bind(XMLEditorMessages.Editor_could_not_be_open, (new Object[]{input.getName()})));
-			}
-			else {
-				try {
-					contents.close();
-				}
-				catch (IOException e) {
-				}
-			}
-		}
-	}
-
-	// void doSaveAsForStructuredTextMulitPagePart() {
-	// setPageText(getActivePage(), fTextEditor.getTitle());
-	// setInput(fTextEditor.getEditorInput());
-	// if (fDesignViewer != null) {
-	// //fDesignViewer.setEditorInput(fTextEditor.getEditorInput());
-	// fDesignViewer.setModel(getModel());
-	// fDesignViewer.saveAsOccurred();
-	// }
-	// // even though we've set title etc., several times already!
-	// // only now is all prepared for it.
-	// firePropertyChange(IWorkbenchPart.PROP_TITLE);
-	// firePropertyChange(PROP_DIRTY);
-	// }
-	/*
-	 * (non-Javadoc) Initializes the editor part with a site and input. <p>
-	 * Subclasses of <code> EditorPart </code> must implement this method.
-	 * Within the implementation subclasses should verify that the input type
-	 * is acceptable and then save the site and input. Here is sample code:
-	 * </p><pre> if (!(input instanceof IFileEditorInput)) throw new
-	 * PartInitException("Invalid Input: Must be IFileEditorInput");
-	 * setSite(site); setInput(editorInput); </pre>
-	 */
-	protected boolean fileDoesNotExist(IFileEditorInput input, Throwable[] coreException) {
-		boolean result = false;
-		InputStream inStream = null;
-		if ((!(input.exists())) || (!(input.getFile().exists()))) {
-			result = true;
-		}
-		else {
-			try {
-				inStream = input.getFile().getContents(true);
-			}
-			catch (CoreException e) {
-				// very likely to be file not found
-				result = true;
-				coreException[0] = e;
-			}
-			finally {
-				if (input != null) {
-					try {
-						if (inStream != null) {
-							inStream.close();
-						}
-					}
-					catch (IOException e) {
-
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	public Object getAdapter(Class key) {
-		Object result = null;
-
-		// DMW: I'm bullet-proofing this because
-		// its been reported (on 4.03 version) a null pointer sometimes
-		// happens here on startup, when an editor has been left
-		// open when workbench shutdown.
-		if (fTextEditor != null) {
-			result = fTextEditor.getAdapter(key);
-		}
-		return result;
-	}
-
-	public IEditorPart getEditorPart() {
-		return this;
-	}
-
-	protected IStructuredModel getModel() {
-		IStructuredModel model = null;
-		if (fTextEditor != null) {
-			model = fTextEditor.getModel();
-//			IDocument doc = fTextEditor.getDocumentProvider().getDocument(getEditorInput());	
-//	    	IModelManager modelManager = ModelManagerImpl.getInstance();    	
-//	    	model = modelManager.getModelForRead((IStructuredDocument) doc);
-		}
-
-		return model;
-	}
-
-	protected IPreferenceStore getPreferenceStore() {
-		return WSDLEditorPlugin.getInstance().getPreferenceStore();
-	}
-
-	public StructuredTextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	/*
-	 * (non-Javadoc) Method declared on IWorkbenchPart.
-	 */
-	public String getTitle() {
-		String title = null;
-		if (getTextEditor() == null) {
-			if (getEditorInput() != null) {
-				title = getEditorInput().getName();
-			}
-		}
-		else {
-			title = getTextEditor().getTitle();
-		}
-		if (title == null) {
-			title = getPartName();
-		}
-		return title;
-	}
-
-	/*
-	 * (non-Javadoc) Sets the cursor and selection state for this editor to
-	 * the passage defined by the given marker. <p> Subclasses may override.
-	 * For greater details, see <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public void gotoMarker(IMarker marker) {
-		// (pa) 20020217 this was null when opening an editor that was
-		// already open
-		if (fTextEditor != null) {
-			IGotoMarker markerGotoer = (IGotoMarker) fTextEditor.getAdapter(IGotoMarker.class);
-			markerGotoer.gotoMarker(marker);
-		}
-	}
-
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		editorInputIsAcceptable(input);
-		try {
-			super.init(site, input);
-			if (partListener == null) {
-				partListener = new PartListener();
-			}
-			// getSite().getPage().addPartListener(partListner);
-			// we want to listen for our own activation
-			IWorkbenchWindow window = getSite().getWorkbenchWindow();
-			window.getPartService().addPartListener(partListener);
-			window.getShell().addShellListener(partListener);
-		}
-		catch (Exception e) {
-			// log for now, unless we find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		setPartName(input.getName());
-	}
-
-	/*
-	 * (non-Javadoc) Returns whether the "save as" operation is supported by
-	 * this editor. <p> Subclasses must override this method to implement the
-	 * open-save-close lifecycle for an editor. For greater details, see
-	 * <code> IEditorPart </code></p>
-	 * 
-	 * @see IEditorPart
-	 */
-	public boolean isSaveAsAllowed() {
-		return fTextEditor != null && fTextEditor.isSaveAsAllowed();
-	}
-
-	/*
-	 * (non-Javadoc) Returns whether the contents of this editor should be
-	 * saved when the editor is closed. <p> This method returns <code> true
-	 * </code> if and only if the editor is dirty ( <code> isDirty </code> ).
-	 * </p>
-	 */
-	public boolean isSaveOnCloseNeeded() {
-		// overriding super class since it does a lowly isDirty!
-		if (fTextEditor != null)
-			return fTextEditor.isSaveOnCloseNeeded();
-		return isDirty();
-	}
-
-	/**
-	 * Notifies this multi-page editor that the page with the given id has
-	 * been activated. This method is called when the user selects a different
-	 * tab.
-	 * 
-	 * @param newPageIndex
-	 *            the index of the activated page
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-
-		saveLastActivePageIndex(newPageIndex);
-	}
-
-	/**
-	 * Posts the update code "behind" the running operation.
-	 */
-	protected void postOnDisplayQue(Runnable runnable) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		if (windows != null && windows.length > 0) {
-			Display display = windows[0].getShell().getDisplay();
-			display.asyncExec(runnable);
-		}
-		else
-			runnable.run();
-	}
-
-	/**
-	 * Indicates that a property has changed.
-	 * 
-	 * @param source
-	 *            the object whose property has changed
-	 * @param propId
-	 *            the id of the property which has changed; property ids are
-	 *            generally defined as constants on the source class
-	 */
-	public void propertyChanged(Object source, int propId) {
-		switch (propId) {
-			// had to implement input changed "listener" so that
-			// strucutedText could tell it containing editor that
-			// the input has change, when a 'resource moved' event is
-			// found.
-			case IEditorPart.PROP_INPUT :
-			case IEditorPart.PROP_DIRTY : {
-				if (source == fTextEditor) {
-					if (fTextEditor.getEditorInput() != getEditorInput()) {
-						setInput(fTextEditor.getEditorInput());
-						// title should always change when input changes.
-						// create runnable for following post call
-						Runnable runnable = new Runnable() {
-							public void run() {
-								_firePropertyChange(IWorkbenchPart.PROP_TITLE);
-							}
-						};
-						// Update is just to post things on the display queue
-						// (thread). We have to do this to get the dirty
-						// property to get updated after other things on the
-						// queue are executed.
-						postOnDisplayQue(runnable);
-					}
-				}
-				break;
-			}
-			case IWorkbenchPart.PROP_TITLE : {
-				// update the input if the title is changed
-				if (source == fTextEditor) {
-					if (fTextEditor.getEditorInput() != getEditorInput()) {
-						setInput(fTextEditor.getEditorInput());
-					}
-				}
-				break;
-			}
-			default : {
-				// propagate changes. Is this needed? Answer: Yes.
-				if (source == fTextEditor) {
-					firePropertyChange(propId);
-				}
-				break;
-			}
-		}
-
-	}
-
-	protected void safelySanityCheckState() {
-		// If we're called before editor is created, simply ignore since we
-		// delegate this function to our embedded TextEditor
-		if (getTextEditor() == null)
-			return;
-
-		getTextEditor().safelySanityCheckState(getEditorInput());
-
-	}
-
-	protected void saveLastActivePageIndex(int newPageIndex) {
-		// save the last active page index to preference manager
-		getPreferenceStore().setValue(IXMLPreferenceNames.LAST_ACTIVE_PAGE, newPageIndex);
-	}
-
-	/**
-	 * Sets the currently active page.
-	 */
-	protected void setActivePage() {
-		// retrieve the last active page index from preference manager
-		int activePageIndex = getPreferenceStore().getInt(IXMLPreferenceNames.LAST_ACTIVE_PAGE);
-
-		// We check this range since someone could hand edit the XML
-		// preference file to an invalid value ... which I know from
-		// experience :( ... if they do, we'll reset to default and continue
-		// rather than throw an assertion error in the setActivePage(int)
-		// method.
-		if (activePageIndex < 0 || activePageIndex >= getPageCount()) {
-			activePageIndex = fSourcePageIndex;
-		}
-		setActivePage(activePageIndex);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		// If driven from the Source page, it's "model" may not be up to date
-		// with the input just yet. We'll rely on later notification from the
-		// TextViewer to set us straight
-		super.setInput(input);
-		setPartName(input.getName());
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java
deleted file mode 100644
index 55a4d83..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/WSDLSelectionManager.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-
-public class WSDLSelectionManager implements ISelectionProvider, ISelectionChangedListener
-{       
-  protected List listenerList = new ArrayList();
-  protected ISelection currentSelection;
-  protected boolean enableNotify = true;
-
-  public void setSelection(ISelection selection, ISelectionProvider source)
-  {  
-    if (enableNotify)
-    {
-      currentSelection = selection;
-      enableNotify = false;
-      try
-      {
-        SelectionChangedEvent event = new SelectionChangedEvent(source, selection);
-        List copyOfListenerList = new ArrayList(listenerList);
-        for (Iterator i = copyOfListenerList.iterator(); i.hasNext(); )
-        {
-          ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-          listener.selectionChanged(event);
-        }
-      }
-      finally
-      {
-        enableNotify = true;
-      }
-    }
-  }      
-
-  //  implements ISelectionProvider
-  //
-  public void setSelection(ISelection selection)
-  {
-    setSelection(selection, this);
-  }
-
-  public ISelection getSelection() 
-  {
-    return currentSelection;
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.remove(listener);
-  }
-  
-  public void addSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.add(listener);
-  } 
-  
-  // implements ISelectionChangedListener
-  //
-  public void selectionChanged(SelectionChangedEvent event)  
-  {                                                                                         
-    if (enableNotify)
-    {
-      setSelection(event.getSelection(), event.getSelectionProvider());
-    }
-  }
-}                      
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java
deleted file mode 100644
index a8bb5d6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddEEMenuActionContributor.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.ui.internal.actions.MenuBuilder;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-                             
-/**
- * TODO... there are likely several places where we can refactor code from  AbstractNodeActionManager
- */
-public class AddEEMenuActionContributor implements IMenuActionContributor
-{                   
-  protected MenuBuilder menuBuilder = new MenuBuilder();
-
-  public void contributeMenuActions(final IMenuManager menu, Node node, Object object)
-  {
-    boolean isSubmenuRequired = false;
-    Element element = null;
-
-    if (object instanceof WSDLElement)
-    {     
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {                   
-      	public Object caseBinding(Binding binding)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingOperation(BindingOperation bindingOperation)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingInput(BindingInput bindingInput)
-        {                                          
-          return Boolean.TRUE;
-	      } 
-
-      	public Object caseBindingOutput(BindingOutput bindingOutput)
-        {                                          
-          return Boolean.TRUE;
-	      }
-
-      	public Object caseBindingFault(BindingFault bindingFault)
-        {                                          
-          return Boolean.TRUE;
-	      } 
- 
-      	public Object caseDefinition(Definition definition)
-        {      
-          return Boolean.TRUE;
-	      }           
-     
-      	public Object casePort(Port port)
-        {                                         
-          return Boolean.TRUE;
-        } 
-      	public Object caseUnknownExtensibilityElement(UnknownExtensibilityElement unknownExtensibilityElement)
-      	{
-      		if (getExtensibilityElementActions(unknownExtensibilityElement.getElement()).size() > 0)
-      		{      		
-      			return Boolean.TRUE;
-      		}
-      		else
-      		{
-      			return Boolean.FALSE;
-      		}
-      	}
-      };        
-      isSubmenuRequired = wsdlSwitch.doSwitch((WSDLElement)object) != null;
-      element = WSDLEditorUtil.getInstance().getElementForObject(object);      
-    }
-    else if (object instanceof WSDLGroupObject)
-    {
-      WSDLGroupObject groupObject = (WSDLGroupObject)object;
-     
-      switch (groupObject.getType())
-      {   
-        case WSDLGroupObject.EXTENSIBILITY_ELEMENTS_GROUP : 
-        {
-          isSubmenuRequired = true;
-          element = WSDLEditorUtil.getInstance().getElementForObject(groupObject.getDefinition());    
-          break;
-        }
-      }   
-    }
-
-    if (isSubmenuRequired)
-    {
-      MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ADD_EXTENSIBILITY_ELEMENT"));  //$NON-NLS-1$
-      // here I'm attempting to add the menu item in a 'good' place in the exisiting menu
-      // todo add menu groups to avoid the need for this test
-      //
-//      if (menu.find("addchild") != null)
-//      {
-//      	menu.insertAfter("addchild", submenu);
-//      }
-//      else
-//      {
-//      	menu.add(submenu);
-//      }	 
-    	menu.add(submenu);
-      if (element != null && element instanceof IDOMNode)
-      {
-        addExtensibilityElementActions(submenu, element);
-      }
-    }
-  }
-
-  public void addExtensibilityElementActions(IMenuManager menu, Element element)
-  {                 
-    ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-    CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);
-    
-    if (ed != null)
-    {
-      addActionHelper(menu, getExtensibilityElementActions(element));
-    }
-  }
-  
-  public List getExtensibilityElementActions(Element element) {
-    List modelQueryActionList = new ArrayList();
-  	ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-    CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);                                                                                                                            
-
-    if (ed != null)
-    {                                                                                    
-      // add insert child node actions
-      //
-      int ic = ModelQuery.INCLUDE_CHILD_NODES;
-      int vc = ModelQuery.VALIDITY_STRICT;
-
-      modelQuery.getInsertActions(element, ed, -1, ic, vc, modelQueryActionList);
-    }
-    
-    return modelQueryActionList;
-  }
-  
-
-  protected void addActionHelper(IMenuManager menu, List modelQueryActionList)
-  {                          
-    List actionList = new Vector();
-
-    for (Iterator i = modelQueryActionList.iterator(); i.hasNext(); )
-    {                                                   
-      ModelQueryAction action = (ModelQueryAction)i.next();
-      CMNode cmnode = action.getCMNode();
-      if (cmnode != null)
-      {                                       
-        boolean isOtherNamespace = false;
-        CMDocument cmDocument = (CMDocument)cmnode.getProperty("CMDocument");
-        if (cmDocument != null)          
-        {             
-          String namespaceURI = (String)cmDocument.getProperty("http://org.eclipse.wst/cm/properties/targetNamespaceURI"); 
-          isOtherNamespace = namespaceURI != null && !namespaceURI.equals(WSDLConstants.WSDL_NAMESPACE_URI);
-        }
-
-        if (isOtherNamespace)
-        {
-          int cmNodeType = cmnode.getNodeType();
-          if (action.getKind() == ModelQueryAction.INSERT)
-          {                                                 
-            switch (cmNodeType)                             
-            {
-              case CMNode.ELEMENT_DECLARATION :
-              {
-                actionList.add(new AddNodeAction((CMElementDeclaration)cmnode, action.getParent(), action.getStartIndex()));
-                break;
-              }
-            }
-          }           
-        }
-      }   
-    }  
-    menuBuilder.populateMenu(menu, actionList, false);
-  }   
-
-  /**
-   * AddNodeAction
-   */
-  public class AddNodeAction extends BaseNodeAction
-  {
-    protected String description;
-    protected String undoDescription; 
-    protected CMNode cmnode;
-    protected int index;
-    protected Node parent;
-
-
-    public AddNodeAction(CMNode cmnode, Node parent,  int index)
-    {                                 
-      this.cmnode = cmnode;
-      this.parent = parent;
-      this.index = index;                                   
-                                                                                                
-      String text = getLabel(parent, cmnode);
-      setText(text);     
-      description = text;
-      undoDescription = XMLCommonResources.getInstance().getString("_UI_MENU_ADD") + " " + text;
-      //setImageDescriptor(imageDescriptorCache.getImageDescriptor(cmnode)); 
-    }
-
-    public String getLabel(Node parent, CMNode cmnode)
-    {                                                
-      String result = "?" + cmnode + "?";
-      if (cmnode != null)
-      {                
-        result = DOMNamespaceHelper.computeName(cmnode, parent, null);         
-      }
-      return result;   
-    }  
-
-    public Node getNode()
-    {
-      return parent;
-    }
-
-    public String getUndoDescription()
-    {
-      return undoDescription;
-    }
-
-    public void run()
-    {
-      beginRecording();
-
-      if (cmnode != null && parent != null)
-      {
-        Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document)parent : parent.getOwnerDocument();        
-
-        DOMContentBuilder builder = new DOMContentBuilderImpl(document); 
-        builder.setProperty(DOMContentBuilder.PROPERTY_BUILD_BLANK_TEXT_NODES, Boolean.TRUE);
-        builder.setBuildPolicy(DOMContentBuilder.BUILD_ONLY_REQUIRED_CONTENT);
-        builder.build(parent, cmnode);
-        insertNodesAtIndex(parent, builder.getResult(), index, true);
-      }
-
-      endRecording();
-    } 
-
-    public void insertNodesAtIndex(Node parent, List list, int index, boolean format)
-    {                   
-      NodeList nodeList = parent.getChildNodes();
-      if (index == -1)
-      {
-        index = nodeList.getLength();
-      }
-      Node refChild = (index < nodeList.getLength()) ? nodeList.item(index) : null;
-    
-      // here we consider the case where the previous node is a 'white space' Text node
-      // we should really do the insert before this node
-      //
-      int prevIndex = index - 1;
-      Node prevChild = (prevIndex < nodeList.getLength()) ? nodeList.item(prevIndex) : null;
-	    if (isWhitespaceTextNode(prevChild)) 
-      {
-	  	  refChild = prevChild;
-	    }
-    
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Node newNode = (Node)i.next();
-    
-        if (newNode.getNodeType() == Node.ATTRIBUTE_NODE)
-        {
-          Element parentElement = (Element)parent;
-          parentElement.setAttributeNode((Attr)newNode);
-        }
-        else
-        {
-          parent.insertBefore(newNode, refChild);
-        }  
-      }
-    
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Node newNode = (Node)i.next();
-        if (format)
-        {                                                             
-		      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-		      formatProcessorXML.formatNode((IDOMNode)newNode);
-        }  
-      }                      
-	    //setViewerSelection(list);
-    }   
-
-    protected boolean isWhitespaceTextNode(Node node) 
-    {
-	    return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-    } 
-  }                                       
-}    
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java
deleted file mode 100644
index 12a1f6b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementAction.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class AddElementAction extends BaseNodeAction {
-	protected Node parentNode;
-	protected String prefix;
-	protected String nodeName;
-	protected Element newElement;
-	protected Node relativeNode = null;
-	protected IEditorPart editorPart;
-	protected Definition definition;
-	protected Document document;
-	protected boolean computeTopLevelRefChild;
-
-	protected boolean selectNewlyCreatedObject = true; // We should not be
-														// selecting the
-														// object in the
-														// action..... TODO
-
-	public AddElementAction(String text, String imageDescriptorKey, Node parentNode, String nodeName) {
-		setText(text);
-		setImageDescriptor(WSDLEditorPlugin.getImageDescriptor(imageDescriptorKey));
-		this.parentNode = parentNode;
-		this.nodeName = nodeName;
-	}
-
-	public AddElementAction(String text, String imageDescriptorKey, Node parentNode, String prefix, String localName) {
-		setText(text);
-		setImageDescriptor(WSDLEditorPlugin.getImageDescriptor(imageDescriptorKey));
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-	}
-
-	public AddElementAction(String text, Node parentNode, String prefix, String localName) {
-		setText(text);
-		setImageDescriptor(null);
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-	}
-
-	public AddElementAction(Node parentNode, String prefix, String localName, Node relativeNode) {
-		this.parentNode = parentNode;
-		this.prefix = prefix;
-		this.nodeName = localName;
-		this.relativeNode = relativeNode;
-	}
-
-	public void setComputeTopLevelRefChild(boolean isEnabled) {
-		computeTopLevelRefChild = isEnabled;
-	}
-
-	protected void setEditorPart(IEditorPart editorPart) {
-		this.editorPart = editorPart;
-	}
-
-	protected boolean showDialog() {
-		return true;
-	}
-
-	public void run() {
-		boolean ok = showDialog();
-		if (ok) {
-			beginRecording();
-			performAddElement();
-			endRecording();
-		}
-	}
-
-	protected void performAddElement() {
-		if (parentNode != null) {
-			newElement = createElement(nodeName);
-			addAttributes(newElement);
-			if (relativeNode == null && computeTopLevelRefChild) {
-				relativeNode = computeTopLevelRefChild(newElement);
-			}
-
-			if (relativeNode == null) {
-				parentNode.appendChild(newElement);
-			}
-			else {
-				parentNode.insertBefore(newElement, relativeNode);
-			}
-			// format(parentNode);
-			format(newElement);
-			// Ugly..... We should not be selecting the object in the graph
-			// view in the Action.
-			// This should be refactored out. We add this boolean check
-			// because WSDLSetTypeDialog.java
-			// uses AddImportAction.java but we should not be selecting the
-			// newly created import....
-			if (selectNewlyCreatedObject) {
-				selectObjectForNewElement();
-			}
-		}
-	}
-
-	// Ugly..... We should not be selecting the object in the graph view in
-	// the Action.
-	// This should be refactored out. We add this boolean check because
-	// WSDLSetTypeDialog.java
-	// uses AddImportAction.java but we should not be selecting the newly
-	// created import....
-	// We should call this method before calling run()
-	public void selectObjectForNewElement(boolean select) {
-		selectNewlyCreatedObject = select;
-	}
-
-	public Node getNode() {
-		if (parentNode != null) {
-			return parentNode;
-		}
-		else {
-			return document;
-		}
-	}
-
-
-	public String getUndoDescription() {
-		return WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD");
-	}
-
-
-	protected Element createElement(String nodeName) {
-		Document document = parentNode.getOwnerDocument();
-
-		Element element = (prefix != null && prefix.length() > 0) ? document.createElement(prefix + ":" + nodeName) : document.createElement(nodeName);
-
-		return element;
-	}
-
-	protected void addAttributes(Element newElement) {
-	}
-
-
-	protected void format(Node parentNode) {
-		if (parentNode instanceof IDOMNode) {
-			// format selected node
-			FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-			formatProcessorXML.formatNode((IDOMNode) parentNode);
-
-		}
-	}
-
-	protected Element getDefinitionElement(Element parentElement) {
-		Element definitionElement = null;
-
-		for (Node node = parentElement.getOwnerDocument().getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				Element element = (Element) node;
-				if (WSDLEditorUtil.getInstance().getWSDLType(element) == WSDLConstants.DEFINITION) {
-					definitionElement = element;
-					break;
-				}
-			}
-		}
-		return definitionElement;
-	}
-
-	public Element getNewElement() {
-		return newElement;
-	}
-
-	public void setDefinition(Definition definition) {
-		this.definition = definition;
-	}
-
-	public void selectObjectForNewElement() {
-		if (editorPart == null) {
-			editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		}
-		if (editorPart != null && definition != null) {
-			Object object = WSDLEditorUtil.getInstance().findModelObjectForElement(definition, newElement);
-			if (object != null) {
-				ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-				if (selectionProvider != null) {
-					selectionProvider.setSelection(new StructuredSelection(object));
-				}
-			}
-		}
-	}
-
-	public void selectObject(WSDLElement object) {
-		if (editorPart == null) {
-			editorPart = WSDLEditorPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		}
-		if (editorPart != null && definition != null) {
-			if (object != null) {
-				ISelectionProvider selectionProvider = (ISelectionProvider) editorPart.getAdapter(ISelectionProvider.class);
-				if (selectionProvider != null) {
-					selectionProvider.setSelection(new StructuredSelection(object));
-				}
-			}
-		}
-	}
-
-	public String showDialogHelper(String title, String defaultName, List usedNames) {
-		String result = defaultName;
-		NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName, usedNames);
-		int rc = dialog.createAndOpen();
-		if (rc == IDialogConstants.OK_ID) {
-			result = dialog.getName();
-		}
-		else {
-			result = null;
-		}
-		return result;
-	}
-
-	protected Node computeTopLevelRefChild(Node nodeToAdd) {
-		Node result = null;
-		int a = getPrecedence(nodeToAdd);
-
-		for (Node node = parentNode.getFirstChild(); node != null; node = node.getNextSibling()) {
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				int b = getPrecedence(node);
-				if (b > a) {
-					result = node;
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	protected void createDefinitionStub() {
-		if (document != null) {
-			// Create the Definitions element with proper namespace
-			Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-			String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-			if (charSet == null || charSet.trim().equals("")) {
-				charSet = "UTF-8";
-			}
-			document.appendChild(document.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"" + charSet + "\""));
-			Element root = document.createElement("wsdl:definitions");
-			document.appendChild(root);
-
-			// Add various namespace attributes here.
-			root.setAttribute("xmlns:soap", "http://schemas.xmlsoap.org/wsdl/soap/");
-			root.setAttribute("xmlns:tns", getDefaultNamespace());
-			root.setAttribute("xmlns:wsdl", "http://schemas.xmlsoap.org/wsdl/");
-			root.setAttribute("xmlns:xsd", "http://www.w3.org/2001/XMLSchema");
-			root.setAttribute("name", getFileName());
-			root.setAttribute("targetNamespace", getDefaultNamespace());
-
-			definition.setElement(root);
-			parentNode = root;
-			prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-		}
-	}
-
-	private String getDefaultNamespace() {
-		String namespace = WSDLEditorPlugin.getInstance().getPreferenceStore().getString(WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_DEFAULT_TARGET_NAMESPACE"));
-		if (!namespace.endsWith("/")) {
-			namespace = namespace.concat("/");
-		}
-
-		namespace += getFileName() + "/";
-
-		return namespace;
-	}
-
-	private String getFileName() {
-		String fileLocation = definition.getLocation();
-		IPath filePath = new Path(fileLocation);
-		return filePath.removeFileExtension().lastSegment().toString();
-	}
-
-	protected static HashMap precedenceMap = createPrecedenceMap();
-
-	protected static int getPrecedence(Node node) {
-		int result = 2;
-		String localName = node.getLocalName();
-		if (localName != null) {
-			Integer integer = (Integer) precedenceMap.get(localName);
-			if (integer != null) {
-				result = integer.intValue();
-			}
-		}
-		return result;
-	}
-
-	protected static HashMap createPrecedenceMap() {
-		HashMap hashMap = new HashMap();
-		hashMap.put(WSDLConstants.DOCUMENTATION_ELEMENT_TAG, new Integer(1));
-		hashMap.put(WSDLConstants.IMPORT_ELEMENT_TAG, new Integer(3));
-		hashMap.put(WSDLConstants.TYPES_ELEMENT_TAG, new Integer(4));
-		hashMap.put(WSDLConstants.MESSAGE_ELEMENT_TAG, new Integer(5));
-		hashMap.put(WSDLConstants.PORT_TYPE_ELEMENT_TAG, new Integer(6));
-		hashMap.put(WSDLConstants.BINDING_ELEMENT_TAG, new Integer(7));
-		hashMap.put(WSDLConstants.SERVICE_ELEMENT_TAG, new Integer(8));
-		return hashMap;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java
deleted file mode 100644
index 8bdee2f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddElementDeclarationAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-public class AddElementDeclarationAction extends Action
-{
-	protected Definition definition;
-	protected String namespace;
-	protected String prefix;
-	
-	public AddElementDeclarationAction(Definition definition, String namespace, String suggestedPrefix)
-	{
-		this.definition = definition;
-		this.namespace = namespace;
-		this.prefix = suggestedPrefix;
-	}
-	
-	public void run()
-	{
-		String existingPrefix = definition.getPrefix(namespace);
-		if (existingPrefix != null)
-		{
-			prefix = existingPrefix;
-		}
-		else
-		{
-			prefix = NameUtil.buildUniquePrefix(definition, prefix);
-			Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-			if (definitionElement != null)
-			{
-				definitionElement.setAttribute("xmlns:" + prefix, namespace);
-			}			
-		}		
-	}
-	
-	public String getPrefix()
-	{
-		return prefix;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java
deleted file mode 100644
index fc85352..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddImportAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AddImportAction extends AddElementAction
-{                              
-  protected String namespace;
-  protected String location;
-  protected String elementDeclarationNamespacePrefix;
-
-  public AddImportAction(IEditorPart part, Definition definition, Node parentNode, String prefix)
-  {
-	this(part, definition, parentNode, prefix, null, null);
-  }
-  
-  public AddImportAction(IEditorPart part, Definition definition, Node parentNode, String prefix, String namespace, String location)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_IMPORT"), "icons/import_obj.gif", parentNode, prefix, "import");
-	  setDefinition(definition);
-	  setComputeTopLevelRefChild(true);
-	  this.namespace = namespace;
-	  this.location = location;
-	  setEditorPart(part);
-	  
-	  if (part instanceof WSDLEditor) {
-	  	document = ((WSDLEditor) part).getXMLDocument();
-	  }
-  }
-        
-  protected Element createElement(String nodeName)
-  {
-  	if (elementDeclarationNamespacePrefix != null && namespace != null)
-  	{ 
-    	Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    	if (definitionElement != null)
-    	{    
-	  	  definitionElement.setAttribute("xmlns:" + elementDeclarationNamespacePrefix, namespace);
-    	}      	
-  	}
-  	return super.createElement(nodeName);  
-  }
-  
-  public void setElementDeclarationNamespacePrefix(String nsPrefix)
-  {
-  	this.elementDeclarationNamespacePrefix = nsPrefix;
-  }
-                   
-  protected void addAttributes(Element newElement)
-  {                                              
-    newElement.setAttribute("namespace", namespace != null ? namespace : "");
-    newElement.setAttribute("location", location != null ? location : "");
-  }                                     
-  
-  public void performAddElement() {
-  	if (parentNode == null || (document != null && document.getChildNodes().getLength() == 0)) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java
deleted file mode 100644
index 7e39d86..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddMessageUIAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-
-
-public final class AddMessageUIAction extends WSDLElementUIAction
-{
-  private Definition definition;
-  private String name;
-  
-  public AddMessageUIAction
-  	(Definition definition, 
-     String name, 
-     boolean createPart)
-  {
-    super
-    	(new AddMessageCommand(definition,name,createPart), 
-    	 WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD"), 
-    	 WSDLConstants.MESSAGE_ELEMENT_TAG, 
-    	 WSDLEditorPlugin.getImageDescriptor("icons/message_obj.gif"));
-    
-    this.definition = definition;
-    this.name = name;
-  }
- 
-  protected boolean showDialog()
-  {
-	  name = NameUtil.buildUniqueMessageName(definition, name);
-	  name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), name);
-	  return name != null;
-  }
-  
-  protected String showDialogHelper(String title, String defaultName)
-  {   
-    String result = defaultName;                                                                                             
-    NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  } 
-  
-  protected void preRun()
-  {
-    ((AddMessageCommand)super.modelAction).setLocalName(name);
-  }
-
-  protected WSDLElement getOwner()
-  {
-    return definition;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java
deleted file mode 100644
index b352e34..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddNamespaceDeclarationsAction.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.action.Action;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class AddNamespaceDeclarationsAction extends Action
-{
-  protected Element ownerElement;
-  protected String[] namespaceNames;
-  protected String[] preferredPrefixes;
-
-  public AddNamespaceDeclarationsAction(Element ownerElement, String[] namespaceNames, String[] preferredPrefixes)
-  {
-    this.ownerElement = ownerElement;
-    this.namespaceNames = namespaceNames;
-    this.preferredPrefixes = preferredPrefixes;
-  }
-
-  public AddNamespaceDeclarationsAction(Element ownerElement, String namespaceName, String preferredPrefix)
-  {
-    this.ownerElement = ownerElement;
-    namespaceNames = new String[1];
-    namespaceNames[0] = namespaceName;
-
-    preferredPrefixes = new String[1];
-    preferredPrefixes[0] = preferredPrefix;
-  }
-
-  public void run()
-  {
-    if (ownerElement != null)
-    {
-      NamedNodeMap map = ownerElement.getAttributes();
-      Hashtable table = new Hashtable();
-      Hashtable prefixTable = new Hashtable();
-
-      int mapLength = map.getLength();
-      for (int i = 0; i < mapLength; i++)
-      {
-        Attr attribute = (Attr) map.item(i);
-        String attributeName = attribute.getName();
-        if (attributeName.startsWith("xmlns:"))
-        {
-          table.put(attribute.getValue(), Boolean.TRUE);
-          prefixTable.put(attributeName.substring(6), Boolean.TRUE);
-        }
-        else if (attributeName.equals("xmlns"))
-        {
-          table.put(attribute.getValue(), Boolean.TRUE);
-          prefixTable.put("", Boolean.TRUE);
-        }
-      }
-
-      for (int i = 0; i < namespaceNames.length; i++)
-      {
-        String namespace = namespaceNames[i];
-        if (table.get(namespace) == null)
-        {
-          String prefix = (i < preferredPrefixes.length) ? preferredPrefixes[i] : "p0";
-          if (prefixTable.get(prefix) != null)
-          {
-            prefix = computeUniquePrefix("p", prefixTable);
-          }
-
-          String attributeName = prefix.length() > 0 ? "xmlns:" + prefix : "xmlns";
-          ownerElement.setAttribute(attributeName, namespace);
-        }
-      }
-    }
-  }
-
-  protected String computeUniquePrefix(String base, Hashtable table)
-  {
-    int i = 0;
-    String prefix = base;
-    while (true)
-    {
-      if (table.get(prefix) == null)
-      {
-        break;
-      }
-      else
-      {
-        prefix = base + i;
-        i++;
-      }
-    }
-    return prefix;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java
deleted file mode 100644
index 182c6a4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/AddWSISchemaImportAction.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class AddWSISchemaImportAction extends BaseNodeAction
-{
-    protected Definition definition;
-    protected Element definitionElement;
-    protected String namespace;
-    protected String location;
-    protected String elementDeclarationNamespacePrefix;
-
-    public AddWSISchemaImportAction(Definition definition, String namespace, String location)
-    {
-        this.definition = definition;
-        this.namespace = namespace;
-        this.location = location;
-        definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    }
-
-    public Node getNode()
-    {
-        return definitionElement;
-    }
-    
-    public String getUndoDescription()
-    {
-    	return WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_IMPORT");
-    }
-
-    protected Element getOrCreateTypesElement()
-    {
-        Element typesElement = null;
-        if (definition.getTypes() == null)
-        {
-            if (definitionElement != null)
-            {
-                AddElementAction addTypesAction = new AddElementAction("", "icons/xsd_obj.gif", definitionElement, definitionElement.getPrefix(), "types");
-                addTypesAction.setComputeTopLevelRefChild(true);
-                addTypesAction.run();
-                typesElement = addTypesAction.getNewElement();
-                format(typesElement);
-            }
-        }
-        else
-        {
-            typesElement = WSDLEditorUtil.getInstance().getElementForObject(definition.getTypes());
-        }
-        return typesElement;
-    }
-    
-    protected Element getImportHolderElement(Element typesElement) {
-    	Element importHolderElement = null;
-        NodeList nodeList = typesElement.getChildNodes();
-        for (int i = 0; i < nodeList.getLength(); i++)
-        {
-            Node node = nodeList.item(i);
-            if (node.getNodeType() == Node.ELEMENT_NODE)
-            {
-                Element element = (Element) node;
-                if ("schema".equals(element.getLocalName()) && element.getAttribute("targetNamespace") == null)
-                {
-                    importHolderElement = element;
-                    break;
-                }
-            }
-        }
-        
-        return importHolderElement;
-    }
-
-    public Element getOrCreateImportHolderElement(Element typesElement)
-    {
-        Element importHolderElement = getImportHolderElement(typesElement);
-        if (importHolderElement == null)
-        {
-            AddElementAction addImportHolderAction = new AddElementAction("", "icons/xsd_obj.gif", typesElement, "xsd", "schema")
-            {
-                protected void addAttributes(Element newElement)
-                {
-                    newElement.setAttribute("xmlns:xsd", WSDLConstants.XSD_NAMESPACE_URI);
-                }
-            };
-            addImportHolderAction.run();
-            importHolderElement = addImportHolderAction.getNewElement();
-            format(importHolderElement);
-        }
-        return importHolderElement;
-    }
-    
-    // We don't want to add the import if it's already there
-    protected boolean importNotAlreadyExists() {
-    	boolean notExists = true;
-    	
-    	if (definition.getTypes() != null) {
-    		Element typesElement = WSDLEditorUtil.getInstance().getElementForObject(definition.getTypes());
-    		Element schemaElement = getImportHolderElement(typesElement);
-
-    		if (schemaElement != null) {
-    			// Collect children
-    			Node node = schemaElement.getFirstChild();
-    			java.util.Vector schemaChildren = new java.util.Vector();
-    			if (node != null) {
-    				Node child = node;
-					
-    				if (!(child instanceof org.eclipse.wst.xml.core.internal.document.TextImpl)) {
-    					schemaChildren.addElement(child);
-    				}
-					
-    				while (child.getNextSibling() != null) {
-    					child = child.getNextSibling();
-    					if (!(child instanceof org.eclipse.wst.xml.core.internal.document.TextImpl)) {
-    						schemaChildren.addElement(child);
-    					}
-    				}
-
-    				for (int index = 0; index < schemaChildren.size(); index++) {
-    					Element schemaChild = (Element) schemaChildren.elementAt(index);
-    					String schemaLocation = schemaChild.getAttribute("schemaLocation");
-    					String schemaNamespace = schemaChild.getAttribute("namespace");
-				
-    					if (schemaLocation != null && namespace != null &&
-    							schemaLocation.equals(location) && schemaNamespace.equals(namespace)) {
-    						notExists = false;
-    						break;
-    					}
-    				}
-    			}
-    		}
-    	}
-    	
-    	return notExists;
-    }
-
-    public void run()
-    {
-        if (definitionElement != null && importNotAlreadyExists())
-        {
-            beginRecording();
-            performAddElement();
-            endRecording();
-        }
-    }
-    public void performAddElement()
-    {
-        try
-        {
-            Element typesElement = getOrCreateTypesElement();
-            Element importHolderElement = getOrCreateImportHolderElement(typesElement);
-
-            AddElementAction addImportAction = new AddElementAction("", "icons/xsd_obj.gif", importHolderElement, importHolderElement.getPrefix(), "import")
-            {
-                protected void addAttributes(Element newElement)
-                {
-                    newElement.setAttribute("namespace", namespace);
-                    newElement.setAttribute("schemaLocation", location);
-                }
-            };
-            addImportAction.run();
-            Element newElement = addImportAction.getNewElement();
-            format(newElement);
-        }
-        catch (Exception e)
-        {
-        }
-    }
-
-    public void setElementDeclarationNamespacePrefix(String nsPrefix)
-    {
-        this.elementDeclarationNamespacePrefix = nsPrefix;
-    }
-
-    protected static void format(Node parentNode)
-    {
-        if (parentNode instanceof IDOMNode)
-        {
-            // format selected node                                                    
-            FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-            formatProcessorXML.formatNode((IDOMNode)parentNode);
-        }
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java
deleted file mode 100644
index e7fc8de..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/BaseNodeAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import org.eclipse.jface.action.Action;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-public abstract class BaseNodeAction extends Action
-{ 
-  public abstract Node getNode();
-  public abstract String getUndoDescription();
-
-  public void beginRecording()
-  {    
-    Node node = getNode();  
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  public void endRecording()
-  {                 
-    Node node = getNode(); 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java
deleted file mode 100644
index ba45fde..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyGlobalAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class CopyGlobalAction extends Action {
-  	private IEditorPart editor;
-  	private WSDLElement selection;
-  	
-  	public CopyGlobalAction(WSDLElement selection, IEditorPart editor) {
-  		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_COPY"));
-  		this.selection = selection;
-  		this.editor = editor;
-  		setEnabledState();
-  	}
-  	
-  	public void run() {
-  		if (editor instanceof WSDLEditor) {
-  			((WSDLEditor) editor).setClipboardContents(selection);
-  			
-  			((WSDLEditor) editor).getSelectionManager().setSelection(new StructuredSelection(selection));
-  		}
-  	}
-  	
-  	public void setSelection(WSDLElement newSelection) {
-  		selection = newSelection;
-  		setEnabledState();
-  	}
-  	
-  	protected void setEnabledState() {
-  		if (selection instanceof Operation) {
-  			setEnabled(true);
-  		}
-  		else {
-  	  		setEnabled(false);
-  		}
-  	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java
deleted file mode 100644
index 3f3d8af..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CopyWSDLElementAction.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Node;
-
-/*
- * Class which copies a WSDLElement and it's 'children' elements.
- * For example, a copy command on a Operation will result in a copy
- * of the operation and it's input/output/faults, and it's message
- * and parts.
- */
-public class CopyWSDLElementAction extends WSDLDragAction {
-	WSDLElement element, parent;
-	Node parentNode;
-	WSDLElementCommand wsdlElementCommand;
-	EditPartViewer editPartViewer;
-	
-	/*
-	 *  element = The WSDLElement being copied
-	 *  parent = The Parent of the 'new' WSDLElement
-	 *  parentNode = ElementImpl (for undo)
-	 */	
-	public CopyWSDLElementAction(EditPartViewer editPartViewer, WSDLElement element, WSDLElement parent, Node parentNode) {
-		setText("Copy WSDLElement");  // Do not Translate This
-		this.element = element;	
-		this.parent = parent;
-		this.parentNode = parentNode;
-		this.editPartViewer = editPartViewer;
-	}
-	
-	public boolean canExecute() {
-		if (element instanceof Operation){
-			if(parent instanceof PortType) {
-				PortType pt = (PortType) parent;
-				Operation op = (Operation) element;
-				wsdlElementCommand  = new AddOperationCommand(pt, op, NameUtil.buildUniqueOperationName(pt, op.getName()), true);		
-			}
-		}
-		/*
-		else if (element instanceof MessageReference) {
-	
-		}
-		else if (element instanceof Input) {
-
-		}
-		else if (element instanceof Output) {
-			
-		}
-		else if (element instanceof Fault) {
-			
-		}
-		else if (element instanceof Message) {
-			
-		}
-		*/
-		
-		if (wsdlElementCommand != null) {
-			return true;
-		}
-		else {
-			return false;
-		}
-	}
-	
-	public void run() {
-		if (wsdlElementCommand == null) {
-			if (canExecute()) {
-				runCommand();
-			}
-		}
-		 else {
-		 	runCommand();
-		 }
-	}
-	
-	private void runCommand() {
-	 	this.beginRecording();
-		wsdlElementCommand.run();
-		selectWSDLElement(wsdlElementCommand.getWSDLElement());
-		this.endRecording();
-	}
-	
-	private void selectWSDLElement(WSDLElement element) {
-		// Select the newly created element
-	    // Expand all the associated elements 'below' the given element
-	    Map editPartMap = editPartViewer.getEditPartRegistry();
-	    WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-	    if (wsdlEditPart != null) {
-	    	editPartViewer.select(wsdlEditPart);
-		    expandEditParts(element, true);
-	    }
-	}
-	
-	private void expandEditParts(Object element, boolean expandChildren) {
-	    if (element != null) {
-	    	Map editPartMap = editPartViewer.getEditPartRegistry();
-	    	WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-			wsdlEditPart.setExpanded(true);
-			
-			if (expandChildren) {
-				Iterator iterator = WSDLEditorUtil.getModelGraphViewChildren(element).iterator();
-				
-				while (iterator.hasNext()) {
-					expandEditParts(iterator.next(), expandChildren);
-				}
-			}
-	    }
-	}
-	
-	// Inherited classes from BaseNodeAction
-	  public Node getNode() {
-	  	return parentNode;
-	  }
-	  
-	  public String getUndoDescription() {
-	  	return WSDLEditorPlugin.getWSDLString("_UI_ACTION_COPY");
-	  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java
deleted file mode 100644
index 4e4b9c5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/CreateDocActionDelegate.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFolderMainPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class CreateDocActionDelegate extends ActionDelegate implements IEditorActionDelegate
-{
-  protected IFile iFile;
-  protected IEditorPart editorPart;
-
-  protected final static String WSDLEDITOR_DOCGEN_PLUGIN_ID = "org.eclipse.wst.wsdl.ui.internal.docgen"; //$NON-NLS-1$
-  protected final static String VALIDATE_WSDL_PLUGIN_ID = "org.eclipse.wst.validate.wsdl"; //$NON-NLS-1$
-
-  protected IWorkspaceRoot workspaceRoot = null;
-
-  public CreateDocActionDelegate()
-  {
-  }
-
-  public void setFile(IFile iFile)
-  {
-    this.iFile = iFile;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-  public void run(IAction action)
-  {
-// TODO: Uncomment when validation is checked into corona    
-//    ISharedService validateSharedService = ExtensionPlugin.getSharedService("ValidateWSDLSharedService"); //$NON-NLS-1$
-//    System.out.println(validateSharedService);
-//    if (validateSharedService != null)
-//    {
-//      try
-//      {
-//        Boolean rc = (Boolean) validateSharedService.run(iFile);
-//        if (rc.booleanValue())
-//        {
-          NewWSDLDocFolderWizard wiz = new NewWSDLDocFolderWizard();
-          NewWSDLDocDialog dlg = new NewWSDLDocDialog(WSDLEditorPlugin.getShell(), wiz);
-          dlg.open();
-//        }
-//        else
-//        {
-//          MessageDialog.openError(Display.getCurrent().getActiveShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_INVALID_WSDL"), //$NON-NLS-1$
-//          WSDLEditorPlugin.getWSDLString("_UI_ERROR_INVALID_WSDL_DESC")); //$NON-NLS-1$
-//        }
-//      }
-//      catch (Exception e)
-//      {
-//      }
-//    }
-//    else
-//    {
-//      MessageDialog.openError(Display.getCurrent().getActiveShell(), "Error", //$NON-NLS-1$
-//      "Cannot find validator"); //$NON-NLS-1$
-//    }
-  }
-
-  class GenHTMLOperation extends WorkspaceModifyOperation
-  {
-    IFile iFile;
-    String outputLocation;
-    public GenHTMLOperation(IFile iFile)
-    {
-      super();
-      this.iFile = iFile;
-    }
-
-    public void setOutputLocation(String outputLocation)
-    {
-      this.outputLocation = outputLocation;
-    }
-
-    protected void execute(IProgressMonitor monitor) throws CoreException
-    {
-    	/*
-      monitor.beginTask(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATING_HTML_FILES"), IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-      WSDLDoc doc = new WSDLDoc(new WSDLDocFileWriter());
-
-      try
-      {
-        Plugin plugin = Platform.getPlugin("org.eclipse.wst.wsdl.ui.internal.docgen"); //$NON-NLS-1$
-        IPath installPath = new Path(plugin.getDescriptor().getInstallURL().toExternalForm()).removeTrailingSeparator();
-        String installStr = Platform.asLocalURL(new URL(installPath.toString())).getFile();
-        Path docgenPath = new Path(installStr);
-
-        doc.setTemplateLocation(docgenPath.toOSString() + "template" + File.separator); //$NON-NLS-1$
-        doc.setOptions(iFile.getRawLocation().removeLastSegments(1).toOSString(), outputLocation, "");
-
-        doc.addFile(iFile.getName());
-        doc.doBuildStep();
-      }
-      catch (Exception e)
-      {
-        // e.printStackTrace(); 
-      }
-      finally
-      {
-        monitor.done();
-      }
-      */
-    }
-  }
-
-  class WSDLDocNewFolderMainPage extends WizardNewFolderMainPage
-  {
-    public WSDLDocNewFolderMainPage(String pageName)
-    {
-      super(pageName, new StructuredSelection(iFile));
-      setDescription(WSDLEditorPlugin.getWSDLString("_UI_LABEL_CREATE_FOLDER_FOR_DOCS")); //$NON-NLS-1$
-    }
-  }
-
-  class NewWSDLDocFolderWizard extends Wizard
-  {
-    IFolder folder;
-
-    private WSDLDocNewFolderMainPage newFolderPage;
-
-    public NewWSDLDocFolderWizard()
-    {
-      super();
-      setNeedsProgressMonitor(true);
-    }
-
-    public boolean performFinish()
-    {
-      folder = newFolderPage.createNewFolder();
-      if (folder == null)
-      {
-        MessageDialog.openError(WSDLEditorPlugin.getShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_ERROR"), //$NON-NLS-1$
-        WSDLEditorPlugin.getWSDLString("_UI_ERROR_FOLDER_NOT_CREATED")); //$NON-NLS-1$
-        return false;
-      }
-
-      GenHTMLOperation op = new GenHTMLOperation(iFile);
-      op.setOutputLocation(folder.getLocation().toOSString());
-
-      try
-      {
-        op.execute(new NullProgressMonitor());
-
-        // refresh folder and open index.html in web browser
-        folder.refreshLocal(IResource.DEPTH_INFINITE, null);
-        String indexHtmlFile = folder.getLocation().toOSString() + File.separator + "index.html"; //$NON-NLS-1$
-        IFile indexHtmlIFile = getWorkspaceFileFromLocalLocation(indexHtmlFile);
-        if (indexHtmlIFile != null && indexHtmlIFile.exists())
-        {
-          revealSelection(new StructuredSelection(indexHtmlIFile));
-          
-          openEditor(indexHtmlIFile, "org.eclipse.webbrowser"); //$NON-NLS-1$
-        }
-        else
-        {
-          MessageDialog.openError(Display.getCurrent().getActiveShell(), WSDLEditorPlugin.getWSDLString("_UI_ERROR_ERROR"), //$NON-NLS-1$
-          WSDLEditorPlugin.getWSDLString("_UI_ERROR_CREATING_HTML_FILES")); //$NON-NLS-1$
-        }
-      }
-      catch (CoreException ce)
-      {
-        //        ce.printStackTrace();
-      }
-      catch (Exception e)
-      {
-        //        e.printStackTrace();
-      }
-      return true;
-    }
-
-    protected void revealSelection(final ISelection selection)
-    {
-      if (selection != null)
-      {
-        IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-        final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-        final IWorkbenchPart focusPart = workbenchWindow.getActivePage().getActivePart();
-        if (focusPart instanceof ISetSelectionTarget)
-        {
-          Display.getCurrent().asyncExec
-          (new Runnable()
-              {
-            public void run()
-            {
-              ((ISetSelectionTarget)focusPart).selectReveal(selection);
-            }
-          });
-        }
-      }
-    }
-    
-    protected void openEditor(final IFile iFile, final String editorId)
-    {
-      if (iFile != null)
-      {
-        IWorkbench workbench = WSDLEditorPlugin.getInstance().getWorkbench();
-        final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
-        Display.getDefault().asyncExec
-        (new Runnable()
-            {
-          public void run()
-          {
-            try
-            {
-              workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), editorId);
-            }
-            catch (PartInitException ex)
-            {
-//              B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception encountered when attempting to open file: " + iFile + "\n\n" + ex);
-            }
-          }
-        });
-      }
-    }
-    
-    protected IFile getWorkspaceFileFromLocalLocation(String fileName)
-    {
-      IWorkspace workspace = ResourcesPlugin.getWorkspace();
-      if (workspace != null)
-      {
-        IFile iFile = workspace.getRoot().getFileForLocation(new Path(fileName));
-        if (iFile != null)
-        {
-          return iFile;
-        }
-      }
-      return null;
-    }
-    
-    public void addPages()
-    {
-      newFolderPage = new WSDLDocNewFolderMainPage(WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_FOLDER")); //$NON-NLS-1$
-      addPage(newFolderPage);
-    }
-
-    public boolean canFinish()
-    {
-      if (newFolderPage.isPageComplete())
-      {
-        return true;
-      }
-      return false;
-    }
-
-    public IFolder getFolder()
-    {
-      return folder;
-    }
-  }
-
-  class NewWSDLDocDialog extends WizardDialog
-  {
-    public NewWSDLDocDialog(Shell parentShell, IWizard newWizard)
-    {
-      super(parentShell, newWizard);
-    }
-  }
-
-  public void setActiveEditor(IAction action, IEditorPart targetEditor)
-  {
-    editorPart = targetEditor;
-    iFile = null;
-    if (editorPart != null)
-    {
-      IEditorInput input = targetEditor.getEditorInput();
-      if (input instanceof IFileEditorInput)
-      {
-        iFile = ((IFileEditorInput) input).getFile();
-      }
-    }
-  }
-
-  public void selectionChanged(IAction action, ISelection selection)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java
deleted file mode 100644
index b9b0612..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteAction.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class DeleteAction extends BaseNodeAction {
-	 protected List list;
-	 protected String deleteString = WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE") + " "; //$NON-NLS-1$
-//	 private Object object;
-//	 private Node node;
-	
-	public DeleteAction(Object object, Node node) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-	    list = new Vector();
-	    list.add(object);
-	}
-	
-	public DeleteAction(List deleteList) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-	    list = deleteList;
-	}
-
-	private Vector getReferencedMessages(Operation operation) {
-		Vector messages = new Vector();
-		messages.addAll(getMessages(operation.getEFaults()));
-		
-		if (operation.getEInput() != null && operation.getEInput().getEMessage() != null)
-			messages.addElement(operation.getEInput().getEMessage());
-		if (operation.getEOutput() != null && operation.getEOutput().getEMessage() != null)
-			messages.addElement(operation.getEOutput().getEMessage());
-		
-		return messages;
-	}
-	
-	public void run() {
-		// We want to delete Operations first.  So we need to sort the list
-		List sortedList = new ArrayList(list.size());
-		Iterator listIterator = list.iterator();
-		
-		while (listIterator.hasNext()) {
-			Object unsortedObject = listIterator.next();
-			if (unsortedObject instanceof Operation) {
-				sortedList.add(0, unsortedObject);
-			}
-			else {
-				sortedList.add(unsortedObject);
-			}
-		}
-		
-		Node recordingNode = null;
-		if (sortedList.size() > 1) {
-			recordingNode = getElement(sortedList.get(0));
-			beginRecording(recordingNode, WSDLEditorPlugin.getWSDLString("_UI_ACTION_MULTIPLE_DELETE"));
-		}
-		
-		Iterator iterator = sortedList.iterator();
-		while (iterator.hasNext()) {
-			Object object = iterator.next();
-			
-			if (object instanceof Operation) {
-				deleteOperation((Operation) object);
-			}
-			else if (object instanceof Part) {
-				deletePart((Part) object);
-			}
-			else {
-				DeleteNodeAction deleteNodeAction = new DeleteNodeAction(getElement(object));
-				deleteNodeAction.run();
-			}
-		}
-		
-		if (recordingNode != null) {
-			endRecording(recordingNode);
-		}
-	}
-	
-	private Vector getMessages(List faults) {
-		Vector v = new Vector();
-		Iterator it = faults.iterator();
-		
-		while (it.hasNext()) {
-			Fault fault = (Fault) it.next();
-			if (fault.getEMessage() != null) {
-				v.addElement(fault.getEMessage());
-			}
-		}
-		
-		return v;
-	}
-	
-	private Vector getParts(Vector messages) {
-		Vector parts = new Vector();
-		Iterator it = messages.iterator();
-		
-		while (it.hasNext()) {
-			Message message = (Message) it.next();
-			
-			if (message.getEParts() != null) {
-				parts.addAll(message.getEParts());
-			}
-		}
-		
-		return parts;
-	}
-	
-	public Node getNode()
-	{
-	  return list.size() > 0 ? (Node) getElement(list.get(0)) : null;
-	} 
-
-	public String getUndoDescription()
-	{
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-	}
-	
-	private void deleteOperation(Operation operation) {
-		DeleteOperationDialog dialog = new DeleteOperationDialog(WSDLEditorPlugin.getShell(), operation.getName());
-	    int returnCode = dialog.createAndOpen();
-	    
-	    if (returnCode == IDialogConstants.OK_ID) {
-	    	if (dialog.deleteMessagesAndParts()) {
-	    		// Get all associated messages
-	    		Vector messages = getReferencedMessages(operation);
-	    		
-	    		// Determine which Messages are referenced from 'outside' this operation
-	    		Vector referencedMessages = new Vector();
-	    		if (operation.getEnclosingDefinition().getEPortTypes() != null) {
-	    			Iterator portTypeIterator = operation.getEnclosingDefinition().getEPortTypes().iterator();
-	    			Vector operations = new Vector();
-	    			
-	    			while (portTypeIterator.hasNext()) {
-	    				PortType portType = (PortType) portTypeIterator.next();
-	    				
-	    				if (portType.getEOperations() != null) {
-	    					Iterator operationIterator = portType.getEOperations().iterator();
-	    					while (operationIterator.hasNext()) {
-	    						Operation nextOperation = (Operation) operationIterator.next();
-	    						if (!nextOperation.equals(operation))
-	    							operations.add(nextOperation);
-	    					}
-	    				}
-	    			}
-	    			
-	    			for (int index = 0; index < operations.size(); index++) {
-	    				referencedMessages.addAll(getReferencedMessages((Operation) operations.elementAt(index)));
-	    			}
-	    		
-	    			// Filter which Messages need to be deleted
-	    			for (int index = 0; index < messages.size(); index++) {
-	    				int foundIndex = referencedMessages.indexOf(messages.elementAt(index));
-	    				
-	    				if (foundIndex != -1) {
-	    					// Message is referenced elsewhere.  Do not delete
-	    					messages.remove(index);
-	    				}
-	    			}
-	    		}
-	    		
-	    		// Get all associated parts
-	    		Vector parts = getParts(messages);
-	    		
-	    		// Remove our list of Messages and Parts
-	    		PortType portType = (PortType) operation.eContainer();
-	    		Node recordingNode = portType.getEnclosingDefinition().getElement();
-	    		beginRecording(recordingNode, deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION"));
-	    		
-	    		for (int index = 0; index < messages.size(); index++) {
-	    			Message message = (Message) messages.elementAt(index);
-	    			Definition definition = (Definition) message.eContainer();
-	    			definition.getEMessages().remove(message);
-	    		}
-
-	    		for (int index = 0; index < parts.size(); index++) {
-	    			Part part = (Part) parts.elementAt(index);
-	    			Message message = (Message) part.eContainer();
-	    			message.getEParts().remove(part);
-	    		}
-	    		
-	    		// Delete the Operation
-	    		portType.getEOperations().remove(operation);
-
-	    		endRecording(recordingNode);
-	    	}
-	    	else {
-	    		// Only delete the Operation
-	    		PortType portType = (PortType) operation.eContainer();
-	    		Node recordingNode = portType.getElement();
-	    		
-	    		beginRecording(recordingNode, deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION")); // Translate this!!!
-	    		portType.getEOperations().remove(operation);
-	    		endRecording(recordingNode);
-	    	}
-	    }
-	}
-	
-	private void deletePart(Part part) {
-		Message message = (Message) part.eContainer();
-		if (message != null) {
-			beginRecording(message.getElement(), deleteString + WSDLEditorPlugin.getWSDLString("_UI_LABEL_PART"));
-			message.getEParts().remove(part);
-			endRecording(message.getElement());
-		}
-	}
-	
-	private Element getElement(Object object) {
-		Element element = null;
-		if (object instanceof WSDLElement) {
-			element = ((WSDLElement) object).getElement();
-		}
-		else if (object instanceof XSDSchema) {
-			element = ((XSDSchema) object).getElement();
-		}
-		
-		return element;
-	}
-	
-	/*
-	 * The following method should be used to begin recording changes.
-	 * This should eventually replace BaseNodeAction.beginRecording()
-	 * when all deletes are model driven.
-	 */
-	  private void beginRecording(Node node, String undoDescription)
-	  {    
-	    if (node instanceof IDOMNode)
-	    {
-	      ((IDOMNode)node).getModel().beginRecording(this, undoDescription);  
-	    }
-	  }
-
-	/*
-	 * The following method should be used to begin recording changes.
-	 * This should eventually replace BaseNodeAction.beginRecording()
-	 * when all deletes are model driven.
-	 */
-	  public void endRecording(Node node)
-	  {
-	    if (node instanceof IDOMNode)
-	    {
-	      ((IDOMNode)node).getModel().endRecording(this);  
-	    }
-	  }
-	
-	private class DeleteOperationDialog extends Dialog implements SelectionListener{
-		private Button checkButton = null;
-		private boolean deleteMessagesAndParts = true;
-		private String operationName;
-		 
-		public DeleteOperationDialog(Shell shell, String name) {
-			super(shell);
-			operationName = name;
-		}
-		
-		protected Control createDialogArea(Composite parent) 
-		  {
-		    Composite dialogArea = (Composite)super.createDialogArea(parent);
-
-		    Composite composite = new Composite(dialogArea, SWT.NONE);
-		    GridLayout layout = new GridLayout();
-		    layout.numColumns = 2;
-		    layout.marginWidth = 0;
-		    layout.marginHeight = 0;
-		    layout.verticalSpacing = 0;
-
-		    composite.setLayout(layout);
-
-		    GridData gdFill= new GridData();
-		    gdFill.horizontalAlignment= GridData.FILL;
-		    gdFill.grabExcessHorizontalSpace= true;
-		    gdFill.verticalAlignment= GridData.FILL;
-		    gdFill.grabExcessVerticalSpace= true;
-		    composite.setLayoutData(gdFill);
-
-		    Label label = new Label(composite, SWT.NONE);
-		    label.setText(operationName);
-//		    label.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_OPERATION") + " " + operationName);
-		    GridData labelData = new GridData();
-		    labelData.horizontalSpan = 2;
-		    
-		    label.setLayoutData(labelData);
-		    
-		    Label emptyLabel = new Label(composite, SWT.NONE);
-		    GridData emptyData = new GridData();
-		    emptyData.horizontalSpan = 2;
-		    emptyLabel.setLayoutData(emptyData);
-
-		    checkButton = new Button(composite, SWT.CHECK);
-		    checkButton.setSelection(deleteMessagesAndParts);
-		    checkButton.addSelectionListener(this);
-		    Label nameLabel = new Label(composite, SWT.NONE);
-		    nameLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_DELETE_ASSOCIATED_MSG_AND_PARTS"));
-		    
-		    return dialogArea;
-		  }
-		
-		public boolean deleteMessagesAndParts() {
-			return deleteMessagesAndParts;
-		}
-		
-		public void widgetDefaultSelected(SelectionEvent e)  {}
-
-		public void widgetSelected(SelectionEvent e)  {
-			if (e.widget == checkButton) {
-				if (checkButton.getSelection()) {
-					deleteMessagesAndParts = true;
-				}
-				else {
-					deleteMessagesAndParts = false;
-				}
-			}
-		}
-
-		public int createAndOpen() {
-			create();
-		    getShell().setText(WSDLEditorPlugin.getWSDLString("_UI_DELETE_OPERATION_TITLE"));
-		    setBlockOnOpen(true);
-		    return open();
-		}
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java
deleted file mode 100644
index 1764287..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteInterfaceAction.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.List;
-
-public interface DeleteInterfaceAction {
-
-	public void setDeleteList(List list);
-	
-	public void run();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java
deleted file mode 100644
index f4e2931..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteNodeAction.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-                      
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-
-public class DeleteNodeAction extends BaseNodeAction
-{ 
-  protected List list;
-
-  public DeleteNodeAction(Node node)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-    list = new Vector();
-    list.add(node);
-  }    
-  
-  public DeleteNodeAction(List nodeList)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));  //$NON-NLS-1$
-    list = new Vector();
-    Iterator it = nodeList.iterator();
-    while (it.hasNext()) {
-    	list.add(it.next());
-    }
-  }
-
-  public void run()
-  {
-    beginRecording();
-
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      Node node = (Node)i.next();
-      if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-      {
-        Attr attr = (Attr)node;
-        attr.getOwnerElement().removeAttributeNode(attr);
-      }
-      else
-      {                
-        Node parent = node.getParentNode();
-        if (parent != null)
-        {                                         
-          Node previousSibling = node.getPreviousSibling();
-          if (previousSibling != null && isWhitespaceTextNode(previousSibling))
-          {
-            parent.removeChild(previousSibling);
-          }
-          parent.removeChild(node);
-        }
-      }
-    }         
-
-    endRecording();
-  }   
-
-  protected boolean isWhitespaceTextNode(Node node) 
-  {
-	  return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-  }    
-
-  public Node getNode()
-  {
-    return list.size() > 0 ? (Node)list.get(0) : null;
-  } 
-
-  public String getUndoDescription()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java
deleted file mode 100644
index 731b0aa..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/DeleteWSDLAndXSDAction.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Node;
-
-
-/**
- * This class handles delete with the WSDL Editor's graph view.  the object for
- * deletion could be a WSDL 'object' or an XSD 'object'.  We need to make this
- * distinction because we have two different Delete classes.  One to handle
- * WSDL and another to handle XSD.
- */
-public class DeleteWSDLAndXSDAction extends BaseNodeAction {
-	List list;
-	Node recordingNode;
-	WSDLEditor wsdlEditor;
-
-	public DeleteWSDLAndXSDAction(List deleteList, Node recordingNode, WSDLEditor wsdlEditor) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"));
-		list = deleteList;
-		this.recordingNode = recordingNode;
-		this.wsdlEditor = wsdlEditor;
-	}
-	
-	public void run() {
-		Iterator it = list.iterator();
-		List wsdlDeleteList = new ArrayList();
-		List xsdDeleteList = new ArrayList();
-
-		while (it.hasNext()) {
-			Object object = it.next();
-			
-			if (object instanceof WSDLElement || object instanceof XSDSchema) {
-				wsdlDeleteList.add(object);
-			}
-			else {
-				xsdDeleteList.add(object);
-			}
-		}
-		
-		Object newSelection = null;
-		Object topLevelObject = null;
-		if (wsdlDeleteList.size() > 0 || xsdDeleteList.size() > 0)
-		{	
-			try
-			{
-			beginRecording();	
-				
-		
-		// Delete WSDL objects
-		if (wsdlDeleteList.size() > 0) {
-			Object wsdlObject = wsdlDeleteList.get(0);
-			if (wsdlObject instanceof WSDLElement) {
-				newSelection = ((WSDLElement) wsdlObject).eContainer();
-				topLevelObject = getTopLevelWSDLObject((WSDLElement) wsdlObject);
-			}
-			
-			DeleteAction wsdlDelete = new DeleteAction(wsdlDeleteList);
-			wsdlDelete.run();
-		}
-		
-		// Delete XSD objects
-		if (xsdDeleteList.size() > 0) {
-			Object xsdObject = xsdDeleteList.get(0);
-			if (xsdObject instanceof XSDConcreteComponent) {
-				newSelection = ((XSDConcreteComponent) xsdObject).getContainer();
-				topLevelObject = getTopLevelXSDObject((XSDConcreteComponent) xsdObject);
-			}
-			
-			DeleteInterfaceAction xsdDelete = (DeleteInterfaceAction) getXSDDelete();
-			xsdDelete.setDeleteList(xsdDeleteList);
-			xsdDelete.run();
-			// Hack to force a refresh of all components of the Graph View.  This is needed
-			// for the case where we delete a XSD Element (View input == Definition).  The XSD
-			// Element EditPart visual would not be removed from the view.
-			wsdlEditor.getDefinition().setQName(wsdlEditor.getDefinition().getQName());
-		}
-			}
-			finally
-			{
-			  endRecording();
-			}
-			// Make our selection after our Deletions
-			ISelectionProvider selectionProvider = (ISelectionProvider)wsdlEditor.getSelectionManager();
-		    if (selectionProvider != null)
-		    {
-		    	if (newSelection instanceof XSDParticle)
-	            {
-	              newSelection = ((XSDParticle) newSelection).getContainer();
-	            }
-	    		
-		    	if (newSelection == null) {
-		    		newSelection = getNewSelection();
-		    	}
-		    	if (newSelection != null) {
-		    		// We have a newSelection, but it may also be deleted by the user.  In this case, select the top level object
-		    		if (list.contains(newSelection) && topLevelObject != null) {
-		    			newSelection = topLevelObject;
-		    		}
-
-		    		selectionProvider.setSelection(new StructuredSelection(newSelection));
-		    	}
-		    }
-		}
-	}
-	
-	public Node getNode()
-	{
-	  return recordingNode;
-	}
-
-	public String getUndoDescription()
-	{
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_DELETE"); //$NON-NLS-1$
-	}
-
-	private Object getXSDDelete() {
-		WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-	    WSDLEditorExtension[] extensions = registry.getRegisteredExtensions(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR);
-	    Object xsdDelete = null;
-	    
-	    for (int i = 0; i < extensions.length; i++)
-	    {
-//	    	xsdDelete = extensions[i].createExtensionObject(WSDLEditorExtension.XSD_DELETE_ACTION, wsdlEditor);
-	    	xsdDelete = extensions[i].createExtensionObject(WSDLEditorExtension.XSD_DELETE_ACTION, null);
-	    	if (xsdDelete != null) {
-	    		break;
-	    	}
-	    }	    
-	    
-	    return xsdDelete;
-	}
-	
-	private Object getNewSelection() {
-		// Hack using wsdleditor....  This situation occurs when we delete the Schema from the Types group....  We
-		// usually get the container of the object being deleted... however, in this situation, the container would
-		// be null because the object being deleted is a Schema......
-		Object selection;
-		try {
-			selection = wsdlEditor.getGraphViewer().getComponentViewer().getInput();
-			if (selection == null) {
-				selection = wsdlEditor.getDefinition();
-			}
-		}
-		catch (Exception e) {
-			selection = wsdlEditor.getDefinition();
-		}
-		
-		return selection;
-	}
-
-	private WSDLElement getTopLevelWSDLObject(WSDLElement element) {
-		WSDLElement topObject = (WSDLElement) element.eContainer();
-		
-		while (topObject != null && !(topObject instanceof Definition)) {
-			topObject = (WSDLElement) topObject.eContainer();
-		}
-
-		return topObject;
-	}
-	
-	private XSDConcreteComponent getTopLevelXSDObject(XSDConcreteComponent component) {
-		XSDConcreteComponent topObject = component.getContainer();
-		
-		while (topObject != null && !(topObject instanceof XSDSchema)) {
-			topObject = (XSDConcreteComponent) topObject.eContainer();
-		}
-
-		return topObject;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java
deleted file mode 100644
index d84926f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/EditNamespacesAction.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.nsedit.EditNamespacesDialog;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Element;
-
-
-public class EditNamespacesAction extends Action
-{
-  protected Definition definition;
-
-  public EditNamespacesAction(Definition definition)
-  {
-    setText(WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES"));
-    this.definition = definition;
-  }
-
-  public void run()
-  {
-    DOMNamespaceInfoManager namespaceInfoManager = new DOMNamespaceInfoManager();
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    if (element != null)
-    {
-      List namespaceInfoList = namespaceInfoManager.getNamespaceInfoList(element);
-//      List oldNamespaceInfoList = NamespaceInfo.cloneNamespaceInfoList(namespaceInfoList);
-
-      // here we store a copy of the old info for each NamespaceInfo
-      // this info will be used in createPrefixMapping() to figure out how to update the document 
-      // in response to these changes
-      for (Iterator i = namespaceInfoList.iterator(); i.hasNext();)
-      {
-        NamespaceInfo info = (NamespaceInfo) i.next();
-        NamespaceInfo oldCopy = new NamespaceInfo(info);
-        info.setProperty("oldCopy", oldCopy);
-      }
-
-	  IPath path = new Path(definition.getDocumentBaseURI());
-      EditNamespacesDialog dialog = new EditNamespacesDialog(WSDLEditorPlugin.getShell(),  path, WSDLEditorPlugin.getWSDLString("_UI_EDIT_NAMESPACES_DIALOG_TITLE"), definition.getTargetNamespace(), namespaceInfoList);
-      int rc = dialog.createAndOpen();
-      if (rc == IDialogConstants.OK_ID)
-      {      	
-		element.setAttribute("targetNamespace", dialog.getTargetNamespace());
-		
-        List newInfoList = dialog.getNamespaceInfoList();
-        namespaceInfoManager.removeNamespaceInfo(element);
-        namespaceInfoManager.addNamespaceInfo(element, newInfoList, false);
-
-/*
-        // see if we need to rename any prefixes
-        Map prefixMapping = createPrefixMapping(oldNamespaceInfoList, namespaceInfoList);
-        if (prefixMapping.size() > 0)
-        {
-          //manager.getModel().aboutToChangeModel();
-          ReplacePrefixAction replacePrefixAction = new ReplacePrefixAction(element, prefixMapping);
-          replacePrefixAction.run();
-          //manager.getModel().changedModel();
-        }
-*/        
-      }
-    }
-  }
-
-  protected Map createPrefixMapping(List oldList, List newList)
-  {
-    Map map = new Hashtable();
-
-    Hashtable oldURIToPrefixTable = new Hashtable();
-    for (Iterator i = oldList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo oldInfo = (NamespaceInfo) i.next();
-      oldURIToPrefixTable.put(oldInfo.uri, oldInfo);
-    }
-
-    for (Iterator i = newList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo newInfo = (NamespaceInfo) i.next();
-      NamespaceInfo oldInfo = (NamespaceInfo) oldURIToPrefixTable.get(newInfo.uri != null ? newInfo.uri : "");
-
-      // if oldInfo is non null ... there's a matching URI in the old set
-      // we can use its prefix to detemine out mapping
-      //
-      // if oldInfo is null ...  we use the 'oldCopy' we stashed away 
-      // assuming that the user changed the URI and the prefix
-      if (oldInfo == null)
-      {
-        oldInfo = (NamespaceInfo) newInfo.getProperty("oldCopy");
-      }
-
-      if (oldInfo != null)
-      {
-        String newPrefix = newInfo.prefix != null ? newInfo.prefix : "";
-        String oldPrefix = oldInfo.prefix != null ? oldInfo.prefix : "";
-        if (!oldPrefix.equals(newPrefix))
-        {
-          map.put(oldPrefix, newPrefix);
-        }
-      }
-    }
-    return map;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java
deleted file mode 100644
index 7020db6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ExtensibleMenuActionContributor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;                        
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtension;
-import org.eclipse.wst.wsdl.ui.internal.extension.WSDLEditorExtensionRegistry;
-import org.w3c.dom.Node;
-
-
-public class ExtensibleMenuActionContributor implements IMenuActionContributor
-{                                                                   
-  protected WSDLEditor wsdlEditor;
-  protected IMenuActionContributor[] menuActionContributors;  
-
-  public ExtensibleMenuActionContributor(WSDLEditor wsdlEditor)
-  {
-    this.wsdlEditor = wsdlEditor; 
-
-    WSDLEditorExtensionRegistry registry = WSDLEditorPlugin.getInstance().getWSDLEditorExtensionRegistry(); 
-
-    WSDLEditorExtension[] extensions = registry.getRegisteredExtensions(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR);
-    menuActionContributors = new IMenuActionContributor[extensions.length];
-
-    for (int i = 0; i < menuActionContributors.length; i++)
-    {
-      menuActionContributors[i] = (IMenuActionContributor)extensions[i].createExtensionObject(WSDLEditorExtension.MENU_ACTION_CONTRIBUTOR, wsdlEditor);
-    }
-  }
-                           
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object)
-  {  
-    for (int i = 0; i < menuActionContributors.length; i++)
-    {                          
-      if (menuActionContributors[i] != null)
-      {
-        menuActionContributors[i].contributeMenuActions(manager, node, object);
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java
deleted file mode 100644
index 428695c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/IDesignViewerActionBarContributor.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-
-public interface IDesignViewerActionBarContributor extends ISourceViewerActionBarContributor {
-	public void initViewerSpecificContributions(IActionBars bars);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java
deleted file mode 100644
index ef249c5..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/PasteGlobalAction.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.w3c.dom.Node;
-
-public class PasteGlobalAction extends Action {
-	private IEditorPart editor;
-	private WSDLElement selection;
-	private Node selectionNode;
-	
-	public PasteGlobalAction(WSDLElement selection, IEditorPart editor) {
-		setText(WSDLEditorPlugin.getWSDLString("_UI_ACTION_PASTE"));  // Translate This
-		this.selection = selection;
-		this.editor = editor;
-		selectionNode = selection.getElement();
-		setEnabledState();
-	}
-	
-	public void run() {
-		if (editor instanceof WSDLEditor) {
-			WSDLEditor wsdlEditor = (WSDLEditor) editor;
-			CopyWSDLElementAction copyAction = new CopyWSDLElementAction(wsdlEditor.getGraphViewer().getComponentViewer(), wsdlEditor.getClipboardContents(), selection, selectionNode);
-			copyAction.run();
-		}
-	}
-	
-  	public void setSelection(WSDLElement newSelection) {
-  		selection = newSelection;
-  		setEnabledState();
-  	}
-  	
-  	protected void setEnabledState() {
-  		WSDLElement parentElement = null;
-  		if ((parentElement = showPasteAction((WSDLElement) selection, editor)) != null) {
-  			selection = parentElement;
-  			setEnabled(true);
-  		}
-  		else {
-  			setEnabled(false);
-  		}
-  	}
-  	
-  	 private WSDLElement showPasteAction(WSDLElement element, IEditorPart ePart) {
-  	  	WSDLElement parentElement = null;
-  	  	
-  	  	if (ePart instanceof WSDLEditor) {
-  	  		WSDLElement clipboardElement = ((WSDLEditor) ePart).getClipboardContents();
-  	  		
-  	  		if (element instanceof PortType) {
-  	  			if (clipboardElement instanceof Operation) {
-  	  				parentElement = element;
-  	  			}
-  	  		}
-  	  		if (element instanceof Operation) {
-  	  			if (clipboardElement instanceof Operation) {
-  	  				parentElement = (WSDLElement) ((Operation) element).eContainer();
-  	  			}
-  	  		}
-  	  	}
-  	  	
-  	  	return parentElement;
-  	  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java
deleted file mode 100644
index 6a04631..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/ReloadDependenciesActionDelegate.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class ReloadDependenciesActionDelegate extends ActionDelegate implements IEditorActionDelegate
-{
-	private WSDLEditor wsdlEditor;
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor)
-	{
-		wsdlEditor = (targetEditor instanceof WSDLEditor) ? (WSDLEditor)targetEditor : null;
-	}
-
-	public void run(IAction action)
-	{
-		if (wsdlEditor != null)
-		{
-			try
-			{
-				wsdlEditor.reloadDependencies();
-			}
-			catch (Exception e)
-			{
-				e.printStackTrace();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java
deleted file mode 100644
index f6826e8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/RenameAction.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions; 
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.visitor.BindingRenamer;
-import org.eclipse.wst.wsdl.ui.internal.visitor.MessageRenamer;
-import org.eclipse.wst.wsdl.ui.internal.visitor.PortTypeRenamer;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-//import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class RenameAction //extends BaseNodeAction implements Runnable
-{
-  protected Object modelObject;                 
-  protected String newName;
-  protected Node node;                        
-
-  public RenameAction(Object modelObject, String newName)
-  {                          
-    this.modelObject = modelObject;
-    this.newName = newName;
-    this.node = WSDLEditorUtil.getInstance().getNodeForObject(modelObject);
-  }      
-
-  /*
-  public Node getNode()
-  {
-    return node;
-  }
-  */
-
-  /*
-  public String getUndoDescription()
-  {
-    return WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME");  //$NON-NLS-1$
-  }
-  */
-
-  public void run()
-  {
-    if (modelObject instanceof Operation) 
-    {
-      renameOperationHelper((Operation)modelObject);
-    }  
-    else if (modelObject instanceof Input ||
-             modelObject instanceof Output ||
-             modelObject instanceof Fault)
-    {
-      renameIOFHelper((WSDLElement)modelObject);
-    }
-    else
-    {
-      renameModelObjectHelper(modelObject, newName);
-    }
-  } 
-
-  protected void renameModelObjectHelper(Object modelObject, String theNewName)
-  {
-    Element element = WSDLEditorUtil.getInstance().getElementForObject(modelObject);
-    if (element != null)
-    { 
-      element.setAttribute("name", theNewName);
-    }    
-
-    if (modelObject instanceof Message)
-    {
-      MessageRenamer renamer = new MessageRenamer((Message)modelObject, theNewName);
-      renamer.visitBindings();
-    }
-    else if (modelObject instanceof PortType)
-    {
-      PortTypeRenamer renamer = new PortTypeRenamer((PortType)modelObject, theNewName);
-      renamer.visitBindings();
-    }
-    else if (modelObject instanceof Binding)
-    {
-      BindingRenamer renamer = new BindingRenamer((Binding)modelObject, theNewName);
-      renamer.visitServices();
-    }
-  }
-
-  protected void renameOperationHelper(Operation operation)
-  {
-    renameModelObjectHelper(operation, newName);
-  }
-
-
-  protected void renameIOFHelper(WSDLElement object)
-  {                         
-    Definition definition = object.getEnclosingDefinition(); 
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-                          
-    List list = null;
-
-    if (object instanceof Input)
-    {
-      list = util.getBindingInputs((Input)object);
-    }
-    else if (object instanceof Output)
-    {
-      list = util.getBindingOutputs((Output)object);
-    }
-    else // fault
-    {
-      list = util.getBindingFaults((Fault)object);
-    }
-      
-    if (list != null)
-    {
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        Object bindingObject = i.next();
-        renameModelObjectHelper(bindingObject, newName);
-      }                                           
-    }
-
-    renameModelObjectHelper(object, newName);
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java
deleted file mode 100644
index 3ff35e4..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetExistingComponentAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.InvokeSetDialog;
-import org.w3c.dom.Node;
-
-
-
-public class SetExistingComponentAction extends AddElementAction
-{
-  Object input;
-  protected IEditorPart editorPart;
-  protected String kind;
-
-  public SetExistingComponentAction(
-    String text,
-    Node parentNode,
-    String prefix,
-    String localName,
-    Object input)
-  {
-    super(text, parentNode, prefix, localName);
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-
-  protected void performAddElement()
-  {
-    InvokeSetDialog dialog = new InvokeSetDialog();
-    if (input instanceof Part)
-    {
-      dialog.setReferenceKind(kind);
-    }
-    dialog.run(input, editorPart);
-    
-    // We shouldn't know about the editor in this class
-    WSDLEditor editor = (WSDLEditor) editorPart;
-    editor.getSelectionManager().setSelection(new StructuredSelection(input));
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java
deleted file mode 100644
index f775e43..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SetNewComponentAction.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants;
-import org.eclipse.wst.wsdl.internal.generator.BindingGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDElementDeclarationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddXSDTypeDefinitionCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/*
- * TODO: Need to clean up this class.... We probably don't use quite a few of these
- * methods/instance variables.
- */
-public class SetNewComponentAction extends AddElementAction
-{
-  Object input;
-  protected IEditorPart editorPart;
-  protected String kind;
-  private String typeKind = "complex";      // TODO: Refactor code to handle this better
-
-  public SetNewComponentAction(
-    String text,
-    Node parentNode,
-    String prefix,
-    String localName,
-    Object input)
-  {
-    super(text, parentNode, prefix, localName);
-    this.input = input;
-  }
-
-  public void setEditor(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart; 
-  }
-
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public void setTypeKind(String typeKind)
-  {
-      this.typeKind = typeKind;
-  }
-
-  // TODO: Clean up next methods below!!!
-  private WSDLElementCommand command;
-  private String newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_COMPONENT");
-  
-  protected void performAddElement()
-  {
-    Shell shell = Display.getCurrent().getActiveShell();
-    String defaultName = getDefaultName();
-    NewComponentDialog dialog = new NewComponentDialog(shell, newDialogTitle, defaultName, getUsedNames());
-
-    int dialogCode = dialog.createAndOpen();
-    
-    if (dialogCode == Window.OK) {
-        if (input instanceof Port) {
-            Definition definition = ((Port) input).getEnclosingDefinition();
-            String newName = dialog.getName();
-            
-            // TODO: We should be smarter in choosing some default options/settings for generating a new Binding
-//            BindingGenerator bindingGenerator = new BindingGenerator(definition);
-//            bindingGenerator.setName(newName);
-//            bindingGenerator.setProtocol("SOAP");
-//            bindingGenerator.generate();
-			BindingGenerator bindingGenerator = new BindingGenerator(definition, null, SOAPConstants.SOAP_NAMESPACE_URI);
-			bindingGenerator.setName(newName);
-			bindingGenerator.generateBinding();
-            
-          String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-          if (itemPrefix == null)
-          {
-            itemPrefix = "";
-          }
-          org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-          wsdlElement.setAttribute("binding", itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName);     
-          
-        }
-        else if (input instanceof Binding) {            
-            Definition definition = ((Binding) input).getEnclosingDefinition();
-            Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-            
-            String newName = dialog.getName();
-            String prefix = definitionElement.getPrefix();
-            // Use AddMessageAction in WSDLMenuActionContributor
-            AddElementAction addPortTypeAction = new AddElementAction("", "icons/message_obj.gif", definitionElement, prefix, "portType"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-            addPortTypeAction.setComputeTopLevelRefChild(true);
-            addPortTypeAction.run();
-            org.w3c.dom.Element newMessage = addPortTypeAction.getNewElement();
-            newMessage.setAttribute("name", newName); //$NON-NLS-1$
-            // need to get the prefix for the item
-            // could get list of updated messages and then select but currently we only have the local name
-            String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-            if (itemPrefix == null)
-            {
-              itemPrefix = ""; //$NON-NLS-1$
-            }
-            String portTypeValue = itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName; //$NON-NLS-1$ //$NON-NLS-2$
-
-            // Set the component
-            if (input != null && portTypeValue != null) {
-                org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-                wsdlElement.setAttribute("type", portTypeValue);
-            } 
-        }
-        else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-            Definition definition = ((MessageReference) input).getEnclosingDefinition();
-            String newName = dialog.getName();
-
-            AddMessageCommand action = new AddMessageCommand(definition, newName);
-            action.run();
-            Message message = (Message) action.getWSDLElement();
-            CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(message); 
-            CreateWSDLElementHelper.createPart(message);
-
-          // need to get the prefix for the item
-          // could get list of updated messages and then select but currently we only have the local name
-          String itemPrefix = definition.getPrefix(definition.getTargetNamespace());
-          if (itemPrefix == null)
-          {
-            itemPrefix = ""; //$NON-NLS-1$
-          }
-          org.w3c.dom.Element wsdlElement = WSDLEditorUtil.getInstance().getElementForObject((WSDLElement) input);
-          wsdlElement.setAttribute("message", itemPrefix.length() == 0 ? newName : itemPrefix + ":" + newName); //$NON-NLS-1$ //$NON-NLS-2$
-        }
-        else if (input instanceof Part) {
-            Definition definition = ((Part) input).getEnclosingDefinition();
-            String referencingPrefix = definition.getPrefix(definition.getTargetNamespace());
-            String newName = dialog.getName();
-            
-            if (kind.equalsIgnoreCase("type")) {
-                if (typeKind.equalsIgnoreCase("complex")) {
-                    ((AddXSDTypeDefinitionCommand) command).isComplexType(true);    
-                }
-                else {
-                    ((AddXSDTypeDefinitionCommand) command).isComplexType(false);
-                }                
-                ((AddXSDTypeDefinitionCommand) command).run(newName);
-                ComponentReferenceUtil.setComponentReference((Part) input, true, referencingPrefix.equals("") ? newName : referencingPrefix + ":" + newName);
-            }
-            else if (kind.equalsIgnoreCase("element")) {
-                ((AddXSDElementDeclarationCommand) command).run(newName);
-                ComponentReferenceUtil.setComponentReference((Part) input, false, referencingPrefix.equals("") ? newName : referencingPrefix + ":" + newName);
-            }
-        }
-        
-        // We shouldn't know about the editor in this class
-      WSDLEditor editor = (WSDLEditor) editorPart;
-      editor.getSelectionManager().setSelection(new StructuredSelection(input));
-    }
-  }
-  
-  private List getUsedNames() {
-      if (input instanceof Port) {
-          Definition definition = ((Port) input).getEnclosingDefinition();
-          return NameUtil.getUsedBindingNames(definition);
-      }
-      else if (input instanceof Binding) {
-          Definition definition = ((Binding) input).getEnclosingDefinition();
-          return NameUtil.getUsedPortTypeNames(definition);
-      }
-      else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-          Definition definition = ((MessageReference) input).getEnclosingDefinition();
-          return NameUtil.getUsedMessageNames(definition);
-      }
-      else if (input instanceof Part) {
-          Definition definition = ((Part) input).getEnclosingDefinition();
-          if (kind.equalsIgnoreCase("element")) {
-              if (command == null) {
-                  command = new AddXSDElementDeclarationCommand(definition, "NewElement");
-              }
-              XSDSchema parentSchema = ((AddXSDElementDeclarationCommand) command).getSchema();
-              
-              return getUsedElementNames(parentSchema);
-          }
-          else if (kind.equalsIgnoreCase("type")) {
-              if (command == null) {
-                  command = new AddXSDTypeDefinitionCommand(definition, "NewType");
-              }
-              XSDSchema parentSchema = ((AddXSDTypeDefinitionCommand) command).getSchema();
-              
-              List usedNames;
-              if (typeKind.equalsIgnoreCase("complex")) {
-                  usedNames = getUsedComplexTypeNames(parentSchema);    
-              }
-              else {
-                  usedNames = getUsedSimpleTypeNames(parentSchema);
-              }
-              
-              return usedNames;
-          }
-      }
-      
-      return (new ArrayList());
-  }
-
-  private String getDefaultName() {
-      if (input instanceof Port) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_BINDING");       // TODO: Ugly Hack... remove
-          Definition def = ((Port) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewBinding", NameUtil.getUsedBindingNames(def));
-      }
-      else if (input instanceof Binding) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_PORTTYPE");       // TODO: Ugly Hack... remove
-          Definition def = ((Binding) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewPortType", NameUtil.getUsedPortTypeNames(def));
-      }
-      else if (input instanceof Input || input instanceof Output || input instanceof Fault) {
-          newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_MESSAGE");       // TODO: Ugly Hack... remove
-          Definition def = ((MessageReference) input).getEnclosingDefinition();
-          return NameUtil.getUniqueNameHelper("NewMessage", NameUtil.getUsedMessageNames(def));
-      }
-      else if (input instanceof Part) {
-          Definition def = ((Part) input).getEnclosingDefinition();
-          
-          if (kind.equalsIgnoreCase("element")) {
-              newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_ELEMENT");      // TODO: Ugly Hack... remove
-              if (command == null) {
-                  command = new AddXSDElementDeclarationCommand(def, "NewElement");
-              }
-              XSDSchema parentSchema = ((AddXSDElementDeclarationCommand) command).getSchema();
-              
-              List usedNames = getUsedElementNames(parentSchema);
-              return NameUtil.getUniqueNameHelper("NewElement", usedNames);
-          }
-          else if (kind.equalsIgnoreCase("type")) {
-              if (command == null) {
-                  command = new AddXSDTypeDefinitionCommand(def, "NewType");
-              }
-              XSDSchema parentSchema = ((AddXSDTypeDefinitionCommand) command).getSchema();
-
-              String newItemName = "NewComplexType";
-              List usedNames = null;
-              if (typeKind.equalsIgnoreCase("complex")) {
-                  newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_COMPLEX_TYPE");       // TODO: Ugly Hack... remove
-                  usedNames = getUsedComplexTypeNames(parentSchema);    
-              }
-              else {
-                  newDialogTitle = WSDLEditorPlugin.getWSDLString("_UI_LABEL_NEW_SIMPLE_TYPE");       // TODO: Ugly Hack... remove
-                  usedNames = getUsedSimpleTypeNames(parentSchema);
-                  newItemName = "NewSimpleType";
-              }
-              
-              return newItemName = NameUtil.getUniqueNameHelper(newItemName, usedNames);
-          }
-      }
-      
-      return "NewComponent";
-  }
-  
-  private List getUsedSimpleTypeNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator typesIt = schema.getTypeDefinitions().iterator();
-      while (typesIt.hasNext()) {
-          XSDTypeDefinition type = (XSDTypeDefinition) typesIt.next();
-          if (type instanceof XSDSimpleTypeDefinition) {
-              namesList.add(type.getName());
-          }
-      }
-      
-      return namesList;
-  }
-  
-  private List getUsedComplexTypeNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator typesIt = schema.getTypeDefinitions().iterator();
-      while (typesIt.hasNext()) {
-          XSDTypeDefinition type = (XSDTypeDefinition) typesIt.next();
-          if (type instanceof XSDComplexTypeDefinition) {
-              namesList.add(type.getName());
-          }
-      }
-      
-      return namesList;
-  }
-  
-  private List getUsedElementNames(XSDSchema schema) {
-      List namesList = new ArrayList();
-      
-      Iterator elementsIt = schema.getElementDeclarations().iterator();
-      while (elementsIt.hasNext()) {
-          XSDElementDeclaration element = (XSDElementDeclaration) elementsIt.next();
-          namesList.add(element.getName());
-      }
-      
-      return namesList;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
deleted file mode 100644
index 32fc403..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SmartRenameAction.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.w3c.dom.Node;
-
-
-/*
- * This class renames 'related' WSDLElements.  The scenario is as follows:
- * The user renames a WSDLElement in the editor, say a Message.  This class
- * will find the 'related' elements to this Message and rename them as well.
- * It will only rename a 'related' element if the element name (or part of it)
- * is generated.
- * 
- * See NameUtil.java
- */
-public class SmartRenameAction extends BaseNodeAction implements Runnable {
-	protected Object element;
-	protected String newName;
-	private List messageReferences; // This variable should be accessed by method getAllMessageReferences()
-	protected Node node;   
-	
-	public SmartRenameAction(Object element, String newName) {
-		setText("Smart Rename Action"); // Do not translate
-		this.element = element;
-		this.newName = newName;
-	    this.node = WSDLEditorUtil.getInstance().getNodeForObject(element);
-	}
-	
-	public Node getNode() {
-	   return node;
-	}
-
-	public String getUndoDescription() {
-	  return WSDLEditorPlugin.getWSDLString("_UI_ACTION_RENAME");  //$NON-NLS-1$
-	}
-
-	public void run() {
-		RenameAction renamer;
-		String oldName;
-		
-		beginRecording();
-		if (element instanceof Operation) {
-			Operation operation = (Operation) element;
-			oldName = operation.getName();
-
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			// Rename Operation 
-			renamer = new RenameAction(operation, newName);
-			renamer.run();
-			
-			// Rename Input
-			Input input = operation.getEInput();
-			/*
-			if (input != null && isInputOutputNameGenerated(oldName, input.getName())) {
-				renamer = new RenameAction(input, newName);
-				renamer.run();
-			}
-			*/
-			
-			// Rename Output
-			Output output = operation.getEOutput();
-			/*
-			if (output != null && isInputOutputNameGenerated(oldName, output.getName())) {
-				renamer = new RenameAction(output, newName);
-				renamer.run();
-			}
-			*/
-			
-			// Rename Messages and Parts
-			Message msg;
-
-			// Input
-			if (input != null && input.getEMessage() != null) {
-				msg = input.getEMessage();
-				String oldMessageName = "";
-
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Request")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);	
-					}
-				}
-			}
-			
-			// Output
-			if (output != null && output.getMessage() != null) {
-				msg = output.getEMessage();
-				String oldMessageName = "";
-				
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Response")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-					}
-					
-				}
-			}
-			
-			// Faults
-			List faults = operation.getEFaults();
-			if (faults != null) {
-				Iterator it = faults.iterator();
-				while (it.hasNext()) {
-					Fault fault = (Fault) it.next();
-					msg = fault.getEMessage();
-					String oldMessageName = "";
-
-					if (msg != null) {
-						oldMessageName = msg.getQName().getLocalPart();
-						
-						if (isMessageNameGenerated(oldMessageName, oldName, fault.getName())) {
-							renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-							
-							if (msg.getEParts() != null)
-								renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-						}
-					}
-				}
-			}
-		}
-		else if (element instanceof Input) {
-			Input input = (Input) element;
-			oldName = input.getName();
-			if (oldName == null) {
-				oldName = "";
-			}
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			input.setName(newName);
-
-//			 Rename Messages and Parts
-			Message msg;
-			
-			// Input
-			if (input != null && input.getEMessage() != null) {
-				msg = input.getEMessage();
-				String oldMessageName = "";
-				
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					
-					if (isMessageNameGenerated(oldMessageName, oldName, "Request")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);	
-					}
-				}
-			}
-		}
-		else if (element instanceof Output) {
-			Output output = (Output) element;
-			oldName = output.getName();
-			if (oldName == null) {
-				oldName = "";
-			}
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			output.setName(newName);
-
-//			 Rename Messages and Parts
-			Message msg;
-			
-			// Output
-			if (output != null && output.getMessage() != null) {
-				msg = output.getEMessage();
-				String oldMessageName = "";
-				if (msg != null) {
-					oldMessageName = msg.getQName().getLocalPart();
-					if (isMessageNameGenerated(oldMessageName, oldName, "Response")) {
-						renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-						
-						if (msg.getEParts() != null)
-							renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-					}
-				}
-			}
-		}
-		else if (element instanceof Fault) {
-			Fault fault = (Fault) element;
-			Message msg = fault.getEMessage();
-			String oldMessageName = "";
-			oldName = fault.getName();
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-			
-			// Rename the Fault
-			renamer = new RenameAction(fault, newName);
-			renamer.run();
-
-			// Rename the Message and Parts
-			if (msg != null) {
-				oldMessageName = msg.getQName().getLocalPart();
-				
-				Operation op = (Operation) fault.eContainer();
-				if (isMessageNameGenerated(oldMessageName, op.getName(), oldName)) {
-					renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-					
-					if (msg.getEParts() != null)
-						renameFaultParts(msg.getEParts(), op.getName(), oldName, newName);
-				}
-			}
-		}
-		else if (element instanceof Message) {
-			Message msg = (Message) element;
-			oldName = msg.getQName().getLocalPart();
-			String oldMessageName = msg.getQName().getLocalPart();
-			
-			if (oldName.equals(newName)) {
-				return;
-			}
-
-			renameMessageHelper(msg, computeNewMessageName(msg, oldName, newName));
-					
-			if (msg.getEParts() != null)
-				renamePartsHelper(msg.getEParts(), oldMessageName, msg.getQName().getLocalPart(), true);
-		}
-		else if (element instanceof Part) {
-			Part part = (Part) element;
-			String oldPartName = part.getName();
-			
-			if (oldPartName.equals(newName)) {
-				return;
-			}
-			
-			renamer = new RenameAction(element, newName);
-			renamer.run();
-			
-//			Rename Elements
-			renameXSDElement(part, oldPartName, newName);
-		}
-		else if (element instanceof Port) {
-			Port port = (Port) element;
-			String oldPortName = port.getName();
-			
-			renamer = new RenameAction(element, newName);
-			renamer.run();
-
-//			Rename Binding
-			Binding binding = port.getEBinding();
-			if (binding != null && binding.getQName().getLocalPart().equals(oldPortName)) {
-				renamer = new RenameAction(binding, newName);	
-				renamer.run();
-			}
-		}
-		endRecording();
-	}
-	
-	// boolean isInputOutput should be set to true if the part is an Input or Output.
-	// Set false if the part is a Fault.
-	private void renamePartsHelper(List partsList, String oldSubString, String newSubString, boolean isInputOutput) {
-		RenameAction renamer;
-		
-		if (partsList != null) {
-			Iterator pIt = partsList.iterator();
-			while (pIt.hasNext()) {
-				Part part = (Part) pIt.next();
-				String oldPartName = part.getName();
-				
-				if (isPartNameGenerated(oldPartName, oldSubString)) {
-					String newPartName;
-					if (isInputOutput) {
-						newPartName = computeNewPartName(part, oldSubString, newSubString);
-					}
-					else {
-						newPartName = computeNewFaultPartName(part, oldSubString, newSubString);
-					}
-					
-					renamer = new RenameAction(part, newPartName);
-					renamer.run();
-					
-					// Rename Elements
-					renameXSDElement(part, oldPartName, newPartName);
-				}
-			}
-		}
-	}
-	
-	// This method is used to update the Part name when the Fault name is changed.  Only
-	// change the Part name if the part name is a generated name.
-	// Compare to renamePartsHelper().  The renamePartsHelper() method is called when a Fault
-	// has NOT been renamed, rather, it is triggered by some other naming (ex. Operation
-	// renaming).  It will updat Input/Output, AND Fault Parts.
-	private void renameFaultParts(List partsList, String baseName, String oldSubString, String newSubString) {
-		RenameAction renamer;
-		
-		if (partsList != null) {
-			Iterator pIt = partsList.iterator();
-			while (pIt.hasNext()) {
-				Part part = (Part) pIt.next();
-				String oldPartName = part.getName();
-				
-				if (isPartNameGenerated(oldPartName, baseName, oldSubString)) {
-					String newPartName;
-					newPartName = computeNewFaultPartName(part, oldSubString, newSubString);
-					renamer = new RenameAction(part, newPartName);
-					renamer.run();
-					
-					// Rename Elements
-					renameXSDElement(part, oldPartName, newPartName);
-				}
-			}
-		}
-	}
-	
-	private String computeNewMessageName(Message message, String oldSubString, String newSubString) {
-		String string = message.getQName().getLocalPart();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 0);		
-	}
-	
-//	private String computeNewFaultMessageName(Message message, String oldSubString, String newSubString) {
-//		String string = message.getQName().getLocalPart();
-//		return replaceSectionWithSubString(string, oldSubString, newSubString, 1);		
-//	}
-	
-	// Method for Input, Output, and Fault Parts
-	// See computeNewFaultPartName() for comparison
-	private String computeNewPartName(Part part, String oldSubString, String newSubString) {
-		String string = part.getName();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 0);		
-	}
-	
-	// Method for Fault Parts
-	// This method behaves in the exact same way as computeNewPartName() except it starts searching for a match
-	// after the first character.  This method is intended for users who wish to rename a generated (Fault) part
-	// where the Fault name has changed.  We start our search after the first character because the generated name
-	// of the part is built by appending the Fault name after the Operation name.
-	private String computeNewFaultPartName(Part part, String oldSubString, String newSubString) {
-		String string = part.getName();
-		return replaceSectionWithSubString(string, oldSubString, newSubString, 1);		
-	}
-	
-	private String replaceSectionWithSubString(String fullString, String oldSubString, String newSubString, int startSearchIndex) {
-		StringBuffer fullSB = new StringBuffer(fullString);
-		int index = fullSB.indexOf(oldSubString, startSearchIndex);
-		if (index >= 0) {
-			return fullSB.replace(index, index + oldSubString.length(), newSubString).toString();
-		}
-		
-		return "";
-	}
-
-	////////////////////////////////////////////////////////////////////////////////////////
-	
-	private static boolean commonNameGeneratorCheck(String targetName, String baseName, String appendName) {
-		// First criteria is targetName must start with the baseName
-		if (!targetName.startsWith(baseName))
-			return false;
-			
-		if (appendName.trim().length() > 0) {
-			// Second criteria.  The appended name must be in the targetName and begin right
-			// after the baseName location
-			if (!targetName.startsWith(appendName, baseName.length()))
-				return false;
-		}
-			
-		// Third criteria (if necessary).  If baseName + appendName is shorter than targetName,
-		// then there must be 'extra' characters at the end of targetName.  These characters must
-		// make up an integer.  If not, it is not a generated string.
-		int subLength = baseName.length() + appendName.length();
-		if (targetName.length() > subLength) {
-			// We have 'extra' characters
-			String extras = targetName.substring(subLength);
-			
-			if(!isDigit(extras))
-				return false;
-		}
-		
-		return true;
-	}
-	
-	public static boolean isOperationNameGenerated(String opName, String name) {
-		return opName.equals(name);
-	}
-	
-	public static boolean isMessageNameGenerated(String msgName, String baseName, String appendName) {
-		return commonNameGeneratorCheck(msgName, baseName, appendName);
-	}
-	
-	public static boolean isInputOutputNameGenerated(String inOutName, String name) {
-		return inOutName.equals(name);
-	}
-	
-	public static boolean isFaultNameGenerated(String faultName, String name) {
-		return faultName.equals(name);
-	}
-	
-	public static boolean isPartNameGenerated(String partName, String baseName) {
-		return commonNameGeneratorCheck(partName, baseName, "");
-	}
-	
-	private boolean isPartNameGenerated(String partName, String baseName, String appendName) {
-		return commonNameGeneratorCheck(partName, baseName, appendName);
-	}
-	
-	private static boolean isDigit(String string) {
-		boolean rValue = true;
-		char[] chars = string.toCharArray();
-	
-		for (int index = 0; index < chars.length; index++) {
-			if (!Character.isDigit(chars[index])) {
-				rValue = false;
-				break;
-			}
-		}
-		
-		return rValue;
-	}
-	
-	/*
-	 * The following classes aid in renaming a message
-	 */
-	private void renameMessageHelper(Message msg, String newName) {
-		List messageRefs = getReferencingMessageReferences(msg, getAllMessageReferences());
-		
-		RenameAction renamer = new RenameAction(msg, newName);
-		renamer.run();
-		
-		Iterator iterator = messageRefs.iterator();
-		while (iterator.hasNext()) {
-			MessageReference messageReference = (MessageReference) iterator.next();
-			messageReference.setEMessage(msg);
-		}
-	}
-	
-	private List getReferencingMessageReferences(Message msg, List messageRefs) {
-		Vector referencesVector = new Vector();
-		QName messageQName = msg.getQName();
-		Iterator iterator = messageRefs.iterator();
-		
-		while (iterator.hasNext()) {
-			MessageReference messageReference = (MessageReference) iterator.next();
-			if (messageReference.getEMessage() != null && messageQName.equals(messageReference.getEMessage().getQName())) {
-				referencesVector.addElement(messageReference);
-			}
-		}
-		
-		return referencesVector;
-	}
-	
-	private List getAllMessageReferences() {
-		if (messageReferences == null) {
-			messageReferences = new Vector();
-			Definition definition = ((WSDLElement) element).getEnclosingDefinition();
-			List portTypes = definition.getEPortTypes();
-		
-			if (portTypes != null) {
-				Iterator portTypeIterator = portTypes.iterator();
-				while (portTypeIterator.hasNext()) {
-					List operationsList = ((PortType) portTypeIterator.next()).getEOperations();
-					
-					if (operationsList != null) {
-						Iterator operationsIterator = operationsList.iterator();
-						while (operationsIterator.hasNext()) {
-							messageReferences.addAll(getAllMessageReferences((Operation) operationsIterator.next()));
-						}
-					}
-				}
-			}
-		}
-		
-		return messageReferences;
-	}
-	
-	private Vector getAllMessageReferences(Operation operation) {
-		Vector iofs = new Vector();
-		Iterator it = operation.getEFaults().iterator();
-		while (it.hasNext()) {
-			iofs.addElement(it.next());
-		}
-		
-		if (iofs == null)
-			iofs = new Vector();
-		
-		if (operation.getEInput() != null)
-			iofs.addElement(operation.getEInput());
-		
-		if (operation.getEOutput() != null)
-			iofs.addElement(operation.getEOutput());
-		
-		return iofs;
-	}
-	
-	private void renameXSDElement(Part part, String oldXSDName, String newXSDName) {
-		XSDElementDeclaration elementDeclaration = part.getElementDeclaration();
-		if (elementDeclaration != null && oldXSDName.equals(elementDeclaration.getName())) {
-			renameElementDeclarationHelper(elementDeclaration, oldXSDName, newXSDName);
-			
-			// Here we rename the element reference.
-			//
-			QName qname = new QName(part.getElementName().getNamespaceURI(), newXSDName);
-			part.setElementName(qname);			
-		}
-	}
-	
-	private void renameElementDeclarationHelper(XSDElementDeclaration elementDeclaration, String oldXSDName, String newXSDName) {
-		if (elementDeclaration != null && elementDeclaration.getName().equals(oldXSDName)) {
-			elementDeclaration.setName(newXSDName);
-		}
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java
deleted file mode 100644
index ccef1da..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourceEditorActionBarContributor.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder;
-import org.eclipse.wst.sse.ui.internal.IExtendedContributor;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLMultiPageEditorPart;
-
-public class SourceEditorActionBarContributor extends MultiPageEditorActionBarContributor implements IExtendedContributor {
-
-	protected IEditorActionBarContributor designViewerActionBarContributor = null;
-	protected IEditorActionBarContributor sourceViewerActionContributor = null;
-	protected WSDLMultiPageEditorPart multiPageEditor = null;
-
-	// EditorExtension
-	private static final String EDITOR_ID = "org.eclipse.wst.wsdl.ui.internal.actions.XMLMultiPageEditorPart"; //$NON-NLS-1$
-	private IExtendedContributor extendedContributor;
-
-	public SourceEditorActionBarContributor() {
-		super();
-
-		sourceViewerActionContributor = new SourcePageActionContributor();
-
-		// Read action extensions.
-		ExtendedEditorActionBuilder builder = new ExtendedEditorActionBuilder();
-		extendedContributor = builder.readActionExtensions(EDITOR_ID);
-	}
-
-	public void init(IActionBars actionBars) {
-		super.init(actionBars);
-
-		if (actionBars != null) {
-			initDesignViewerActionBarContributor(actionBars);
-			initSourceViewerActionContributor(actionBars);
-		}
-	}
-
-	protected void initDesignViewerActionBarContributor(IActionBars actionBars) {
-		if (designViewerActionBarContributor != null)
-			designViewerActionBarContributor.init(actionBars, getPage());
-	}
-
-	protected void initSourceViewerActionContributor(IActionBars actionBars) {
-		if (sourceViewerActionContributor != null)
-			sourceViewerActionContributor.init(actionBars, getPage());
-	}
-
-	public void dispose() {
-		super.dispose();
-
-		if (designViewerActionBarContributor != null)
-			designViewerActionBarContributor.dispose();
-
-		if (sourceViewerActionContributor != null)
-			sourceViewerActionContributor.dispose();
-
-		if (extendedContributor != null)
-			extendedContributor.dispose();
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToMenu(IMenuManager)
-	 */
-	public final void contributeToMenu(IMenuManager menu) {
-		super.contributeToMenu(menu);
-
-		addToMenu(menu);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToMenu(menu);
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see IExtendedContributor#contributeToPopupMenu(IMenuManager)
-	 */
-	public final void contributeToPopupMenu(IMenuManager menu) {
-
-		addToPopupMenu(menu);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToPopupMenu(menu);
-	}
-
-	protected void addToPopupMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-	 */
-	public final void contributeToToolBar(IToolBarManager toolBarManager) {
-		super.contributeToToolBar(toolBarManager);
-
-		addToToolBar(toolBarManager);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToToolBar(toolBarManager);
-	}
-
-	protected void addToToolBar(IToolBarManager toolBarManager) {
-	}
-
-	/**
-	 * @see EditorActionBarContributor#contributeToStatusLine(IStatusLineManager)
-	 */
-	public final void contributeToStatusLine(IStatusLineManager manager) {
-		super.contributeToStatusLine(manager);
-
-		addToStatusLine(manager);
-
-		if (extendedContributor != null)
-			extendedContributor.contributeToStatusLine(manager);
-	}
-
-	protected void addToStatusLine(IStatusLineManager manager) {
-	}
-
-	/**
-	 * @see IExtendedContributor#updateToolbarActions()
-	 */
-	public void updateToolbarActions() {
-		if (extendedContributor != null)
-			extendedContributor.updateToolbarActions();
-	}
-
-	public void setActiveEditor(IEditorPart targetEditor) {
-		// save multiPageEditor before calling super.setActiveEditor(targetEditor)
-		// super.setActiveEditor will call setActivePage(IEditorPart activeEditor)
-		// multiPageEditor is needed in setActivePage(IEditorPart activeEditor)
-		if (targetEditor instanceof WSDLMultiPageEditorPart)
-			multiPageEditor = (WSDLMultiPageEditorPart) targetEditor;
-
-		super.setActiveEditor(targetEditor);
-
-		updateToolbarActions();
-
-		if (extendedContributor != null)
-			extendedContributor.setActiveEditor(targetEditor);
-	}
-
-	public void setActivePage(IEditorPart activeEditor) {
-		// This contributor is designed for StructuredTextMultiPageEditorPart.
-		// To safe-guard this from problems caused by unexpected usage by other editors, the following
-		// check is added.
-		if (multiPageEditor != null) {
-			if (activeEditor != null && activeEditor instanceof StructuredTextEditor)
-				activateSourcePage(activeEditor);
-			else
-				activateDesignPage(activeEditor);
-		}
-
-		updateToolbarActions();
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-			// update menu bar and tool bar
-			actionBars.updateActionBars();
-		}
-	}
-
-	protected void activateDesignPage(IEditorPart activeEditor) {
-		if (designViewerActionBarContributor != null && designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor) {
-			// if design page is not really an IEditorPart, activeEditor == null, so pass in multiPageEditor instead (d282414)
-			if (activeEditor == null) {
-				sourceViewerActionContributor.setActiveEditor(multiPageEditor);
-			}
-			else {
-				sourceViewerActionContributor.setActiveEditor(activeEditor);
-			}
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(false);
-		}
-	}
-
-	protected void activateSourcePage(IEditorPart activeEditor) {
-		if (designViewerActionBarContributor != null && designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor) {
-			sourceViewerActionContributor.setActiveEditor(activeEditor);
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(true);
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java
deleted file mode 100644
index 84b6bd7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/SourcePageActionContributor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML;
-
-
-/**
- * SourcePageActionContributor
- * 
- * This class is for multi page editor's source page contributor.
- *
- * Use WSDLEditorActionContributor for single page editor
- * */
-public class SourcePageActionContributor extends ActionContributorXML {
-
-	private IActionBars fBars;
-
-	/**
-	 * This method calls:
-	 * <ul>
-	 *  <li><code>contributeToMenu</code> with <code>bars</code>' menu manager</li>
-	 *  <li><code>contributeToToolBar</code> with <code>bars</code>' tool bar
-	 *    manager</li>
-	 *  <li><code>contributeToStatusLine</code> with <code>bars</code>' status line
-	 *    manager</li>
-	 * </ul>
-	 * The given action bars are also remembered and made accessible via 
-	 * <code>getActionBars</code>.
-	 * 
-	 * @param bars the action bars
-	 * 
-	 */
-	public void init(IActionBars bars) {
-		fBars = bars;
-		contributeToMenu(bars.getMenuManager());
-		contributeToToolBar(bars.getToolBarManager());
-		contributeToStatusLine(bars.getStatusLineManager());
-	}
-
-	/**
-	 * Returns this contributor's action bars.
-	 *
-	 * @return the action bars
-	 */
-	public IActionBars getActionBars() {
-		return fBars;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java
deleted file mode 100644
index b7f9855..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLActionBarContributor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public class WSDLActionBarContributor extends SourceEditorActionBarContributor
-{
-  protected ITextEditor textEditor;
-
-  /**
-   * Constructor for WSDLActionBarContributor.
-   */
-  public WSDLActionBarContributor()
-  {
-    super();
-  }
-
-  public void setActivePage(IEditorPart activeEditor)
-  {
-    super.setActivePage(activeEditor);
-
-    // always enable undo/redo regardless of which page we're on.  The undo/redo comes from the editor
-    //    
-    updateAction(ActionFactory.UNDO.getId(), ITextEditorActionConstants.UNDO, true);
-    updateAction(ActionFactory.REDO.getId(), ITextEditorActionConstants.REDO, true);
-
-    // turn these off so that the actionhandler will handle it for us
-    //
-    //updateAction(IWorkbenchActionConstants.CUT, ITextEditorActionConstants.CUT, false);
-    //updateAction(IWorkbenchActionConstants.COPY, ITextEditorActionConstants.COPY, false);
-    //updateAction(IWorkbenchActionConstants.PASTE, ITextEditorActionConstants.PASTE, false);
-
-    getActionBars().updateActionBars();
-  }
-
-  protected void updateAction(String globalActionId, String textEditorActionId, boolean enable)
-  {
-    getActionBars().setGlobalActionHandler(globalActionId, enable ? getAction(textEditor, textEditorActionId) : null);
-  }
-
-  /**
-   * Returns the action registed with the given text editor.
-   * @return IAction or null if editor is null.
-   */
-  protected IAction getAction(ITextEditor editor, String actionID)
-  {
-    try
-    {
-      return (editor == null ? null : editor.getAction(actionID));
-    }
-    catch (Exception e)
-    {
-      return null;
-    }
-  }
-
-  /**
-   * @see EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-   */
-  public void addToToolBar(IToolBarManager toolBarManager)
-  {
-    super.addToToolBar(toolBarManager);
-    toolBarManager.add(new GroupMarker("WSDLEditor"));
-  }
-
-
-  public void setActiveEditor(IEditorPart activeEditor)
-  {
-    super.setActiveEditor(activeEditor);
-    textEditor = null;
-    if (activeEditor instanceof WSDLEditor)
-    {
-      textEditor = ((WSDLEditor) activeEditor).getTextEditor();
-    }
-    
-    updateAction(ActionFactory.UNDO.getId(), ITextEditorActionConstants.UNDO, true);
-    updateAction(ActionFactory.REDO.getId(), ITextEditorActionConstants.REDO, true);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java
deleted file mode 100644
index 6425160..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.w3c.dom.Node;
-
-public abstract class WSDLDragAction extends BaseNodeAction {
-	protected WSDLTreeNodeEditPart movingChildEditPart;
-	protected Point pointerLocation;
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public boolean canExecute() {
-		return false;
-	}
-	
-	public void execute() {
-		run();
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public String getUndoDescription() {
-		return "";
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public Node getNode() {
-		return null;
-	}
-	
-	/*
-	 * Sub-classes should override this method.
-	 */
-	public IFigure getFeedbackFigure() {
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java
deleted file mode 100644
index 1cff3c8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragReorderAction.java
+++ /dev/null
@@ -1,424 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.wsdl.OperationType;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.OperationImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-
-
-public class WSDLDragReorderAction extends WSDLDragAction
-{
-  protected WSDLEditor wsdlEditor;
-  protected WSDLElement movingChild;
-  protected WSDLElement newParent;
-  protected WSDLTreeNodeEditPart leftSiblingEditPart;
-  protected WSDLTreeNodeEditPart rightSiblingEditPart;
-  protected WSDLElement leftSibElement;
-  protected WSDLElement rightSibElement;
-  protected boolean canNeverExecute = false;
-  
-  public WSDLDragReorderAction(WSDLTreeNodeEditPart movingChildEditPart, EditPart pointerEditPart, Point pointerLocation) {
-  	this.movingChildEditPart = movingChildEditPart;
-  	this.pointerLocation = pointerLocation;
-
-	EditPart possibleParent = getParentEditPart(pointerEditPart);
-	
-	if (!(possibleParent instanceof WSDLTreeNodeEditPart)) {
-		canNeverExecute = true;
-		return;
-	}
-  	
-	WSDLTreeNodeEditPart targetParentEditPart = (WSDLTreeNodeEditPart) possibleParent;
-	wsdlEditor = ((WSDLComponentViewer) possibleParent.getViewer()).getWSDLEditor();
-	
-	if (pointerEditPart.getParent() != null) {
-		// Sort the siblings (and itself)
-		List targetEditPartSiblings = pointerEditPart.getParent().getChildren();
-		Collections.sort(targetEditPartSiblings, new VerticalEditPartComparator());
-  
-		// Get 'left' and 'right' siblings
-		leftSiblingEditPart = getVerticalLeftSibling(targetEditPartSiblings, movingChildEditPart, pointerLocation);
-		rightSiblingEditPart = getVerticalRightSibling(targetEditPartSiblings, movingChildEditPart, pointerLocation);           	
-
-		if (movingChildEditPart != null)
-			movingChild = (WSDLElement) movingChildEditPart.getModel();
-		if (leftSiblingEditPart != null)
-			leftSibElement = (WSDLElement) leftSiblingEditPart.getModel();
-		if (rightSiblingEditPart != null)
-			rightSibElement = (WSDLElement) rightSiblingEditPart.getModel();
-		
-		newParent = (WSDLElement) targetParentEditPart.getModel();
-	}
-	else {
-		newParent = (WSDLElement) targetParentEditPart.getModel();
-		leftSibElement = null;
-		rightSibElement= null;
-	}
-  }
-            
-  public boolean canExecute()
-  {
-    boolean result = false;
-
-    if (canNeverExecute || newParent == null || movingChild == null) {
-    	return false;
-    }
-    
-    if (movingChild instanceof Input) {
-    	if (!(leftSibElement instanceof Fault) && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-    else if (movingChild instanceof Output) {
-    	if (!(leftSibElement instanceof Fault) && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-    else if (movingChild instanceof Part) {
-    	if (newParent instanceof Message && newParent.equals(movingChild.eContainer())) {
-    		result = true;
-    	}
-    }
-
-    return result;
-  }           
-
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {                            
-//    beginRecording();
-  	if (canExecute()) {
-  		if (movingChild instanceof Input) {
-  			Input input = (Input) movingChild;
-  			OperationImpl operation = (OperationImpl) input.eContainer();
-  			
-  			if (leftSiblingEditPart == null) {
-  				// Input/Output style
-  				setInputOutputOrder(operation, true);
-  			}
-  			else {
-  				// Output/Input style
-  				setInputOutputOrder(operation, false);
-  			}
-  		}
-  		else if (movingChild instanceof Output) {
- 			Output output = (Output) movingChild;
-  			OperationImpl operation = (OperationImpl) output.eContainer();
-  			
-  			if (leftSiblingEditPart == null) {
-  				// Output/Input style
-  				setInputOutputOrder(operation, false);
-  			}
-  			else {
-  				// Input/Output style
-  				setInputOutputOrder(operation, true);
-  			}
-  		}
-  		else if (movingChild instanceof Part) {
-  			Message message = (Message) newParent;
-  			List parts = message.getEParts();
-
-  			parts.remove(movingChild);
-
-  			int leftIndex = -1, rightIndex = -1;
-  			if (leftSibElement != null) {
-  				leftIndex = parts.indexOf(leftSibElement);
-  			}
-  			if (rightSibElement != null) {
-  				rightIndex = parts.indexOf(rightSibElement);
-  			}
-
-  			if (leftIndex == -1) {
-  				// Add moving child to the front
-  				parts.add(0, movingChild);  				
-  			}
-  			else if (rightIndex == -1) {
-  				// Add moving child to the end
-  				parts.add(movingChild);
-  			}
-  			else {
-  				// Add moving child after the occurence of the left sibling
-  				parts.add(leftIndex + 1, movingChild);
-  			}
-  		}
-  		wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(movingChild));
-  	}
-//    endRecording();
-  }
-  
-  public IFigure getFeedbackFigure() {
-  	IFigure feedbackFigure = null;
-    if (feedbackFigure == null && movingChildEditPart instanceof WSDLTreeNodeEditPart)
-    {                                       
-      feedbackFigure = new Polyline();                         
-//  polyLine.setLineStyle(Graphics.LINE_DASHDOT);      
-      ((Polyline)feedbackFigure).setLineWidth(2);	
-      drawLines((Polyline) feedbackFigure);
-    }
-    
-  	return feedbackFigure;
-  }
-
-  /* Return a PointList which will be used to add a feedback figure.  The feedback figure will be a
-   * Polyline composed of the Points in the PointList
-   */
-  private PointList drawLines(Polyline polyLine) {
-    PointList pointList = new PointList(); 
-    
-    if (leftSiblingEditPart != null) {
-    	Rectangle leftRectangle = leftSiblingEditPart.getFigure().getBounds();
-	   	int xCoord = leftRectangle.x + 15;
-	  	int yCoord = leftRectangle.y;
-	   	int height = leftRectangle.height;
-	   	int width = leftRectangle.width - 15;
-
-	   	// Draw left end line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height + 3, xCoord, yCoord + height - 3);
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height - 3, xCoord, yCoord + height);
-	   	
-	   	// Draw horizontal line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + height, xCoord + width, yCoord + height);
-	   	
-	   	// Draw right end line
-	   	addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height - 3);
-	  	addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height + 3);   	
-    }
-    else if (rightSiblingEditPart != null) {
-    	Rectangle rightRectangle = rightSiblingEditPart.getFigure().getBounds();
-    	int xCoord = rightRectangle.x + 15;
-    	int yCoord = rightRectangle.y;
-   		int width = rightRectangle.width - 15;	
-
-   		// Draw left end line
-	   	addLineToPolyline(polyLine, xCoord, yCoord + 3, xCoord, yCoord - 3);
-	   	addLineToPolyline(polyLine, xCoord, yCoord - 3, xCoord, yCoord);
-	   	
-	   	// Draw horizontal line
-	   	addLineToPolyline(polyLine, xCoord, yCoord, xCoord + width, yCoord);
-	   	
-	   	// Draw right end line
-	   	addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord - 3);
-	  	addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord + 3);   
-    }
-
-    return pointList;
-  }                    
-  
-  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2) {
-	polyline.addPoint(new Point(x1, y1));
-	polyline.addPoint(new Point(x2, y2));
-
-	return polyline;
-  }                                          
-  
-  /*
-   * Pre-condition: The List siblings should be sorted by it's y-coordinate 
-   */
-  private WSDLTreeNodeEditPart getVerticalRightSibling(List siblings, WSDLTreeNodeEditPart movingEditPart, Point pointerLocation) {
-  	WSDLTreeNodeEditPart rightSibling = null;
-  	int pointerYLocation = pointerLocation.y;
-
-  	for (int index = 0; index < siblings.size(); index++) {
-  		WSDLTreeNodeEditPart sibling = (WSDLTreeNodeEditPart) siblings.get(index);
-  		int siblingYLocation = sibling.getSelectionFigure().getBounds().getCenter().y;
-
-  		if (siblingYLocation > pointerYLocation) {
-  			rightSibling = sibling;
-  			break;
-  		}
-  	}
-  	
-  	return rightSibling;
-  }
-
-  /*
-   * Pre-condition: The List siblings should be sorted by it's y-coordinate 
-   */
-  private WSDLTreeNodeEditPart getVerticalLeftSibling(List siblings, WSDLTreeNodeEditPart movingEditPart, Point pointerLocation) {
-  	WSDLTreeNodeEditPart leftSibling = null;
-  	int pointerYLocation = pointerLocation.y;
-
-  	int index;
-  	for (index = 0; index < siblings.size(); index++) {
-  		WSDLTreeNodeEditPart sibling = (WSDLTreeNodeEditPart) siblings.get(index);
-  		int siblingYLocation = sibling.getSelectionFigure().getBounds().getCenter().y;
-  	  	
-  		if (siblingYLocation > pointerYLocation) {
-  			if (index > 0) {
-  				leftSibling = (WSDLTreeNodeEditPart) siblings.get(index - 1);
-  			}
-
-  			break;
-  		}
-  	}
-
-  	if (index == siblings.size()) {
-  		leftSibling = (WSDLTreeNodeEditPart) siblings.get(index - 1);
-  	}
-
-  	return leftSibling;
-  }
-  
-  protected EditPart getParentEditPart(EditPart target)
-  {
-  	return target.getParent();
-  }
-  
-  // boolean inputFirst = true if the Input is the first in the order of Input and Output
-  private void setInputOutputOrder(OperationImpl operation, boolean inputFirst) {
-  	// We need to determine more info before we can set the style	
-  	if (inputFirst && operation.getEInput() != null) {
-  		// Check if there is an Output
-  		if (operation.getEOutput() != null) {
-  			// Order is: Input, Output
-/*  			
-  			Node operationNode = operation.getElement();		
-  			NodeList childNodeList = operationNode.getChildNodes();
-  			
-  			Node inputNode = operation.getEInput().getElement();
-  			Node outputNode = operation.getEOutput().getElement();
-  			
-  			Node inputTextNode = inputNode.getNextSibling();
-  			Node outputTextNode = outputNode.getNextSibling();
-  			
-  			int inputNodeIndex = getNodeIndex(childNodeList, inputNode);
-  			int outputNodeIndex = getNodeIndex(childNodeList, outputNode);
-  			
-  			if (inputNodeIndex > outputNodeIndex) {
-  				// We need to swap Input and Output
-  				operationNode.removeChild(inputNode);
-  				operationNode.removeChild(outputNode);
-  				
-  				operationNode.insertBefore(inputNode, outputTextNode);
-  				operationNode.insertBefore(outputNode, inputTextNode);
-  			}
-*/  			
-  			
-  			setOperationStyle(operation, OperationType.REQUEST_RESPONSE);
-  		}
-  		/*
-  		else {
-  			// Order is: Input
-  			setOperationStyle(operation, OperationType.ONE_WAY);
-  		}
-  		*/
-  	}
-  	else if (operation.getEOutput() != null) {
-  		// Check if there is an Input
-  		if (operation.getEInput() != null) {
-  			// Order is: Output, Input
-/*  			
-  			Node operationNode = operation.getElement();		
-  			NodeList childNodeList = operationNode.getChildNodes();
-  			
-  			Node inputNode = operation.getEInput().getElement();
-  			Node outputNode = operation.getEOutput().getElement();
-  			
-  			Node inputTextNode = inputNode.getNextSibling();
-  			Node outputTextNode = outputNode.getNextSibling();
-  			
-  			int inputNodeIndex = getNodeIndex(childNodeList, inputNode);
-  			int outputNodeIndex = getNodeIndex(childNodeList, outputNode);
-  			
-  			if (outputNodeIndex > inputNodeIndex) {
-  				// We need to swap Input and Output
-  				operationNode.removeChild(inputNode);
-  				operationNode.removeChild(outputNode);
-
-  				operationNode.insertBefore(inputNode, outputTextNode);
-  				operationNode.insertBefore(outputNode, inputTextNode);
-  			}
-*/  			
-  			setOperationStyle(operation, OperationType.SOLICIT_RESPONSE);
-  		}
-  		/*
-  		else {
-  			// Order is: Output
-  			setOperationStyle(operation, OperationType.NOTIFICATION);
-  		}
-  		*/
-  	}
-  }
-
-/*
- * return -1 if node is not found in the given nodeList
- */
-//	private int getNodeIndex(NodeList nodeList, Node node) {
-//		int index = 0;
-//		while (index < nodeList.getLength() && !(nodeList.item(index).equals(node))) {
-//			index++;
-//		}
-//		
-//		if (index >= nodeList.getLength()) {
-//			index = -1;
-//		}
-//		
-//		return index;
-//	}
-  
-  private void setOperationStyle(OperationImpl operation, OperationType operationType) {
-  	// If there is no style to begin with, don't set one now
-  	if (operation.getStyle() == null) {
-  		return;
-  	}
-  	
-  	operation.setStyle(operationType);
-  }
-  
-  private class VerticalEditPartComparator implements Comparator {
-  	
-  	public VerticalEditPartComparator() {
-  	}
-  	
-  	public int compare(Object part1, Object part2) {
-  		int compareValue = 0;
-
-  		if (part1 instanceof WSDLTreeNodeEditPart && part2 instanceof WSDLTreeNodeEditPart) {
-  			WSDLTreeNodeEditPart editPart1 = (WSDLTreeNodeEditPart) part1;
-  			WSDLTreeNodeEditPart editPart2 = (WSDLTreeNodeEditPart) part2;
-  			
-  			int editPart1Y = editPart1.getSelectionFigure().getBounds().getCenter().y;
-  			int editPart2Y = editPart2.getSelectionFigure().getBounds().getCenter().y;
-  			
-  			Integer integerPart1 = new Integer(editPart1Y);
-  			Integer integerPart2 = new Integer(editPart2Y);
-  			
-  			compareValue = integerPart1.compareTo(integerPart2);
-  		}
-
-  		return compareValue;
-  	}
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java
deleted file mode 100644
index 9aa7d48..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLDragSetMessageAction.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.graph.WSDLComponentViewer;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.GroupEditPart;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IConnectedFigure;
-
-public class WSDLDragSetMessageAction extends WSDLDragAction {
-	protected EditPart pointerEditPart;
-	protected WSDLElement movingChild;
-	protected WSDLElement pointerModelElement;
-	
-	public WSDLDragSetMessageAction(WSDLTreeNodeEditPart movingChildEditPart, EditPart pointerEditPart, Point pointerLocation) {
-		this.movingChildEditPart = movingChildEditPart;
-		this.pointerEditPart = pointerEditPart;
-		this.pointerLocation = pointerLocation;
-		
-		movingChild = (WSDLElement) movingChildEditPart.getModel();
-		pointerModelElement = (WSDLElement) pointerEditPart.getModel();
-		
-		// Allow the user to hover over a Part (of a Message) to set the Message
-		if (pointerModelElement instanceof Part) {
-			this.pointerEditPart = pointerEditPart.getParent();
-			pointerModelElement = (WSDLElement) this.pointerEditPart.getModel();
-		}
-	}
-
-	public boolean canExecute() {
-	    boolean result = false;
-
-	    if (pointerModelElement == null || movingChild == null) {
-	    	return false;
-	    }
-	    
-	    if (movingChild instanceof Input || movingChild instanceof Output || movingChild instanceof Fault) {
-	    	if (pointerModelElement instanceof Message) {
-	    		result = true;
-	    	}
-	    }
-
-	    return result;
-	}
-	
-	public void run() {
-		if (canExecute()) {
-			MessageReference messageReference = (MessageReference) movingChild;
-			messageReference.setEMessage((Message) pointerModelElement);
-			((WSDLElementImpl) messageReference).updateElement(true);
-			
-			WSDLEditor wsdlEditor = ((WSDLComponentViewer) pointerEditPart.getViewer()).getWSDLEditor();
-			wsdlEditor.getSelectionManager().setSelection(new StructuredSelection(movingChild));
-		}
-	}
-
-	public IFigure getFeedbackFigure() {
-		Polyline polyfigure = new Polyline();
-		GroupEditPart leftGroupEditPart = getGroupEditPart(movingChildEditPart);
-		GroupEditPart rightGroupEditPart = getGroupEditPart(pointerEditPart);
-		int mx = rightGroupEditPart.getFigure().getBounds().x - 5;                                                      
- 
-        drawLine(polyfigure, leftGroupEditPart.outputConnection.getFigure(), ((AbstractGraphicalEditPart) pointerEditPart).getFigure(), mx);
-		
-		return polyfigure;
-	}
-	
-	  protected void drawLine(Polyline feedbackFigure, IFigure a, IFigure b, int mx)
-	  {
-	        Rectangle r1 = getConnectionBounds(a);
-	        Rectangle r2 = getConnectionBounds(b);
-	        int x1 = r1.x + r1.width;
-	        int y1 = r1.y + r1.height / 2;
-	        int x2 = r2.x - 1;
-	        int y2 = r2.y + 8;
-                                          
-	        // draw horizontal line
-	       	addLineToPolyline(feedbackFigure, x1, y1, mx, y1);
-
-	        // draw horizontal line
-	       	addLineToPolyline(feedbackFigure, mx, y2, x2 - 1, y2);
-
-	        // draw the arrow head
-	       	addLineToPolyline(feedbackFigure, x2 - 1, y2, x2 - 4, y2 - 3);
-	       	addLineToPolyline(feedbackFigure, x2 - 1, y2, x2 - 4, y2 + 3);
-	  }
-
-	  protected Rectangle getConnectionBounds(IFigure figure)
-	  {                 
-	    Rectangle r = null;
-	    if (figure instanceof IConnectedFigure)
-	    {
-	      IConnectedFigure connectedFigure = (IConnectedFigure)figure;
-	      r = connectedFigure.getConnectionFigure().getBounds();
-	    }
-	    else
-	    {
-	      r = figure.getBounds();
-	    }
-	    return r; 
-	  }                      
-	  
-	  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2) {
-      	polyline.addPoint(new Point(x1, y1));
-      	polyline.addPoint(new Point(x2, y2));
-      	polyline.setLineWidth(1);
-      	//polyline.setLineStyle(Graphics.LINE_DOT);
-      	
-      	return polyline;
-	  }
-	  
-	  private GroupEditPart getGroupEditPart(EditPart editPart) {
-	  	EditPart parentPart = editPart.getParent();
-	  	
-	  	if (parentPart == null) {
-	  		return null;
-	  	}
-	  	if (!(parentPart instanceof GroupEditPart)) {
-	  		parentPart = getGroupEditPart(parentPart);
-	  	}
-	  	
-	  	return (GroupEditPart) parentPart;
-	  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java
deleted file mode 100644
index e2f287c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementAction.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentDialog;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-public abstract class WSDLElementAction extends Action
-{
-  protected WSDLElementCommand modelCommand;
-  private IEditorPart editorPart;
-  
-  public WSDLElementAction
-  	(WSDLElementCommand command,
-  	 String undoDescription,
-  	 String label,
-  	 ImageDescriptor image)
-  {
-    super(label,image);
-    modelCommand = command;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-/*
-  private String getUndoDescription()
-  {
-    return undoDescription;
-  }
-*/
-  abstract protected WSDLElement getOwner();
-  
-  abstract protected boolean showDialog();
-  
-  public void run()
-  {
-    boolean ok = showDialog();
-    if (ok)
-    {
-	    preRun();
-	    modelCommand.run();
-	    format();
-	    selectObject();
-	    postRun();
-    }
-  }
-  
-  protected void preRun()
-  {
-  }
-  
-  protected void postRun()
-  {
-  }
-/*
-  private void beginRecording()
-  {    
-    Node node = null;
-    if (getOwner() != null)
-      node = getOwner().getElement(); 
-    
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  private void endRecording()
-  {                 
-    Node node = null;
-    if (getOwner() != null)
-      node = getOwner().getElement(); 
-    
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-*/
-  protected WSDLElement getWSDLElement()
-  {
-    return modelCommand.getWSDLElement();
-  }
-  
-  private void format()
-  {
-    Node parentNode = null;
-    if (getOwner() != null)
-      parentNode = getOwner().getElement(); 
-    
-    if (parentNode instanceof IDOMNode) 
-    {
-		  // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);      
-    }
-  }
-  
-  private void selectObject()
-  {               
-    if (editorPart != null && getOwner() != null)
-    {
-      Object object = getWSDLElement();
-      if (object != null)
-      {
-        ISelectionProvider selectionProvider = (ISelectionProvider)editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }  
-    }   
-  }
-  
-  protected String showDialogHelper(String title, String defaultName)
-  {   
-    String result = defaultName;                                                                                             
-    NewComponentDialog dialog = new NewComponentDialog(WSDLEditorPlugin.getShell(), title, defaultName);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java
deleted file mode 100644
index 2382209..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLElementUIAction.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementCommand;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.w3c.dom.Node;
-
-public abstract class WSDLElementUIAction extends Action
-{
-  protected WSDLElementCommand modelAction;
-  private IEditorPart editorPart;
-  
-  public WSDLElementUIAction
-  	(WSDLElementCommand action,
-  	 String undoDescription,
-  	 String label,
-  	 ImageDescriptor image)
-  {
-    super(label,image);
-    modelAction = action;
-  }
-
-  public void setEditorPart(IEditorPart editorPart)
-  {
-    this.editorPart = editorPart;
-  }
-
-  private Node getOwnerNode()
-  {
-    if (getOwner() != null)
-      return getOwner().getElement();
-    else
-      return null;
-  }
-
-  abstract protected WSDLElement getOwner();
-  
-  abstract protected boolean showDialog();
-  
-  public void run()
-  {
-    boolean ok = showDialog();
-    if (ok)
-    {
-	    preRun();
-	    modelAction.run();
-	    format();
-	    selectObject();
-	    postRun();
-    }
-  }
-  
-  protected void preRun()
-  {
-  }
-  
-  protected void postRun()
-  {
-  }
-/*
-  private void beginRecording()
-  {    
-    Node node = getOwnerNode();  
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().beginRecording(this, getUndoDescription());  
-    }
-  }
-
-  private void endRecording()
-  {                 
-    Node node = getOwnerNode(); 
-    if (node instanceof IDOMNode)
-    {
-      ((IDOMNode)node).getModel().endRecording(this);  
-    }
-  }
-*/
-  protected WSDLElement getWSDLElement()
-  {
-    return modelAction.getWSDLElement();
-  }
-  
-  private void format()
-  {
-    Node parentNode = getOwnerNode();
-    if (parentNode instanceof IDOMNode) 
-    {
-		  // format selected node                                                    
-      FormatProcessorXML formatProcessorXML = new FormatProcessorXML();
-      formatProcessorXML.formatNode((IDOMNode)parentNode);      
-    }
-  }
-  
-  private void selectObject()
-  {               
-    if (editorPart != null && getOwner() != null)
-    {
-      Object object = getWSDLElement();
-      if (object != null)
-      {
-        ISelectionProvider selectionProvider = (ISelectionProvider)editorPart.getAdapter(ISelectionProvider.class);
-        if (selectionProvider != null)
-        {
-          selectionProvider.setSelection(new StructuredSelection(object));
-        }
-      }  
-    }   
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java
deleted file mode 100644
index ce494be..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuActionContributor.java
+++ /dev/null
@@ -1,1148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.internal.util.WSDLSwitch;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddInputCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddMessageCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOperationCommand;
-import org.eclipse.wst.wsdl.ui.internal.commands.AddOutputCommand;
-import org.eclipse.wst.wsdl.ui.internal.extension.IMenuActionContributor;
-import org.eclipse.wst.wsdl.ui.internal.graph.editparts.WSDLTreeNodeEditPart;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.CreateWSDLElementHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.ui.internal.widgets.NewComponentWithChildDialog;
-import org.eclipse.wst.wsdl.ui.internal.wizards.BindingWizard;
-import org.eclipse.wst.wsdl.ui.internal.wizards.PortWizard;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class WSDLMenuActionContributor implements IMenuActionContributor
-{
-  protected AddEEMenuActionContributor addEEMenuActionContributor;
-  IEditorPart editorPart;
-
-  public WSDLMenuActionContributor(IEditorPart editorPart)
-  {
-    addEEMenuActionContributor = new AddEEMenuActionContributor();
-    this.editorPart = editorPart;
-  }
-
-  protected static List createList(Action action)
-  {
-    List list = new ArrayList();
-    list.add(action);
-    return list;
-  }
-  
-	private class OpenSchemaOnSelectionHelper extends Action {
-		Object object;
-		
-		public OpenSchemaOnSelectionHelper(Object object) {
-			setText(WSDLEditorPlugin.getWSDLString("_UI_OPEN_IMPORT"));
-			this.object = object;
-			
-			if (object instanceof Import) {
-				String location = ((Import) object).getLocationURI();
-				
-				if (location == null || location.trim().equals(""))
-					setEnabled(false);
-			}
-		}
-		
-		public void run() {
-			Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-			org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper helper = new org.eclipse.wst.wsdl.ui.internal.util.OpenOnSelectionHelper(definition);
-		    helper.openEditor((org.eclipse.emf.ecore.EObject) object);
-		}
-	}
-
-  public void contributeMenuActions(final IMenuManager menu, final Node node, Object object)
-  {
-    final IMenuManager addMenu;
-    boolean addEditAction = false;
-    final boolean isEditable = (node instanceof IDOMNode);
-    if (object instanceof WSDLElement && node != null && isEditable)
-    {
-      addEditAction = true;
-      addMenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_CHILD"), "addchild"); //$NON-NLS-1$ //$NON-NLS-2$
-      menu.add(addMenu);
-      Definition definition = ((WSDLElement) object).getEnclosingDefinition();
-
-      final String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-
-      if (object instanceof Import) {
-      	menu.add(new OpenSchemaOnSelectionHelper(object));
-      }
-      
-      WSDLSwitch wsdlSwitch = new WSDLSwitch()
-      {
-        public Object caseBinding(Binding binding)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddBindingOperationAction(node, "NewBindingOperation", prefix)); //$NON-NLS-1$
-            menu.add(new Separator());
-          }
-          
-          menu.add(createSetPortTypeMenu(binding, isEditable));
-          menu.add(new GenerateBindingContentAction(binding, isEditable));
-          return null;
-        }
-
-        public Object caseBindingOperation(BindingOperation bindingOperation)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddBindingInputAction(editorPart, node, prefix));
-            menu.add(new AddBindingOutputAction(editorPart, node, prefix));
-            menu.add(new AddBindingFaultAction(node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseDefinition(Definition definition)
-        {
-           menu.add(new EditNamespacesAction(definition));
-           menu.add(new Separator());
-        	
-          if (isEditable)
-          {
-            menu.add(new AddMessageAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddServiceAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddPortTypeAction(definition, null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            menu.add(new AddBindingAction(definition, ((WSDLEditor) editorPart).getXMLDocument()));//, null, node, prefix));
-            menu.add(new AddImportAction(editorPart, definition, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseFault(Fault fault)
-        {
-          menu.add(createSetMessageMenu(fault, isEditable));
-          //menu.add(createAddBindingMenuForIOF(fault));
-          return null;
-        }
-
-        public Object caseInput(Input input)
-        {
-          menu.add(createSetMessageMenu(input, isEditable));
-          //menu.add(createAddBindingMenuForIOF(input));
-          return null;
-        }
-
-        public Object caseOutput(Output output)
-        {
-          menu.add(createSetMessageMenu(output, isEditable));
-          //menu.add(createAddBindingMenuForIOF(output));
-          return null;
-        }
-
-        public Object caseMessage(Message message)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddPartAction(editorPart, message, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseOperation(Operation operation)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddInputAction(editorPart, node, operation, prefix));
-            menu.add(new AddOutputAction(editorPart, node, operation, prefix));
-            menu.add(new AddFaultAction(editorPart, node, operation, prefix));
-          }
-          //menu.add(createAddBindingMenuForOperation(operation));
-          return null;
-        }
-
-        public Object casePart(Part part)
-        {
-          menu.add(createSetPartMenu(part, (Element) node, "element", isEditable)); //$NON-NLS-1$
-          menu.add(createSetPartMenu(part, (Element) node, "type", isEditable)); //$NON-NLS-1$
-          return null;
-        }
-
-        public Object casePort(Port port)
-        {
-          if (node instanceof Element)
-          {
-            menu.add(createSetBindingMenu(port, (Element) node, isEditable));
-            if (port.getEBinding() != null)
-            {
-              menu.add(createSetPortTypeMenu(port.getEBinding(), isEditable));
-            }
-          }
-          return null;
-        }
-
-        public Object casePortType(PortType portType)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddOperationAction(editorPart, portType, node, prefix));
-          }
-          return null;
-        }
-
-        public Object caseService(Service service)
-        {
-          if (isEditable)
-          {
-            menu.add(new AddPortAction(service));
-          }
-          return null;
-        }
-
-        //public Object caseTypes(Types types)
-        //{   
-        //  return createTypesAdapter();
-        // } 
-      };
-      wsdlSwitch.doSwitch((WSDLElement) object);
-    }
-    else if (object instanceof WSDLGroupObject)
-    {
-      addMenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_CHILD"), "addchild"); //$NON-NLS-1$ //$NON-NLS-2$
-      menu.add(addMenu);
-      
-      WSDLGroupObject groupObject = (WSDLGroupObject) object;
-      Definition definition = groupObject.getDefinition();
-
-      final String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-
-      //for (Iterator i = actionList.iterator(); i.hasNext(); )
-      //{                           
-      //  Action action = (Action)i.next();
-      //  manager.add(action); 
-      //}
-
-      switch (groupObject.getType())
-      {
-        case WSDLGroupObject.MESSAGES_GROUP :
-          {
-            menu.add(new AddMessageAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.SERVICES_GROUP :
-          {
-            menu.add(new AddServiceAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.PORT_TYPES_GROUP :
-          {
-            menu.add(new AddPortTypeAction(groupObject.getDefinition(), null, node, prefix, ((WSDLEditor) editorPart).getXMLDocument()));
-            break;
-          }
-        case WSDLGroupObject.BINDINGS_GROUP :
-          {
-            menu.add(new AddBindingAction(groupObject.getDefinition(), ((WSDLEditor) editorPart).getXMLDocument()));//, null, node, prefix));
-            break;
-          }
-        case WSDLGroupObject.IMPORTS_GROUP :
-          {
-            menu.add(new AddImportAction(editorPart, groupObject.getDefinition(), node, prefix));
-            break;
-          }
-      }
-    }
-
-    menu.add(new Separator());
-    
-   	addEEMenuActionContributor.contributeMenuActions(menu, node, object);
-
-    menu.add(new Separator());
-
-    if (object instanceof WSDLElement && node != null && addEditAction && node != null && isEditable)
-    {
-      //////////////////////////////////////// Currently, only allow Copy and Paste on Operations
-    	if (object instanceof Operation) {
-    		// Add Cut, Copy Actions
-    		// Note:  The Cut, Copy, Paste Actions are Model Driven.  The Delete Action is still
-    		// currently DOM driven.
-    		//      menu.add(new CutAction((WSDLElement) object, editorPart));
-   		 	menu.add(new CopyGlobalAction((WSDLElement) object, editorPart));
-    	}
-
-   	 	Action pasteAction = new PasteGlobalAction((WSDLElement) object, editorPart);
-   	 	if (pasteAction.isEnabled()) {
-   	 		menu.add(pasteAction);
-   	 	}
-   	 	
-	 	menu.add(new Separator());
-      //////////////////////////////////////// Currently, only allow Copy and Paste on Operations
-		
-		// Get the list of selected elements.  Use this list for the DeleteAction.		
-		IStructuredSelection selectionList = (IStructuredSelection) ((WSDLEditor) editorPart).getSelectionManager().getSelection();	
-		Action deleteAtion = new DeleteWSDLAndXSDAction(selectionList.toList(), node, (WSDLEditor) editorPart);
-		menu.add(deleteAtion);
-		deleteAtion.setEnabled(isEditable);
-    }
-       
-    // insertion point for popupMenus extension
-    menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-  }
-
-  /*
-  protected MenuManager createAddBindingMenuForOperation(Operation operation) 
-  {
-    MenuManager subMenu = new MenuManager("Add Binding");                    
-  
-    Definition definition = operation.getEnclosingDefinition(); 
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-  
-    String operationName = operation.getName();
-    if (operationName != null)
-    {       
-      for (Iterator i = util.getBindings(operation).iterator(); i.hasNext(); )
-      {   
-        Binding binding = (Binding)i.next();
-            
-        BindingOperation matchingBindingOperation = null;
-  
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext(); )
-        {
-          BindingOperation bindingOperation = (BindingOperation)j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          { 
-            matchingBindingOperation = bindingOperation;
-            break;
-          }
-        }         
-  
-        if (matchingBindingOperation == null)
-        {                                                                            
-          Element bindingElement = WSDLUtil.getInstance().getElementForObject(binding);
-          subMenu.add(new AddBindingOperationAction(bindingElement, operation, prefix));
-        }    
-      }
-    }
-    return subMenu;
-  }*/
-
-  /*
-  protected MenuManager createAddBindingMenuForIOF(WSDLElement iof) 
-  {
-    MenuManager subMenu = new MenuManager("Add Binding");                    
-  
-    Definition definition = iof.getEnclosingDefinition(); 
-    Operation operation = (Operation)iof.eContainer();
-  
-    ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-  
-    String operationName = operation.getName();
-    if (operationName != null)
-    {  
-      for (Iterator i = util.getBindings(operation).iterator(); i.hasNext(); )
-      {   
-        Binding binding = (Binding)i.next();
-  
-        boolean hasName = false;
-        for (Iterator j = binding.getBindingOperations().iterator(); j.hasNext(); )
-        {
-          BindingOperation bindingOperation = (BindingOperation)j.next();
-          if (operationName.equals(bindingOperation.getName()))
-          {
-            hasName = true;
-            break;
-          }
-        }         
-  
-        if (!hasName)
-        {                                                                            
-          // TODO... should we add the operation to all of the bindings?
-          //
-          Element bindingElement = WSDLUtil.getInstance().getElementForObject(binding);
-          subMenu.add(new AddBindingOperationAction(bindingElement, operationName));
-        }
-      }
-    }
-    return subMenu;
-  }
-  */
-
-  protected MenuManager createSetBindingMenu(Port port, Element portElement, boolean isEditable)
-  {
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_BINDING"));
-
-    Definition definition = port.getEnclosingDefinition();
-    String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
-    SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_BINDING"), definitionElement, prefix, "binding", port);
-    setNewAction.setEditor(editorPart);
-    setNewAction.setEnabled(true);
-    submenu.add(setNewAction);     
-    
-    SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_BINDING"), definitionElement, prefix, "binding", port);
-    action.setEditor(editorPart);
-    action.setEnabled(isEditable);
-    submenu.add(action);
-    
-    return submenu;
-  }
-
-  protected MenuManager createSetPortTypeMenu(Binding binding, boolean isEditable)
-  {      
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_PORTTYPE"));
-
-    if (binding != null)
-    {
-      Definition definition = binding.getEnclosingDefinition();
-      Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-      String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-	  
-      SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PORTTYPE"), definitionElement, prefix, "portType", binding);
-      setNewAction.setEditor(editorPart);
-      setNewAction.setEnabled(true);
-      submenu.add(setNewAction);      
-
-      SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_PORTTYPE"), definitionElement, prefix, "portType", binding);
-      action.setEditor(editorPart);
-      action.setEnabled(isEditable);      
-      submenu.add(action);
-    }
-    return submenu;
-  }
-
-  protected MenuManager createSetMessageMenu(WSDLElement wsdlElement, boolean isEditable)
-  {
-    Definition definition = wsdlElement.getEnclosingDefinition();
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-    Element referencingElement = WSDLEditorUtil.getInstance().getElementForObject(wsdlElement);
-	
-    MenuManager submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_MESSAGE"));
-    if (definitionElement != null && referencingElement != null)
-    {
-      String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-      
-      SetNewComponentAction setNewAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), definitionElement, prefix, "message", wsdlElement);
-      setNewAction.setEditor(editorPart);
-      setNewAction.setEnabled(true);
-      submenu.add(setNewAction);  
-      
-      SetExistingComponentAction action = new SetExistingComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_MESSAGE"), definitionElement, prefix, "message", wsdlElement);
-      action.setEditor(editorPart);
-      action.setEnabled(isEditable);
-      submenu.add(action);
-    }
-    
-    return submenu;
-  }
-
-  protected MenuManager createSetPartMenu(Part part, Element portElement, String referenceKind, boolean isEditable)
-  {
-    Definition definition = part.getEnclosingDefinition();
-    String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-    Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-
-    String actionName;
-    MenuManager submenu = null;
-    if (referenceKind.equalsIgnoreCase("element")) // NON NLS
-    {
-      actionName = WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_ELEMENT");
-      submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_ELEMENT"));
-	  
-      SetNewComponentAction setNewElementAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_ELEMENT"), definitionElement, prefix, "element", part);
-      setNewElementAction.setEditor(editorPart);
-      setNewElementAction.setEnabled(true);
-      setNewElementAction.setReferenceKind(referenceKind);
-      submenu.add(setNewElementAction);
-    }
-    else
-    {
-      actionName = WSDLEditorPlugin.getWSDLString("_UI_ACTION_EXISTING_TYPE");
-      submenu = new MenuManager(WSDLEditorPlugin.getWSDLString("_UI_ACTION_SET_TYPE"));
-      
-      SetNewComponentAction setNewComplexAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_COMPLEX_TYPE"), definitionElement, prefix, "complex type", part);
-      setNewComplexAction.setEditor(editorPart);
-      setNewComplexAction.setEnabled(true);
-      setNewComplexAction.setReferenceKind(referenceKind);
-      setNewComplexAction.setTypeKind("complex");
-      Image image = XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-      setNewComplexAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
-      submenu.add(setNewComplexAction);
-      
-      SetNewComponentAction setNewSimpleAction = new SetNewComponentAction(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_SIMPLE_TYPE"), definitionElement, prefix, "simple type", part);
-      setNewSimpleAction.setEditor(editorPart);
-      setNewSimpleAction.setEnabled(true);
-      setNewSimpleAction.setReferenceKind(referenceKind);
-      setNewSimpleAction.setTypeKind("simple");
-      image = XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-      setNewSimpleAction.setImageDescriptor(ImageDescriptor.createFromImage(image));
-
-      submenu.add(setNewSimpleAction); 
-    }
-
-    
-    SetExistingComponentAction action = new SetExistingComponentAction(actionName, definitionElement, prefix, actionName, part);
-    action.setReferenceKind(referenceKind);
-    action.setEditor(editorPart);
-    action.setEnabled(isEditable);
-    submenu.add(action);
-    
-    return submenu;
-  }
-  
-//  private WSDLElement showPasteAction(WSDLElement element, IEditorPart ePart) {
-//  	WSDLElement parentElement = null;
-//  	
-//  	if (ePart instanceof WSDLEditor) {
-//  		WSDLElement clipboardElement = ((WSDLEditor) ePart).getClipboardContents();
-//  		
-//  		if (element instanceof PortType) {
-//  			if (clipboardElement instanceof Operation) {
-//  				parentElement = element;
-//  			}
-//  		}
-//  		if (element instanceof Operation) {
-//  			if (clipboardElement instanceof Operation) {
-//  				parentElement = (WSDLElement) ((Operation) element).eContainer();
-//  			}
-//  		}
-//  	}
-//  	
-//  	return parentElement;
-//  }
-}
-
-class AddBindingOperationAction extends AddElementAction
-{
-  protected String name;
-  protected Operation operation;
-
-  public AddBindingOperationAction(Node parentNode, String name, String prefix)
-  {
-    // super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD") + " " + WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_OPERATION"), "icons/operationbinding_obj.gif", parentNode, prefix, "operation");
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING_OPERATION"), "icons/operationbinding_obj.gif", parentNode, prefix, "operation");
-    this.name = name;
-  }
-
-  public AddBindingOperationAction(Node parentNode, Operation operation, String prefix)
-  {
-    this(parentNode, operation.getName(), prefix);
-    this.operation = operation;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-
-  protected void performAddElement()
-  {
-    super.performAddElement();
-
-    if (operation != null)
-    {
-      if (operation.getInput() != null)
-      {
-        new AddBindingInputAction(editorPart, newElement, prefix).run();
-      }
-      if (operation.getOutput() != null)
-      {
-        new AddBindingOutputAction(editorPart, newElement, prefix).run();
-      }
-      for (Iterator i = operation.getEFaults().iterator(); i.hasNext();)
-      {
-        Fault fault = (Fault) i.next();
-        new AddBindingFaultAction(newElement, fault, prefix).run();
-      }
-      format(operation.getElement());
-    }
-  }
-}
-
-
-class AddOperationAction extends AddElementAction
-{
-  protected String name = "NewOperation";
-  protected PortType portType;
-  protected boolean createSubComponents = false;
-
-  public AddOperationAction(IEditorPart editorPart, PortType portType, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OPERATION"), "icons/operation_obj.gif", parentNode, prefix, "operation");
-    setEditorPart(editorPart);
-    setDefinition(portType.getEnclosingDefinition());
-    this.portType = portType;
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueOperationName(portType);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_OPERATION"), name, NameUtil.getUsedOperationNames(portType));
-    return name != null;
-  }
-
-//  protected void addAttributes(Element newElement)
-//  {
-//    newElement.setAttribute("name", name);
-//  }
-
-  protected void performAddElement()
-  {
-  	if (createSubComponents) {
-  	  	CreateWSDLElementHelper.operationName = name;
-  	  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  		Operation operation = CreateWSDLElementHelper.createOperation(portType);
-  		format(operation.getElement());  		
-  		selectObject(operation);
-  		expandEditParts(operation,true);
-  	}
-  	else {
-  		// Add Operation
-  		AddOperationCommand opAction = new AddOperationCommand(portType, name);
-		opAction.run();
-		Operation operation = (Operation) opAction.getWSDLElement();
-		
-		// Add Output
-  		AddOutputCommand outAction = new AddOutputCommand(operation, NameUtil.buildUniqueInputName(portType, operation.getName(), ""));
-  		outAction.run();
-  		
-		// Add Input
-		AddInputCommand inAction = new AddInputCommand(operation, NameUtil.buildUniqueOutputName(portType, operation.getName(), ""));
-  		inAction.run();
-
-  		format(operation.getElement());
-
- 	  	selectObject(operation);
- 	  	expandEditParts(operation, true);
-  	}
-  }
-
-	private void expandEditParts(Object element, boolean expandChildren) {
-	    if (element != null) {
-	    	EditPartViewer editPartViewer = ((WSDLEditor) editorPart).getGraphViewer().getComponentViewer();
-	    	Map editPartMap = editPartViewer.getEditPartRegistry();
-	    	WSDLTreeNodeEditPart wsdlEditPart = (WSDLTreeNodeEditPart) editPartMap.get(element);
-			wsdlEditPart.setExpanded(true);
-			
-			if (expandChildren) {
-				Iterator iterator = WSDLEditorUtil.getModelGraphViewChildren(element).iterator();
-				
-				while (iterator.hasNext()) {
-					expandEditParts(iterator.next(), expandChildren);
-				}
-			}
-	    }
-	}
-
-  public String showDialogHelper(String title, String defaultName, List usedNames)
-  {   
-    String result = defaultName; 
-    NewComponentWithChildDialog dialog = new NewComponentWithChildDialog(WSDLEditorPlugin.getShell(), title, defaultName, usedNames);
-    int rc = dialog.createAndOpen();
-    if (rc == IDialogConstants.OK_ID)
-    {
-      result = dialog.getName();  
-      createSubComponents = dialog.createSubComponents();
-    }
-    else
-    {
-      result = null;
-    }               
-    return result;
-  }
-}
-
-abstract class AddIOFAction extends AddElementAction
-{
-  protected Operation operation;
-
-  public AddIOFAction(IEditorPart editorPart, String text, String imageDescriptorKey, Node parentNode, String prefix, String localName, Operation operation)
-  {
-    super(text, imageDescriptorKey, parentNode, prefix, localName);
-    this.operation = operation;
-    setEditorPart(editorPart);
-    setDefinition(operation.getEnclosingDefinition());
-  }
-
-  abstract protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement);
-
-  /*
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("message", "");
-  }
-  */
-
-  protected void performAddElement()
-  {
-    if (operation != null)
-    {
-      Definition definition = operation.getEnclosingDefinition();
-      ComponentReferenceUtil util = new ComponentReferenceUtil(definition);
-
-      for (Iterator i = util.getBindingOperations(operation).iterator(); i.hasNext();)
-      {
-        BindingOperation bindingOperation = (BindingOperation) i.next();
-        Element bindingOperationElement = WSDLEditorUtil.getInstance().getElementForObject(bindingOperation);
-        if (bindingOperationElement != null)
-        {
-          performAddElementToBindingOperation(bindingOperation, bindingOperationElement);
-        }
-      }
-      format(operation.getElement());
-    }
-  }
-}
-
-class AddInputAction extends AddIOFAction
-{
-  public AddInputAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_INPUT"), "icons/input_obj.gif", parentNode, prefix, "input", operation);
-  }
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingInput() == null)
-    {
-      new AddBindingInputAction(editorPart, bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	PortType portType = (PortType) ((WSDLElementImpl) operation).getContainer();
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  	Input input = CreateWSDLElementHelper.createInput(portType, operation, null); 
-  	format(input.getElement());
-  	selectObject(input);
-  }
-}
-
-class AddOutputAction extends AddIOFAction
-{
-  public AddOutputAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OUTPUT"), "icons/output_obj.gif", parentNode, prefix, "output", operation);
-  }
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingOutput() == null)
-    {
-      new AddBindingOutputAction(editorPart, bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	// Determine Part info
-  	PortType portType = (PortType) ((WSDLElementImpl) operation).getContainer();
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(portType);
-  	Output output = CreateWSDLElementHelper.createOutput(portType, operation); 
-  	format(output.getElement());
-  	selectObject(output);
-  }
-}
-
-class AddFaultAction extends AddIOFAction
-{
-  protected String name = "NewFault";
-  public AddFaultAction(IEditorPart editorPart, Node parentNode, Operation operation, String prefix)
-  {
-    super(editorPart, WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_FAULT"), "icons/fault_obj.gif", parentNode, prefix, "fault", operation);
-    name = NameUtil.buildUniqueFaultName(operation);
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueFaultName(operation);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_FAULT"), name, NameUtil.getUsedFaultNames(operation));
-    return name != null;
-  }
-
-  /*
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("message", "");
-    newElement.setAttribute("name", name);
-  }
-  */
-
-  protected void performAddElementToBindingOperation(BindingOperation bindingOperation, Element bindingOperationElement)
-  {
-    if (bindingOperation.getBindingFault(name) == null)
-    {
-      new AddBindingFaultAction(bindingOperationElement, prefix).run();
-    }
-  }
-  
-  protected void performAddElement() {
-  	CreateWSDLElementHelper.faultName = name;
-  	CreateWSDLElementHelper.PART_TYPE_OR_DEFINITION = CreateWSDLElementHelper.getPartInfo(operation);
-  	Fault fault = CreateWSDLElementHelper.createFault(operation);
-  	format(fault.getElement());  	
-  	selectObject(fault);
-  }
-}
-
-class AddBindingInputAction extends AddElementAction
-{
-  public AddBindingInputAction(IEditorPart editorPart, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_INPUT"), "icons/input_obj.gif", parentNode, prefix, "input");
-    setEditorPart(editorPart);
-  }
-}
-
-class AddBindingOutputAction extends AddElementAction
-{
-  public AddBindingOutputAction(IEditorPart editorPart, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_OUTPUT"), "icons/output_obj.gif", parentNode, prefix, "output");
-    setEditorPart(editorPart);
-  }
-}
-
-class AddBindingFaultAction extends AddElementAction
-{
-  protected Fault fault;
-
-  public AddBindingFaultAction(Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_FAULT"), "icons/fault_obj.gif", parentNode, prefix, "fault");
-  }
-
-  public AddBindingFaultAction(Node parentNode, Fault fault, String prefix)
-  {
-    this(parentNode, prefix);
-    this.fault = fault;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    if (fault == null)
-    {
-      newElement.setAttribute("name", "NewFault");
-    }
-    else
-    {
-      newElement.setAttribute("name", fault.getName());
-    }
-  }
-}
-
-class AddMessageAction extends AddElementAction
-{
-  protected Definition definition;
-  protected String name;
-
-  public AddMessageAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_MESSAGE"), "icons/message_obj.gif", parentNode, prefix, "message");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddMessageAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_MESSAGE"), "icons/message_obj.gif", parentNode, prefix, "message");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-  
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniqueMessageName(definition, name);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_MESSAGE"), name, NameUtil.getUsedMessageNames(definition));
-    return name != null;
-  }
-
-//  protected void addAttributes(Element newElement)
-//  {
-//    newElement.setAttribute("name", name);
-//  }
-  
-  protected void performAddElement() {
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null|| list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	AddMessageCommand action = new AddMessageCommand(definition, name);
-	action.run();
-	Message message = (Message) action.getWSDLElement();
-	CreateWSDLElementHelper.createPart(message);
-	format(message.getElement());
-	selectObject(message);
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-}
-
-class AddPartAction extends AddElementAction
-{
-  protected Message message;
-  protected String name;
-
-  public AddPartAction(IEditorPart editorPart, Message message, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PART"), "icons/part_obj.gif", parentNode, prefix, "part");
-    this.message = message;
-    setEditorPart(editorPart);
-    setDefinition(message.getEnclosingDefinition());
-  }
-
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniquePartName(message, message.getQName().getLocalPart());
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PART"), name, NameUtil.getUsedPartNames(message));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-    String xsdPrefix = message.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-    if (xsdPrefix == null)
-    {
-    	Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(message.getEnclosingDefinition());    	
-        new AddNamespaceDeclarationsAction(definitionElement, WSDLConstants.XSD_NAMESPACE_URI, "xsd").run();
-		xsdPrefix = message.getEnclosingDefinition().getPrefix(WSDLConstants.XSD_NAMESPACE_URI);
-    }
-			
-    String defaultTypeName = "string";
-    if (xsdPrefix != null && xsdPrefix.length() > 0)
-    {
-      defaultTypeName = xsdPrefix + ":" + defaultTypeName;
-    }
-    newElement.setAttribute("type", defaultTypeName);
-  }
-}
-
-class AddServiceAction extends AddElementAction
-{
-  protected String name;
-  protected Definition definition;
-
-  public AddServiceAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SERVICE"), "icons/service_obj.gif", parentNode, prefix, "service");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddServiceAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_SERVICE"), "icons/service_obj.gif", parentNode, prefix, "service");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public boolean showDialog()
-  {
-    if (name == null)
-    {
-      name = NameUtil.buildUniqueServiceName(definition);
-    }
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_SERVICE"), name, NameUtil.getUsedServiceNames(definition));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-  
-  protected void performAddElement() {  	
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null || list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
-
-class AddPortTypeAction extends AddElementAction
-{
-  protected String name;
-  protected Definition definition;
-
-  public AddPortTypeAction(Definition definition, String name, Node parentNode, String prefix)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORTTYPE"), "icons/porttype_obj.gif", parentNode, prefix, "portType");
-    this.definition = definition;
-    this.name = name;
-    setComputeTopLevelRefChild(true);
-  }
-
-  public AddPortTypeAction(Definition definition, String name, Node parentNode, String prefix, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORTTYPE"), "icons/porttype_obj.gif", parentNode, prefix, "portType");
-    this.definition = definition;
-    this.name = name;
-    this.setDefinition(definition);
-    this.document = document;
-    setComputeTopLevelRefChild(true);
-  }
-  
-  public boolean showDialog()
-  {
-    name = NameUtil.buildUniquePortTypeName(definition, name);
-    name = showDialogHelper(WSDLEditorPlugin.getWSDLString("_UI_ACTION_NEW_PORTTYPE"), name, NameUtil.getUsedPortTypeNames(definition));
-    return name != null;
-  }
-
-  protected void addAttributes(Element newElement)
-  {
-    newElement.setAttribute("name", name);
-  }
-
-  public String getPortTypeName()
-  {
-    return name;
-  }
-  
-  protected void performAddElement() {
-  	NodeList list = document.getChildNodes();
-  	if (parentNode == null || list.getLength() == 0) {
-  		createDefinitionStub();
-  	}
-  	
-  	super.performAddElement();
-  }
-}
-
-class AddBindingAction extends Action
-{
-  protected Definition definition;
-  protected Document document;
-
-  public AddBindingAction(Definition definition, Document document)
-  {
-    super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_BINDING"), ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/binding_obj.gif")); //$NON-NLS-1$
-    //setToolTipText(WSDLEditorPlugin.getInstance().getWSDLString("_UI_LABEL_BINDING_WIZARD")); //$NON-NLS-1$
-    this.definition = definition;
-    this.document = document;
-  }
-
-  public void run()
-  {
-    BindingWizard wizard = new BindingWizard(definition, document);
-    WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-    wizardDialog.create();
-
-    int result = wizardDialog.open();
-
-    if (result == Window.OK)
-    {
-      //todo...      
-    }
-  }
-}
-
-class AddPortAction extends Action
-{
-	protected Service service;
-
-	public AddPortAction(Service service)
-	{
-		super(WSDLEditorPlugin.getWSDLString("_UI_ACTION_ADD_PORT"), ImageDescriptor.createFromFile(WSDLEditorPlugin.class, "icons/binding_obj.gif")); //$NON-NLS-1$
-		//setToolTipText(WSDLEditorPlugin.getInstance().getWSDLString("_UI_LABEL_BINDING_WIZARD")); //$NON-NLS-1$
-		this.service = service;
-	}
-
-	public void run()
-	{
-		PortWizard wizard = new PortWizard(service);
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.create();
-
-		int result = wizardDialog.open();
-		if (result == Window.OK)
-		{
-			//todo...      
-		}
-	}
-}
-
-class GenerateBindingContentAction extends Action
-{
-	protected Binding binding;
-	public GenerateBindingContentAction(Binding binding, boolean isEditable)
-	{
-		super(WSDLEditorPlugin.getWSDLString("_UI_GENERATE_BINDING_CONTENT"));
-		this.binding = binding;
-		setEnabled(isEditable);
-	}
-	
-	public void run()
-	{
-		BindingWizard wizard = new BindingWizard(binding.getEnclosingDefinition(), binding, BindingWizard.KIND_REGENERATE_BINDING);
-		wizard.setBindingName(ComponentReferenceUtil.getName(binding));
-		wizard.setPortTypeName(ComponentReferenceUtil.getPortTypeReference(binding));
-		WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
-		wizardDialog.create();
-		wizardDialog.open();	
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java
deleted file mode 100644
index a71c238..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/actions/WSDLMenuListener.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.actions;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.eclipse.wst.wsdl.ui.internal.model.WSDLGroupObject;
-import org.w3c.dom.Node;
-
-
-public class WSDLMenuListener implements IMenuListener
-{                      
-  protected ISelectionProvider selectionProvider;
-  protected ExtensibleMenuActionContributor extensibleMenuActionContributor;
-
-  public WSDLMenuListener(WSDLEditor editor, ISelectionProvider selectionProvider)
-  {
-    super();                                                               
-    this.extensibleMenuActionContributor = new ExtensibleMenuActionContributor(editor);
-    this.selectionProvider = selectionProvider;              
-  }
-      
-  protected Object getSelectedObject()
-  {      
-    ISelection selection = selectionProvider.getSelection();    
-    return selection.isEmpty() ? null : ((IStructuredSelection)selection).getFirstElement();   
-  }
-
-  public void menuAboutToShow(IMenuManager manager)
-  {                                                                                         
-    Object object = getSelectedObject();
-    Node node = null;
-    if (object instanceof Node)
-    {
-      node = (Node)object;
-    }
-    else if (object instanceof WSDLElement)
-    {
-      node = ((WSDLElement)object).getElement();   
-    }                                                                            
-    else if (object instanceof WSDLGroupObject)
-    {
-      node =  ((WSDLGroupObject)object).getDefinition().getElement();
-    }
-    extensibleMenuActionContributor.contributeMenuActions(manager, node, object);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java
deleted file mode 100644
index 899817a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddBindingCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Binding binding;
- 
-  public AddBindingCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-  
-  public WSDLElement getWSDLElement()
-  {
-    return binding;
-  }
-
-  public void run()
-  {
-    binding = WSDLFactory.eINSTANCE.createBinding();
-    binding.setQName(new QName(definition.getTargetNamespace(),localName));
-    binding.setEnclosingDefinition(definition);
-    definition.addBinding(binding);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java
deleted file mode 100644
index c8e02ae..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingFaultCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingFaultCommand extends WSDLElementCommand
-{
-  BindingFault bindingFault;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingFaultCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingFault = WSDLFactory.eINSTANCE.createBindingFault();
-    bindingFault.setName(name); 
-    bindingFault.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.addBindingFault((BindingFault)bindingFault);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingFault;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java
deleted file mode 100644
index 5303b44..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingInputCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingInput;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingInputCommand extends WSDLElementCommand
-{
-  BindingInput bindingInput;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingInputCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingInput = WSDLFactory.eINSTANCE.createBindingInput();
-    bindingInput.setName(name); 
-    bindingInput.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.setBindingInput((BindingInput)bindingInput);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingInput;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java
deleted file mode 100644
index 45e0f96..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOperationCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingOperationCommand extends WSDLElementCommand
-{
-  private Binding binding;
-  
-  private String name;
-  private String bindingInputName = "";
-  private String bindingOutputName = "";
-  private String bindingFaultName ="";
-  
-  private BindingOperation bindingOperation;
-  
-  private boolean createBindingInput = false;
-  private boolean createBindingOutput = false;
-  private boolean createBindingFault = false;
-  
-  public AddBindingOperationCommand(Binding binding,String name)
-  {
-    this.binding = binding;
-    this.name = name;
-  }
-  
-  public AddBindingOperationCommand
-    (Binding binding,  
-     String name,
-     boolean createBindingInput,
-     boolean createBindingOutput,
-     boolean createBindingFault)
-  {
-    this.binding = binding;
-    this.name = name;
-    this.createBindingInput = createBindingInput;
-    this.createBindingOutput = createBindingOutput;
-    this.createBindingFault = createBindingFault;
-  }
-    
-  public void run()
-  {
-    bindingOperation = WSDLFactory.eINSTANCE.createBindingOperation();
-    bindingOperation.setName(name);
-    bindingOperation.setEnclosingDefinition(binding.getEnclosingDefinition());
-    binding.addBindingOperation(bindingOperation);
-
-    WSDLElementCommand command = null;
-    if (createBindingInput)
-    {
-      command = new AddBindingInputCommand(bindingOperation,bindingInputName);
-      command.run();
-    }
-
-    if (createBindingOutput)
-    {
-      command = new AddBindingOutputCommand(bindingOperation,bindingOutputName);
-      command.run();
-    }
-
-    if (createBindingFault)
-    {
-      command = new AddBindingFaultCommand(bindingOperation,bindingFaultName);
-      command.run();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingOperation;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public void setBindingInputName(String name)
-  {
-    this.bindingInputName = name;
-  }
-  
-  public void setBindingOutputName(String name)
-  {
-    this.bindingOutputName = name;
-  }
-  
-  public void setBindingFaultName(String name)
-  {
-    this.bindingFaultName = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java
deleted file mode 100644
index 4286b6c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddBindingOutputCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.BindingOutput;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddBindingOutputCommand extends WSDLElementCommand
-{
-  BindingOutput bindingOutput;
-  BindingOperation bindingOperation;
-  String name;
-  
-  public AddBindingOutputCommand(BindingOperation bindingOperation, String name)
-  {
-    this.bindingOperation = bindingOperation;
-    this.name = name;
-  }
-
-  public void run()
-  {
-    bindingOutput = WSDLFactory.eINSTANCE.createBindingOutput();
-    bindingOutput.setName(name); 
-    bindingOutput.setEnclosingDefinition(bindingOperation.getEnclosingDefinition());
-    bindingOperation.setBindingOutput((BindingOutput)bindingOutput);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return bindingOutput;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java
deleted file mode 100644
index deb638a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddFaultCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddFaultCommand extends AddMessageReferenceCommand
-{
-  private Fault originalFault;
-  
-  public AddFaultCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddFaultCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create a Fault based on the given Fault.  In essence, this will
-   * create a copy of the given Fault.
-   */
-  public AddFaultCommand(Operation operation, Fault originalFault, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalFault = originalFault;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createFault();
-    messageReference.setName(name); 
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.addFault((Fault)messageReference);
-    
-    //  TBD - add binding fault
-
-    if (originalFault == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Fault to new Fault
-    	if (originalFault.getEMessage() != null) {
-//    		String originalMsgName = originalFault.getEMessage().getQName().getLocalPart();
-//    		
-//    		boolean gened = false;
-//    		if (originalFault.eContainer() instanceof Operation)
-//    			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalFault.eContainer()).getName(), "");
-//    		
-//    		String newMsgName = "";
-//    		if (gened) {
-//    			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-//    		}
-//    		else {
-//    			Definition definition = operation.getEnclosingDefinition();
-//    			Message tMessage = originalFault.getEMessage();
-//    			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-//    		}
-    		
-    		createMessage(originalFault, NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference));
-    	}
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java
deleted file mode 100644
index 7fc4eb6..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddImportCommand.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddImportCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String namespace;
-  private String location;
-  private Import importElement;
-  
-  public AddImportCommand
-  	(Definition definition,  
-  	 String namespace,
-  	 String location)
-  {
-    this.definition = definition;
-    this.namespace = namespace;
-    this.location = location;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return importElement;
-  }
-
-  public void run()
-  {
-    importElement = WSDLFactory.eINSTANCE.createImport();
-    importElement.setNamespaceURI(namespace);
-    importElement.setLocationURI(location);
-    importElement.setEnclosingDefinition(definition);
-    definition.addImport(importElement);
-  }
-  
-  public void setNamespaceURI(String namespace)
-  {
-    this.namespace = namespace;
-  }
-  
-  public void setLocationURI(String location)
-  {
-    this.location = location;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java
deleted file mode 100644
index 0e33b71..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddInputCommand.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddInputCommand extends AddMessageReferenceCommand
-{
-  private Input originalInput;
-	
-  public AddInputCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddInputCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create an Input based on the given Input.  In essence, this will
-   * create a copy of the given Input.
-   */
-  public AddInputCommand(Operation operation, Input originalInput, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalInput = originalInput;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createInput();
-  //  messageReference.setName(name); 
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.setInput((Input)messageReference);
-    
-    // TBD - add binding input 
-    
-    if (originalInput == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Input to new Input
-    	if (originalInput.getEMessage() != null) {
-    		String originalMsgName = originalInput.getEMessage().getQName().getLocalPart();
-    		
-    		boolean gened = false;
-    		if (originalInput.eContainer() instanceof Operation)
-    			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalInput.eContainer()).getName(), "Request");
-    		
-    		String newMsgName = "";
-    		if (gened) {
-    			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-    		}
-    		else {
-    			Definition definition = operation.getEnclosingDefinition();
-    			Message tMessage = originalInput.getEMessage();
-    			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-    		}
-
-    		createMessage(originalInput, newMsgName);
-    	}
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java
deleted file mode 100644
index 9079724..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-
-public final class AddMessageCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Message message;
-  private Message originalMessage;
-  
-  private boolean createPart = false;
-  private final String DEFAULT_PART_NAME = "NewPart";
-  
-  public AddMessageCommand
-  	(Definition definition,  
-  	 String localName)
-  {
-    this.definition = definition;
-    this.localName = localName;
-  }
-  
-  public AddMessageCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createPart)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createPart = createPart;
-	}
-  
-  /*
-   * Constructor used to create a Message based on the given Message.  In essence, this will
-   * create a copy of the given Message.
-   */
-  public AddMessageCommand(Definition definition, Message originalMessage, String localName, boolean copyPart) {
-    this.definition = definition;
-	this.localName = localName;
-	this.createPart = copyPart;
-  	this.originalMessage = originalMessage;
-  }
-  
-  public void run()
-  {
-    message = WSDLFactory.eINSTANCE.createMessage();
-    message.setQName(new QName(definition.getTargetNamespace(),localName));
-    message.setEnclosingDefinition(definition);
-    definition.addMessage(message);
-    
-    if (originalMessage == null) {
-    	if (createPart)
-    	{
-    		AddPartCommand command = 
-    			new AddPartCommand(message,DEFAULT_PART_NAME,WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string",true);
-    		command.run();
-    	}
-    }
-    else {
-    	if (originalMessage.getEParts() != null) {
-    		Iterator it = originalMessage.getEParts().iterator();
-    		
-    		while (it.hasNext()) {
-    			Part part = (Part) it.next();
-    			AddPartCommand command;
-    			if (SmartRenameAction.isPartNameGenerated(part.getName(), originalMessage.getQName().getLocalPart()))
-    				command = new AddPartCommand(message, part, NameUtil.buildUniquePartName(message, message.getQName().getLocalPart()));	
-    			else
-    				command = new AddPartCommand(message, part, part.getName());
-    			
-    			
-    			command.run();
-    		}
-    	}
-    }
-  }
-
-  public void setLocalName(String name)
-  {
-    this.localName = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return message;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java
deleted file mode 100644
index 1ec11ea..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddMessageReferenceCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.MessageReference;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.WSDLElement;
-
-abstract public class AddMessageReferenceCommand extends WSDLElementCommand
-{
-  protected String name;
-  protected MessageReference messageReference;
-  protected Operation operation;
-  protected boolean createMessage = false;
-  private final String DEFAULT_MESSAGE_NAME = "NewMessage";
-
-  public AddMessageReferenceCommand(Operation operation, String name)
-  {
-    this.operation = operation;
-    this.name = name;
-  }
-  
-  public AddMessageReferenceCommand(Operation operation, String name, boolean createMessage)
-  {
-    this.operation = operation;
-    this.name = name;
-    this.createMessage = createMessage;
-  }
-
-  protected void createMessage()
-  {
-    Definition definition = operation.getEnclosingDefinition();
-    AddMessageCommand command = 
-      new AddMessageCommand(definition,DEFAULT_MESSAGE_NAME,createMessage);      
-    command.run();
-    messageReference.setEMessage((Message)command.getWSDLElement());
-  }
-  
-  /*
-   * Overloaded createMessage(arg) method.  Similar to to createMessage() but takes in a MessageReference.
-   * Method used to create a copy of the original Message (contained in the passed in MessageReference).
-   */
-  protected void createMessage(MessageReference originalMRef, String newMessageRefName) {
-    Definition definition = operation.getEnclosingDefinition();
-    Message tMessage = originalMRef.getEMessage();
-    AddMessageCommand command = 
-      new AddMessageCommand(definition, tMessage, newMessageRefName, true);
-    command.run();
-    messageReference.setEMessage((Message)command.getWSDLElement());
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return messageReference;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java
deleted file mode 100644
index 8059fc2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOperationCommand.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddOperationCommand extends WSDLElementCommand
-{
-  private PortType portType;
-  private String name;
-  private Operation operation;
-  private Operation originalOperation;
-  private boolean copyInOutFault;
-  
-  private boolean createInput = false;
-  private boolean createOutput = false;
-  private boolean createFault = false;
-  
-  private final String DEFAULT_INPUT_NAME = "";
-  private final String DEFAULT_OUTPUT_NAME = "";
-  private final String DEFAULT_FAULT_NAME = "";
-  
-  public AddOperationCommand
-		(PortType portType,  
-		 String name)
-	{
-	  this.portType = portType;
-	  this.name = name;
-	}
-  
-  public AddOperationCommand
-		(PortType portType,  
-		 String name,
-		 boolean createInput,
-		 boolean createOutput,
-		 boolean createFault)
-	{
-	  this.portType = portType;
-	  this.name = name;
-	  this.createInput = createInput;
-	  this.createOutput = createOutput;
-	  this.createFault = createFault;
-	}
-  
-  /*
-   * Constructor used to create an Operation based on the given Operation.  In essence, this will
-   * create a copy of the given Operation.
-   */
-  public AddOperationCommand(PortType portType, Operation originalOperation, String name, boolean copyInOutFault) {
-  	this.portType = portType;
-  	this.originalOperation = originalOperation;
-  	this.name = name;
-  	this.copyInOutFault = copyInOutFault;
-  }
-  
-  public void run()
-  {
-    operation = WSDLFactory.eINSTANCE.createOperation();
-    operation.setName(name);
-    operation.setEnclosingDefinition(portType.getEnclosingDefinition());
-    portType.addOperation(operation);
-
-    if (originalOperation == null) {    
-    	WSDLElementCommand command = null;
-    	if (createInput)
-    	{
-    		command = new AddInputCommand(operation,DEFAULT_INPUT_NAME,true);
-    		command.run();
-    	}
-    
-    	if (createOutput)
-    	{
-    		command = new AddOutputCommand(operation,DEFAULT_OUTPUT_NAME,true);
-    		command.run();
-    	}
-    
-    	if (createFault)
-    	{
-    		command = new AddFaultCommand(operation,DEFAULT_FAULT_NAME,true);
-    		command.run();
-    	}
-    }
-    else {
-    	// Do necessary copying of data from original operation to new operation
-    	// Paramater ordering? Documentation?  This part still needs to be worked on    	
-    	// Copy 'kids' if necessary
-    	if (copyInOutFault) {
-    		WSDLElementCommand command = null;
-        
-        	if (originalOperation.getEOutput() != null)
-        	{
-        		Output output = originalOperation.getEOutput();
-        		command = new AddOutputCommand(operation, output, NameUtil.buildUniqueOutputName(portType, operation.getName(), ""));
-        		command.run();
-        	}
-        	
-        	if (originalOperation.getEInput() != null)
-        	{
-        		Input input = originalOperation.getEInput();
-        		command = new AddInputCommand(operation, input, NameUtil.buildUniqueInputName(portType, operation.getName(), ""));
-        		command.run();
-        	}
-        
-        	if (originalOperation.getEFaults() != null)
-        	{
-        		Iterator it = originalOperation.getEFaults().iterator();
-        		while (it.hasNext()) {
-        			Fault fault = (Fault) it.next();
-        			command = new AddFaultCommand(operation, fault, NameUtil.buildUniqueFaultName(originalOperation, fault.getName()));
-        			command.run();
-        		}
-        	}
-    		
-    	}
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return operation;
-  }
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java
deleted file mode 100644
index 5c57c58..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddOutputCommand.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.ui.internal.actions.SmartRenameAction;
-import org.eclipse.wst.wsdl.ui.internal.util.NameUtil;
-
-
-public final class AddOutputCommand extends AddMessageReferenceCommand
-{
-  private Output originalOutput;
-  
-  public AddOutputCommand(Operation operation, String name)
-  {
-    super(operation,name);
-  }
-
-  public AddOutputCommand(Operation operation, String name, boolean createMessage)
-  {
-    super(operation,name,createMessage);
-  }
-  
-  /*
-   * Constructor used to create an Output based on the given Output.  In essence, this will
-   * create a copy of the given Output.
-   */
-  public AddOutputCommand(Operation operation, Output originalOutput, String name) {
-  	super(operation, name, false);
-  	
-  	this.originalOutput = originalOutput;
-  }
-  
-  public void run()
-  {
-    messageReference = WSDLFactory.eINSTANCE.createOutput();
-//    messageReference.setName(name);
-    messageReference.setEnclosingDefinition(operation.getEnclosingDefinition());
-    operation.setOutput((Output)messageReference);
-    
-    //  TBD - add binding output 
-    
-    if (originalOutput == null) {
-    	if (createMessage)
-    		createMessage();
-    }
-    else {
-    	// Do necessary copying of data from original Output to new Output
-    	if (originalOutput.getEMessage() != null) {
-    		String originalMsgName = originalOutput.getEMessage().getQName().getLocalPart();
-		
-		boolean gened = false;
-		if (originalOutput.eContainer() instanceof Operation)
-			gened = SmartRenameAction.isMessageNameGenerated(originalMsgName, ((Operation) originalOutput.eContainer()).getName(), "Response");
-		
-		String newMsgName = "";
-		if (gened) {
-			newMsgName = NameUtil.buildUniqueMessageName(operation.getEnclosingDefinition(), messageReference);
-		}
-		else {
-			Definition definition = operation.getEnclosingDefinition();
-			Message tMessage = originalOutput.getEMessage();
-			newMsgName = NameUtil.buildUniqueMessageName(definition, tMessage.getQName().getLocalPart());
-		}
-		
-    	createMessage(originalOutput, newMsgName);
-    	}
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java
deleted file mode 100644
index 2ed9d68..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPartCommand.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Message;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.PartImpl;
-import org.eclipse.wst.wsdl.internal.impl.WSDLElementImpl;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-
-public final class AddPartCommand extends WSDLElementCommand
-{
-  private Message message;
-  private String name;
-  private Part part;
-  private Part originalPart;
-  
-  private QName typeOrElementName;
-  private boolean useType = true;
-
-  public AddPartCommand
-		(Message message,
-		 String name)
-	{
-	  this.message = message;
-	  this.name = name;
-	}
-  
-  public AddPartCommand
-		(Message message,
-		 String name,
-		 String namespace,
-		 String localName,
-		 boolean useType)
-	{
-	  this.message = message;
-	  this.name = name;
-	  this.useType = useType;
-	  typeOrElementName = new QName(namespace,localName);
-	}
-  
-  /*
-   * Constructor used to create a Part based on the given Part.  In essence, this will
-   * create a copy of the given Part.
-   */
-  public AddPartCommand
-	(Message message,
-	 Part originalPart,
-	 String name)
-  {
-  	this.message = message;
-  	this.name = name;
-  	this.originalPart = originalPart;
-  }
-  
-  /**
-   * @deprecated
-   */
-  public AddPartCommand
-		(Message message,
-		 String name,
-		 String namespace,
-		 String localName)
-	{
-	  this.message = message;
-	  this.name = name;
-	  typeOrElementName = new QName(namespace,localName);
-	}
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return part;
-  }
-  
-  public void run()
-  {
-    if (typeOrElementName == null)
-      typeOrElementName = createDefaultTypeName();
-    
-    // Add namespace to the Definitions if it is not there yet.
-    addNamespaceDeclaration();
-    
-    part = WSDLFactory.eINSTANCE.createPart();
-    part.setName(name);
-    
-    if (originalPart == null) {
-    	if (useType)
-    		part.setTypeName(typeOrElementName);
-    	else
-    		part.setElementName(typeOrElementName);
-    }
-    else {
-    	if (originalPart.getTypeName() != null)
-    		part.setTypeName(originalPart.getTypeName());
-
-    	String newElementName = null;
-    	if (originalPart.getElementName() != null) {
-    		
-    		boolean createNewElement = true;
-    		if (originalPart.getElementDeclaration() != null && originalPart.getElementDeclaration().getElement() != null) {
-        		if (!(originalPart.getElementDeclaration().getElement() instanceof IDOMNode)) {
-        			createNewElement = false;
-        		}        		
-    		}
-    		
-    		if (createNewElement) {
-    			newElementName = getNewNameHelper(name, originalPart.getEnclosingDefinition(), false);
-    			part.setElementName(new QName(originalPart.getElementName().getNamespaceURI(), newElementName));
-	
-    			if (originalPart.getEnclosingDefinition() != null) {
-    				if (newElementName == null) {
-    					newElementName = getNewNameHelper(name, originalPart.getEnclosingDefinition(), false);
-    				}
-    		
-    				AddXSDElementDeclarationCommand elementAction = new AddXSDElementDeclarationCommand(originalPart.getEnclosingDefinition(), newElementName);
-    				elementAction.run();
-    			}
-    		}
-    		else {
-    			part.setElementName(new QName(originalPart.getElementName().getNamespaceURI(), originalPart.getElementName().getLocalPart()));
-    		}
-    	}
-    }
-    	
-    part.setEnclosingDefinition(message.getEnclosingDefinition());
-    ((PartImpl)part).reconcileReferences(false); 
-    message.addPart(part);
-  }
-  
-  private void addNamespaceDeclaration()
-  {
-    Definition definition = message.getEnclosingDefinition();
-    if (!definition.getNamespaces().containsValue(typeOrElementName.getNamespaceURI()))
-    {
-      definition.addNamespace("p",typeOrElementName.getNamespaceURI());
-      ((WSDLElementImpl)definition).updateElement(false);
-    }
-  }
-  
-  private QName createDefaultTypeName()
-  {
-    QName qname = new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string");
-    return qname;
-  }
-  
-  private String getNewNameHelper(String base, Definition def, boolean isType)
-  { 
-    String name = base;    
-    int count = 0;
-
-    // Ugly....  Redo this...
-    // Get a list of Elements...
-    List elementList = null;
-    if (def.getETypes() != null) {
-    	List xsdsList = def.getETypes().getEExtensibilityElements();
-    	if (xsdsList != null) {
-    		Iterator xsdsIterator = xsdsList.iterator();
-    		XSDSchemaExtensibilityElement xsdElement = (XSDSchemaExtensibilityElement) xsdsIterator.next();
-    		XSDSchema schema = xsdElement.getSchema();
-    		if (schema != null) {
-    			elementList = schema.getElementDeclarations();
-    		}
-    	}
-    }
-    
-    if (elementList != null) {
-    	int index = 0;
-    	while (index < elementList.size()) {
-    		XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) elementList.get(index);
-    		
-    		if (name.equals(elementDeclaration.getName())) {
-    			count++;
-    			name = name + count;
-    			index = 0;
-    		}
-    		else {
-    			index++;
-    		}
-    	}
-    }
-
-    return name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java
deleted file mode 100644
index a647c52..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-public final class AddPortCommand extends WSDLElementCommand
-{
-  private Service service;
-  private String name;
-  private Port port;
-  
-  public AddPortCommand
-		(Service service,
-		 String name)
-	{
-	  this.service = service;
-	  this.name = name;
-	}
-  
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return port;
-  }
-
-  public void run()
-  {
-    port = WSDLFactory.eINSTANCE.createPort();
-    port.setName(name);
-    port.setEnclosingDefinition(service.getEnclosingDefinition());
-    service.addPort(port);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java
deleted file mode 100644
index 5eb4d5a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddPortTypeCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.PortType;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddPortTypeCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private PortType portType;
-  
-  private boolean createOperation = false;
-  private final String DEFAULT_OPERATION_NAME = "NewOperation";
-
-  public AddPortTypeCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-
-  public AddPortTypeCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createOperation)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createOperation = createOperation;
-	}
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.wsdl.ui.internal.commands.WSDLElementAction#getWSDLElement()
-   */
-  public WSDLElement getWSDLElement()
-  {
-    return portType;
-  }
-
-  public void run()
-  {
-    portType = WSDLFactory.eINSTANCE.createPortType();
-    portType.setQName(new QName(definition.getTargetNamespace(),localName));
-    portType.setEnclosingDefinition(definition);
-    definition.addPortType(portType);
-    
-    if (createOperation)
-    {
-      AddOperationCommand command = 
-        new AddOperationCommand(portType,DEFAULT_OPERATION_NAME,true,true,false);
-      command.run();
-    }
-  }
-  
-  public void setLocalName(String name)
-  {
-    localName = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java
deleted file mode 100644
index d9fed45..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddServiceCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-
-public final class AddServiceCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String localName;
-  private Service service;
-  
-  private boolean createPort = false;
-  private final String DEFAULT_PORT_NAME = "NewPort";
-
-  public AddServiceCommand
-		(Definition definition,  
-		 String localName)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	}
-
-	public AddServiceCommand
-		(Definition definition, 
-		 String localName,
-		 boolean createPort)
-	{
-	  this.definition = definition;
-	  this.localName = localName;
-	  this.createPort = createPort;
-	}
-
-  public WSDLElement getWSDLElement()
-  {
-    return service;
-  }
-
-  public void run()
-  {
-    service = WSDLFactory.eINSTANCE.createService();
-    service.setQName(new QName(definition.getTargetNamespace(),localName));
-    service.setEnclosingDefinition(definition);
-    definition.addService(service);
-    
-    if (createPort)
-    {
-      AddPortCommand command = 
-        new AddPortCommand(service,DEFAULT_PORT_NAME);
-      command.run();
-    }
-  }
-  
-  public void setLocalName(String name)
-  {
-    localName = name;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java
deleted file mode 100644
index b568fd1..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddTypesCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-
-// Definition must not have "types" element to run this command.
-public final class AddTypesCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private Types types;
-  
-  public AddTypesCommand(Definition definition)
-  {
-    this.definition = definition;
-  }
-
-  public void run()
-  {
-  	if ((types = definition.getETypes()) != null)
-      return; // "types" already exists.
-  	
-    types = WSDLFactory.eINSTANCE.createTypes();
-    types.setEnclosingDefinition(definition);
-    definition.setTypes(types);
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return types;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java
deleted file mode 100644
index ab3352d..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddUnknownExtensibilityElementCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.wst.wsdl.ExtensibleElement;
-import org.eclipse.wst.wsdl.UnknownExtensibilityElement;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.internal.impl.UnknownExtensibilityElementImpl;
-
-public final class AddUnknownExtensibilityElementCommand extends WSDLElementCommand
-{
-  private ExtensibleElement extensibleElement;
-  private String namespaceURI;
-  private String localName;
-  private UnknownExtensibilityElement extensibilityElement;
-  private Map properties;
- 
-  public AddUnknownExtensibilityElementCommand
-    (ExtensibleElement extensibleElement, 
-     String namespaceURI,
-     String localName)
-  {
-    this.extensibleElement = extensibleElement;
-    this.namespaceURI = namespaceURI;
-    this.localName = localName;
-  }
-  
-  public AddUnknownExtensibilityElementCommand
-    (ExtensibleElement extensibleElement, 
-     String namespaceURI,
-     String localName,
-     Map properties)
-  {
-    this.extensibleElement = extensibleElement;
-    this.namespaceURI = namespaceURI;
-    this.localName = localName;
-    this.properties = properties;
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return extensibilityElement;
-  }
-
-  public void run()
-  {
-  	extensibilityElement = WSDLFactory.eINSTANCE.createUnknownExtensibilityElement();
-  	extensibilityElement.setElementType(new QName(namespaceURI,localName));
-  	
-    if (properties != null)
-    {
-      Iterator iterator = properties.entrySet().iterator();
-      Map.Entry entry = null;
-      while (iterator.hasNext())
-      {
-      	entry = (Map.Entry)iterator.next();
-      	String attribute = (String)entry.getKey();
-      	String value = (String)entry.getValue();      	
-      	((UnknownExtensibilityElementImpl)extensibilityElement).setAttribute(attribute,value);
-      }
-    }
-    
-  	extensibilityElement.setEnclosingDefinition(extensibleElement.getEnclosingDefinition());
-  	extensibleElement.addExtensibilityElement(extensibilityElement);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java
deleted file mode 100644
index 5fce11e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDElementDeclarationCommand.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-
-// This class is used to create a new XSDElementDeclaration in the targetNamespace.
-public final class AddXSDElementDeclarationCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String targetNamespace;
-  private String elementName;
-  private XSDSchema schema;
-  private XSDElementDeclaration xsdElement;
-  
-  /**
-   * TODO:
-   * We have a potential problem here....  What if the definition targetnamespace is null....
-   */
-  public AddXSDElementDeclarationCommand(Definition definition, String elementName)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-    this.elementName = elementName;
-  }
-  
-  /**
-   * @deprecated
-   * Use AddXSDElementDeclarationCommand(Definition definition, String typeName)
-   */
-  public AddXSDElementDeclarationCommand
-    (Definition definition, 
-     String targetNamespace, 
-     String elementName)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-    this.elementName = elementName;
-  }
-
-  public void run()
-  {
-    XSDSchema xsdSchema = getSchema();
-    XSDElementDeclaration elementDecl = 
-      XSDFactory.eINSTANCE.createXSDElementDeclaration();
-    elementDecl.setName(elementName);
-    
-    XSDSimpleTypeDefinition simpleTypeDefinition = getXSDStringType(xsdSchema);
-    elementDecl.setTypeDefinition(simpleTypeDefinition);    
-    xsdSchema.getContents().add(elementDecl);
-    
-    xsdElement = elementDecl;
-  }
-  
-  public void run(String newElementName) {
-  	elementName = newElementName;
-  	run();
-  }
-  
-  /*
-   * Specify which Schema to use when creating the Type.
-   * Call this method before calling run().  Otherwise it will use the first
-   * Schema it finds.
-   */
-  public void setSchema(XSDSchema schema) {
-  	this.schema = schema;
-  }
-  
-  /*
-   * Return the Schema used to create the Type
-   */
-  public XSDSchema getSchema() {
-  	if (schema == null) {
-  		return getXSDSchema(targetNamespace);
-  	}
-  	else {
-  		return schema;
-  	}
-  }
-  
-  private XSDSimpleTypeDefinition getXSDStringType(XSDSchema schema)
-  {
-    return schema.getSchemaForSchema().resolveSimpleTypeDefinition("string");
-  }
-  
-  private XSDSchema getXSDSchema(String targetNamespace)
-  {
-    XSDSchema xsdSchema;
-    
-    // Do we have a schema already?
-    Iterator iterator = getTypes().getSchemas(targetNamespace).iterator();
-    if (iterator.hasNext())
-    {
-      xsdSchema = (XSDSchema)iterator.next(); // Get the first one.
-      return xsdSchema;
-    }
-    else
-    {	    
-      // Create a new schema because there's none.
-      AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition,targetNamespace);
-      command.run();
-      return ((XSDSchemaExtensibilityElement)command.getWSDLElement()).getSchema();
-    }
-  }
-  
-  private Types getTypes()
-  {
-    // Types is created if it does not exist yet.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return null;
-  }
-  
-  public XSDElementDeclaration getXSDElement()
-  {
-	  return xsdElement;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java
deleted file mode 100644
index 73bd1fd..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDSchemaCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.WSDLFactory;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-
-
-
-public final class AddXSDSchemaCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private XSDSchemaExtensibilityElement extensibilityElement;
-  private String targetNamespace;
-  
-  public AddXSDSchemaCommand(Definition definition)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-  }
-  
-  public AddXSDSchemaCommand(Definition definition, String targetNamespace)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-  }
-  
-  public void run()
-  {    
-    extensibilityElement = WSDLFactory.eINSTANCE.createXSDSchemaExtensibilityElement();
-    extensibilityElement.setEnclosingDefinition(definition);
- 
-    XSDSchema xsdSchema = XSDFactory.eINSTANCE.createXSDSchema();
-    xsdSchema.setSchemaForSchemaQNamePrefix("xsd");
-    xsdSchema.setTargetNamespace(targetNamespace);
-    // Choose the prefix Choose the prefix used for this schema's namespace and the schema for schema's namespace.
-    //    
-    java.util.Map qNamePrefixToNamespaceMap = xsdSchema.getQNamePrefixToNamespaceMap();
-//    qNamePrefixToNamespaceMap.put("p", xsdSchema.getTargetNamespace());
-    qNamePrefixToNamespaceMap.put
-	  (xsdSchema.getSchemaForSchemaQNamePrefix(),org.eclipse.xsd.util.XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    extensibilityElement.setSchema(xsdSchema);
-       
-    // TBD - Check if multiple schemas with the same targetNamespace can co-exist.
-    Types types = getTypes();
-    types.addExtensibilityElement(extensibilityElement);
-  }
-
-  private Types getTypes()
-  {
-    // Types is created if it does not exist.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return extensibilityElement;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java
deleted file mode 100644
index e0ec076..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/AddXSDTypeDefinitionCommand.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Types;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-// This class is used to create a new XSDTypeDefinition in the targetNamespace.
-public final class AddXSDTypeDefinitionCommand extends WSDLElementCommand
-{
-  private Definition definition;
-  private String targetNamespace;
-  private String typeName;
-  private XSDSchema schema;
-  private XSDTypeDefinition xsdType;
-  private boolean isComplexType = true;
-  
-  /**
-   * TODO:
-   * We have a potential problem here....  What if the definition targetnamespace is null....
-   */
-  public AddXSDTypeDefinitionCommand(Definition definition, String typeName)
-  {
-    this.definition = definition;
-    this.targetNamespace = definition.getTargetNamespace();
-    this.typeName = typeName;
-  }
-  
-  public AddXSDTypeDefinitionCommand(Definition definition, String typeName, boolean isComplexType)
-  {
-  	this(definition, typeName);
-  	this.isComplexType = isComplexType;
-  }
-  
-  /**
-   * @deprecated
-   * Use AddXSDTypeDefinitionCommand(Definition definition, String typeName)
-   */
-  public AddXSDTypeDefinitionCommand
-    (Definition definition, 
-     String targetNamespace,
-     String typeName)
-  {
-    this.definition = definition;
-    this.targetNamespace = targetNamespace;
-    this.typeName = typeName;
-  }
-  
-  public void run()
-  {
-    XSDSchema xsdSchema = getSchema();
-    XSDTypeDefinition typeDef;
-    
-    if (isComplexType) {
-    	typeDef = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-    }
-    else {
-    	typeDef = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-    }
-    
-    typeDef.setName(typeName);
-    xsdSchema.getContents().add(typeDef);
-    
-    xsdType = typeDef;
-  }
-  
-  public void run(String newTypeName) {
-  	typeName = newTypeName;
-  	run();
-  }
-  
-  /*
-   * Specifiy if we should create a complex or simple type.  This should should be
-   * called before run().
-   * Overrides the value set when the constructor
-   * AddXSDTypeDefinitionCommand(Definition definition, String typeName, boolean isComplexType)
-   * is used.
-   */
-  public void isComplexType(boolean isComplexType) {
-  	this.isComplexType = isComplexType;
-  }
-  
-  /*
-   * Specify which Schema to use when creating the Type.
-   * Call this method before calling run().  Otherwise it will use the first
-   * Schema it finds.
-   */
-  public void setSchema(XSDSchema schema) {
-  	this.schema = schema;
-  }
-  
-  /*
-   * Return the Schema used to create the Type
-   */
-  public XSDSchema getSchema() {
-  	if (schema == null) {
-  		return getXSDSchema(targetNamespace);
-  	}
-  	else {
-  		return schema;
-  	}
-  }
-
-  private XSDSchema getXSDSchema(String targetNamespace)
-  {
-    XSDSchema xsdSchema;
-    
-    // Do we have a schema already?
-    Iterator iterator = getTypes().getSchemas(targetNamespace).iterator();
-    if (iterator.hasNext())
-    {
-      xsdSchema = (XSDSchema)iterator.next(); // Get the first one.
-      return xsdSchema;
-    }
-    else
-    {	    
-      // Create a new schema because there's none.
-      AddXSDSchemaCommand command = new AddXSDSchemaCommand(definition,targetNamespace);
-      command.run();
-      return ((XSDSchemaExtensibilityElement)command.getWSDLElement()).getSchema();
-    }
-  }
-  
-  private Types getTypes()
-  {
-    // Types is created if it does not exist yet.
-    Types types = (Types)definition.getTypes();
-    if (types != null)
-      return types;
-    else
-    {
-      AddTypesCommand command = new AddTypesCommand(definition);
-      command.run();
-      return (Types)command.getWSDLElement();
-    }
-  }
-  
-  public WSDLElement getWSDLElement()
-  {
-    return null;
-  }
-  
-  public XSDTypeDefinition getXSDElement()
-  {
-	  return xsdType;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java
deleted file mode 100644
index 3fc9c24..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/commands/WSDLElementCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.commands;
-
-import org.eclipse.wst.wsdl.WSDLElement;
-
-public abstract class WSDLElementCommand
-{
-  public abstract WSDLElement getWSDLElement();
-  public abstract void run();
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java
deleted file mode 100644
index ff3bfc7..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ContentGenerator.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;  
-        
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-
-public interface ContentGenerator
-{        
-	
-  public static String ADDRESS_LOCATION = "http://tempuri.org/";  
-  public void init(Definition definition, Object generator, Object[] options);
-
-  public String[] getRequiredNamespaces();
-  
-  public String[] getPreferredNamespacePrefixes();
-
-  // generates the 'address' extensiblity element for a port
-  //
-  public void generatePortContent(Element portElement, Port port);
- 
-  public void generateBindingContent(Element bindingElement, PortType portType);
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation);
- 
-  public void generateBindingInputContent(Element bindingInputElement, Input input);    
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output);
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java
deleted file mode 100644
index 3599cef..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/HttpContentGenerator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-public class HttpContentGenerator implements ContentGenerator
-{
-  protected Definition definition;
-  protected boolean isPost;
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;
-
-  protected final static String[] requiredNamespaces = { "http://schemas.xmlsoap.org/wsdl/mime/", "http://schemas.xmlsoap.org/wsdl/http/" };
-  protected final static String[] preferredNamespacePrefixes = { "mime", "http" };
-
-  public void init(Definition definition, Object generator, Object[] options)
-  {
-    this.definition = definition;
-
-    if (options != null)
-    {
-      if (options.length > 0 && options[0] != null)
-      {
-        Boolean isPostOption = (Boolean) options[0];
-        isPost = isPostOption.booleanValue();
-      }
-      if (options.length > 1 && options[1] != null)
-      {
-        addressLocation = (String) options[1];
-      }
-    }
-  }
-
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-
-  public String[] getPreferredNamespacePrefixes()
-  {
-    return preferredNamespacePrefixes;
-  }
-
-  public void generatePortContent(Element portElement, Port port)
-  {
-    Element element = createElement(portElement, "http", "address");
-    element.setAttribute("location", addressLocation);
-  }
-
-  public void generateBindingContent(Element bindingElement, PortType portType)
-  {
-    Element element = createElement(bindingElement, "http", "binding");
-    element.setAttribute("verb", isPost ? "POST" : "GET");
-  }
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation)
-  {
-    Element element = createElement(bindingOperationElement, "http", "operation");
-    element.setAttribute("location", "/" + operation.getName());
-  }
-
-  public void generateBindingInputContent(Element bindingInputElement, Input input)
-  {
-    if (isPost)
-    {
-      Element element = createElement(bindingInputElement, "mime", "content");
-      element.setAttribute("type", "application/x-www-form-urlencoded");
-    }
-    else
-    {
-      createElement(bindingInputElement, "http", "urlEncoded");
-    }
-  }
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output)
-  {
-    Element element = createElement(bindingOutputElement, "mime", "content");
-    element.setAttribute("type", "text/xml");
-  }
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault)
-  {
-    //TODO!!
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-    parentElement.appendChild(result);
-    return result;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java
deleted file mode 100644
index d928c33..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/SoapContentGenerator.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator;  
-        
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Operation;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.PortType;
-import org.w3c.dom.Element;
-
-
-public class SoapContentGenerator implements ContentGenerator
-{ 
-  private final int DOCUMENT_LITERAL = 1;
-  private final int RPC_LITERAL      = 2;
-  private final int RPC_ENCODED      = 3;
-
-  protected int bindingOption = DOCUMENT_LITERAL;
-  protected String namespaceValue = "";
-  protected String addressLocation = ContentGenerator.ADDRESS_LOCATION;                   
-  protected Definition definition;                                    
-
-  protected final static String[] requiredNamespaces = {"http://schemas.xmlsoap.org/wsdl/soap/"};
-  protected final static String[] preferredNamespacePrefixes = {"soap"};
-
-
-  public void init(Definition definition, Object generator, Object[] options)
-  {              
-    this.definition = definition;
-                       
-    if (options != null)
-    {
-      bindingOption = computeBindingOption(options);
-
-      if (options.length > 1 && options[1] != null)
-      {
-      	addressLocation = (String)options[1];
-      }  
-    }
-    if (definition.getTargetNamespace() != null)
-    {
-      namespaceValue = definition.getTargetNamespace();
-    } 
-  }
-  
-  private int computeBindingOption(Object[] options) {
-  	int option = DOCUMENT_LITERAL;
-    if (options.length > 0 && options[0] != null)
-    {
-		boolean isDocumentLiteralOption = ((Boolean)options[0]).booleanValue();
-		if (isDocumentLiteralOption)
-			option =  DOCUMENT_LITERAL;
-		else
-			option = RPC_ENCODED;		
-		
-    	if (options.length >= 3 && options[2] != null) {
-    		// Extra info sent in
-    		if (((Boolean)options[2]).booleanValue())
-    			option = RPC_LITERAL;
-    	}
-    }
-
-    return option;
-  }
-     
-  public String[] getRequiredNamespaces()
-  {
-    return requiredNamespaces;
-  }
-  
-  public String[] getPreferredNamespacePrefixes()
-  {
-    return preferredNamespacePrefixes;
-  }  
-
-  public void generatePortContent(Element portElement, Port port)
-  {
-    Element element = createElement(portElement, "soap", "address");
-    element.setAttribute("location", addressLocation);     
-  }  
-
-  public void generateBindingContent(Element bindingElement, PortType portType)
-  {
-    Element element = createElement(bindingElement, "soap", "binding");
-    element.setAttribute("style", (bindingOption == DOCUMENT_LITERAL) ? "document" : "rpc"); 
-    element.setAttribute("transport", "http://schemas.xmlsoap.org/soap/http");
-  }
-
-  public void generateBindingOperationContent(Element bindingOperationElement, Operation operation)
-  {
-    Element element = createElement(bindingOperationElement, "soap", "operation");
-    
-    String soapActionValue = namespaceValue;                                        
-    if (!soapActionValue.endsWith("/"))
-    {                
-      soapActionValue += "/";
-    }                        
-    soapActionValue += operation.getName();
-    element.setAttribute("soapAction", soapActionValue);
-  }  
-
-  public void generateBindingInputContent(Element bindingInputElement, Input input)
-  {
-    generateSoapBody(bindingInputElement);
-  }
-
-  public void generateBindingOutputContent(Element bindingOutputElement, Output output)
-  {
-    generateSoapBody(bindingOutputElement);
-  }         
-
-  public void generateBindingFaultContent(Element bindingFaultElement, Fault fault)
-  {                              
-    Element element = createElement(bindingFaultElement, "soap", "fault");      
-    element.setAttribute("name", fault.getName()); 
-    element.setAttribute("use", (bindingOption == RPC_ENCODED) ? "encoded" : "literal");
-    if (bindingOption == RPC_ENCODED)
-    {
-      element.setAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-      element.setAttribute("namespace", namespaceValue);
-    }
-    else if (bindingOption == RPC_LITERAL) {
-        element.setAttribute("namespace", namespaceValue);
-    }
-  }  
-
-  protected void generateSoapBody(Element parentElement)
-  {
-    Element element = createElement(parentElement, "soap", "body");      
-    element.setAttribute("use", (bindingOption == RPC_ENCODED) ? "encoded" : "literal"); 
-    if (bindingOption == RPC_ENCODED)
-    {
-      element.setAttribute("encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-      element.setAttribute("namespace", namespaceValue);
-    }
-    else if (bindingOption == RPC_LITERAL) {
-    	element.setAttribute("namespace", namespaceValue);
-    }
-  }
-
-  protected Element createElement(Element parentElement, String prefix, String elementName)
-  {                                         
-    String name = prefix != null ? (prefix + ":" + elementName) : elementName;
-    Element result = parentElement.getOwnerDocument().createElement(name);
-    parentElement.appendChild(result);
-    return result;
-  }
-} 
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java
deleted file mode 100644
index bca40e9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/ContentGeneratorOptionsPage.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;  
-        
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-
-public interface ContentGeneratorOptionsPage
-{                                          
-  public void init(BaseGenerator baseGenerator);             
-  public Composite createControl(Composite parent);
-  public Composite getControl();
-  
-  // TODO can this go into init?
-  //
-  public void setOptionsOnGenerator();
-  public boolean isOverwriteApplicable();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java
deleted file mode 100644
index 1e355e3..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpBindingOptionsPage.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-
-public class HttpBindingOptionsPage implements ContentGeneratorOptionsPage, SelectionListener
-{
-  protected Button getButton;
-  protected Button postButton;
-  protected Composite control;
-  protected BaseGenerator generator;
-  protected HTTPContentGenerator httpGenerator;
-
-  public HttpBindingOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-	if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		httpGenerator = (HTTPContentGenerator) generator.getContentGenerator();
-	}
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-   
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_HTTP_BINDING_OPTIONS"));
-
-    getButton = new Button(control, SWT.RADIO);
-    getButton.setText("HTTP GET");
-    getButton.setSelection(true);
-
-    postButton = new Button(control, SWT.RADIO);
-    postButton.setText("HTTP POST");
-
-    if (generator.getName() != null)
-    {
-      Definition definition = generator.getDefinition();
-      QName qname = new QName(definition.getTargetNamespace(), generator.getName());
-      Binding binding = (Binding) definition.getBinding(qname);
-      if (binding != null)
-      {
-        List eeList = binding.getEExtensibilityElements();
-        if (eeList.size() > 0)
-        {
-          ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-          Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-          String verb = element.getAttribute("verb");
-          if ("POST".equals(verb))
-          {
-            getButton.setSelection(false);
-            postButton.setSelection(true);
-          }
-        }
-      }
-    }
-
-    postButton.addSelectionListener(this);
-    getButton.addSelectionListener(this);
-	computeOptions();
-	
-    return control;
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-  
-  public boolean isOverwriteApplicable()
-  {
-  	return true;
-  }  
-
-  public void widgetSelected(SelectionEvent event)
-  {
-	computeOptions();
-  }
-
-  protected void computeOptions()
-  {
-	  if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		  HTTPContentGenerator httpGenerator = (HTTPContentGenerator) generator.getContentGenerator();
-
-		  if (postButton.getSelection()) {
-			  httpGenerator.setVerb(HTTPContentGenerator.VERB_POST);
-		  }	  
-		  else if (getButton.getSelection()) {
-			  httpGenerator.setVerb(HTTPContentGenerator.VERB_GET);
-		  }
-	  }
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java
deleted file mode 100644
index 28ea27a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/HttpPortOptionsPage.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.binding.http.internal.generator.HTTPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class HttpPortOptionsPage implements ContentGeneratorOptionsPage, ModifyListener
-{
-  protected Text addressField;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public HttpPortOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-    control.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_HTTP_PORT_DETAILS"));
-
-    Composite nameValueGroup = new Composite(control, SWT.NONE);
-    nameValueGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout2 = new GridLayout(2, false);
-    layout2.marginWidth = 0;
-    nameValueGroup.setLayout(layout2);
-
-    Label addressLabel = new Label(nameValueGroup, SWT.NONE);
-    addressLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LOCATION") + " ");
-    addressField = new Text(nameValueGroup, SWT.BORDER);
-    addressField.setText("http://example.com/");
-    addressField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    addressField.addModifyListener(this);
-
-    return control;
-  }
-
-  public boolean isOverwriteApplicable()
-  {
-    return false;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-	  computeOptions();
-  }
-  
-  private void computeOptions() {
-	if (generator.getContentGenerator() instanceof HTTPContentGenerator) {
-		((HTTPContentGenerator) generator.getContentGenerator()).setAddressLocation(addressField.getText());
-	}
-  }
-
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java
deleted file mode 100644
index a9e32d2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapBindingOptionsPage.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.BindingFault;
-import org.eclipse.wst.wsdl.BindingOperation;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.ExtensibilityElement;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.w3c.dom.Element;
-
-
-public class SoapBindingOptionsPage implements ContentGeneratorOptionsPage, SelectionListener
-{
-  protected Button docLiteral;
-  protected Button rpcLiteral;
-  protected Button rpcEncoded;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public SoapBindingOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_LABEL_SOAP_BINDING_OPTIONS"));
-
-    docLiteral = new Button(control, SWT.RADIO);
-    docLiteral.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_DOCUMENT_LITERAL"));
-    docLiteral.setSelection(true);
-
-    rpcLiteral = new Button(control, SWT.RADIO);
-    rpcLiteral.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_LITERAL"));
-    
-    rpcEncoded = new Button(control, SWT.RADIO);
-    rpcEncoded.setText(WSDLEditorPlugin.getWSDLString("_UI_RADIO_RPC_ENCODED"));
-
-    if (generator.getName() != null)
-    {
-      Definition definition = generator.getDefinition();
-      QName qname = new QName(definition.getTargetNamespace(), generator.getName());
-      Binding binding = (Binding) definition.getBinding(qname);
-
-      if (binding != null)
-      {
-        List eeList = binding.getEExtensibilityElements();
-        if (eeList.size() > 0)
-        {
-          ExtensibilityElement ee = (ExtensibilityElement) eeList.get(0);
-
-          Element element = WSDLEditorUtil.getInstance().getElementForObject(ee);
-          String style = element.getAttribute("style");
-          
-          if ("rpc".equals(style))
-          {
-            // Try to determine if it's RPC Literal or RPC Encoded
-          	String use = "encoded";
-          	List operations = binding.getEBindingOperations();
-          	if (operations.size() > 0) {
-          		element = null;
-          		BindingOperation operation = (BindingOperation) operations.get(0);
-          		if (operation.getEBindingInput() != null && operation.getEBindingInput().getEExtensibilityElements().size() > 0) {
-          			Object object = operation.getEBindingInput().getEExtensibilityElements().get(0);
-          			element = WSDLEditorUtil.getInstance().getElementForObject(object);
-          		}
-          		else if (operation.getEBindingOutput() != null && operation.getEBindingOutput().getEExtensibilityElements().size() > 0) {
-          			Object object = operation.getEBindingOutput().getEExtensibilityElements().get(0);
-          			element = WSDLEditorUtil.getInstance().getElementForObject(object);
-          		}
-          		else if (operation.getEBindingFaults().size() > 0) {
-          			BindingFault fault = (BindingFault) operation.getEBindingFaults().get(0);
-          			List faultEE = fault.getExtensibilityElements();
-          			
-          			if (faultEE.size() > 0) {
-          				element = WSDLEditorUtil.getInstance().getElementForObject(faultEE.get(0));
-          			}
-          		}
-          		
-          		if (element != null) {
-          			use = element.getAttribute("use");
-          		}
-          	}
-          	
-          	if (use != null && "literal".equals(use)) {
-          		docLiteral.setSelection(false);
-          		rpcLiteral.setSelection(true);
-          		rpcEncoded.setSelection(false);
-          	}
-          	else {          	
-          		docLiteral.setSelection(false);
-          		rpcLiteral.setSelection(false);
-          		rpcEncoded.setSelection(true);
-          	}
-          }
-        }
-      }
-    }
-
-    docLiteral.addSelectionListener(this);
-    rpcLiteral.addSelectionListener(this);
-    rpcEncoded.addSelectionListener(this);
-    computeOptions();
-
-    return control;
-  }
-
-  public Composite getControl() {
-	  return control;
-  }
-  
-  public boolean isOverwriteApplicable()
-  {
-    return true;
-  }
-
-  public void widgetSelected(SelectionEvent event)
-  {
-    computeOptions();
-  }
-
-  protected void computeOptions()
-  {
-	  if (generator.getContentGenerator() instanceof SOAPContentGenerator) {
-		  SOAPContentGenerator soapGenerator = (SOAPContentGenerator) generator.getContentGenerator();
-		  if (docLiteral.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_DOCUMENT);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_LITERAL);
-		  }	  
-		  else if (rpcLiteral.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_RPC);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_LITERAL);
-		  }
-		  else if (rpcEncoded.getSelection()) {
-			  soapGenerator.setStyle(SOAPContentGenerator.STYLE_RPC);
-			  soapGenerator.setUse(SOAPContentGenerator.USE_ENCODED);
-		  }
-	  }
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java
deleted file mode 100644
index 137394f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/contentgenerator/ui/SoapPortOptionsPage.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.contentgenerator.ui;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.wsdl.binding.soap.internal.generator.SOAPContentGenerator;
-import org.eclipse.wst.wsdl.internal.generator.BaseGenerator;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-
-public class SoapPortOptionsPage implements ContentGeneratorOptionsPage, ModifyListener
-{
-  protected Text addressField;
-  protected Composite control;
-  protected BaseGenerator generator;
-
-  public SoapPortOptionsPage()
-  {
-  }
-
-  public void init(BaseGenerator generator)
-  {
-    this.generator = generator;
-  }
-
-  public Composite createControl(Composite parent)
-  {
-    control = new Composite(parent, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.marginWidth = 0;
-    control.setLayout(layout);
-    control.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Label separator = new Label(control, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    separator.setLayoutData(gd);
-
-    Label optionsHeading = new Label(control, SWT.NONE);
-    optionsHeading.setText(WSDLEditorPlugin.getWSDLString("_UI_SOAP_PORT_DETAILS"));
-
-    Composite nameValueGroup = new Composite(control, SWT.NONE);
-    nameValueGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridLayout layout2 = new GridLayout(2, false);
-    layout2.marginWidth = 0;
-    nameValueGroup.setLayout(layout2);
-
-    Label addressLabel = new Label(nameValueGroup, SWT.NONE);
-    addressLabel.setText(WSDLEditorPlugin.getWSDLString("_UI_LOCATION") + " ");
-    addressField = new Text(nameValueGroup, SWT.BORDER);
-    addressField.setText("http://example.com/");
-    addressField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    addressField.addModifyListener(this);
-
-    return control;
-  }
-
-  public boolean isOverwriteApplicable()
-  {
-    return false;
-  }
-
-  public void modifyText(ModifyEvent e)
-  {
-	  computeOptions();
-  }
-  
-  private void computeOptions() {
-	if (generator.getContentGenerator() instanceof SOAPContentGenerator) {
-		((SOAPContentGenerator) generator.getContentGenerator()).setAddressLocation(addressField.getText());
-	}
-  }
-  
-  public void setOptionsOnGenerator() {
-	  computeOptions();
-  }
-  
-  public Composite getControl() {
-	  return control;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java
deleted file mode 100644
index 23634b9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/GenerateBindingOnSaveDialog.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-
-public class GenerateBindingOnSaveDialog extends MessageDialog implements SelectionListener {
-	private static String dialogTitle = "Regenerate Bindings On Save";		// TODO: Translations needed....
-	private static String dialogMessage = "Regenerate Bindings On Save?";
-	private static String[] buttons = new String[]{"Yes", "No", "Cancel"};
-	
-	private Button rememberDecisionBox;
-	private boolean rememberDecision = false;
-	
-	public GenerateBindingOnSaveDialog(Shell shell) {
-		super(shell, dialogTitle, null, dialogMessage, MessageDialog.QUESTION, buttons, 0);
-	}
-	
-	
-	protected Control createCustomArea(Composite parent) {
-		Composite comp = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		comp.setLayout(layout);
-		comp.setData(new GridData());
-		
-		// Spacer
-		new Label(comp, SWT.NONE);
-		new Label(comp, SWT.NONE);
-		
-		rememberDecisionBox = new Button(comp, SWT.CHECK);
-		rememberDecisionBox.setText("Remember my decision");	// TODO: Externalize...
-		rememberDecisionBox.addSelectionListener(this);
-
-		return parent;
-	}
-	
-	private void storePromptPreference(int swtValue) {
-		// Store the new preference for displaying this dialog.
-		if (rememberDecision) {
-			WSDLEditorPlugin.getInstance().getPluginPreferences().setValue("Prompt Regenerate Binding on save", false);
-		
-			String generateID = WSDLEditorPlugin.getWSDLString("_UI_PREF_PAGE_AUTO_REGENERATE_BINDING");
-			if (swtValue == SWT.YES) {
-				WSDLEditorPlugin.getInstance().getPluginPreferences().setValue(generateID, true);
-			}
-			else if (swtValue == SWT.NO) {
-				WSDLEditorPlugin.getInstance().getPluginPreferences().setValue(generateID, false);
-			}
-		}
-	}
-	
-	public int open() {
-		int rValue = super.open();
-		
-		if (rValue ==0) {
-			storePromptPreference(SWT.YES);
-			return SWT.YES;
-		}
-		else if (rValue == 1) {
-			storePromptPreference(SWT.NO);
-			return SWT.NO;
-		}
-		else if (rValue == 2) {
-			storePromptPreference(SWT.CANCEL);
-			return SWT.CANCEL;
-		}
-		
-		return rValue;
-	}
-	
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == rememberDecisionBox) {
-			rememberDecision = rememberDecisionBox.getSelection();
-		}
-	}
-	
-	public void widgetDefaultSelected(SelectionEvent e) {}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java
deleted file mode 100644
index b696cad..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/ImportAddResourceListener.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import java.util.Collection;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-
-public class ImportAddResourceListener implements IResourceChangeListener, IResourceDeltaVisitor
-{
-  Vector importedFiles;
-
-  ImportAddResourceListener()
-  {
-    importedFiles = new Vector(); 
-  }
-  
-  public void resourceChanged(IResourceChangeEvent event)
-  {
-    IResourceDelta resourceDelta = event.getDelta();
-    
-    try
-    {
-      if (resourceDelta != null) 
-      {
-        resourceDelta.accept(this);
-      }
-    }
-    catch (Exception e)
-    {
-//      B2BGUIPlugin.getPlugin().getMsgLogger().write("Exception caught during resource change" + e);
-//      B2BGUIPlugin.getPlugin().getMsgLogger().writeCurrentThread(); 
-    }      
-  }
-
-  public boolean visit(IResourceDelta delta)
-  {
-    if (delta.getKind() == IResourceDelta.ADDED)
-    {
-      if (delta.getResource() instanceof IFile) 
-        importedFiles.add(delta.getResource());
-    }
-    return true;
-  }
-
-  public Collection getImportedFiles()
-  {
-    return importedFiles;
-  }
-    
-  // This returns the first imported file in the list of imported files
-  public IFile getImportedFile()
-  {
-    if (importedFiles.isEmpty() == false) 
-      return (IFile)importedFiles.firstElement();
-  
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java
deleted file mode 100644
index ba1e630..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/InvokeSetDialog.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.wsdl.Binding;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Fault;
-import org.eclipse.wst.wsdl.Input;
-import org.eclipse.wst.wsdl.Output;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.Port;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLComponentSelectionDialog;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLComponentSelectionProvider;
-import org.eclipse.wst.wsdl.ui.internal.dialogs.types.WSDLSetComponentHelper;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-
-public class InvokeSetDialog
-{
-  String kind;
-  String newValue = "";
-  
-  public void setReferenceKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public String getValue()
-  {
-    return newValue; 
-  }
-  
-  public void run(Object input, IEditorPart editorPart)
-  {
-      WSDLComponentSelectionDialog dialog = null;
-      Shell shell = Display.getCurrent().getActiveShell();
-      IFile iFile = ((IFileEditorInput) editorPart.getEditorInput()).getFile();
-      Definition definition = ((WSDLElement) input).getEnclosingDefinition();
-      String property = "";
-      
-    if (input instanceof Binding)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_PORTTYPE");
-        
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.PORT_TYPE);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        provider.setDialog(dialog);
-        property = "type";
-    }
-    else if (input instanceof Port)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_BINDING");
-        
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.BINDING);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        provider.setDialog(dialog);
-        property = "binding";
-    }
-    else if (input instanceof Part)
-    {
-        List validExtensions = new ArrayList(2);
-        validExtensions.add("wsdl");
-        validExtensions.add("xsd");
-        WSDLComponentSelectionProvider provider = null;
-        if (kind.equalsIgnoreCase("type")) {
-            property = ""; 
-            String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_TYPE");
-            
-            provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLEditorUtil.TYPE, validExtensions);
-            dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        }
-        else {
-            property = ""; 
-            String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_ELEMENT");
-            
-            provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLEditorUtil.ELEMENT, validExtensions);
-            dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);
-        }
-        provider.setDialog(dialog);
-    }
-    else if (input instanceof Input || input instanceof Output || input instanceof Fault)
-    {
-        String dialogTitle = WSDLEditorPlugin.getWSDLString("_UI_TITLE_SPECIFY_MESSAGE");
-
-        WSDLComponentSelectionProvider provider = new WSDLComponentSelectionProvider(iFile, definition, WSDLConstants.MESSAGE);
-        dialog = new WSDLComponentSelectionDialog(shell, dialogTitle, provider);   
-        provider.setDialog(dialog);
-        property = "message";
-    }
-
-    dialog.setBlockOnOpen(true);
-    dialog.create();
-
-    if (dialog.open() == Window.OK) {
-        WSDLSetComponentHelper helper = new WSDLSetComponentHelper(iFile, definition);
-        if (kind != null && kind.equalsIgnoreCase("type")) {
-            helper.setXSDTypeComponent((Part) input, dialog.getSelection());
-        }
-        else if (kind != null && kind.equalsIgnoreCase("element")){
-            helper.setXSDElementComponent((Part) input, dialog.getSelection());
-        }
-        else {
-            helper.setWSDLComponent((WSDLElement) input, property, dialog.getSelection());
-        }
-    } 
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java
deleted file mode 100644
index 3673cbb..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentFinder.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.SearchMatch;
-//import org.eclipse.wst.common.core.search.SearchParticipant;
-//import org.eclipse.wst.common.core.search.SearchPlugin;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.ProjectSearchScope;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.core.search.scope.WorkspaceSearchScope;
-import org.eclipse.wst.common.core.search.util.CollectingSearchRequestor;
-//import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentDeclarationPattern;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentFinder;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-
-public class WSDLComponentFinder extends XMLComponentFinder {
-	QualifiedName metaName;
-    public WSDLComponentFinder(QualifiedName metaName) {
-    	this.metaName = metaName;
-    }
-    
-    
-    protected void findComponents(SearchEngine searchEngine, List list, int scope)
-    {      
-      SearchScope searchScope = new WorkspaceSearchScope();
-      if (scope == ENCLOSING_PROJECT_SCOPE)
-      {
-        searchScope = new ProjectSearchScope(currentIFile.getProject().getLocation());
-      }       
-      try {
-          CollectingSearchRequestor requestor = new CollectingSearchRequestor();
-          
-          XMLComponentDeclarationPattern pattern = new XMLComponentDeclarationPattern(new QualifiedName("*", "*"), metaName, SearchPattern.R_PATTERN_MATCH);
-          
-          // TODO (cs) rethink the commented out code below.  Is there some reason for narrowing to list of search particpants?
-          // It seems the only benefit may be to filter our xsd component declarations that aren't defined
-          // in stand alone wsdl documents.  Perhaps it's best to do this with an additional property arg on the
-          // declaration pattern or perhaps simply doing some 'post' filtering.
-          //
-          //String participantId = metaName.getNamespace().equals(WSDLConstants.WSDL_NAMESPACE_URI) ?
-          //    "org.eclipse.wst.wsdl.search.WSDLSearchParticipant" :
-          //    "org.eclipse.wst.xsd.search.XSDSearchParticipant";        		  
-          //SearchParticipant particpant = SearchPlugin.getDefault().getSearchParticipant(participantId);         
-          //SearchParticipant[] participants = { particpant };     
-          
-          // TODO (cs) I'm betting we'll need to provide some hook here to allow extenders to configure
-          // the search options.  Currently we just pass in null.
-          searchEngine.search(pattern, requestor, searchScope, null, new NullProgressMonitor());
-          
-          for (Iterator i = requestor.getResults().iterator(); i.hasNext(); )
-          {
-            SearchMatch match = (SearchMatch)i.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(metaName);
-            spec.setFileLocation(match.getFile().getLocation().toString());
-            Object o = match.map.get("name");
-            if (o != null && o instanceof QualifiedName)
-            {  
-              QualifiedName qualifiedName = (QualifiedName)o;
-              if (qualifiedName.getLocalName() != null)
-              {  
-                spec.addAttributeInfo("name", qualifiedName.getLocalName());
-                spec.setTargetNamespace(qualifiedName.getNamespace());
-                list.add(spec);
-              }  
-            }  
-          }  
-      } catch (CoreException e) {
-        e.printStackTrace();
-          //status.add(e.getStatus());
-      }      
-    }
-    
-    public List getWorkbenchResourceComponents(int scope) {
-
-        List list = new ArrayList();
-        SearchEngine searchEngine = new SearchEngine();
-        findComponents(searchEngine, list, scope);    
-        return list;       
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java
deleted file mode 100644
index 885640f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionDialog.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.common.IComponentSelectionProvider;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionDialog;
-
-public class WSDLComponentSelectionDialog extends XMLComponentSelectionDialog {
-	
-    public WSDLComponentSelectionDialog(Shell shell, String dialogTitle, IComponentSelectionProvider provider) {
-        super(shell, dialogTitle, provider);
-    }  
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java
deleted file mode 100644
index dcb8fdc..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLComponentSelectionProvider.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.internal.impl.ImportImpl;
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditorPlugin;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.common.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentFinder;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionDialog;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSelectionProvider;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.wst.wsdl.ui.internal.search.IWSDLSearchConstants;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class WSDLComponentSelectionProvider extends XMLComponentSelectionProvider {
-    public static final String BUILT_IN_TYPE = "BUILT_IN_TYPE";
-    
-    private WSDLComponentFinder wsdlComponentFinder;
-    private WSDLComponentSelectionDialog dialog;
-    private WSDLComponentLabelProvider labelProvider;
-    private Definition definition;
-    private QualifiedName metaName;
-    private int kind;
-    
-    /*
-     * Takes in the IFile we are currently editing.
-     */
-    public WSDLComponentSelectionProvider(IFile file, Definition definition, int kind) {
-    	this.kind = kind;
-        List validExt = new ArrayList(1);
-        validExt.add("wsdl");
-        this.metaName = getQualifiedName(kind);
-        wsdlComponentFinder = new WSDLComponentFinder(metaName);
-        wsdlComponentFinder.setFile(file);
-        //wsdlComponentFinder.setValidExtensions(validExt);
-        this.definition = definition;
-        labelProvider = new WSDLComponentLabelProvider();
-    }
-    
-    protected QualifiedName getQualifiedName(int kind)
-    {    	 
-    	switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return IWSDLSearchConstants.BINDING_META_NAME;
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return IWSDLSearchConstants.PORT_TYPE_META_NAME;
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return IWSDLSearchConstants.MESSAGE_META_NAME;
-		}   
-		case WSDLEditorUtil.TYPE :
-		{
-			// TODO... need to combine complex and simple into a single meta name
-			return IXSDSearchConstants.COMPLEX_TYPE_META_NAME;
-		}
-		case WSDLEditorUtil.ELEMENT :
-		{
-			return IXSDSearchConstants.ELEMENT_META_NAME;
-		}
-		}    	
-    	return null;
-    }
-
-    public WSDLComponentSelectionProvider(IFile file, Definition definition, int kind, List validExt) {
-        this(file, definition, kind);
-        //wsdlComponentFinder.setValidExtensions(validExt);
-    }
-    
-    public void setDialog(WSDLComponentSelectionDialog dialog) {
-        this.dialog = dialog;
-    }
-    
-    public String getType(Object element) {
-        return null;
-    }
-    
-    private void createWSDLComponentObjects(IComponentList list, List inputComponents, QualifiedName metaName) {
-        Iterator it = inputComponents.iterator();
-        while (it.hasNext()) {
-            WSDLElement wsdlElement = (WSDLElement) it.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(metaName); 
-            spec.addAttributeInfo("name", wsdlElement.getElement().getAttribute("name"));
-            spec.setTargetNamespace(wsdlElement.getEnclosingDefinition().getTargetNamespace());
-            
-            String normalizedFile = getNormalizedLocation(wsdlElement.getEnclosingDefinition().getLocation());
-            spec.setFileLocation(normalizedFile);
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-    
-    private void createXSDComponentObjects(IComponentList list, List inputComponents, QualifiedName metaName) {
-        Iterator it = inputComponents.iterator();
-        while (it.hasNext()) {
-            XSDNamedComponent xsdElement = (XSDNamedComponent) it.next();
-            XMLComponentSpecification spec = new XMLComponentSpecification(metaName); 
-            spec.addAttributeInfo("name", xsdElement.getName());
-            spec.setTargetNamespace(xsdElement.getTargetNamespace());
-            
-            String normalizedFile = getNormalizedLocation(xsdElement.getSchema().getSchemaLocation());
-            spec.setFileLocation(normalizedFile);
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-        
-    public void getComponents(IComponentList list, boolean quick) {
-        if (quick) {
-            //Iterator tags = lookupTagPaths.iterator();
-            //while (tags.hasNext()) {
-                getComponentsQuick(list, metaName);
-            //}
-        }
-        else {
-            // Grab components from workspace locations
-            String scope = "";
-            if (dialog != null) {
-                scope = dialog.getSearchScope();
-            }
-            
-            List comps = new ArrayList();
-            if (scope.equals(XMLComponentSelectionDialog.SCOPE_ENCLOSING_PROJECT)) {
-                comps = wsdlComponentFinder.getWorkbenchResourceComponents(XMLComponentFinder.ENCLOSING_PROJECT_SCOPE);
-            }
-            else if (scope.equals(XMLComponentSelectionDialog.SCOPE_WORKSPACE)) {
-                comps = wsdlComponentFinder.getWorkbenchResourceComponents(XMLComponentFinder.ENTIRE_WORKSPACE_SCOPE);            
-            }
-
-            Iterator compsIt = comps.iterator();
-            while (compsIt.hasNext()) {
-                XMLComponentSpecification item = (XMLComponentSpecification) compsIt.next();
-                addDataItemToTreeNode(list, item);
-            }
-        }
-    }
-    
-    private void getComponentsQuick(IComponentList list, QualifiedName metaName) {
-        // Grab components within the file
-        if (metaName == IWSDLSearchConstants.BINDING_META_NAME) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEBindings(), metaName);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEBindings();
-                
-                createWSDLComponentObjects(list, importedComponents, metaName);
-            }
-        }
-        else if (metaName == IWSDLSearchConstants.PORT_TYPE_META_NAME) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEPortTypes(), metaName);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEPortTypes();
-                
-                createWSDLComponentObjects(list, importedComponents, metaName);
-            }
-        }
-        else if (metaName == IWSDLSearchConstants.MESSAGE_META_NAME) {
-            // Grab explictly defined components
-            createWSDLComponentObjects(list, definition.getEMessages(), metaName);
-            
-            // Grab directly imported components
-            Iterator importsIt = getWSDLFileImports(definition.getEImports()).iterator();
-            while (importsIt.hasNext()) {
-                Import importItem = (Import) importsIt.next();
-                Definition importDefinition = importItem.getEDefinition();
-                List importedComponents = importDefinition.getEMessages();
-                
-                createWSDLComponentObjects(list, importedComponents, metaName);
-            }
-        }
-        /*TODO... fix these cases
-        else if (metaName == IXSDSearchConstants.COMPLEX_TYPE_META_NAME) {
-            createXSDInlineTypesObjects(list, metaName);
-        }
-        else if (metaName.equals("/definitions/types/schema/simpleType")) {
-            createXSDInlineTypesObjects(list, metaName);
-        }*/
-        else if (metaName == IXSDSearchConstants.ELEMENT_META_NAME) {
-            createXSDElementObjects(list, metaName);
-            createRegularImportXSDElementObjects(list);
-        }
-        else if (metaName == IXSDSearchConstants.COMPLEX_TYPE_META_NAME){
-            createXSDInlineWrapperTypeObjects(list, metaName);
-            
-            createXSDBuiltInTypeObjects(list);
-            createRegularImportXSDTypeObjects(list);
-        }
-        else if (metaName == IXSDSearchConstants.SIMPLE_TYPE_META_NAME) {
-            createXSDInlineWrapperTypeObjects(list, metaName);
-        }
-        //else if (metaName.equals("/schema/element")) {
-        //    createXSDInlineWrapperElementObjects(list, metaName);
-        //}
-    }
-    
-    private List getWSDLFileImports(List wsdlImports) {
-        List list = new ArrayList();
-        Iterator it = wsdlImports.iterator();
-        while (it.hasNext()) {
-            ImportImpl importItem = (ImportImpl) it.next();
-            importItem.importDefinitionOrSchema();          // Load if necessary
-            if (importItem.getESchema() == null) {
-                list.add(importItem);
-            }
-        }
-        
-        return list;
-    }
-    
-    private void createXSDBuiltInTypeObjects(IComponentList list) { 
-        for (int i = 0; i < XSDDOMHelper.dataType.length; i++) {
-            String builtIn = XSDDOMHelper.dataType[i][0];
-            XMLComponentSpecification spec = new XMLComponentSpecification(null);//BUILT_IN_TYPE); 
-            spec.addAttributeInfo("name", builtIn);
-            spec.setTargetNamespace(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-
-//            String normalizedFile = getNormalizedLocation(definition.getLocation());
-//            spec.setFileLocation(normalizedFile);
-            spec.setFileLocation("Built-in");    
-            
-            addDataItemToTreeNode(list, spec);
-        }
-    }
-    
-    private void createRegularImportXSDTypeObjects(IComponentList list) {
-        // Handle regular imports(xsd and wsdl).
-        Iterator imports = definition.getEImports().iterator();
-        while (imports.hasNext()) {
-            Import importItem = (Import) imports.next();
-            ((ImportImpl) importItem).importDefinitionOrSchema();
-            List schemas = new ArrayList();
-            String complexPath = "";
-            String simplePath = "";
-            
-            if (importItem.getESchema() != null) {
-                // Import is a xsd file
-                schemas.add(importItem.getESchema());
-                complexPath = "/schema/complexType";
-                simplePath = "/schema/simpleType";
-            }
-            else if (importItem.getEDefinition() != null) {
-                // Import is a wsdl file
-                Definition definition = importItem.getEDefinition();
-                if (definition.getETypes() != null) {
-	                Iterator schemaIt = definition.getETypes().getEExtensibilityElements().iterator();
-	                while (schemaIt.hasNext()) {
-	                    XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) schemaIt.next();
-	                    schemas.add(eeElement.getSchema());
-	                    complexPath = "/definitions/types/schema/complexType";
-	                    simplePath = "/definitions/types/schema/simpleType";
-	                }
-                }
-            }
-            
-            if (schemas.size() > 0) {
-                Iterator schemaIt = schemas.iterator();
-                while (schemaIt.hasNext()) {
-                    Iterator typesIt = ((XSDSchema) schemaIt.next()).getTypeDefinitions().iterator();
-                    List complexList = new ArrayList();
-                    List simpleList = new ArrayList();
-                    while (typesIt.hasNext()) {
-                        Object component = typesIt.next();
-                        if (component instanceof XSDComplexTypeDefinition) {
-                            complexList.add(component);
-                        }
-                        else if (component instanceof XSDSimpleTypeDefinition) {
-                            simpleList.add(component);
-                        }
-                    }
-                    
-                    createXSDComponentObjects(list, complexList, IXSDSearchConstants.COMPLEX_TYPE_META_NAME);
-                    createXSDComponentObjects(list, simpleList, IXSDSearchConstants.SIMPLE_TYPE_META_NAME);
-                }
-            }
-        }
-    }
-    
-    private void createRegularImportXSDElementObjects(IComponentList list) {
-        // Handle regular imports(xsd and wsdl).
-        Iterator imports = definition.getEImports().iterator();
-        while (imports.hasNext()) {
-            Import importItem = (Import) imports.next();
-            ((ImportImpl) importItem).importDefinitionOrSchema();
-            List schemas = new ArrayList();
-            String path = "";
-            
-            if (importItem.getESchema() != null) {
-                // Import is a xsd file
-                schemas.add(importItem.getESchema());
-                path = "/schema/element";
-            }
-            else if (importItem.getEDefinition() != null) {
-                // Import is a wsdl file
-                Definition definition = importItem.getEDefinition();
-                if (definition.getETypes() != null) {
-	                Iterator schemaIt = definition.getETypes().getEExtensibilityElements().iterator();
-	                while (schemaIt.hasNext()) {
-	                    XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) schemaIt.next();
-	                    schemas.add(eeElement.getSchema());
-	                    path = "/definitions/types/schema/element";
-	                }
-                }
-            }
-            
-            if (schemas.size() > 0) {
-                Iterator schemaIt = schemas.iterator();
-                while (schemaIt.hasNext()) {
-                    List elementList = ((XSDSchema) schemaIt.next()).getElementDeclarations();
-                    createXSDComponentObjects(list, elementList, IXSDSearchConstants.ELEMENT_META_NAME);
-                }
-            }
-        }
-    }
-    
-    private void createXSDInlineTypesObjects(IComponentList list, QualifiedName tagPath) {
-        // Handle inline schemas
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() != null && !schema.getTargetNamespace().equals("")) {
-                    List keepTypes = new ArrayList();
-                    Iterator typeIterator = schema.getTypeDefinitions().iterator();
-                    // Filter out unwanted Types
-                    if (tagPath.equals("/definitions/types/schema/complexType")) {
-                        while (typeIterator.hasNext()) {
-                            Object type = typeIterator.next();
-                            if (type instanceof XSDComplexTypeDefinition &&
-                                    ((XSDComplexTypeDefinition) type).getSchema().equals(schema)) {
-                                keepTypes.add(type);
-                            }
-                        }
-                    }
-                    else if (tagPath.equals("/definitions/types/schema/simpleType")) {
-                        while (typeIterator.hasNext()) {
-                            Object type = typeIterator.next();
-                            if (type instanceof XSDSimpleTypeDefinition &&
-                                    ((XSDSimpleTypeDefinition) type).getSchema().equals(schema)) {
-                                keepTypes.add(type);
-                            }
-                        }
-                    }
-                    
-                    createXSDComponentObjects(list, keepTypes, tagPath);
-            }
-        }
-    }
-
-    private void createXSDElementObjects(IComponentList list, QualifiedName tagPath) {
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            List keepElements = new ArrayList();
-            if (schema.getTargetNamespace() != null && !schema.getTargetNamespace().equals("")) {
-                Iterator elementIt = schema.getElementDeclarations().iterator();
-                while (elementIt.hasNext()) {
-                    // Only look for elements explicitly defined in the Schema (not through imports).
-                    XSDElementDeclaration xsdElement = (XSDElementDeclaration) elementIt.next();
-                    if (xsdElement.getSchema().equals(schema)) {
-                        keepElements.add(xsdElement);
-                    }
-                }
-                
-                createXSDComponentObjects(list, keepElements, tagPath);
-            }
-        }
-    }
-    
-    private void createXSDInlineWrapperTypeObjects(IComponentList list, QualifiedName tagPath) {
-        // Handle inline schemas
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {
-                List keepTypes = new ArrayList();
-                
-                List imports = new ArrayList();
-                Iterator contents = schema.getContents().iterator();
-                while (contents.hasNext()) {
-                    XSDSchemaContent content = (XSDSchemaContent) contents.next();
-                    if (content instanceof XSDImport) {
-                        imports.add(content);             
-                    }
-                }
-                
-                Iterator importIterator = imports.iterator();
-                while (importIterator.hasNext()) {
-                    XSDImport importObject = (XSDImport) importIterator.next();
-                    XSDSchema importSchema = ((XSDImportImpl) importObject).importSchema();
-                    Iterator typesIt = importSchema.getTypeDefinitions().iterator();
-                    while (typesIt.hasNext()) {
-                        Object typeObject = typesIt.next();
-                        if (tagPath.equals("/schema/complexType") &&
-                            typeObject instanceof XSDComplexTypeDefinition) {
-                            keepTypes.add(typeObject);
-                        }
-                        else if (tagPath.equals("/schema/simpleType") &&
-                                 typeObject instanceof XSDSimpleTypeDefinition) {
-                            keepTypes.add(typeObject);
-                        }
-                    }
-                    
-                }
-
-                createXSDComponentObjects(list, keepTypes, tagPath);
-            }
-        }
-    }
-    
-    private void createXSDInlineWrapperElementObjects(IComponentList list, QualifiedName tagPath) {
-    	if (definition.getETypes() == null) {
-    		return;
-    	}
-    	
-        Iterator inlineSchemasIt = definition.getETypes().getSchemas().iterator();
-        while (inlineSchemasIt.hasNext()) {
-            XSDSchema schema = (XSDSchema) inlineSchemasIt.next();
-            
-            if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {
-                Iterator contents = schema.getContents().iterator();
-                List imports = new ArrayList();
-                while (contents.hasNext()) {
-                    XSDSchemaContent content = (XSDSchemaContent) contents.next();
-                    if (content instanceof XSDImport) {
-                        imports.add(content);             
-                    }
-                }
-                
-                Iterator importIterator = imports.iterator();
-                while (importIterator.hasNext()) {
-                    XSDImport importObject = (XSDImport) importIterator.next();
-                    XSDSchema importSchema = ((XSDImportImpl) importObject).importSchema();
-
-                    createXSDComponentObjects(list, importSchema.getElementDeclarations(), tagPath);    
-                }                
-            }
-        }
-    }
-
-//      private ITypeSystemProvider getTypeSystemProvider() {
-//            ITypeSystemProvider provider = WSDLEditorUtil.getInstance().getTypeSystemProvider(definition);
-//            if (provider instanceof ExtensibleTypeSystemProvider) {
-//                provider = (ExtensibleTypeSystemProvider) provider; 
-//            }
-//            else {
-//                return null;
-//            }
-//            
-//            return provider;
-//      }
-
-    
-  
-    public ILabelProvider getLabelProvider() {
-        return labelProvider;
-    }    
-    
-	public String getListTitle() {
-
-		switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_BINDINGS");
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_PORTTYPES");
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_MESSAGES");
-		}   
-		case WSDLEditorUtil.TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_TYPES");
-		}
-		case WSDLEditorUtil.ELEMENT :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MATCHING_ELEMENTS");
-		}
-		}    	
-		return null;	   
-	}
-
-	public String getNameFieldTitle() {
-		switch (kind)
-		{
-		case WSDLConstants.BINDING :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_BINDING_NAME");
-		}
-		case WSDLConstants.PORT_TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_PORTTYPE_NAME");
-		}	
-		case WSDLConstants.MESSAGE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_MESSAGE_NAME");
-		}   
-		case WSDLEditorUtil.TYPE :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_TYPE_NAME");
-		}
-		case WSDLEditorUtil.ELEMENT :
-		{
-			return WSDLEditorPlugin.getWSDLString("_UI_LABEL_ELEMENT_NAME");
-		}
-		}    	
-		return null;	   
-	}
-    public class WSDLComponentLabelProvider extends XMLComponentSelectionLabelProvider {
-        public Image getImage(Object element) {
-            XMLComponentTreeObject specification = (XMLComponentTreeObject) element;
-            XMLComponentSpecification spec = (XMLComponentSpecification) specification.getXMLComponentSpecification().get(0);
-            if (spec.getMetaName() == IWSDLSearchConstants.BINDING_META_NAME) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/binding_obj.gif");
-            }
-            else if (spec.getMetaName() == IWSDLSearchConstants.PORT_TYPE_META_NAME) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/portType_obj.gif");
-            }
-            else if (spec.getMetaName() == IWSDLSearchConstants.MESSAGE_META_NAME) {
-                return WSDLEditorPlugin.getInstance().getImage("icons/message_obj.gif");
-            }
-            else if (spec.getMetaName() == IXSDSearchConstants.COMPLEX_TYPE_META_NAME){
-            	//|| spec.getMetaName() == ("/schema/complexType"))             	
-                return XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-            }
-            else if (spec.getMetaName() == IXSDSearchConstants.SIMPLE_TYPE_META_NAME ||
-                     //spec.getMetaName() == ("/schema/simpleType") ||
-                     spec.getMetaName() == null /*BUILT_IN_TYPE*/){ 
-                return XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-            }
-            else if (spec.getMetaName() == IXSDSearchConstants.ELEMENT_META_NAME){
-            		// ||spec.getMetaName() == ("/schema/element"))
-                return XSDEditorPlugin.getXSDImage("icons/XSDElement.gif");
-            }
-    
-            return null;
-        }
-    }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java
deleted file mode 100644
index 0d1f2a9..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/dialogs/types/WSDLSetComponentHelper.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.dialogs.types;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.Import;
-import org.eclipse.wst.wsdl.Part;
-import org.eclipse.wst.wsdl.WSDLElement;
-import org.eclipse.wst.wsdl.XSDSchemaExtensibilityElement;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddElementDeclarationAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddImportAction;
-import org.eclipse.wst.wsdl.ui.internal.actions.AddWSISchemaImportAction;
-import org.eclipse.wst.wsdl.ui.internal.util.ComponentReferenceUtil;
-import org.eclipse.wst.wsdl.ui.internal.util.WSDLEditorUtil;
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.eclipse.wst.xsd.ui.internal.dialogs.types.xml.XMLComponentSpecification;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-
-
-public class WSDLSetComponentHelper {
-    private Definition definition;
-    private IFile currentIFile;
-    
-    public WSDLSetComponentHelper(IFile iFile, Definition definition) {
-        currentIFile = iFile;
-        this.definition = definition;
-    }
-    
-    public void setWSDLComponent(WSDLElement inputElement, String property, XMLComponentSpecification spec) {
-        addImportIfNecessary(spec);
-        String componentObject = getPrefixedComponentName(spec);
-
-        org.w3c.dom.Element wsdlElement = inputElement.getElement();
-        
-        wsdlElement.setAttribute(property, componentObject); //$NON-NLS-1$
-    }
-    
-    public void setXSDTypeComponent(Part part, XMLComponentSpecification spec) {
-        if (spec.getMetaName() != null) {
-            addImportIfNecessary(spec);
-        }
-        String componentObject = getPrefixedComponentName(spec);
-        
-        ComponentReferenceUtil.setComponentReference((Part) part, true, componentObject);
-    }
-    
-    public void setXSDElementComponent(Part part, XMLComponentSpecification spec) {
-        addImportIfNecessary(spec);
-        String componentObject = getPrefixedComponentName(spec);
-        
-        ComponentReferenceUtil.setComponentReference((Part) part, false, componentObject);
-    }
-    
-    /*
-     * Return the prefixed component name described by the given
-     * XMLComponentSpecification object.
-     */
-    public String getPrefixedComponentName(XMLComponentSpecification spec) {
-        String name = (String) spec.getAttributeInfo("name");
-        List prefixes = getPrefixes(definition, spec.getTargetNamespace());
-        if (prefixes.size() > 0) {
-            name = prefixes.get(0) + ":" + name;
-        }
-        
-        return name;
-    }         
-          
-    private List getPrefixes(Definition definition, String namespace) {
-        List list = new ArrayList();
-        Map map = definition.getNamespaces();
-        for (Iterator i = map.keySet().iterator(); i.hasNext();) {
-            String prefix = (String) i.next();
-            String theNamespace = (String) map.get(prefix);
-            if (theNamespace != null && theNamespace.equals(namespace)) {
-                list.add(prefix);
-            }
-        }
-        return list;
-    }
-
-    
-    private void addImportIfNecessary(XMLComponentSpecification spec) {
-        boolean foundMatch = false;
-        
-        // Check itself
-        String currentFileLocation = currentIFile.getLocation().toString();
-        if (currentFileLocation.equals(spec.getFileLocation())) {
-            foundMatch = true;
-        }
-        
-        // Check regular Imports
-        if (!foundMatch) {
-            Iterator importsIt = definition.getEImports().iterator();
-            
-            while (importsIt.hasNext()) {
-                String importLocation = "";
-                Import importItem = (Import) importsIt.next();
-                if (importItem.getESchema() != null) {
-                    XSDSchema schema = importItem.getESchema();
-                    importLocation = getNormalizedLocation(schema.getSchemaLocation());
-                }
-                else {            
-                    Definition importDefinition = importItem.getEDefinition();
-                    importLocation = getNormalizedLocation(importDefinition.getLocation()); 
-                }            
-    
-                if (importLocation.equals(spec.getFileLocation())) {
-                    foundMatch = true;
-                    break;
-                }
-            }
-        }
-        
-        // Check inline Schemas
-        if (!foundMatch) {
-            List imports = new ArrayList();
-            
-            if (definition.getETypes() != null) {
-	            Iterator it = definition.getETypes().getEExtensibilityElements().iterator();
-	            while (it.hasNext()) {
-	                XSDSchemaExtensibilityElement eeElement = (XSDSchemaExtensibilityElement) it.next();
-	                XSDSchema schema = eeElement.getSchema();
-	                if (schema.getTargetNamespace() == null || schema.getTargetNamespace().equals("")) {                    
-	                    Iterator contents = schema.getContents().iterator();
-	                    while (contents.hasNext()) {
-	                        XSDSchemaContent content = (XSDSchemaContent) contents.next();
-	                        if (content instanceof XSDImport) {
-	                            imports.add(content);             
-	                        }
-	                    }
-	                }
-	            }
-            }
-            
-            Iterator importIt = imports.iterator();
-            while (importIt.hasNext()) {
-                XSDImport importItem = (XSDImport) importIt.next();
-                XSDSchema resolvedSchema = importItem.getResolvedSchema();
-                String resolvedString = resolvedSchema.getSchemaLocation();
-                String importLocation = getNormalizedLocation(resolvedString);
-                
-                if (importLocation.equals(spec.getFileLocation())) {
-                    foundMatch = true;
-                    break;
-                }
-            }            
-        }
-        
-        if (!foundMatch) {
-            boolean wsiStyleImport = isXSDSchemaFile(spec);
-            if (wsiStyleImport) {
-                AddElementDeclarationAction action = new AddElementDeclarationAction(definition, spec.getTargetNamespace(), "xsd");
-                action.run();
-             
-                String location = URIHelper.getRelativeURI(new Path(spec.getFileLocation()), currentIFile.getLocation());
-                AddWSISchemaImportAction addImport = new AddWSISchemaImportAction(definition, spec.getTargetNamespace(), location);
-                addImport.run();
-            }
-            else {
-                String newSelectedFileLoc = spec.getFileLocation();
-                String currentFileLoc = getNormalizedLocation(definition.getLocation());
-                String relativeLoc = ComponentReferenceUtil.computeRelativeURI(newSelectedFileLoc, currentFileLoc, true);
-                
-                org.w3c.dom.Element definitionElement = WSDLEditorUtil.getInstance().getElementForObject(definition);
-                String prefix = definition.getPrefix(WSDLConstants.WSDL_NAMESPACE_URI);
-                String namespace = spec.getTargetNamespace();
-                
-                AddImportAction addImportAction = new AddImportAction(null, definition, definitionElement, prefix, namespace, relativeLoc);
-                addImportAction.run();            
-                
-                String uniquePrefix = getUniquePrefix(definition, prefix);            
-                definitionElement.setAttribute("xmlns:" + uniquePrefix, namespace);
-            }
-        }
-    }
-    /*
-     * Try to determine if the passed in XMLComponentSpecification refers to
-     * an XSD or WSDL file.  If it's an XSD, return true.
-     */
-    private boolean isXSDSchemaFile(XMLComponentSpecification spec) {
-        String fileLocation = spec.getFileLocation();
-        int periodIndex = fileLocation.lastIndexOf(".");
-        
-        if (periodIndex > 0) {
-            String extension = fileLocation.substring(periodIndex + 1);
-            if (extension.equalsIgnoreCase("xsd")) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-    
-    private String getUniquePrefix(Definition definition, String initPrefix) {
-      String uniquePrefix;
-      Map map = definition.getNamespaces();
-
-      if (definition.getNamespace(initPrefix) == null) {
-        uniquePrefix = initPrefix;
-      }
-      else {// if used, then try to create a unique one
-        String tempPrefix = initPrefix;
-        int i = 1;
-        while(map.containsKey(tempPrefix + i)) {
-          i++;
-        }
-        uniquePrefix = tempPrefix + i;
-      }
-      return uniquePrefix;    
-    } 
-    
-    private String getNormalizedLocation(String location) {
-        try {
-            URL url = new URL(location);
-            URL resolvedURL = Platform.resolve(url);
-            location = resolvedURL.getPath();
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-        
-        return location; 
-      }
-    
-    
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java
deleted file mode 100644
index 326428b..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ExtensibilityItemTreeProviderRegistry.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-
-/**
- * This class reads the plugin manifests and registers each extensibility item tree provider
- */
-public class ExtensibilityItemTreeProviderRegistry extends NSKeyedExtensionRegistry
-{
-  protected static final String LABEL_PROVIDER_PROPERTY = "labelProviderClass";
-  protected static final String CONTENT_PROVIDER_PROPERTY = "contentProviderClass";
-  protected static final String[] ATT_NAMES = { "labelProviderClass", "contentProviderClass" };
-
-  public ILabelProvider getLabelProvider(String namespace)
-  {
-    return (ILabelProvider) getProperty(namespace, LABEL_PROVIDER_PROPERTY);
-  }
-
-  public ITreeChildProvider getContentProvider(String namespace)
-  {
-    return (ITreeChildProvider) getProperty(namespace, CONTENT_PROVIDER_PROPERTY);
-  }
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java
deleted file mode 100644
index d1f474f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IDetailsViewerProvider.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-
-public interface IDetailsViewerProvider
-{                                      
-  public Object getViewerKey(Object modelObject);
-  public Viewer createViewer(Object modelObject, Composite parent, IEditorPart editorPart);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java
deleted file mode 100644
index 01c8237..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IEditPartProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.w3c.dom.Node;
-
-public interface IEditPartProvider
-{                                      
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java
deleted file mode 100644
index a1ff915..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IMenuActionContributor.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.w3c.dom.Node;
-
-public interface IMenuActionContributor
-{                                      
-  public void contributeMenuActions(IMenuManager manager, Node node, Object object);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java
deleted file mode 100644
index 95d9a75..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/IModelQueryContributor.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-                   
-// Note this class will likely be removed in the future when the ModelQuery's extension mechanism is updated
-//
-public interface IModelQueryContributor
-{                                      
-  public void setModel(IDOMModel xmlModel);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java
deleted file mode 100644
index ee956ce..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeAssociationProvider.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public interface INodeAssociationProvider
-{                    
-  public Object getModelObject(Object parentModelObject, Element[] elementChain, int start, int[] end);
-  public Node getNode(Object modelObject); 
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java
deleted file mode 100644
index 86cfebb..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/INodeReconciler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.w3c.dom.Element;
-
-
-public interface INodeReconciler
-{
-  public void notifyChanged(Object modelObject, Element element, int eventType, Object feature, Object oldValue, Object newValue, int index);                                         
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java
deleted file mode 100644
index aac380e..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITreeChildProvider.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-/**
- * This class allows extension writers to provide specialize tree content behaviour.
- * It is intended to behave similar to the org.eclipse.jface.viewers.ITreeContentProvider.
- * The major difference is that this class is simplified so that only one method is involved.
- * 
- * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)  	
- */
-public interface ITreeChildProvider
-{
-	public Object[] getChildren(Object object);
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java
deleted file mode 100644
index 4700ede..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/ITypeSystemProvider.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import java.util.List;
-
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.xsd.XSDSchema;
-
-public interface ITypeSystemProvider
-{                                                      
-  public static final int UNKNOWN_TYPE = 0x0;
-  public static final int BUILT_IN_TYPE = 0x1;
-  public static final int USER_DEFINED_SIMPLE_TYPE = 0x2;
-  public static final int USER_DEFINED_COMPLEX_TYPE = 0x4;
-
-  public List getAvailableTypeNames(Definition definition, int typeNameCategory);
-  public List getAvailableElementNames(Definition definition);  
-  public List getAvailableTypes(Definition definition, XSDSchema schema, int typeNameCategory);
-  public int getCategoryForTypeName(Definition definition, String typeName);
-  public List getPrefixedNames(Definition definition, String namespace, String localName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java
deleted file mode 100644
index eff406f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/NSKeyedExtensionRegistry.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import java.util.HashMap;
-
-import org.osgi.framework.Bundle;
-
-public class NSKeyedExtensionRegistry
-{
-  protected HashMap map = new HashMap();
-  private static final String PLUGIN_LOADING_ERROR = "PLUGIN_LOADING_ERROR";
-
-  public NSKeyedExtensionRegistry()
-  {
-  }
-
-  public void put(String namespaceURI, String className, Bundle bundle)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    if (info == null)
-    {
-      info = new SinglePropertyExtensionInfo(className, bundle);
-      map.put(namespaceURI, info);
-    }
-  }
-
-  public void put(String namespaceURI, HashMap propertyToClassNameMap, Bundle bundle)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    if (info == null)
-    {
-      info = new MultiPropertyExtensionInfo(propertyToClassNameMap, bundle);
-      map.put(namespaceURI, info);
-    }
-  }
-
-  /**
-   * 
-   * @deprecated
-   */
-  public Object get(String namespaceURI)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    return info != null ? info.getObject("") : null;
-  }
-
-  public Object getProperty(String namespaceURI, String property)
-  {
-    ExtensionInfo info = (ExtensionInfo) map.get(namespaceURI);
-    return info != null ? info.getObject(property) : null;
-  }
-
-  private abstract class ExtensionInfo
-  {
-    protected Bundle bundle;
-
-    public ExtensionInfo(Bundle bundle)
-    {
-      this.bundle = bundle;
-    }
-
-    public abstract Object getObject(String property);
-  }
-
-  private class SinglePropertyExtensionInfo extends ExtensionInfo
-  {
-    protected String className;
-    protected Object object;
-    protected boolean error;
-
-    public SinglePropertyExtensionInfo(String className, Bundle bundle)
-    {
-      super(bundle);
-      this.className = className;
-    }
-
-    public Object getObject(String property)
-    {
-      if (object == null)
-      {
-        try
-        {
-          Class theClass = bundle.loadClass(className);
-          object = theClass.newInstance();
-        }
-        catch (Exception e)
-        {
-          object = PLUGIN_LOADING_ERROR;
-          e.printStackTrace();
-        }
-      }
-      return object != PLUGIN_LOADING_ERROR ? object : null;
-    }
-  }
-
-  private class MultiPropertyExtensionInfo extends ExtensionInfo
-  {
-    protected HashMap propertyToClassNameTable;
-    protected HashMap propertyToObjectTable = new HashMap();
-
-    public MultiPropertyExtensionInfo(HashMap propertToClassNameTable, Bundle bundle)
-    {
-      super(bundle);
-      this.propertyToClassNameTable = propertToClassNameTable;
-    }
-
-    public Object getObject(String property)
-    {
-      Object result = null;
-      String className = (String) propertyToClassNameTable.get(property);
-      if (className != null)
-      {
-        result = propertyToObjectTable.get(property);
-        if (result == null)
-        {
-          try
-          {
-            Class theClass = bundle.loadClass(className);
-            result = theClass.newInstance();
-            propertyToObjectTable.put(property, result);
-          }
-          catch (Exception e)
-          {
-            propertyToObjectTable.put(property, PLUGIN_LOADING_ERROR);
-            result = PLUGIN_LOADING_ERROR;
-            e.printStackTrace();
-          }
-        }
-      }
-	  return result != PLUGIN_LOADING_ERROR ? result : null;      
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java
deleted file mode 100644
index 5bbaf6c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtension.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-
-public interface WSDLEditorExtension
-{                                          
-  public static final int OUTLINE_TREE_CONTENT_PROVIDER = 1;    // req'd for model based ext
-  public static final int OUTLINE_LABEL_PROVIDER = 2;           // req'd for model based ext
-
-  public static final int MENU_ACTION_CONTRIBUTOR = 3;          // node
-  public static final int DETAILS_VIEWER_PROVIDER = 4;          // node
-
-  public static final int EDIT_PART_FACTORY = 5;                // req'd for model based ext
-  public static final int TYPE_SYSTEM_PROVIDER = 6;             // req'd for type system ext
-  public static final int NODE_RECONCILER = 7;                  // req'd for model based ext
-  public static final int NODE_ASSOCIATION_PROVIDER = 8;        // req'd for model based ext
-  public static final int MODEL_QUERY_CONTRIBUTOR = 9;          // req'd for model based ext
-
-  public static final int PROPERTY_SOURCE_PROVIDER = 10;        // req'd for model based ext
-  public static final int PROPERTY_SECTION_DESCRIPTOR_PROVIDER = 11;  // req'd for model based ext
-  public static final int XSD_DELETE_ACTION = 12;
-  
-  boolean isExtensionTypeSupported(int type);
-  boolean isApplicable(Object modelObject);
-  Object createExtensionObject(int type, WSDLEditor wsdlEditor);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java
deleted file mode 100644
index 47ee082..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/extension/WSDLEditorExtensionRegistry.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.extension;
-        
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.wsdl.ui.internal.WSDLEditor;
-import org.osgi.framework.Bundle;
-
-public class WSDLEditorExtensionRegistry
-{                   
-  //protected List classNameClassLoaderPairList = new ArrayList();
-  //protected HashMap treeProviderMap = new HashMap(); 
-  protected List registeredExtensionList = new ArrayList();
-
-  public WSDLEditorExtensionRegistry()
-  {
-    add(new WSDLEditor.BuiltInWSDLEditorExtension());
-  }            
-
-  //public ExtensibilityItemTreeProvider getExtensibilityItemTreeProvider(String namespaceURI)
-  //{
-  //  return (ExtensibilityItemTreeProvider)treeProviderMap.get(namespaceURI);
-  //}
-
-  //public void putExtensibilityItemTreeProvider(String namespaceURI, ExtensibilityItemTreeProvider treeProvider)
-  //{
-  //  treeProviderMap.put(namespaceURI, treeProvider);
-  //}
-  
-  public List getRegisteredExtensions()
-  {                            
-    return registeredExtensionList;                                
-  }                       
-
-  public WSDLEditorExtension getApplicableExtension(int type, Object object)
-  { 
-    WSDLEditorExtension result = null;                                    
-    for (Iterator i = getRegisteredExtensions().iterator(); i.hasNext(); )
-    {
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      if (extension.isExtensionTypeSupported(type) && extension.isApplicable(object))
-      { 
-        result = extension;
-        break;
-      }
-    }         
-    return result;                                                           
-  }
-
-  public WSDLEditorExtension[] getRegisteredExtensions(int type)
-  { 
-    List list = new ArrayList();                                    
-    for (Iterator i = getRegisteredExtensions().iterator(); i.hasNext(); )
-    {
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      if (extension.isExtensionTypeSupported(type))
-      { 
-        list.add(extension);
-      }
-    } 
-
-    WSDLEditorExtension[] result = new WSDLEditorExtension[list.size()];
-    int count = 0;
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    { 
-      WSDLEditorExtension extension = (WSDLEditorExtension)i.next();
-      result[count] = extension;
-      count++;
-    }
-    return result;                          
-  }
-             
-  public void addAsFirst(WSDLEditorExtension extension)
-  {               
-    getRegisteredExtensions().add(0, extension);
-  }    
-
-  public void add(WSDLEditorExtension extension)
-  {               
-    getRegisteredExtensions().add(extension);
-  }          
-
-  public void add(ClassLoader classLoader, String className)
-  {                      
-    // TODO... consider defered instantiation of WSDLEditorExtensions         
-    try
-    {       
-      Class theClass = classLoader != null ? classLoader.loadClass(className) : Class.forName(className);
-      WSDLEditorExtension extension = (WSDLEditorExtension)theClass.newInstance();
-      registeredExtensionList.add(extension);
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-  }
-  public void add(Bundle bundle, String className)
-  {                      
-    // TODO... consider defered instantiation of WSDLEditorExtensions         
-    try
-    {      
-      
-      Class theClass = bundle.loadClass(className);
-      WSDLEditorExtension extension = (WSDLEditorExtension)theClass.newInstance();
-      registeredExtensionList.add(extension);
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java
deleted file mode 100644
index 61bf0d2..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/ExtensiblityElementFilter.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public interface ExtensiblityElementFilter 
-{
-  public boolean isValidContext(Element parentElement, String localName);     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java
deleted file mode 100644
index 859259c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/HttpExtensiblityElementFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-
-public class HttpExtensiblityElementFilter implements ExtensiblityElementFilter
-{  
-  public HttpExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-    
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("binding"))
-	{
-	  result = localName.equals("binding"); 	  
-	}	  
-	else if (parentElementName.equals("operation"))
-	{
-	  result = localName.equals("operation"); 
-	}
-	else if (parentElementName.equals("input") || 
-	         parentElementName.equals("output"))
-	{
-	  result = localName.equals("body") || 
-	           localName.equals("header"); 	  
-	}	
-	else if (parentElementName.equals("fault"))
-	{
-	  result = localName.equals("fault"); 	  
-	}
-	else if (parentElementName.equals("port"))
-	{
-	  result = localName.equals("address"); 	  
-	}	
-    
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java
deleted file mode 100644
index eaa701f..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/MimeExtensiblityElementFilter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.eclipse.wst.wsdl.util.WSDLConstants;
-import org.w3c.dom.Element;
-
-
-public class MimeExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  private static final String MIME_NAMESPACE_URI="http://schemas.xmlsoap.org/wsdl/mime/";
-  public MimeExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-
-    String parentElementName = parentElement.getLocalName();
-    String parentElementNamespace = parentElement.getNamespaceURI();
-
-  	if (WSDLConstants.WSDL_NAMESPACE_URI.equals(parentElementNamespace))
-  	{
-    	if (parentElementName.equals("input") || parentElementName.equals("output"))
-    	{
-    	  	result = localName.equals("content") ||
-				     localName.equals("multipartRelated") ||
-				     localName.equals("mimeXml");    	  	
-    	}
-  	}
-  	else if (MIME_NAMESPACE_URI.equals(parentElementNamespace))
-  	{
-		result = true;				
-  	}
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java
deleted file mode 100644
index fbfe95c..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/SoapExtensiblityElementFilter.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public class SoapExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  public SoapExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("binding"))
-	{
-	  result = localName.equals("binding"); 	  
-	}	  
-	else if (parentElementName.equals("operation"))
-	{
-	  result = localName.equals("operation"); 
-	}
-	else if (parentElementName.equals("input") || 
-	         parentElementName.equals("output"))
-	{
-	  result = localName.equals("body") || 
-	           localName.equals("header"); 	  
-	}	
-	else if (parentElementName.equals("fault"))
-	{
-	  result = localName.equals("fault"); 	  
-	}
-	else if (parentElementName.equals("port"))
-	{
-	  result = localName.equals("address"); 	  
-	}	
-
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java
deleted file mode 100644
index c9d3aec..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/filter/XSDExtensiblityElementFilter.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.filter;
-
-import org.w3c.dom.Element;
-
-public class XSDExtensiblityElementFilter implements ExtensiblityElementFilter
-{   
-  public XSDExtensiblityElementFilter()
-  {
-  }  	
-	
-  public boolean isValidContext(Element parentElement, String localName)
-  {
-  	boolean result = false;
-    String parentElementName = parentElement.getLocalName();
-	if (parentElementName.equals("types"))
-	{
-	  result = localName.equals("schema"); 	  
-	}	  	
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java
deleted file mode 100644
index 4709c16..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/InteractorHelper.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editparts;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.wsdl.ui.internal.gef.util.figures.Interactor;
-import org.eclipse.wst.xsd.ui.internal.gef.util.figures.IExpandable;
-
-                 
-// hooks up an interactor with an edit part and the figure that needs to be expanded and collapsed
-//
-public class InteractorHelper implements MouseListener
-{                             
-  protected boolean needToPerformDefaultExpansion = true;
-  protected EditPart editPart;               
-  protected Interactor interactor;                                                        
-  protected IExpandable expandable;
-
-  public InteractorHelper(EditPart editPart, Interactor interactor, IExpandable expandable)
-  {                          
-    this.editPart = editPart;
-    this.interactor = interactor;
-    this.expandable = expandable;
-    interactor.addMouseListener(this);
-    expandable.setExpanded(interactor.isExpanded());
-  }                  
-
-  public void setExpanded(boolean isExpanded)
-  {
-    interactor.setExpanded(isExpanded);
-    interactorExpansionChanged(isExpanded);
-  }
-  
-  protected void interactorExpansionChanged(boolean isInteractorExpanded)
-  { 
-    expandable.setExpanded(isInteractorExpanded);
-    expandable.setVisible(isInteractorExpanded);
-
-    editPart.refresh();
-
-    EditPart root = editPart.getRoot();
-    if (root instanceof AbstractGraphicalEditPart)
-    {                               
-      IFigure rootFigure = ((AbstractGraphicalEditPart)root).getFigure();
-      invalidateAll(rootFigure);
-      rootFigure.validate();
-      rootFigure.repaint();
-    }      
-  }
-
-         
-  protected void invalidateAll(IFigure figure)
-  {
-    figure.invalidate();   
-    LayoutManager manager = figure.getLayoutManager();
-    if (manager != null)
-    {
-      manager.invalidate();
-    }
-    for (Iterator i = figure.getChildren().iterator(); i.hasNext(); )
-    {
-      IFigure child = (IFigure)i.next();
-      invalidateAll(child);
-    }
-  } 
-     
-
-  // implements MouseListener
-  //
-  public void mouseDoubleClicked(MouseEvent me) 
-  {      
-  }
- 
-  public void mousePressed(MouseEvent me)
-  {      
-    boolean newExpansionState = !interactor.isExpanded();
-    interactor.setExpanded(newExpansionState);
-    interactorExpansionChanged(newExpansionState);
-  }
- 
-  public void mouseReleased(MouseEvent me)  
-  { 
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java
deleted file mode 100644
index 115179a..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editparts/MultiContentPaneEditPart.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editparts;
-                               
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-
-
-public abstract class MultiContentPaneEditPart extends AbstractGraphicalEditPart
-{
-  protected IFigure[] contentPanes;
-  protected int[] contentPaneIndexAdjustment;
-                         
-  protected IFigure[] initContentPanes()
-  {                             
-    return null;
-  }    
-
-  protected int getContentPane(Object model)
-  {  
-    return 0;
-  }
-    
-  protected List sortByContentPane(List list)
-  {                    
-    return list;
-  }  
-
-
-  protected void setFigure(IFigure figure)
-  {
-	  super.setFigure(figure);
-    contentPanes = initContentPanes();   
-    if (contentPanes != null)
-    {
-      contentPaneIndexAdjustment = new int[contentPanes.length];
-    }
-  }        
-     
-
-  protected void updateContentPaneInfoIndexAdjustment(List list)
-  { 
-    int index = 0;  
-    int listSize = list.size();
-
-    for (int  j = 0; j < contentPanes.length; j++)
-    { 
-      contentPaneIndexAdjustment[j] = index;
-      while (index < listSize)
-      {              
-        Object model = list.get(index);
-        if (getContentPane(model) != j)
-        {
-          break;
-        }                          
-        index++;
-      }
-    }
-  }
-                            
-
-  protected void refreshChildren()
-  {                        
-    if (contentPanes != null)
-    {
-      List sortedList = sortByContentPane(getModelChildren());
-      updateContentPaneInfoIndexAdjustment(sortedList);
-    }
-    super.refreshChildren();
-  }
-                            
-
-  protected void addChildVisual(EditPart childEditPart, int index)
-  {                
-    if (contentPanes != null)
-    {
-      int j = getContentPane(childEditPart.getModel());
-      if (contentPaneIndexAdjustment.length > j)
-      {
-        int adjustedIndex = index - contentPaneIndexAdjustment[j];
-        if (adjustedIndex >= 0)
-        {
-  	      IFigure child = ((GraphicalEditPart)childEditPart).getFigure();
-  	      contentPanes[j].add(child, adjustedIndex);
-        }
-      }
-    }  
-    else
-    {
-      super.addChildVisual(childEditPart, index);
-    }
-  }
-
-  
-  protected void removeChildVisual(EditPart childEditPart)
-  {                         
-    if (contentPanes != null)
-    {
-      int j = getContentPane(childEditPart.getModel());
-      IFigure child = ((GraphicalEditPart)childEditPart).getFigure();
-      contentPanes[j].remove(child);  
-    }    
-    else
-    {
-      super.removeChildVisual(childEditPart);
-    }
-  }
-
-  protected void reorderChild(EditPart editpart, int index)
-  {
-    removeChildVisual(editpart);
-    List children = getChildren();
-    children.remove(editpart);
-    children.add(index, editpart);
-    addChildVisual(editpart, index);
-  }
-}     
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java
deleted file mode 100644
index e2a84e8..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/IDirectEditPolicyDelegate.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies;
-   
-import org.eclipse.jface.viewers.CellEditor;
-
-public interface IDirectEditPolicyDelegate
-{       
-  public void performEdit(CellEditor cellEditor);  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java b/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java
deleted file mode 100644
index 7bac729..0000000
--- a/bundles/org.eclipse.wst.wsdl.ui/src/org/eclipse/wst/wsdl/ui/internal/gef/util/editpolicies/TextCellEditorManager.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.wsdl.ui.internal.gef.util.editpolicies;
-                                                  
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Text;
-
-public abstract class TextCellEditorManager extends DirectEditManager implements IDirectEditPolicyDelegate
-{
-  protected Label label;                                 
-
-  public TextCellEditorManager(GraphicalEditPart source,	Label label)
-  {
-	  super(source, TextCellEditor.class, new InternalCellEditorLocator(label));
-    this.label = label;     
-  }
-
-  protected void initCellEditor() 
-  {                                             
-  	String initialLabelText = label.getText();
-  	getCellEditor().setValue(initialLabelText);
-  	Text text = (Text)getCellEditor().getControl();
-  	text.setFont(label.getFont());
-    text.setForeground(label.getForegroundColor());
-    text.setBackground(label.getBackgroundColor());
-  	text.selectAll();
-  }	          
-
-  protected abstract void performModify(String value);
-    
-  public static class InternalCellEditorLocator implements CellEditorLocator
-  {
-    protected Label label;
-
-    public InternalCellEditorLocator(Label label)
-    {
-      this.label = label;
-    }                   
-
-    public void relocate(CellEditor celleditor) 
-    {
-      Text text = (Text)celleditor.getControl();  
-	    Point sel = text.getSelection();
-	    Point pref = text.computeSize(-1, -1);
-	    Rectangle rect = label.getTextBounds().getCopy();
-	    label.translateToAbsolute(rect);
-	    text.setBounds(rect.x-4, rect.y-1, pref.x+1, pref.y+1);	
-	    text.setSelection(0);
-	    text.setSelection(sel);