[92604] moving api for M4 + Committed by BLB
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/StructureEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/StructureEdit.java
deleted file mode 100644
index 5a43c9d..0000000
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/StructureEdit.java
+++ /dev/null
@@ -1,859 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2003, 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.common.componentcore;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentType;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.ModuleStructuralModel;
-import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.internal.util.EclipseResourceAdapter;
-import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
-import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
-
-/**
- * <p>
- * Provides a Facade pattern for accessing the Web Tools Platform EMF Module Model. ModuleCore can
- * be used as a static utility or an instance adapter.
- * </p>
- * <p>
- * ModuleCore hides the management of accessing EditModels (
- * {@see org.eclipse.wst.common.modulecore.ModuleStructuralModel}) correctly. Each project has
- * exactly one ({@see org.eclipse.wst.common.modulecore.ModuleStructuralModel}) for read and
- * exactly one for write. Each of these is shared among all clients and reference counted as
- * necessary. Clients should use ModuleCore when working with the WTP Modules Strcutrual Model.
- * </p>
- *
- * <p>
- * Each ModuleCore edit facade is designed to manage the EditModel lifecycle for clients. However,
- * while each ModuleCore is designed to be passed around as needed, clients must enforce the
- * ModuleCore lifecycle. The most common method of acquiring a ModuleCore edit facade is to use
- * {@see #getModuleCoreForRead(IProject)} or {@see #getModuleCoreForWrite(IProject)}.
- * </p>
- * <p>
- * When clients have concluded their use of their ModuleCore instance adapter , <b>clients must call
- * {@see #dispose()}</b>.
- * </p>
- * <p>
- * For more information about the underlying EditModel, see <a
- * href="ModuleCoreNature.html#module-structural-model">the discussion of the ModuleStructuralModel
- * </a>.
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- *
- * @see org.eclipse.wst.common.componentcore.ModuleCoreNature
- * @see org.eclipse.wst.common.componentcore.internal.ModuleStructuralModel
- */
-public class StructureEdit implements IEditModelHandler {
-
- public static final Class ADAPTER_TYPE = StructureEdit.class;
-
- static final String DEPLOYABLES_ROOT = ".deployables/"; //$NON-NLS-1$
- static String MODULE_META_FILE_NAME = ".wtpmodules"; //$NON-NLS-1$
-
- private final static ComponentcoreFactory COMPONENT_FACTORY = ComponentcoreFactory.eINSTANCE;
- private static final WorkbenchComponent[] NO_MODULES = new WorkbenchComponent[0];
- private static final ComponentResource[] NO_RESOURCES = new ComponentResource[0];
- private static final IFolder[] NO_FOLDERS = new IFolder[0];
-
-
- private final ModuleStructuralModel structuralModel;
- private final Map dependentCores = new HashMap();
- private boolean isStructuralModelSelfManaged;
- private boolean isReadOnly;
-
- /**
- *
- * <p>
- * Each ModuleCore edit facade is tied to a specific project. A project may have multiple
- * ModuleCore edit facades live at any given time.
- * </p>
- * <p>
- * Use to acquire a ModuleCore facade for a specific project that will not be used for editing.
- * Invocations of any save*() API on an instance returned from This method will throw
- * exceptions.
- * </p>
- *
- * @param aProject
- * The IProject that contains the WTP Modules model to load
- * @return A ModuleCore edit facade to access the WTP Modules Model
- */
- public static StructureEdit getStructureEditForRead(IProject aProject) {
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(aProject);
- return nature != null ? new StructureEdit(nature, true) : null;
- }
-
- /**
- *
- * <p>
- * Each ModuleCore edit facade is tied to a specific project. A project may have multiple
- * ModuleCore edit facades live at any given time.
- * </p>
- * <p>
- * Use to acquire a ModuleCore facade for a specific project that may be used to modify the
- * model.
- * </p>
- *
- * @param aProject
- * The IProject that contains the WTP Modules model to load
- * @return A ModuleCore edit facade to access the WTP Modules Model
- */
- public static StructureEdit getStructureEditForWrite(IProject aProject) {
- ModuleCoreNature nature = ModuleCoreNature.getModuleCoreNature(aProject);
- return nature != null ? new StructureEdit(nature, false) : null;
- }
-
- /**
- * <p>
- * A convenience API to fetch the {@see ModuleCoreNature} for a particular module URI. The
- * module URI must be of the valid form, or an exception will be thrown. The module URI must be
- * contained by a project that has a {@see ModuleCoreNature} or null will be returned.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * @param aModuleURI
- * A valid, fully-qualified module URI
- * @return The ModuleCoreNature of the project associated with aModuleURI
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public static ModuleCoreNature getModuleCoreNature(URI aModuleURI) throws UnresolveableURIException {
- IProject container = getContainingProject(aModuleURI);
- if (container != null)
- return ModuleCoreNature.getModuleCoreNature(container);
- return null;
- }
-
- /**
- * <p>
- * For {@see WorkbenchComponent}s that are contained within a project, the containing project
- * can be determined with the {@see WorkbenchComponent}'s fully-qualified module URI.
- * </p>
- * <p>
- * The following method will return the the corresponding project for the supplied module URI,
- * if it can be determined.
- * </p>
- * <p>
- * The method will not return an inaccessible project.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * @param aModuleURI
- * A valid, fully-qualified module URI
- * @return The project that contains the module referenced by the module URI
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public static IProject getContainingProject(WorkbenchComponent aComponent) {
- String projectName = aComponent.getHandle().segment(ModuleURIUtil.ModuleURI.PROJECT_NAME_INDX);
- if (projectName == null || projectName.length() == 0)
- return null;
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project.isAccessible())
- return project;
- return null;
- }
-
- /**
- * <p>
- * For {@see WorkbenchComponent}s that are contained within a project, the containing project
- * can be determined with the {@see WorkbenchComponent}'s fully-qualified module URI.
- * </p>
- * <p>
- * The following method will return the the corresponding project for the supplied module URI,
- * if it can be determined.
- * </p>
- * <p>
- * The method will not return an inaccessible project.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * @param aModuleURI
- * A valid, fully-qualified module URI
- * @return The project that contains the module referenced by the module URI
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public static IProject getContainingProject(URI aModuleURI) throws UnresolveableURIException {
- ModuleURIUtil.ensureValidFullyQualifiedModuleURI(aModuleURI);
- String projectName = aModuleURI.segment(ModuleURIUtil.ModuleURI.PROJECT_NAME_INDX);
- if (projectName == null || projectName.length() == 0)
- throw new UnresolveableURIException(aModuleURI);
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if (project.isAccessible())
- return project;
- return null;
- }
-
- /**
- * <p>
- * Returns the corresponding Eclipse IResource, if it can be determined, for the given
- * {@see ComponentResource}. The {@see ComponentResource#getSourcePath()} must return a
- * valid resource path for This method to return a valid value. The returned value may be either
- * an {@see org.eclipse.core.resources.IFile} or {@see org.eclipse.core.resources.IFolder}.
- * A client may use the return value of {@see IResource#getType()} to determine what type
- * of resource was returned. (@see IResource#FILE} or {@see IResource#FOLDER}).
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * @param aModuleResource
- * A ComponentResource with a valid sourcePath
- * @return The corresponding Eclipse IResource, if available.
- */
- public static IResource getEclipseResource(ComponentResource aModuleResource) {
- EclipseResourceAdapter eclipseResourceAdapter = (EclipseResourceAdapter) EcoreUtil.getAdapter(aModuleResource.eAdapters(), EclipseResourceAdapter.ADAPTER_TYPE);
- if (eclipseResourceAdapter != null)
- return eclipseResourceAdapter.getEclipseResource();
- eclipseResourceAdapter = new EclipseResourceAdapter();
- aModuleResource.eAdapters().add(eclipseResourceAdapter);
- return eclipseResourceAdapter.getEclipseResource();
- }
-
- /**
- * <p>
- * Returns a URI for the supplied {@see WorkbenchComponent}. The URI will be relative to
- * project root of the flexible project that contains the {@see WorkbenchComponent}.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * @param aWorkbenchModule
- * A valid WorkbenchComponent
- * @return A project-relative URI of the output folder for aWorkbenchModoule.
- */
- public static IFolder getOutputContainerRoot(WorkbenchComponent aWorkbenchModule) {
- IProject project = getContainingProject(aWorkbenchModule);
- if (project != null)
- return project.getFolder(new Path(DEPLOYABLES_ROOT + aWorkbenchModule.getName()));
- return null;
- }
-
- /**
- * <p>
- * Returns a collection of the output containers for the supplied project. The collection may be
- * a single root output container or an array of output containers without a common root. For
- * clients that are looking for an output container for a specific {@see WorkbenchComponent},
- * see {@see #getOutputContainerRoot(WorkbenchComponent)}.
- * </p>
- * <p>
- * If the project is not a ModuleCore project, or has no ModuleCore output containers, an empty
- * array will be returned.
- * </p>
- *
- * @param aProject
- * A project with a {@see ModuleCoreNature}
- * @return An array of output containers or an empty array.
- */
- public static IFolder[] getOutputContainersForProject(IProject aProject) {
- ModuleCoreNature moduleCoreNature = ModuleCoreNature.getModuleCoreNature(aProject);
- if (moduleCoreNature == null)
- return NO_FOLDERS;
- IFolder folder = aProject.getFolder(new Path(DEPLOYABLES_ROOT));
- IFolder[] outputResources = {folder};
- return outputResources;
- }
-
- /**
- * <p>
- * Parses the supplied URI for the deployed name name of the {@see WorkbenchComponent} referenced
- * by the URI.
- * </p>
- *
- * @param aFullyQualifiedModuleURI
- * A valid, fully-qualified module URI
- * @return The deployed name of the referenced {@see WorkbenchComponent}
- * @throws UnresolveableURIException
- * If the supplied URI is invalid or unresolveable
- */
- public static String getDeployedName(URI aFullyQualifiedModuleURI) throws UnresolveableURIException {
- return ModuleURIUtil.getDeployedName(aFullyQualifiedModuleURI);
- }
-
- public static ComponentType getComponentType(IVirtualContainer aComponent) {
- StructureEdit componentCore = null;
- ComponentType componentType = null;
- try {
- componentCore = StructureEdit.getStructureEditForRead(aComponent.getProject());
- WorkbenchComponent wbComponent = componentCore.findComponentByName(aComponent.getComponent().getName());
- componentType = wbComponent.getComponentType();
- } finally {
- if (componentCore != null)
- componentCore.dispose();
- }
- return componentType;
- }
-
- public static void setComponentType(IVirtualContainer component, ComponentType aComponentType) {
- StructureEdit componentCore = null;
- try {
- componentCore = StructureEdit.getStructureEditForWrite(component.getProject());
- WorkbenchComponent wbComponent = componentCore.findComponentByName(component.getComponent().getName());
- wbComponent.setComponentType(aComponentType);
- } finally {
- if (componentCore != null) {
- componentCore.saveIfNecessary(null);
- componentCore.dispose();
- }
- }
- }
-
- protected StructureEdit(ModuleCoreNature aNature, boolean toAccessAsReadOnly) {
- if (toAccessAsReadOnly)
- structuralModel = aNature.getModuleStructuralModelForRead(this);
- else
- structuralModel = aNature.getModuleStructuralModelForWrite(this);
- isReadOnly = toAccessAsReadOnly;
- isStructuralModelSelfManaged = true;
- }
-
- /**
- * <p>
- * The following constructor is used to manage an already loaded model. Clients should use the
- * following line if they intend to use this constructor: <br>
- * <br>
- * <code>ModuleCore componentCore = (ModuleCore) aStructuralModel.getAdapter(ModuleCore.ADAPTER_TYPE)</code>.
- * </p>
- *
- * @param aStructuralModel
- * The edit model to be managed by this ModuleCore
- */
- public StructureEdit(ModuleStructuralModel aStructuralModel) {
- structuralModel = aStructuralModel;
- }
-
- /**
- * <p>
- * Force a save of the underlying model. The following method should be used with care. Unless
- * required, use {@see #saveIfNecessary(IProgressMonitor) instead.
- * </p>
- * {@inheritDoc}
- *
- * @see org.eclipse.wst.common.componentcore.IEditModelHandler#save()
- * @throws IllegalStateException
- * If the ModuleCore object was created as read-only
- */
- public void save(IProgressMonitor aMonitor) {
- if (isReadOnly)
- throwAttemptedReadOnlyModification();
- structuralModel.save(aMonitor, this);
- }
-
- /**
- * <p>
- * Save the underlying model only if no other clients are currently using the model. If the
- * model is not shared, it will be saved. If it is shared, the save will be deferred.
- * </p>
- * {@inheritDoc}
- *
- * @see org.eclipse.wst.common.componentcore.IEditModelHandler#saveIfNecessary()
- * @throws IllegalStateException
- * If the ModuleCore object was created as read-only
- */
- public void saveIfNecessary(IProgressMonitor aMonitor) {
- if (isReadOnly)
- throwAttemptedReadOnlyModification();
- structuralModel.saveIfNecessary(aMonitor, this);
- }
-
- /**
- * <p>
- * Clients must call the following method when they have finished using the model, even if the
- * ModuleCore edit facade was created as read-only.
- * </p>
- * {@inheritDoc}
- *
- * @see org.eclipse.wst.common.componentcore.IEditModelHandler#dispose()
- */
- public void dispose() {
- if (isStructuralModelSelfManaged)
- structuralModel.releaseAccess(this);
- if (dependentCores.size() > 0) {
- synchronized (dependentCores) {
- for (Iterator cores = dependentCores.values().iterator(); cores.hasNext();)
- ((StructureEdit) cores.next()).dispose();
- }
- }
- }
-
- /**
- * <p>
- * Creates a default WTP Module Structural Metamodel file if necessary.
- * </p>
- */
- public void prepareProjectComponentsIfNecessary() {
- structuralModel.prepareProjectModulesIfNecessary();
- }
-
- /**
- * <p>
- * When loaded for write, the current ModuleCore may return the root object, which can be used
- * to add or remove {@see WorkbenchComponent}s. If a client needs to just read the existing
- * {@see WorkbenchComponent}s, use {@see #getWorkbenchModules()}.
- * </p>
- *
- * @return The root object of the underlying model
- */
- public ProjectComponents getComponentModelRoot() {
- return (ProjectComponents) structuralModel.getPrimaryRootObject();
- }
-
- /**
- * <p>
- * Return the an array of ComponentResource which basically represent the source containers of a
- * WorkbenchResource.
- * <p>
- *
- * @param component
- * @return
- */
- public ComponentResource[] getSourceContainers(WorkbenchComponent component) {
- // TODO Api in progress: Need to return the Java Source containers of the project
- // TODO MDE: I don't know if I agree with the placement of this method.
- return null;
- }
-
- /**
- * <p>
- * Clients that wish to modify the individual {@see WorkbenchComponent} instances may use
- * this method. If clients need to add or remove {@see WorkbenchComponent} instances, use
- * {@see #getProjectModules()} to get the root object and then access the contained
- * {@see WorkbenchComponent}s through {@see ProjectComponents#getWorkbenchModules()}.
- *
- * @return The WorkbenchModules of the underlying model, if any.
- */
- public WorkbenchComponent[] getWorkbenchModules() {
- List wbModules = getComponentModelRoot().getComponents();
- return (WorkbenchComponent[]) wbModules.toArray(new WorkbenchComponent[wbModules.size()]);
- }
-
- /**
- * <p>
- * Create a {@see WorkbenchComponent} with the given deployed name. The returned module
- * will be contained by the root object of the current ModuleCore (so no need to re-add it to
- * the Module Module root object). The current ModuleCore must not be read-only to invoke This
- * method.
- * </p>
- *
- * @param aDeployName
- * A non-null String that will be assigned as the deployed-name
- * @return A {@see WorkbenchComponent}associated with the current ModuleCore with the supplied
- * deployed name
- * @throws IllegalStateException
- * If the current ModuleCore was created as read-only
- */
- public WorkbenchComponent createWorkbenchModule(String aDeployName) {
- if (isReadOnly)
- throwAttemptedReadOnlyModification();
- WorkbenchComponent module = COMPONENT_FACTORY.createWorkbenchComponent();
- module.setName(aDeployName);
- getComponentModelRoot().getComponents().add(module);
- return module;
- }
-
- /**
- * <p>
- * Create a {@see ComponentResource} with the sourcePath of aResource. The current
- * ModuleCore must not be read-only to invoke This method.
- * </p>
- *
- * @param aModule
- * A non-null {@see WorkbenchComponent}to contain the created
- * {@see ComponentResource}
- * @param aResource
- * A non-null IResource that will be used to set the sourcePath
- * @return A {@see ComponentResource}associated with the current ModuleCore with its sourcePath
- * equivalent to aResource
- * @throws IllegalStateException
- * If the current ModuleCore was created as read-only
- */
- public ComponentResource createWorkbenchModuleResource(IResource aResource) {
- if (isReadOnly)
- throwAttemptedReadOnlyModification();
-
- ComponentResource moduleResource = COMPONENT_FACTORY.createComponentResource();
- moduleResource.setSourcePath(aResource.getProjectRelativePath().makeAbsolute());
- return moduleResource;
- }
-
- /**
- * <p>
- * Create a {@see ComponentType} with the sourcePath of aResource. The returned resource
- * will be associated with the current ModuleCore. The current ModuleCore must not be read-only
- * to invoke This method.
- * </p>
- *
- * @param aResource
- * A non-null IResource that will be used to set the sourcePath
- * @return A {@see ComponentResource}associated with the current ModuleCore with its sourcePath
- * equivalent to aResource
- * @throws IllegalStateException
- * If the current ModuleCore was created as read-only
- */
- public ComponentType createModuleType(String aModuleTypeId) {
- if (isReadOnly)
- throwAttemptedReadOnlyModification();
-
- ComponentType moduleType = COMPONENT_FACTORY.createComponentType();
- moduleType.setComponentTypeId(aModuleTypeId);
- return moduleType;
- }
-
- /**
- * <p>
- * Search the given module (indicated by aModuleURI) for the {@see ComponentResource}s
- * identified by the module-relative path (indicated by aDeployedResourcePath).
- * </p>
- * @deprecated To be removed at next Integration Build 04/14/05 MDE. No substitute. (No clients).
- *
- * @param aModuleURI
- * A valid, fully-qualified module URI
- * @param aDeployedResourcePath
- * A module-relative path to a deployed file
- * @return An array of WorkbenchModuleResources that contain the URI specified by the
- * module-relative aDeployedResourcePath
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public ComponentResource[] findResourcesByRuntimePath(URI aModuleURI, URI aDeployedResourcePath) throws UnresolveableURIException {
- WorkbenchComponent module = findComponentByName(ModuleURIUtil.getDeployedName(aModuleURI));
- return module.findResourcesByRuntimePath(new Path(aDeployedResourcePath.path()));
- }
-
- /**
- * <p>
- * Search the the module (indicated by the root of aModuleResourcePath) for the
- * {@see ComponentResource}s identified by the module-qualified path (indicated by
- * aDeployedResourcePath).
- * </p>
- * @deprecated To be removed at next Integration Build 04/14/05 MDE Use IPath Signature instead.
- *
- * @param aModuleResourcePath
- * A valid fully-qualified URI of a deployed resource within a specific
- * WorkbenchComponent
- * @return An array of WorkbenchModuleResources that contain the URI specified by
- * aModuleResourcePath
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public ComponentResource[] findResourcesByRuntimePath(URI aModuleResourcePath) throws UnresolveableURIException {
-
- return findResourcesByRuntimePath(ModuleURIUtil.getDeployedName(aModuleResourcePath), new Path(aModuleResourcePath.path()));
- }
-
- /**
- * <p>
- * Search the the module (indicated by the root of aModuleResourcePath) for the
- * {@see ComponentResource}s identified by the module-qualified path (indicated by
- * aDeployedResourcePath).
- * </p>
- *
- * @param aModuleResourcePath
- * A valid fully-qualified URI of a deployed resource within a specific
- * WorkbenchComponent
- * @return An array of WorkbenchModuleResources that contain the URI specified by
- * aModuleResourcePath
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public ComponentResource[] findResourcesByRuntimePath(String aModuleName, IPath aModuleResourcePath) {
- WorkbenchComponent module = findComponentByName(aModuleName);
- return module.findResourcesByRuntimePath(aModuleResourcePath);
- }
-
- /**
- * <p>
- * Locates the {@see ComponentResource}s that contain the supplied resource in their source
- * path. There are no representations about the containment of the {@see ComponentResource}s
- * which are returned. The only guarantee is that the returned elements are contained within the
- * same project.
- * </p>
- * <p>
- * The sourcePath of each {@see ComponentResource} will be mapped to either an IFile or an
- * IFolder. As a result, if the {@see ComponentResource} is a container mapping, the path
- * of the supplied resource may not be identical the sourcePath of the {@see ComponentResource}.
- * </p>
- * @deprecated To be removed at next Integration Build 04/14/05 MDE Use IPath Signature instead.
- *
- * @param aWorkspaceRelativePath
- * A valid fully-qualified workspace-relative path of a given resource
- * @return An array of WorkbenchModuleResources which have sourcePaths that contain the given
- * resource
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public ComponentResource[] findResourcesBySourcePath(URI aWorkspaceRelativePath) throws UnresolveableURIException {
- return findResourcesBySourcePath(new Path(aWorkspaceRelativePath.path()));
- }
-
- /**
- * <p>
- * Locates the {@see ComponentResource}s that contain the supplied resource in their source
- * path. There are no representations about the containment of the {@see ComponentResource}s
- * which are returned. The only guarantee is that the returned elements are contained within the
- * same project.
- * </p>
- * <p>
- * The sourcePath of each {@see ComponentResource} will be mapped to either an IFile or an
- * IFolder. As a result, if the {@see ComponentResource} is a container mapping, the path
- * of the supplied resource may not be identical the sourcePath of the {@see ComponentResource}.
- * </p>
- *
- * @param aWorkspaceRelativePath
- * A valid fully-qualified workspace-relative path of a given resource
- * @return An array of WorkbenchModuleResources which have sourcePaths that contain the given
- * resource
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- public ComponentResource[] findResourcesBySourcePath(IPath aWorkspaceRelativePath) throws UnresolveableURIException {
- ProjectComponents projectModules = getComponentModelRoot();
- EList modules = projectModules.getComponents();
-
- WorkbenchComponent module = null;
- ComponentResource[] resources = null;
- List foundResources = new ArrayList();
- for (int i = 0; i < modules.size(); i++) {
- module = (WorkbenchComponent) modules.get(i);
- resources = module.findResourcesBySourcePath(aWorkspaceRelativePath);
- if (resources != null && resources.length != 0)
- foundResources.addAll(Arrays.asList(resources));
- }
- if (foundResources.size() > 0)
- return (ComponentResource[]) foundResources.toArray(new ComponentResource[foundResources.size()]);
- return NO_RESOURCES;
- }
-
- /**
- * <p>
- * Returns the {@see WorkbenchComponent} contained by the current ModuleCore with the
- * deploy name aModuleName.
- * </p>
- * <p>
- * <b>This method may return null. </b>
- * </p>
- *
- * @param aModuleName
- * @return The {@see WorkbenchComponent}contained by the current ModuleCore with the deploy
- * name aModuleName
- * @see WorkbenchComponent#getDeployedName()
- */
- public WorkbenchComponent findComponentByName(String aModuleName) {
- return getComponentModelRoot() != null ? getComponentModelRoot().findWorkbenchModule(aModuleName) : null;
- }
-
- /**
- * <p>
- * Locate and return the {@see WorkbenchComponent} referenced by the fully-qualified
- * aModuleURI. The method will work correctly even if the requested {@see WorkbenchComponent}
- * is contained by another project.
- * </p>
- *
- * @param aModuleURI
- * A valid, fully-qualified module URI
- * @return The {@see WorkbenchComponent}referenced by aModuleURI
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- * @see WorkbenchComponent#getHandle()
- */
- public WorkbenchComponent findComponentByURI(URI aModuleURI) throws UnresolveableURIException {
- if(aModuleURI.scheme() == null && aModuleURI.segmentCount() == 1)
- return findComponentByName(aModuleURI.segment(0));
- ModuleURIUtil.ensureValidFullyQualifiedModuleURI(aModuleURI);
- String projectName = aModuleURI.segment(ModuleURIUtil.ModuleURI.PROJECT_NAME_INDX);
- String moduleName = aModuleURI.segment(ModuleURIUtil.ModuleURI.MODULE_NAME_INDX);
- /* Accessing a local module */
- if (structuralModel.getProject().getName().equals(projectName)) {
- return findComponentByName(moduleName);
- }
- return getDependentModuleCore(aModuleURI).findComponentByName(moduleName);
- }
-
- /**
- * <p>
- * Searches the available {@see WorkbenchComponent}s as available through
- * {@see #getWorkbenchModules()} for {@see WorkbenchComponent}s that have a
- * {@see WorkbenchComponent#getModuleType()}with a a module type Id as specified by
- * aModuleTypeId.
- * </p>
- *
- * @param aModuleTypeId
- * A non-null module type id ({@see ComponentType#getModuleTypeId()})
- * @return A non-null array of the {@see WorkbenchComponent}s that match the given module type
- * id
- */
- public WorkbenchComponent[] findComponentsByType(String aModuleTypeId) {
- WorkbenchComponent[] availableModules = getWorkbenchModules();
- ComponentType moduleType;
- List results = new ArrayList();
- for (int i = 0; i < availableModules.length; i++) {
- moduleType = availableModules[i].getComponentType();
- if (moduleType != null && aModuleTypeId.equals(moduleType.getComponentTypeId()))
- results.add(availableModules[i]);
- }
- if (results.size() == 0)
- return NO_MODULES;
- return (WorkbenchComponent[]) results.toArray(new WorkbenchComponent[results.size()]);
- }
-
- /**
- * Find and return the ReferencedComponent that represents the depedency from aComponent to aReferencedComponent.
- * <p>This method could return null.</p>
- * @param aComponent
- * @param aReferencedComponent
- * @return
- */
- public ReferencedComponent findReferencedComponent(WorkbenchComponent aComponent, WorkbenchComponent aReferencedComponent) {
- if(aComponent == null || aReferencedComponent == null)
- return null;
-
- IProject containingProject = getContainingProject(aComponent);
- IProject referencedProject = getContainingProject(aReferencedComponent);
-
- EList referencedComponents = aComponent.getReferencedComponents();
-
- for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) {
- ReferencedComponent referencedComponent = (ReferencedComponent) iter.next();
- ComponentHandle referencedHandle = ComponentHandle.create(containingProject, referencedComponent.getHandle());
- if(referencedProject.equals(referencedHandle.getProject()) &&
- aReferencedComponent.getName().equals(referencedHandle.getName()))
- return referencedComponent;
-
- }
- return null;
- }
-
- /**
- * <p>
- * Returns true if the {@see ReferencedComponent} references a {@see WorkbenchComponent}(
- * {@see ReferencedComponent#getHandle()}) which is contained by the project that the current
- * ModuleCore is managing. The following method will determine if the dependency can be
- * satisfied by the current project.
- * </p>
- *
- * @param aDependentModule
- * @return True if the {@see ReferencedComponent}references a {@see WorkbenchComponent}managed
- * directly by the current ModuleCore
- */
- public boolean isLocalDependency(ReferencedComponent aDependentModule) {
- URI dependentHandle = aDependentModule.getHandle();
- // with no scheme and a simple name, the referenced component must be local
- if(dependentHandle.scheme() == null && dependentHandle.segmentCount() == 1)
- return true;
- try {
-
- String localProjectName = structuralModel.getProject().getName();
- if(ModuleURIUtil.ensureValidFullyQualifiedModuleURI(dependentHandle, false)) {
- String dependentProjectName = aDependentModule.getHandle().segment(ModuleURIUtil.ModuleURI.PROJECT_NAME_INDX);
- return localProjectName.equals(dependentProjectName);
- }
- } catch (UnresolveableURIException e) {
- // Ignore
- }
- return false;
- }
-
- /**
- * @param aModuleURI
- * A valid, fully-qualified module URI
- * @return The ModuleCore facade for the supplied URI
- * @throws UnresolveableURIException
- * If the supplied module URI is invalid or unresolveable.
- */
- private StructureEdit getDependentModuleCore(URI aModuleURI) throws UnresolveableURIException {
- StructureEdit dependentCore = (StructureEdit) dependentCores.get(aModuleURI);
- if (dependentCore != null)
- return dependentCore;
- synchronized (dependentCores) {
- dependentCore = (StructureEdit) dependentCores.get(aModuleURI);
- if (dependentCore == null) {
- IProject container = getContainingProject(aModuleURI);
- if (container != null) {
- dependentCore = getStructureEditForRead(container);
- dependentCores.put(aModuleURI, dependentCore);
- } else
- throw new UnresolveableURIException(aModuleURI);
- }
- }
- return dependentCore;
- }
-
- private void throwAttemptedReadOnlyModification() {
- throw new IllegalStateException("Attempt to modify a ModuleCore edit facade that was loaded as read-only.");
- }
-
- /**
- * temporary method to return first module in the project
- *
- * @return first module in the project
- * @deprecated
- */
- public WorkbenchComponent getFirstModule() {
- if (getWorkbenchModules().length > 0)
- return getWorkbenchModules()[0];
- return null;
- }
-
- /**
- * temporary method to return artifact edit for first module in project USERS MUST DISPOSE THE
- * ARTIFACT EDIT
- *
- * @param project
- * @return the artifact edit for the first module
- * @deprecated
- */
- public static ArtifactEdit getFirstArtifactEditForRead(IProject project) {
- StructureEdit componentCore = null;
- ArtifactEdit artEdit = null;
- WorkbenchComponent module = null;
- try {
- componentCore = StructureEdit.getStructureEditForRead(project);
- module = componentCore.getFirstModule();
- artEdit = ArtifactEdit.getArtifactEditForRead(module);
- } finally {
- if (componentCore != null)
- componentCore.dispose();
- }
- return artEdit;
- }
-
- public static URI createComponentURI(IProject aContainingProject, String aComponentName) {
- return URI.createURI(PlatformURLModuleConnection.MODULE_PROTOCOL + IPath.SEPARATOR + PlatformURLModuleConnection.RESOURCE_MODULE + aContainingProject.getName() + IPath.SEPARATOR + aComponentName);
- }
-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
index 51eb549..17c7858 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/StructureEdit.java
@@ -33,8 +33,8 @@
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.internal.resources.ComponentHandle;
import org.eclipse.wst.common.componentcore.internal.util.EclipseResourceAdapter;
+import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
import org.eclipse.wst.common.componentcore.resources.IVirtualContainer;
/**
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilder.java
index 784921f..be3d0a0 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilder.java
@@ -29,10 +29,10 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.datamodel.properties.IProjectComponentsBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilderDependencyResolver.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilderDependencyResolver.java
index 1ecae5d..6b48626 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilderDependencyResolver.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ComponentStructuralBuilderDependencyResolver.java
@@ -18,8 +18,8 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.datamodel.properties.IReferencedComponentBuilderDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java
index 6b346ea..208d6d4 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ProjectComponentsBuilderDataModelProvider.java
@@ -20,13 +20,13 @@
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.emf.common.util.EList;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.datamodel.properties.IProjectComponentsBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IReferencedComponentBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IWorkbenchComponentBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.ComponentType;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderDataModelProvider.java
index 7400b59..5e927c7 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderDataModelProvider.java
@@ -11,11 +11,11 @@
package org.eclipse.wst.common.componentcore.internal.builder;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.datamodel.properties.IReferencedComponentBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.DependencyType;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderOperation.java
index bd2b460..131fc02 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/ReferencedComponentBuilderOperation.java
@@ -28,8 +28,8 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.datamodel.properties.IReferencedComponentBuilderDataModelProperties;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.internal.util.ZipFileExporter;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java
index bf443db..54a57d6 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/builder/WorkbenchComponentBuilderDataModelProvider.java
@@ -17,11 +17,11 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.datamodel.properties.IReferencedComponentBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.datamodel.properties.IWorkbenchComponentBuilderDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
index b39f8c5..1a54e1d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
@@ -19,7 +19,7 @@
import org.eclipse.jem.util.emf.workbench.ResourceSetWorkbenchSynchronizer;
import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
import org.eclipse.wst.common.internal.emfworkbench.CompatibilityWorkbenchURIConverterImpl;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java
index 8dc1edd..22b0c76 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ModuleURIUtil.java
@@ -13,8 +13,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
index 03442a1..fc9c64d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/PlatformURLModuleConnection.java
@@ -18,9 +18,9 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
/**
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
index f2504f3..8c66f1a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ResourceTreeNode.java
@@ -18,9 +18,9 @@
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.util.IPathProvider;
/**
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperation.java
index 51e1777..370172e 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperation.java
@@ -16,7 +16,7 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.command.CommandStack;
import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModel.java
index 7cb79cf..9d8f6c5 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModel.java
@@ -13,8 +13,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel;
import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModelProvider.java
index e653875..0049560 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModelProvider.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditOperationDataModelProvider.java
@@ -10,8 +10,8 @@
import org.eclipse.jem.util.logger.proxy.Logger;
import org.eclipse.wst.common.componentcore.ArtifactEdit;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
index 17b48a7..6371e52 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ArtifactEditProviderOperation.java
@@ -10,7 +10,7 @@
import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
import org.eclipse.wst.common.componentcore.ArtifactEdit;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationDataModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationDataModel.java
index b8433ae..b26ea05 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationDataModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationDataModel.java
@@ -18,7 +18,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.wst.common.componentcore.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperation.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperation.java
index 7fca4d8..cebd172 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperation.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperation.java
@@ -18,9 +18,9 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.EList;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ComponentType;
import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperationEx.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperationEx.java
index 1981fa9..7959282 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperationEx.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/operation/ComponentCreationOperationEx.java
@@ -22,10 +22,10 @@
import org.eclipse.emf.common.util.EList;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.datamodel.properties.IComponentCreationDataModelProperties;
import org.eclipse.wst.common.componentcore.internal.ComponentType;
import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/FlexibleProject.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/FlexibleProject.java
index d65d39b..926a7fe 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/FlexibleProject.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/FlexibleProject.java
@@ -12,7 +12,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.resources.IFlexibleProject;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
index cbf5f34..b05690f 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualComponent.java
@@ -19,7 +19,6 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IPath;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
import org.eclipse.wst.common.componentcore.internal.ComponentType;
@@ -27,6 +26,7 @@
import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
import org.eclipse.wst.common.componentcore.internal.DependencyType;
import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.impl.ModuleURIUtil;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
index de831b0..667293a 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualContainer.java
@@ -19,8 +19,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRoot;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
index c6e3fee..d48c74d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFile.java
@@ -15,8 +15,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRoot;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
index c1aa949..e3be462 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualFolder.java
@@ -15,8 +15,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
index f84bd13..fd5bc89 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/resources/VirtualResource.java
@@ -21,8 +21,8 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRoot;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
index 425eb2c..5c3e60e 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/EclipseResourceAdapter.java
@@ -18,10 +18,10 @@
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.ComponentResource;
import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
/**
* <p>
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ModuleCoreEclipseAdapterFactory.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ModuleCoreEclipseAdapterFactory.java
index 067442a..e13a2ce 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ModuleCoreEclipseAdapterFactory.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/util/ModuleCoreEclipseAdapterFactory.java
@@ -11,8 +11,8 @@
package org.eclipse.wst.common.componentcore.internal.util;
import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.internal.ModuleStructuralModel;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
/**
* <p>
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ComponentHandle.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ComponentHandle.java
index cd3688f..a093139 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ComponentHandle.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/resources/ComponentHandle.java
@@ -12,8 +12,8 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.StructureEdit;
import org.eclipse.wst.common.componentcore.UnresolveableURIException;
+import org.eclipse.wst.common.componentcore.internal.StructureEdit;
/**
* Provides a handle to a component within a project.
