diff options
Diffstat (limited to 'plugins')
306 files changed, 718 insertions, 1018 deletions
diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java index 962b7822c..abab902bb 100644 --- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java +++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaInsertionHelper.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jdt.core.jdom.DOMFactory; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; /** diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java index 564eb6f66..b6dec4de7 100644 --- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java +++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/JavaProjectCreationDataModel.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.JavaCore; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** diff --git a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java index 7c4859003..8baed782d 100644 --- a/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java +++ b/plugins/org.eclipse.jst.common.frameworks/src/org/eclipse/jst/common/jdt/internal/integration/WTPWorkingCopyManager.java @@ -30,14 +30,13 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.common.frameworks.internal.ISaveHandler; import org.eclipse.wst.common.frameworks.internal.SaveFailedException; import org.eclipse.wst.common.frameworks.internal.SaveHandlerHeadless; import org.eclipse.wst.common.frameworks.internal.SaveHandlerRegister; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Insert the type's description here. Creation date: (4/27/2001 4:14:30 PM) * diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java index 46694dd67..adccdc1f5 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/Archive.java @@ -31,6 +31,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter; import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java index 827819725..06d8ece8a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ValidateXmlCommand.java @@ -19,10 +19,10 @@ import java.util.Collection; import java.util.List; import org.eclipse.emf.common.command.AbstractCommand; +import org.eclipse.emf.common.command.Command; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jst.j2ee.internal.xml.CollectingErrorHandler; import org.eclipse.jst.j2ee.internal.xml.XmlDocumentReader; - import org.xml.sax.InputSource; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java index cd3df3232..8807e6d10 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/WARFile.java @@ -15,6 +15,7 @@ package org.eclipse.jst.j2ee.commonarchivecore.internal; import java.util.List; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException; +import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException; import org.eclipse.jst.j2ee.webapplication.WebApp; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java index a05828fae..0adb97cb8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/SaveFilter.java @@ -13,6 +13,7 @@ package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; +import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; /** * Object used for saving an archive with only a subset of its files. By default all files are diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java index a42048508..509f82602 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleRefImpl.java @@ -41,6 +41,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedE import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.NoModuleFileException; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException; +import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java index be95125a0..0b42d603e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategyImpl.java @@ -34,6 +34,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.jem.internal.java.adapters.jdk.JavaJDKAdapterFactory; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; @@ -55,8 +56,6 @@ import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryDomRegistry; import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Abstact implementer off which and load strategy may subclass * diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java index a5f036147..cf617052d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AHomeVRule.java @@ -18,13 +18,12 @@ import java.util.logging.Level; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaHelpers; import org.eclipse.jem.java.Method; +import org.eclipse.jem.util.logger.LogEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.ValidationException; -import org.eclipse.jem.util.logger.LogEntry; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @version 1.0 * @author diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java index f6d6053cd..8b7b69e89 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AValidateEJB.java @@ -20,14 +20,13 @@ import org.eclipse.jem.java.Field; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaParameter; import org.eclipse.jem.java.Method; +import org.eclipse.jem.util.logger.LogEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.MessageLimitException; import org.eclipse.wst.validation.core.ValidationException; -import org.eclipse.jem.util.logger.LogEntry; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Insert the type's description here. * Creation date: (1/5/01 11:51:09 AM) diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java index 7d7f651f5..8b2c6290a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/AbstractEJBValidationRuleFactory.java @@ -18,9 +18,8 @@ import java.util.Iterator; import java.util.Set; import java.util.logging.Level; -import org.eclipse.jst.j2ee.ejb.EJBJar; - import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.jst.j2ee.ejb.EJBJar; /** * To change the template for this generated type comment go to diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java index 235e75a01..5d4bc3c92 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EJBExt20VRule.java @@ -17,6 +17,8 @@ import java.util.Map; import java.util.logging.Level; import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.util.logger.LogEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; @@ -26,9 +28,6 @@ import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.MessageLimitException; import org.eclipse.wst.validation.core.ValidationException; -import org.eclipse.jem.util.logger.LogEntry; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Validate the WebSphere-specific implementation of non-spec features, such * as component inheritance. diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java index 756249980..ca262ae71 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/EarValidator.java @@ -25,6 +25,7 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.application.WebModule; @@ -58,8 +59,6 @@ import org.eclipse.wst.validation.core.IReporter; import org.eclipse.wst.validation.core.ValidationException; import org.eclispe.wst.validation.internal.core.Message; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Insert the type's description here. diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationContext.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationContext.java index 62c823019..e6528422c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationContext.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/IValidationContext.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.model.internal.validation; +import org.eclipse.jem.util.logger.LogEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.validation.core.IHelper; import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.IReporter; import org.eclipse.wst.validation.core.IValidator; import org.eclipse.wst.validation.core.MessageLimitException; -import org.eclipse.jem.util.logger.LogEntry; -import org.eclipse.jem.util.logger.proxy.Logger; - public interface IValidationContext { public static final int ERROR = IMessage.HIGH_SEVERITY; public static final int WARNING = IMessage.NORMAL_SEVERITY; diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java index 3ffd342af..825c2279f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidateCMPBean.java @@ -17,14 +17,13 @@ import org.eclipse.jem.java.Field; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaHelpers; import org.eclipse.jem.java.Method; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.wst.validation.core.IMessage; import org.eclipse.wst.validation.core.ValidationException; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * This class checks entity bean classes for errors or potential errors. * If any problems are found, an error, warning, or info marker is added to the task list. diff --git a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java index 50cd07efc..0e3ed1b2d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java +++ b/plugins/org.eclipse.jst.j2ee.core/j2ee-validation/org/eclipse/jst/j2ee/model/internal/validation/ValidationRuleUtility.java @@ -29,6 +29,8 @@ import org.eclipse.jem.java.JavaParameter; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jem.java.JavaVisibilityKind; import org.eclipse.jem.java.Method; +import org.eclipse.jem.util.logger.LogEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.core.internal.plugin.J2EECorePlugin; import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.CMRField; @@ -45,9 +47,6 @@ import org.eclipse.jst.j2ee.ejb.TransactionType; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.ejb.impl.LocalModelledPersistentAttributeFilter; -import org.eclipse.jem.util.logger.LogEntry; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @version 1.0 * @author diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java index 96db6454c..b51f406b3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/common/impl/XMLResourceImpl.java @@ -19,8 +19,10 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.common.J2EEVersionResource; import org.eclipse.jst.j2ee.common.XMLResource; +import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.xml.J2EEXmlDtDEntityResolver; import org.eclipse.wst.common.internal.emf.resource.Renderer; +import org.eclipse.wst.common.internal.emf.resource.TranslatorResource; import org.eclipse.wst.common.internal.emf.resource.TranslatorResourceImpl; import org.xml.sax.EntityResolver; diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java index 3131017e8..7e966733b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/ejb/impl/EJBRelationshipRoleImpl.java @@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.emf.ecore.xmi.XMIResource; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.common.Description; import org.eclipse.jst.j2ee.ejb.CMPAttribute; import org.eclipse.jst.j2ee.ejb.CMRField; @@ -42,8 +43,6 @@ import org.eclipse.jst.j2ee.ejb.IRoleShapeStrategy; import org.eclipse.jst.j2ee.ejb.MultiplicityKind; import org.eclipse.jst.j2ee.ejb.RoleSource; import org.eclipse.wst.common.internal.emf.utilities.IDUtil; - -import org.eclipse.jem.util.logger.proxy.Logger; /** * The ejb-relationship-role element describes a role within a relationship. * There are two roles in each relationship. The ejb-relationship-role element contains an optional description; an optional name for the relationship role; a specification of the multiplicity of the role; an optional specification of cascade-delete functionality for the role; the role source; and a declaration of the cmr-field, if any, by means of which the other side of the relationship is accessed from the perspective of the role source. The multiplicity and relationship-role-source element are mandatory. The relationship-role-source element designates an entity-bean by means of an ejb-name element. For bidirectional relationships, both roles of a relationship must declare a relationship-role-source element that specifies a cmr-field in terms of which the relationship is accessed. The lack of a cmr-field element in an ejb-relationship-role specifies that the relationship is unidirectional in navigability and that entity bean that participates in the relationship is "not aware" of the relationship. diff --git a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java index b03b28a91..b217cef7d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java +++ b/plugins/org.eclipse.jst.j2ee.core/mofj2ee/org/eclipse/jst/j2ee/internal/xml/GeneralXmlDocumentReader.java @@ -12,14 +12,13 @@ package org.eclipse.jst.j2ee.internal.xml; import java.lang.reflect.InvocationTargetException; +import org.eclipse.jem.util.logger.proxy.Logger; import org.w3c.dom.Document; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; - -import org.eclipse.jem.util.logger.proxy.Logger; /** * Insert the type's description here. * Creation date: (4/11/2001 11:58:50 AM) diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java index 5db0caa78..b59ebe987 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizard.java @@ -11,7 +11,7 @@ package org.eclipse.jst.j2ee.jca.ui.internal.wizard; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; @@ -20,8 +20,8 @@ import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactCreationWizard; import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizard; import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages; import org.eclipse.ui.INewWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java index fab633e89..7312756a3 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorComponentCreationWizardPage.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.jca.ui.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizardPage; import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; public class ConnectorComponentCreationWizardPage extends J2EEComponentCreationWizardPage { diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java index 6ad7e38f1..d38174328 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleExportWizard.java @@ -16,8 +16,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard; import org.eclipse.ui.IExportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleImportWizard.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleImportWizard.java index 4d3da744a..f1c5a7bd3 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleImportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/ConnectorModuleImportWizard.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.jca.ui.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleImportDataModel; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleImportOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> @@ -57,7 +57,7 @@ public final class ConnectorModuleImportWizard extends J2EEModuleImportWizard { * the value of {@link J2EEModuleImportDataModel#ADD_TO_EAR} to <b>true</b> * </p> * - * @see org.eclipse.wst.common.frameworks.ui.WTPWizard#createDefaultModel() + * @see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard#createDefaultModel() */ protected WTPOperationDataModel createDefaultModel() { ConnectorModuleImportDataModel aModel = new ConnectorModuleImportDataModel(); diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java index 93203532e..82dcdd70e 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARExportPage.java @@ -17,7 +17,7 @@ package org.eclipse.jst.j2ee.jca.ui.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; diff --git a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARImportPage.java b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARImportPage.java index 382d6185e..b34d361ce 100644 --- a/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARImportPage.java +++ b/plugins/org.eclipse.jst.j2ee.jca.ui/jca_ui/org/eclipse/jst/j2ee/jca/ui/internal/wizard/RARImportPage.java @@ -16,18 +16,18 @@ */ package org.eclipse.jst.j2ee.jca.ui.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; -import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleImportDataModel; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorComponentCreationDataModel; +import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleImportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.project.IConnectorNatureConstants; import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage; import org.eclipse.jst.j2ee.jca.ui.internal.util.JCAUIMessages; import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java index 754ce851f..ab23a3456 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/jca/internal/plugin/JcaModuleExtensionImpl.java @@ -14,9 +14,9 @@ */ package org.eclipse.jst.j2ee.jca.internal.plugin; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.earcreation.UpdateModuleReferencesInEARProjectCommand; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleCreationDataModel; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorModuleCreationOperation; diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorModuleExportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorModuleExportOperation.java index b131fd7d9..7a830ebdb 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorModuleExportOperation.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/ConnectorModuleExportOperation.java @@ -20,7 +20,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile; diff --git a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/RARProjectLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/RARProjectLoadStrategyImpl.java index 4d6b352a7..c8975b311 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/RARProjectLoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.jca/jcaedit/org/eclipse/jst/j2ee/internal/jca/archive/operations/RARProjectLoadStrategyImpl.java @@ -25,6 +25,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter; +import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.File; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveRuntimeException; @@ -35,9 +37,6 @@ import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.archive.operations.J2EELoadStrategyImpl; import org.eclipse.jst.j2ee.internal.jca.operations.ConnectorNatureRuntime; -import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter; -import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl; - /** * Class defines the loading mechanism for RAR projects. */ diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModel.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModel.java index 35516baa6..2f171f15d 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationDataModel.java @@ -12,13 +12,13 @@ package org.eclipse.jst.j2ee.internal.jca.operations; import org.eclipse.core.runtime.IPath; import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; public class ConnectorComponentCreationDataModel extends J2EEComponentCreationDataModel { diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationOperation.java index fd9abfa87..5d4b88c14 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorComponentCreationOperation.java @@ -15,8 +15,8 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationOperation; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionUtil; import org.eclipse.wst.common.modulecore.ModuleCore; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorEditModel.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorEditModel.java index 06fcfd995..205a67aa2 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorEditModel.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorEditModel.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.internal.jca.operations; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationOperation; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEEditModel; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModel.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModel.java index d4098d4cc..5530009fe 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModel.java @@ -20,8 +20,9 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; import org.eclipse.emf.ecore.EClass; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; @@ -29,10 +30,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.IConnectorNatureConstants; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; - -import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; /** * This dataModel is used for to create Connector Modules. diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModelOld.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModelOld.java index e99cd4a87..49eecfc88 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModelOld.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationDataModelOld.java @@ -21,7 +21,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; import org.eclipse.emf.ecore.EClass; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; @@ -29,8 +29,8 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.IConnectorNatureConstants; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperation.java index 632713537..8dec244c3 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperation.java @@ -29,8 +29,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperationOld.java index da30d27a3..6c5ed7063 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperationOld.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleCreationOperationOld.java @@ -29,8 +29,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleExportDataModel.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleExportDataModel.java index e0fa239a9..e6f997444 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleExportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleExportDataModel.java @@ -11,11 +11,11 @@ package org.eclipse.jst.j2ee.internal.jca.operations; import java.lang.reflect.InvocationTargetException; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.jca.archive.operations.ConnectorModuleExportOperation; import org.eclipse.jst.j2ee.internal.project.IConnectorNatureConstants; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportDataModel.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportDataModel.java index 12e5b5700..4ca1fe798 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportDataModel.java @@ -10,16 +10,15 @@ package org.eclipse.jst.j2ee.internal.jca.operations; import java.lang.reflect.InvocationTargetException; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; - -import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** * This dataModel is used for to import Connector Modules (from RAR files) into the workspace. diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportOperation.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportOperation.java index 631e6fce6..860a052c0 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/internal/jca/operations/ConnectorModuleImportOperation.java @@ -31,7 +31,7 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation; diff --git a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorArtifactEditOperationDataModel.java b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorArtifactEditOperationDataModel.java index 5d8ab9b9d..8c4cf1eb8 100644 --- a/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorArtifactEditOperationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.jca/rarproject/org/eclipse/jst/j2ee/jca/internal/module/util/ConnectorArtifactEditOperationDataModel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.jca.internal.module.util; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; public class ConnectorArtifactEditOperationDataModel extends ArtifactEditOperationDataModel { diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java index ef144c5de..3d397510d 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/EMFRootObjectProvider.java @@ -18,11 +18,10 @@ 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.jem.util.logger.proxy.Logger; import org.eclipse.swt.SWTError; import org.eclipse.swt.SWTException; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @author Admin * diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java index b33ec32d0..337e7cc29 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/J2EEContentProvider.java @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.AbstractTreeViewer; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; @@ -34,8 +35,6 @@ import org.eclipse.ui.progress.UIJob; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; import org.eclipse.wst.common.navigator.views.CommonViewer; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * <p> * The following class is experimental until fully documented. diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java index d3fd483f3..f5f846d04 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddModuleDropAction.java @@ -11,10 +11,10 @@ package org.eclipse.jst.j2ee.navigator.internal.dnd; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.j2ee.application.operations.AddModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddModuleToEARDataModel; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author mdelder diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java index e57bf6c52..9adf77da8 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddProjectToEarDropAction.java @@ -23,11 +23,11 @@ import org.eclipse.swt.dnd.TransferData; import org.eclipse.ui.part.PluginTransfer; import org.eclipse.ui.views.navigator.LocalSelectionTransfer; import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.navigator.internal.views.NavigatorPlugin; +import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; import org.eclipse.wst.common.navigator.internal.views.dnd.IDropValidator; import org.eclipse.wst.common.navigator.internal.views.dnd.NavigatorDropActionDelegate; -import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; /** * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java index 4e09c0f0c..5aa9947f8 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/AddUtilityJarDropAction.java @@ -19,10 +19,10 @@ package org.eclipse.jst.j2ee.navigator.internal.dnd; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.j2ee.application.operations.AddArchiveToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.AddUtilityProjectToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddArchiveToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddUtilityProjectToEARDataModel; import org.eclipse.jst.j2ee.internal.wizard.ServerTargetUIHelper; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java index 04c9f3a49..03f78c78e 100644 --- a/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java +++ b/plugins/org.eclipse.jst.j2ee.navigator.ui/j2ee-navigator/org/eclipse/jst/j2ee/navigator/internal/dnd/J2EEImportDropAction.java @@ -17,18 +17,18 @@ package org.eclipse.jst.j2ee.navigator.internal.dnd; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleImportDataModel; +import org.eclipse.jst.ejb.ui.internal.wizard.EJBModuleImportWizard; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; -import org.eclipse.jst.ejb.ui.internal.wizard.EJBModuleImportWizard; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.ejb.project.operations.EJBModuleImportDataModel; @@ -46,10 +46,10 @@ import org.eclipse.jst.servlet.ui.internal.wizard.WebModuleImportWizard; import org.eclipse.swt.dnd.FileTransfer; import org.eclipse.swt.dnd.TransferData; import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; +import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; import org.eclipse.wst.common.navigator.internal.views.dnd.IDropValidator; import org.eclipse.wst.common.navigator.internal.views.dnd.NavigatorDropActionDelegate; -import org.eclipse.wst.common.navigator.internal.views.dnd.CommonNavigatorDropAdapter; /** * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java index 3de901936..1158dc789 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ClasspathTableManager.java @@ -14,8 +14,8 @@ import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; -import org.eclipse.jst.j2ee.application.operations.ClasspathElement; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement; import org.eclipse.jst.j2ee.internal.common.ClasspathModel; import org.eclipse.jst.j2ee.internal.listeners.IValidateEditListener; import org.eclipse.jst.j2ee.internal.wizard.AvailableJarsProvider; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesPage.java index a1697822c..d9c04e515 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEPropertiesPage.java @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.PropertyPage; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; import org.eclipse.wst.common.modulecore.ModuleCore; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java index de4b429ad..fbb49cbf4 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/JARDependencyPropertiesPage.java @@ -20,7 +20,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; @@ -29,7 +28,7 @@ import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl; import org.eclipse.jst.j2ee.internal.common.ClasspathModel; @@ -55,9 +54,9 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.PropertyPage; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin; import org.eclipse.wst.common.frameworks.internal.ui.WorkspaceModifyComposedOperation; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; /** * @author jialin diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java index cf1ecbe3d..ee8d0b63c 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/AbstractActionDelegate.java @@ -18,6 +18,7 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ISelection; @@ -27,8 +28,6 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - public abstract class AbstractActionDelegate implements org.eclipse.ui.IActionDelegate { protected ISelection selection; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java index c4219083e..83bd8c671 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeleteModuleActionPopulator.java @@ -21,7 +21,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchSite; import org.eclipse.wst.common.frameworks.internal.operation.extensionui.IActionWTPOperationDataModel; import org.eclipse.wst.common.frameworks.internal.operation.extensionui.WTPOperationDataModelUICreator; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author mdelder diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java index 5a82b50be..95dc32fcf 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EEDeployAction.java @@ -21,6 +21,7 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jst.j2ee.internal.deploy.DeployerRegistry; @@ -34,8 +35,6 @@ import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationJobAdap import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * @author cbridgha * diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java index 50b590ac6..78f421a4d 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/J2EERenameAction.java @@ -21,6 +21,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.jdt.ui.actions.SelectionDispatchAction; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jface.action.IAction; import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.dialogs.ProgressMonitorDialog; @@ -49,13 +51,10 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.RenameResourceAction; import org.eclipse.ui.actions.SelectionListenerAction; import org.eclipse.wst.common.frameworks.internal.ui.WTPUIPlugin; +import org.eclipse.wst.common.modulecore.ComponentResource; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.UnresolveableURIException; import org.eclipse.wst.common.modulecore.WorkbenchComponent; -import org.eclipse.wst.common.modulecore.ComponentResource; - -import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; public class J2EERenameAction extends SelectionDispatchAction implements J2EERenameUIConstants { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java index 39c39a5e4..28c811ac7 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/actions/OpenJ2EEResourceAction.java @@ -20,6 +20,7 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.jem.java.JavaClass; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.application.Application; @@ -58,15 +59,10 @@ import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.part.ISetSelectionTarget; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; -import org.eclipse.wst.common.modulecore.ArtifactEdit; +import org.eclipse.wst.common.modulecore.ComponentResource; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.UnresolveableURIException; import org.eclipse.wst.common.modulecore.WorkbenchComponent; -import org.eclipse.wst.common.modulecore.ComponentResource; - -import sun.misc.Service; - -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; /** * Action for opening a J2EE resource from the J2EE navigator. diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java index 75c437a4f..c09a5476c 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/J2EEDeployStatusDialog.java @@ -21,6 +21,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.IStatus; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.ProgressMonitorDialog; import org.eclipse.swt.SWT; @@ -34,8 +35,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @author sagarwal * diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java index dd7434660..1a6d6a94d 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/dialogs/RenameEARDialog.java @@ -11,6 +11,7 @@ package org.eclipse.jst.j2ee.internal.dialogs; import java.util.Set; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java index a15d9aafb..202444c6c 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/ear/actions/ModulesProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jst.j2ee.internal.ear.actions; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; /** * Insert the type's description here. Creation date: (8/22/2001 2:27:24 PM) diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java index 6bbb9fce0..747a629e3 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/listeners/ValidateEditListener.java @@ -21,9 +21,11 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.events.ShellAdapter; import org.eclipse.swt.events.ShellEvent; import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IPartListener; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator; +import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter; public class ValidateEditListener extends ShellAdapter implements IValidateEditListener { protected ResourceStateValidator fValidator; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java index 9ca88ff0b..f70aca485 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEAdapterFactoryContentProvider.java @@ -16,6 +16,7 @@ import java.util.List; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider; +import org.eclipse.jface.viewers.IContentProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.internal.ejb.provider.GroupedEJBJarItemProvider; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java index 9d315515a..b0981a5ee 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEApplicationItemProvider.java @@ -22,6 +22,8 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.ApplicationPackage; import org.eclipse.jst.j2ee.internal.application.impl.ApplicationFactoryImpl; @@ -31,8 +33,6 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap; import org.eclipse.jst.j2ee.internal.ejb.provider.J2EENotificationImpl; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - public class J2EEApplicationItemProvider extends ApplicationItemProvider implements IAdaptable { protected static final Class IRESOURCE_CLASS = IResource.class; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java index bf747f2c8..7bbc1623d 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/provider/J2EEUtilityJavaProjectsItemProvider.java @@ -10,6 +10,7 @@ package org.eclipse.jst.j2ee.internal.provider; import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java index 97a163e90..4aacc5caf 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/war/ui/util/J2EEWebAppItemProvider.java @@ -24,6 +24,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationWrapper; import org.eclipse.emf.common.notify.impl.AdapterImpl; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.internal.web.providers.WebAppItemProvider; import org.eclipse.jst.j2ee.internal.webservices.WebServiceEditModel; import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager; @@ -34,8 +35,6 @@ import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * @author jlanuti * diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java index 23fd61e5d..ea9f782db 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AnnotationsStandaloneGroup.java @@ -18,7 +18,7 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.core.resources.IProject; import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants; @@ -31,8 +31,8 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; /** * @author jlanuti diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java index 65d9cee03..18c746fbb 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizard.java @@ -7,15 +7,15 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientComponentCreationDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientComponentCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.ui.INewWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; public class AppClientComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java index 22dae924e..e719513db 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientComponentCreationWizardPage.java @@ -6,15 +6,15 @@ */ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; public class AppClientComponentCreationWizardPage extends J2EEComponentCreationWizardPage { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java index ab2e29b52..74485567a 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientExportPage.java @@ -17,7 +17,7 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientImportPage.java index bd88bd377..0221dd042 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientImportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientImportPage.java @@ -16,17 +16,17 @@ */ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientComponentCreationDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleImportDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** * @author cbridgha diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleExportWizard.java index 24ba4bfcc..c4fec9072 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleExportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleExportWizard.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.AppClientModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AppClientModuleExportDataModel; import org.eclipse.jst.j2ee.internal.archive.operations.AppClientModuleExportOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.ui.IExportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleImportWizard.java index 45fa5c625..1d5f89727 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleImportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AppClientModuleImportWizard.java @@ -10,14 +10,14 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleImportDataModel; import org.eclipse.jst.j2ee.internal.archive.operations.AppClientModuleImportOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationModuleProjectsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationModuleProjectsPage.java index d28e14876..11bfd16a7 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationModuleProjectsPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationModuleProjectsPage.java @@ -29,10 +29,10 @@ import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.application.operations.AddArchiveProjectsToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.AddArchiveProjectsToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; @@ -43,7 +43,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationProjectCreationPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationProjectCreationPage.java index fdbba3633..ffd8c5a5e 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationProjectCreationPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ApplicationProjectCreationPage.java @@ -15,8 +15,8 @@ */ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java index 3d3ce757f..0933a6a7d 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableJarsProvider.java @@ -15,8 +15,8 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; -import org.eclipse.jst.j2ee.application.operations.ClasspathElement; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.common.frameworks.internal.ui.OverlayIcon; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java index c2a67aa61..0c00231c7 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableModuleProjectsProvider.java @@ -27,7 +27,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.swt.graphics.Image; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java index 9ddf3a51f..56c165562 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilJarsAndWebLibProvider.java @@ -24,7 +24,7 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.File; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java index bfa7f95d6..1d0d2fbe9 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/AvailableUtilityJarsProvider.java @@ -25,9 +25,9 @@ import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.application.operations.J2EEUtilityJarListImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarListImportDataModel; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author vijayb diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultModuleProjectCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultModuleProjectCreationWizard.java index 186c9d9b0..d59ebfc58 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultModuleProjectCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/DefaultModuleProjectCreationWizard.java @@ -19,13 +19,13 @@ import java.net.MalformedURLException; import java.net.URL; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** * @author DABERG diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java index 2332ce869..1adf56aed 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationSecondPage.java @@ -16,9 +16,9 @@ import org.eclipse.jface.viewers.CheckStateChangedEvent; import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jst.j2ee.application.operations.AddArchiveProjectsToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddArchiveProjectsToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; @@ -29,7 +29,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java index 860398617..a1da76e63 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizard.java @@ -7,15 +7,15 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.jst.j2ee.application.operations.EARComponentCreationOperation; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.EARComponentCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.ui.INewWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; public class EARComponentCreationWizard extends J2EEComponentCreationWizard implements IExecutableExtension, INewWizard { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java index f335faf5f..4250043b9 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARComponentCreationWizardPage.java @@ -11,7 +11,7 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; public class EARComponentCreationWizardPage extends J2EEComponentCreationWizardPage { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARExportPage.java index aeb19ed62..b954ee244 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARExportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARExportPage.java @@ -18,8 +18,8 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.application.Application; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationExportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java index 1440a1439..4f80c3aad 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportListContentProvider.java @@ -17,7 +17,7 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportOptionsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportOptionsPage.java index b1c819950..17828f961 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportOptionsPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportOptionsPage.java @@ -26,8 +26,8 @@ import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; @@ -44,9 +44,9 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelListener; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; /** * @author cbridgha diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportPage.java index 80b737e88..ee593b5c0 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportPage.java @@ -15,11 +15,11 @@ */ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportProjectsPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportProjectsPage.java index 238bdab19..fda78697f 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportProjectsPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EARImportProjectsPage.java @@ -29,8 +29,8 @@ import org.eclipse.jface.viewers.ICellModifier; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.jface.viewers.TextCellEditor; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; @@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; /** * @author cbridgha diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationCreationWizard.java index 8c9ccb92a..010d52136 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationCreationWizard.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationExportWizard.java index 32660480c..7b14b25db 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationExportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationExportWizard.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationExportDataModel; import org.eclipse.jst.j2ee.internal.archive.operations.EnterpriseApplicationExportOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.ui.IExportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationImportWizard.java index 59ad84ff5..afa7633ce 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationImportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/EnterpriseApplicationImportWizard.java @@ -11,14 +11,14 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; import org.eclipse.jst.j2ee.internal.archive.operations.EnterpriseApplicationImportOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.ui.IImportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleModuleStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleModuleStandaloneGroup.java index d2e6de094..973f1034e 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleModuleStandaloneGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleModuleStandaloneGroup.java @@ -1,14 +1,14 @@ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; public class FlexibleModuleStandaloneGroup { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java index db664be14..092b1e790 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizard.java @@ -10,16 +10,16 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.FlexibleJavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.FlexibleProjectCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationOperation; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; public class FlexibleProjectCreationWizard extends WTPWizard implements INewWizard, IExecutableExtension { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java index d14afbe4b..ac8c9d489 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/FlexibleProjectCreationWizardPage.java @@ -6,7 +6,7 @@ */ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.FlexibleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModel; @@ -30,8 +30,8 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.server.ui.ServerUIUtil; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java index 2a60ad105..c4538fdea 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactCreationWizard.java @@ -22,8 +22,8 @@ import org.eclipse.ui.IPluginContribution; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; @@ -39,7 +39,7 @@ import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDat * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#doAddPages()} * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#canFinish()} * <li> {@link org.eclipse.wst.common.frameworks.ui.ExtendableWizard#createBaseOperation()} - * <li>{@link org.eclipse.wst.common.frameworks.ui.WTPWizard#createDefaultModel()} + * <li>{@link org.eclipse.wst.common.frameworks.internal.ui.WTPWizard#createDefaultModel()} * </ul> * </p> * <p> @@ -114,7 +114,7 @@ public abstract class J2EEArtifactCreationWizard extends WTPWizard implements IN * wizard completes. * </p> * - * @see org.eclipse.wst.common.frameworks.ui.WTPWizard#dispose() + * @see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard#dispose() */ public final void dispose() { super.dispose(); diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java index 18dfce134..e658ef501 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactExportWizard.java @@ -11,15 +11,14 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.core.resources.IProject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.ui.IWorkbench; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; - -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** * <p> @@ -28,7 +27,7 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities; * </p> * <p> * Subclasses must provide the methods that are required by - * {@link org.eclipse.wst.common.frameworks.ui.WTPWizard}. + * {@link org.eclipse.wst.common.frameworks.internal.ui.WTPWizard}. * </p> * <p> * Optionally, subclasses may also override the following methods: @@ -139,7 +138,7 @@ public abstract class J2EEArtifactExportWizard extends WTPWizard { * wizard completes. * </p> * - * @see org.eclipse.wst.common.frameworks.ui.WTPWizard#dispose() + * @see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard#dispose() */ public final void dispose() { super.dispose(); diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java index 66636c78c..2e8423db1 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEArtifactImportWizard.java @@ -16,14 +16,14 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.internal.DelegateConfigurationElement; import org.eclipse.jst.j2ee.internal.plugin.CommonEditorUtility; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** * <p> @@ -121,7 +121,7 @@ public abstract class J2EEArtifactImportWizard extends WTPWizard implements IImp * wizard completes. * </p> * - * @see org.eclipse.wst.common.frameworks.ui.WTPWizard#dispose() + * @see org.eclipse.wst.common.frameworks.internal.ui.WTPWizard#dispose() */ public final void dispose() { super.dispose(); diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java index b30974852..a92d40495 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizard.java @@ -12,8 +12,8 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEdit; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.ui.IWorkbench; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java index 68a1076e3..343955fc9 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEComponentCreationWizardPage.java @@ -16,8 +16,9 @@ */ package org.eclipse.jst.j2ee.internal.wizard; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.swt.SWT; @@ -40,13 +41,11 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; - import org.eclipse.wst.server.ui.ServerUIUtil; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; public abstract class J2EEComponentCreationWizardPage extends WTPWizardPage { diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java index 82a03cbb7..2d5d23137 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEExportPage.java @@ -24,8 +24,8 @@ import org.eclipse.core.resources.IResource; import org.eclipse.emf.ecore.EObject; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationExportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; @@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.emf.workbench.nature.EMFNature; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java index 8a6ebe090..46ccaadef 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEImportPage.java @@ -21,8 +21,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.swt.SWT; @@ -36,12 +36,12 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Label; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelListener; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java index 940e4fda5..32062bfa8 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleExportPage.java @@ -17,7 +17,7 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java index 88ad9b5ef..887cb07b3 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportPage.java @@ -15,8 +15,8 @@ */ package org.eclipse.jst.j2ee.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.help.WorkbenchHelp; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportWizard.java index a22fdddfc..c84fc15b1 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModuleImportWizard.java @@ -16,12 +16,14 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IExecutableExtension; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.ui.IImportWizard; +import org.eclipse.ui.IWorkbench; import org.eclipse.wst.common.frameworks.internal.AdaptabilityUtility; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.validation.internal.operations.ValidatorSubsetOperation; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java index 01fbd1d40..adb2f3eaa 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEModulesDependencyPage.java @@ -17,10 +17,10 @@ import org.eclipse.jface.viewers.CheckboxTableViewer; import org.eclipse.jface.viewers.ColumnWeightData; import org.eclipse.jface.viewers.ICheckStateListener; import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; -import org.eclipse.jst.j2ee.application.operations.ClasspathElement; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.UpdateManifestDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModel; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.SWT; @@ -36,8 +36,8 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.internal.WorkbenchMessages; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; /* diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEProjectCreationPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEProjectCreationPage.java index d3f86b8da..8f34bedd8 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEProjectCreationPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEProjectCreationPage.java @@ -16,8 +16,9 @@ */ package org.eclipse.jst.j2ee.internal.wizard; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.swt.SWT; @@ -40,12 +41,10 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.help.WorkbenchHelp; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.server.ui.ServerUIUtil; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * @author jsholl * diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPage.java index ae1a60f16..30dc91a46 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportPage.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.viewers.CheckboxTableViewer; -import org.eclipse.jst.j2ee.application.operations.J2EEUtilityJarListImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarListImportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; @@ -37,9 +37,9 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelListener; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener; /** * @author mdelder diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePage.java index 7a0704e04..a673a4b4d 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportTypePage.java @@ -24,10 +24,12 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.emf.workbench.nature.EMFNature; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.application.Application; -import org.eclipse.jst.j2ee.application.operations.J2EEUtilityJarListImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarListImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; @@ -46,12 +48,9 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; - -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jem.util.emf.workbench.nature.EMFNature; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; /** * @author mdelder diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizard.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizard.java index f7d33abc8..ba367fdf8 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizard.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/J2EEUtilityJarImportWizard.java @@ -11,10 +11,10 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEUtilityJarListImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarListImportDataModel; import org.eclipse.ui.IImportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java index a958312bf..8f1286816 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewFlexibleProjectGroup.java @@ -8,7 +8,7 @@ package org.eclipse.jst.j2ee.internal.wizard; import java.io.File; -import org.eclipse.jst.j2ee.application.operations.FlexibleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -20,7 +20,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; public class NewFlexibleProjectGroup { private FlexibleProjectCreationDataModel model; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java index 946080ee8..eb2e01641 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleGroup.java @@ -26,8 +26,8 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.application.operations.FlexibleJavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.FlexibleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.FlexibleProjectCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.internal.Workbench; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; import org.eclipse.wst.server.core.IRuntime; diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleProjectSelectionPage.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleProjectSelectionPage.java index d110a9bfa..9e699623b 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleProjectSelectionPage.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewModuleProjectSelectionPage.java @@ -16,9 +16,10 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.IWizardPage; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationDataModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.actions.IJ2EEUIContextIds; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager; @@ -39,9 +40,7 @@ import org.eclipse.ui.internal.WorkbenchPlugin; import org.eclipse.ui.wizards.IWizardDescriptor; import org.eclipse.ui.wizards.IWizardRegistry; import org.eclipse.wst.common.frameworks.internal.ui.GenericWizardNode; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; - -import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java index e9164b51a..f568b2665 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/NewProjectGroup.java @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; /** * @author DABERG diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java index 8158a0e3b..79ed55157 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerEarAndStandaloneGroup.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.internal.wizard; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.swt.SWT; @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java index d2f9f585b..afd95d3d1 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/ServerTargetGroup.java @@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; -import org.eclipse.wst.common.frameworks.ui.WTPDataModelSynchHelper; +import org.eclipse.wst.common.frameworks.internal.ui.WTPDataModelSynchHelper; /** diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java index 9c0473e77..7b6405255 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/wizard/StringArrayTableWizardSection.java @@ -34,8 +34,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; - -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author jialin diff --git a/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/locator/AbstractWebTaglibLocator.java b/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/locator/AbstractWebTaglibLocator.java index 44f65d2dd..1a627e7bf 100644 --- a/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/locator/AbstractWebTaglibLocator.java +++ b/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/locator/AbstractWebTaglibLocator.java @@ -22,6 +22,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; @@ -32,8 +33,6 @@ import org.eclipse.jst.j2ee.web.taglib.ITaglibInfo; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.web.internal.operation.ILibModule; -import org.eclipse.jem.util.logger.proxy.Logger; - abstract public class AbstractWebTaglibLocator extends AbstractTaglibLocator { /** * Constructor for AbstractWebProjectTaglibLocator. diff --git a/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/TLDDigester.java b/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/TLDDigester.java index b8be2bf45..b467dd093 100644 --- a/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/TLDDigester.java +++ b/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/TLDDigester.java @@ -18,6 +18,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -30,8 +31,6 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * This class parses tld files and produces TLDs, and Tags, and Attributes * diff --git a/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/registry/AbstractTaglibRegistry.java b/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/registry/AbstractTaglibRegistry.java index b8147d5b9..300c8eb6f 100644 --- a/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/registry/AbstractTaglibRegistry.java +++ b/plugins/org.eclipse.jst.j2ee.web/taglib/org/eclipse/jst/j2ee/internal/web/taglib/registry/AbstractTaglibRegistry.java @@ -24,6 +24,7 @@ import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.web.locator.WebProjectTaglibLocator; import org.eclipse.jst.j2ee.internal.web.locator.WebXMLTaglibLocator; @@ -32,8 +33,6 @@ import org.eclipse.jst.j2ee.web.taglib.ITaglibLocator; import org.eclipse.jst.j2ee.web.taglib.ITaglibRegistry; import org.eclipse.jst.j2ee.web.taglib.ITaglibRegistryListener; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @version 1.0 diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java index e9dc26037..44bbc7e2c 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableFactory.java @@ -9,8 +9,6 @@ package org.eclipse.jst.j2ee.internal.web.deployables; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -20,6 +18,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.deployables.J2EEDeployableFactory; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; @@ -28,10 +27,6 @@ import org.eclipse.wst.common.modulecore.ModuleStructuralModel; import org.eclipse.wst.common.modulecore.ProjectComponents; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.internal.Module; -import org.eclipse.wst.server.core.model.ModuleDelegate; - -import org.eclipse.jem.util.logger.proxy.Logger; public class WebDeployableFactory extends J2EEDeployableFactory { private static final String ID = "com.ibm.wtp.web.server"; //$NON-NLS-1$ diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java index 8d86abe4c..acdcc7e18 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/jfaces/extension/FileURLExtensionReader.java @@ -18,9 +18,8 @@ import java.util.Iterator; import java.util.List; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin; - import org.eclipse.jem.util.RegistryReader; +import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin; /** * @author vijayb diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/AddServletOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java index 58d74d913..a5d34bd09 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/AddServletOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/AddServletOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.web.operations; +package org.eclipse.jst.j2ee.internal.web.operations; import java.lang.reflect.InvocationTargetException; import java.util.List; @@ -16,12 +16,12 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.Description; import org.eclipse.jst.j2ee.common.ParamValue; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.webapplication.InitParam; import org.eclipse.jst.j2ee.webapplication.JSPType; import org.eclipse.jst.j2ee.webapplication.Servlet; @@ -29,15 +29,15 @@ import org.eclipse.jst.j2ee.webapplication.ServletMapping; import org.eclipse.jst.j2ee.webapplication.ServletType; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperation; /** * This class, AddServlet Operation is a WTPOperation following the WTP wizard data model and * operation framework. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperation - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel * * This operation subclasses the EditModelOperation so the changes made to the deployment descriptor * models are saved to the edit model. @@ -47,14 +47,14 @@ import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperatio * a web app, whether that be an annotated servlet or a non annotated servlet. This uses the * NewServletClassDataModel to retrieve properties set by the user in order to create the custom * servet. - * @see org.eclipse.jst.j2ee.web.operations.NewServletClassDataModel + * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel * * In the non annotated case, this operation will add the metadata necessary into the web deployment * descriptor. In the annotated case, it will not, it will leave this up to the parsing of the * annotations to build the deployment descriptor artifacts. To actually create the java class for * the servlet, the operation uses the NewServletClassOperation. The NewServletClassOperation * shares the same data model. - * @see org.eclipse.jst.j2ee.web.operations.NewServletClassOperation + * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation * * Clients may subclass this operation to provide their own behaviour on servlet creation. The execute * method can be extended to do so. Also, generateServletMetaData and creteServletClass are exposed. @@ -81,7 +81,7 @@ public class AddServletOperation extends ArtifactEditOperation { * implementation will create the servlet class, and then if the servlet is not * annotated, it will create the servlet metadata for the web deployment descriptor. * This method will accept null as a parameter. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperation#execute(IProgressMonitor) + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation#execute(IProgressMonitor) * @see AddServletOperation#createServletClass() * @see AddServletOperation#generateServletMetaData(NewServletClassDataModel, String, boolean) * diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/CreateServletTemplateModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java index 50395af36..ee99e6897 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/CreateServletTemplateModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/CreateServletTemplateModel.java @@ -11,11 +11,11 @@ /* * Created on Aug 6, 2004 */ -package org.eclipse.jst.j2ee.web.operations; +package org.eclipse.jst.j2ee.internal.web.operations; import java.util.List; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/NewServletClassDataModel.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModel.java index 02608e971..f490b0976 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/NewServletClassDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassDataModel.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.web.operations; +package org.eclipse.jst.j2ee.internal.web.operations; import java.io.File; import java.util.ArrayList; @@ -21,35 +21,34 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.j2ee.internal.web.operations.WebMessages; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit; import org.eclipse.jst.j2ee.webapplication.Servlet; import org.eclipse.jst.j2ee.webapplication.WebApp; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.ArtifactEdit; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; /** * The NewServletClassData model is a subclass of WTPOperationDataModel and follows the WTP Operation and WTP Wizard frameworks. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel - * @see org.eclipse.wst.common.frameworks.operations.WTPOperation + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation * * This data model is a subclass of the NewJavaClassDataModel, which stores base properties necessary in * the creation of a default java class. - * @see org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel + * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel * * The NewServletClassDataModel provides more specific properties for java class creation that are required * in creating a servlet java class. The data model is used to store these values for the NewServletClassOperation. * That operation will create the servlet java class based on the settings defined here in the data model. - * @see org.eclipse.jst.j2ee.web.operations.NewServletClassOperation + * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassOperation * * This data model implements the IAnnotationsDataModel to get the USE_ANNOTATIONS property for determining * whether or not to generate an annotated java class. - * @see org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel + * @see org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel * * Clients can subclass this data model to cache and provide their own specific attributes. They should also provide their * own validation methods and default values for the properties they add. @@ -159,7 +158,7 @@ public class NewServletClassDataModel extends NewJavaClassDataModel implements I * Subclasses may extend this method to provide their own default operation for this * data model. This implementation uses the AddServletOperation to drive the servlet * creation. It will not return null. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#getDefaultOperation() + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#getDefaultOperation() * * @return WTPOperation AddServletOperation */ @@ -172,7 +171,7 @@ public class NewServletClassDataModel extends NewJavaClassDataModel implements I * certain properties should be disabled or enabled. This method does not accept null parameter. * It will not return null. This implementation makes sure annotation support is only allowed * on web projects of J2EE version 1.3 or higher. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#basicIsEnabled(String) + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#basicIsEnabled(String) * @see IAnnotationsDataModel#USE_ANNOTATIONS * * @param propertyName @@ -194,7 +193,7 @@ public class NewServletClassDataModel extends NewJavaClassDataModel implements I * base properties. This implementation adds the servlet specific properties to those added * by the NewJavaClassDataModel. * @see NewJavaClassDataModel#initValidBaseProperties() - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#initValidBaseProperties() + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#initValidBaseProperties() */ protected void initValidBaseProperties() { super.initValidBaseProperties(); @@ -221,7 +220,7 @@ public class NewServletClassDataModel extends NewJavaClassDataModel implements I * accept a null parameter. It may return null. This implementation sets * annotation use to be true, and to generate a servlet with doGet and doPost. * @see NewJavaClassDataModel#getDefaultProperty(String) - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#getDefaultProperty(String) + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#getDefaultProperty(String) * * @param propertyName * @return Object default value of property @@ -252,7 +251,7 @@ public class NewServletClassDataModel extends NewJavaClassDataModel implements I * false if the set fails. This implementation verifies the display name is set to the * classname, that the annotations is disabled/enabled properly, and that the target project * name is determined from the source folder setting. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#doSetProperty(String, Object) + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#doSetProperty(String, Object) * * @param propertyName * @param propertyValue @@ -321,7 +320,7 @@ public class NewServletClassDataModel extends NewJavaClassDataModel implements I * fields specific to the servlet java class creation. It does not accept a null * parameter. This method will not return null. * @see NewJavaClassDataModel#doValidateProperty(String) - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#doValidateProperty(String) + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#doValidateProperty(String) * * @param propertyName * @return IStatus is property value valid? diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/NewServletClassOperation.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java index f7f5d522b..c3eff79dd 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/web/operations/NewServletClassOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/operations/NewServletClassOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.web.operations; +package org.eclipse.jst.j2ee.internal.web.operations; import java.lang.reflect.InvocationTargetException; @@ -33,19 +33,21 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.common.internal.annotations.controller.AnnotationsController; import org.eclipse.jst.common.internal.annotations.controller.AnnotationsControllerManager; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.project.WTPJETEmitter; import org.eclipse.jst.j2ee.internal.web.plugin.WebPlugin; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; +import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperation; +import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperation; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; /** * The NewServletClassOperation is a WTPOperation following the WTP wizard data model and * operation framework. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperation - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel * * It extends EditModelOperation to provide servlet specific java class generation. * @see org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperation @@ -54,13 +56,13 @@ import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperatio * non annotated java class for an added servlet. It shares the NewServletClassDataModel * with the AddServletOperation to store the appropriate properties required to generate * the new servlet. - * @see org.eclipse.jst.j2ee.web.operations.AddServletOperation - * @see org.eclipse.jst.j2ee.web.operations.NewServletClassDataModel + * @see org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation + * @see org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel * * In the annotated case, a WTPJetEmitter servlet template is created and used to generate the * servlet java class with the embedded annotated tags. * @see org.eclipse.jst.j2ee.internal.project.WTPJETEmitter - * @see org.eclipse.jst.j2ee.web.operations.CreateServletTemplateModel + * @see org.eclipse.jst.j2ee.internal.web.operations.CreateServletTemplateModel * * In the non annotated case, the same emitter is used to create the class with the non annotated * servlet template so the annotated tags are omitted. diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java index c4c196ee8..6d2953ba7 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/plugin/WebModuleExtensionImpl.java @@ -21,9 +21,9 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.application.WebModule; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.internal.earcreation.UpdateModuleReferencesInEARProjectCommand; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtensionImpl; diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java index 1707362e4..130607068 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/FilterItemProvider.java @@ -18,6 +18,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java index a44aac805..8ed9ad4bd 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/SecurityConstraintItemProvider.java @@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java index 43c3f5d99..a5b7aedb1 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/ServletItemProvider.java @@ -17,6 +17,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; diff --git a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java index a53f79da2..cfbe1ddf3 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.web/webedit/org/eclipse/jst/j2ee/internal/web/providers/WebAppItemProvider.java @@ -18,6 +18,8 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/ContextRootUpdateOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/ContextRootUpdateOperation.java index a314e14e9..3ddb3aecd 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/ContextRootUpdateOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/ContextRootUpdateOperation.java @@ -20,7 +20,7 @@ import org.eclipse.jst.j2ee.application.WebModule; import org.eclipse.jst.j2ee.internal.earcreation.EAREditModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectSaveStrategyImpl.java index b17408013..e3c6d5074 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectSaveStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WTProjectSaveStrategyImpl.java @@ -26,6 +26,9 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; +import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream; +import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter; +import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.File; import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile; @@ -37,10 +40,6 @@ import org.eclipse.jst.j2ee.internal.archive.operations.J2EESaveStrategyImpl; import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; -import org.eclipse.jem.util.emf.workbench.WorkbenchByteArrayOutputStream; -import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter; -import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl; - /** * @author: Kevin Bauer */ diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModel.java index ad7439183..c57b77101 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationDataModel.java @@ -18,16 +18,16 @@ package org.eclipse.jst.j2ee.internal.web.archive.operations; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.j2ee.application.operations.AddComponentToEnterpriseApplicationDataModel; -import org.eclipse.jst.j2ee.application.operations.AddWebModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddWebModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; /** diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationOperation.java index cb440f3d3..765600579 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebComponentCreationOperation.java @@ -25,8 +25,8 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationOperation; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionUtil; import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebContentNameUpdateOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebContentNameUpdateOperation.java index 21faa78fe..72a067637 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebContentNameUpdateOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebContentNameUpdateOperation.java @@ -13,8 +13,9 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; public class WebContentNameUpdateOperation implements IHeadlessRunnableWithProgress { diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModel.java index 11f5873a0..18d1ddb54 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModel.java @@ -21,11 +21,10 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EClass; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.AddComponentToEnterpriseApplicationDataModel; -import org.eclipse.jst.j2ee.application.operations.AddModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.AddWebModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.AddWebModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; @@ -33,15 +32,13 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * This dataModel is used for to create Web Modules. * diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModelOld.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModelOld.java index d3e96d73d..b9a463572 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModelOld.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationDataModelOld.java @@ -21,10 +21,10 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EClass; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.AddModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.AddWebModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.AddWebModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; @@ -32,15 +32,13 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IRuntimeType; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * This dataModel is used for to create Web Modules. * diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperation.java index fe146e009..c74f824bf 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperation.java @@ -27,9 +27,9 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.web.operations.WebEditModel; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperationOld.java index 56581a4f4..cfc8c7e38 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperationOld.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleCreationOperationOld.java @@ -27,9 +27,9 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; -import org.eclipse.jst.j2ee.application.operations.IAnnotationsDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.IAnnotationsDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.web.operations.WebEditModel; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportDataModel.java index b91d420eb..9f87027a9 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportDataModel.java @@ -10,10 +10,10 @@ package org.eclipse.jst.j2ee.internal.web.archive.operations; import java.lang.reflect.InvocationTargetException; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperation.java index 362adb40c..0e7b30965 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleExportOperation.java @@ -33,7 +33,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java index be67a8d8f..ae0ed5ad4 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportDataModel.java @@ -14,16 +14,16 @@ import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.WARFileImpl; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportOperation.java index 4a1e554b2..08f5dbee4 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/archive/operations/WebModuleImportOperation.java @@ -28,16 +28,16 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEUtilityJarImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; import org.eclipse.jst.j2ee.internal.archive.operations.BinaryProjectHelper; import org.eclipse.jst.j2ee.internal.archive.operations.J2EEArtifactImportOperation; import org.eclipse.jst.j2ee.internal.web.operations.WebPropertiesUtil; //import org.eclipse.jst.j2ee.internal.web.operations.WebSettingsMigrator; import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.ReferencedComponent; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.web.internal.operation.ILibModule; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertWebProjectDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertWebProjectDataModel.java index 4f2491c3b..ccdc36a3b 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertWebProjectDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/ConvertWebProjectDataModel.java @@ -11,7 +11,7 @@ import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataMo import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleCreationDataModel; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleCreationOperation; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntimeUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntimeUtilities.java index b342cd825..13ea988ea 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntimeUtilities.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/J2EEWebNatureRuntimeUtilities.java @@ -12,12 +12,11 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.wst.web.internal.operation.IBaseWebNature; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - public class J2EEWebNatureRuntimeUtilities { /** diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/SynchronizeWLPoperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/SynchronizeWLPoperation.java index 88852108b..82487268d 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/SynchronizeWLPoperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/SynchronizeWLPoperation.java @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper; import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebEditModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebEditModel.java index c1ab026b9..704b05103 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebEditModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebEditModel.java @@ -13,7 +13,7 @@ import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationOperation; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebNatureRuntimeUtilities.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebNatureRuntimeUtilities.java index f5bee33ff..54fd28350 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebNatureRuntimeUtilities.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebNatureRuntimeUtilities.java @@ -12,13 +12,12 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.wst.web.internal.operation.IBaseWebNature; import org.eclipse.wst.web.internal.operation.StaticWebNatureRuntime; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - public class WebNatureRuntimeUtilities { /** diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectFeatureUpdateOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectFeatureUpdateOperation.java index 2f610cdb2..870fa5b9a 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectFeatureUpdateOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectFeatureUpdateOperation.java @@ -13,9 +13,8 @@ package org.eclipse.jst.j2ee.internal.web.operations; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; /** diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectPropertiesUpdateOperation.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectPropertiesUpdateOperation.java index 3fd5a348d..7124cbdea 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectPropertiesUpdateOperation.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebProjectPropertiesUpdateOperation.java @@ -25,7 +25,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.ClasspathEntry; import org.eclipse.jst.j2ee.internal.web.archive.operations.ContextRootUpdateOperation; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebContentNameUpdateOperation; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; /** * @version 1.0 diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java index aa88ab63b..570d123ee 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/operations/WebPropertiesUtil.java @@ -32,7 +32,6 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.web.util.WebArtifactEdit; import org.eclipse.wst.common.modulecore.ModuleCore; diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditOperationDataModel.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditOperationDataModel.java index ae3fc311c..e52f5ec10 100644 --- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditOperationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/internal/web/util/WebArtifactEditOperationDataModel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.internal.web.util; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; public class WebArtifactEditOperationDataModel extends ArtifactEditOperationDataModel { diff --git a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java index fe74c493b..ed5df97fa 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java +++ b/plugins/org.eclipse.jst.j2ee.webservice.ui/webservices_ui/org/eclipse/jst/j2ee/internal/webservice/WebServicesNavigatorLabelProvider.java @@ -22,6 +22,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jst.j2ee.ejb.Session; @@ -41,8 +42,6 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.common.internal.emfworkbench.integration.DynamicAdapterFactory; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * @author jlanuti * diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java index ff69fe2e6..e1c01fea7 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddClientHandler.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java index d38eec3a1..e984b9d21 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddElement.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java index 76bf9dedd..58c5176c4 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandAddPortComponentRef.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; import org.eclipse.jst.j2ee.webservice.wsclient.PortComponentRef; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java index 826c8e020..b93556cc1 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyElement.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java index 96ce31b4e..ad93948cc 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyHandlerClassText.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java index 5c2957fb4..cbd23f858 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifySEI.java @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java index 033dd4419..51c3c3b96 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyServiceInterfaceText.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaRefFactory; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java index 4d7bb779b..cd97b9545 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/command/CommandModifyText.java @@ -13,6 +13,7 @@ import java.util.Collection; import org.eclipse.emf.common.command.AbstractCommand; import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.UnexecutableCommand; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java index f4cc6195b..48796833c 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/editmodel/AbstractEditModelOwner.java @@ -18,13 +18,12 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.impl.AdapterImpl; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; -import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; - import org.eclipse.jem.util.emf.workbench.EMFWorkbenchContextBase; import org.eclipse.jem.util.emf.workbench.IEMFContextContributor; import org.eclipse.jem.util.emf.workbench.ProjectResourceSet; import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase; +import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; public abstract class AbstractEditModelOwner implements IEMFContextContributor { protected IFile fInputFile; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerInitParamDataModel.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerInitParamDataModel.java index 8e8174218..a013b3d41 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerInitParamDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerInitParamDataModel.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.j2ee.common.ParamValue; import org.eclipse.jst.j2ee.internal.common.operations.J2EEModelModifierOperationDataModel; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; /** diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerSOAPHeaderDataModel.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerSOAPHeaderDataModel.java index e9b2793be..9415e7774 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerSOAPHeaderDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddHandlerSOAPHeaderDataModel.java @@ -23,7 +23,7 @@ import org.eclipse.jst.j2ee.common.QName; import org.eclipse.jst.j2ee.internal.common.operations.J2EEModelModifierOperationDataModel; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; /** diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddWebServiceHandlerDataModel.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddWebServiceHandlerDataModel.java index 688f6bcbc..1973ba99a 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddWebServiceHandlerDataModel.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/operation/AddWebServiceHandlerDataModel.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.j2ee.internal.common.operations.J2EEModelModifierOperationDataModel; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; /** diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java index a97b3dfcb..545ee356d 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIHandlerItemProvider.java @@ -18,6 +18,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem; import org.eclipse.jst.j2ee.webservice.wsclient.Handler; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java index 7087b8472..e2fd4df13 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIServiceRefItemProvider.java @@ -18,6 +18,7 @@ import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ITableItemLabelProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.jem.java.JavaClass; import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem; import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef; diff --git a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java index 03e5bc77a..4f0b1a8ff 100644 --- a/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee.webservice/webservice/org/eclipse/jst/j2ee/internal/webservice/provider/ATKUIWebServicesClientItemProvider.java @@ -17,6 +17,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.jst.j2ee.internal.webservice.adapter.AdapterViewerItem; import org.eclipse.jst.j2ee.internal.webservice.plugin.WebServicePlugin; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientEditModel.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientEditModel.java index 2fd8e5c6b..f212d248d 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientEditModel.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientEditModel.java @@ -12,7 +12,7 @@ package org.eclipse.jst.j2ee.applicationclient.creation; import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationOperation; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.client.ClientPackage; import org.eclipse.jst.j2ee.common.XMLResource; diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationDataModelOld.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationDataModelOld.java deleted file mode 100644 index be0271e52..000000000 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationDataModelOld.java +++ /dev/null @@ -1,196 +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 - *******************************************************************************/ -/* - * Created on Nov 5, 2003 - * - * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and - * Comments - */ -package org.eclipse.jst.j2ee.applicationclient.creation; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IPath; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.common.XMLResource; -import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; - -import org.eclipse.jem.util.logger.proxy.Logger; - -/** - * This dataModel is used for to create Application Client Modules. - * - * This class (and all its fields and methods) is likely to change during the WTP 1.0 milestones as - * the new project structures are adopted. Use at your own risk. - * - * @since WTP 1.0 - */ -public final class AppClientModuleCreationDataModelOld extends J2EEModuleCreationDataModelOld { - - /** - * Boolean, default=true. If this is true and CREATE_DEFAULT_FILES is true, then a default main - * class will be generated during project creation. - */ - public static final String CREATE_DEFAULT_MAIN_CLASS = "AppClientModuleCreationDataModel.CREATE_DEFAULT_MAIN_CLASS"; //$NON-NLS-1$ - - /** - * Creates an Application Client project with the specified name and version in the specified - * location. - * - * @param projectName - * The name of the Application Client project to create. - * @param projectLocation - * Sets the local file system location for the described project. The path must be - * either an absolute file system path, or a relative path whose first segment is the - * name of a defined workspace path variable. If <code>null</code> is specified, - * the default location is used. - * @param applicationClientVersion - * Sets the Application Client Module Version for the descibed project. The version - * must be one of <code>J2EEVersionConstants.J2EE_1_2_ID</code>, - * <code>J2EEVersionConstants.J2EE_1_3_ID</code>, or - * <code>J2EEVersionConstants.J2EE_1_4_ID</code>. - * @since WTP 1.0 - */ - public static void createProject(String projectName, IPath projectLocation, int applicationClientVersion) { - AppClientModuleCreationDataModelOld dataModel = new AppClientModuleCreationDataModelOld(); - dataModel.setProperty(PROJECT_NAME, projectName); - if (null != projectLocation) { - dataModel.setProperty(PROJECT_LOCATION, projectLocation.toOSString()); - } - dataModel.setIntProperty(J2EE_MODULE_VERSION, applicationClientVersion); - try { - dataModel.getDefaultOperation().run(null); - } catch (InvocationTargetException e) { - Logger.getLogger().logError(e); - } catch (InterruptedException e) { - Logger.getLogger().logError(e); - } - } - - - public WTPOperation getDefaultOperation() { - return new AppClientModuleCreationOperationOld(this); - } - - protected void initValidBaseProperties() { - super.initValidBaseProperties(); - addValidBaseProperty(CREATE_DEFAULT_MAIN_CLASS); - } - - protected void init() { - setJ2EENatureID(IApplicationClientNatureConstants.NATURE_ID); - super.init(); - setProperty(EDIT_MODEL_ID, IApplicationClientNatureConstants.EDIT_MODEL_ID); - getServerTargetDataModel().setIntProperty(ServerTargetDataModel.DEPLOYMENT_TYPE_ID, XMLResource.APP_CLIENT_TYPE); - getJavaProjectCreationDataModel().setProperty(JavaProjectCreationDataModel.OUTPUT_LOCATION, IApplicationClientNatureConstants.DEFAULT_SOURCE_PATH); - getJavaProjectCreationDataModel().setProperty(JavaProjectCreationDataModel.SOURCE_FOLDERS, new String[]{IApplicationClientNatureConstants.DEFAULT_SOURCE_PATH}); - } - - protected Object getDefaultProperty(String propertyName) { - if (propertyName.equals(CREATE_DEFAULT_MAIN_CLASS)) { - return Boolean.TRUE; - } - return super.getDefaultProperty(propertyName); - } - - - protected WTPPropertyDescriptor doGetPropertyDescriptor(String propertyName) { - if (propertyName.equals(J2EE_MODULE_VERSION)) { - Integer propertyValue = (Integer) getProperty(propertyName); - String description = null; - switch (propertyValue.intValue()) { - case J2EEVersionConstants.J2EE_1_2_ID : - description = J2EEVersionConstants.VERSION_1_2_TEXT; - break; - case J2EEVersionConstants.J2EE_1_3_ID : - description = J2EEVersionConstants.VERSION_1_3_TEXT; - break; - case J2EEVersionConstants.J2EE_1_4_ID : - default : - description = J2EEVersionConstants.VERSION_1_4_TEXT; - break; - } - return new WTPPropertyDescriptor(propertyValue, description); - } - return super.doGetPropertyDescriptor(propertyName); - } - - protected WTPPropertyDescriptor[] getValidJ2EEModuleVersionDescriptors() { - int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID(); - WTPPropertyDescriptor[] descriptors = null; - switch (highestJ2EEPref) { - case J2EEVersionConstants.J2EE_1_2_ID : - descriptors = new WTPPropertyDescriptor[1]; - descriptors[0] = new WTPPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT); - break; - case J2EEVersionConstants.J2EE_1_3_ID : - descriptors = new WTPPropertyDescriptor[2]; - descriptors[0] = new WTPPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT); - descriptors[1] = new WTPPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT); - break; - case J2EEVersionConstants.J2EE_1_4_ID : - default : - descriptors = new WTPPropertyDescriptor[3]; - descriptors[0] = new WTPPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_2_ID), J2EEVersionConstants.VERSION_1_2_TEXT); - descriptors[1] = new WTPPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_3_ID), J2EEVersionConstants.VERSION_1_3_TEXT); - descriptors[2] = new WTPPropertyDescriptor(new Integer(J2EEVersionConstants.J2EE_1_4_ID), J2EEVersionConstants.VERSION_1_4_TEXT); - break; - } - return descriptors; - } - - protected int convertModuleVersionToJ2EEVersion(int moduleVersion) { - return moduleVersion; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEModuleCreationDataModel#getModuleType() - */ - protected EClass getModuleType() { - return CommonarchiveFactoryImpl.getPackage().getApplicationClientFile(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.jst.j2ee.internal.internal.application.operations.J2EEModuleCreationDataModel#getModuleExtension() - */ - protected String getModuleExtension() { - return ".jar"; //$NON-NLS-1$ - } - - /** - * @return Returns the default J2EE spec level based on the Global J2EE Preference - */ - protected Integer getDefaultJ2EEModuleVersion() { - int highestJ2EEPref = J2EEPlugin.getDefault().getJ2EEPreferences().getHighestJ2EEVersionID(); - switch (highestJ2EEPref) { - case (J2EEVersionConstants.J2EE_1_4_ID) : - return new Integer(J2EEVersionConstants.J2EE_1_4_ID); - case (J2EEVersionConstants.J2EE_1_3_ID) : - return new Integer(J2EEVersionConstants.J2EE_1_3_ID); - case (J2EEVersionConstants.J2EE_1_2_ID) : - return new Integer(J2EEVersionConstants.J2EE_1_2_ID); - default : - return new Integer(J2EEVersionConstants.J2EE_1_4_ID); - } - } - -}
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationOperationOld.java deleted file mode 100644 index 58268158a..000000000 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationOperationOld.java +++ /dev/null @@ -1,62 +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 - *******************************************************************************/ -/* - * Created on Nov 5, 2003 - * - * To change the template for this generated file go to - * Window>Preferences>Java>Code Generation>Code and Comments - */ -package org.eclipse.jst.j2ee.applicationclient.creation; - -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; -import org.eclipse.jst.j2ee.application.operations.UpdateManifestDataModel; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; -import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; -import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperation; - -public class AppClientModuleCreationOperationOld extends J2EEModuleCreationOperationOld { - - public AppClientModuleCreationOperationOld(AppClientModuleCreationDataModelOld dataModel) { - super(dataModel); - } - - protected void createDeploymentDescriptor(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException { - EditModelOperation op = new EditModelOperation((J2EEModuleCreationDataModelOld) operationDataModel) { - protected void execute(IProgressMonitor localMonitor) throws CoreException, InvocationTargetException, InterruptedException { - AppClientEditModel model = (AppClientEditModel) editModel; - - IFolder metainf = model.getAppClientNature().getEMFRoot().getFolder(new Path(ArchiveConstants.META_INF)); - if (!metainf.exists()) { - metainf.create(true, true, null); - } - - model.makeDeploymentDescriptorWithRoot(); - AppClientModuleCreationDataModelOld dataModel = (AppClientModuleCreationDataModelOld) operationDataModel; - if (dataModel.getBooleanProperty(AppClientModuleCreationDataModelOld.CREATE_DEFAULT_MAIN_CLASS)) { - NewJavaClassDataModel mainClassDataModel = new NewJavaClassDataModel(); - mainClassDataModel.setProperty(NewJavaClassDataModel.PROJECT_NAME, dataModel.getProjectDataModel().getProject().getName()); - mainClassDataModel.setProperty(NewJavaClassDataModel.CLASS_NAME, "Main"); //$NON-NLS-1$ - mainClassDataModel.setBooleanProperty(NewJavaClassDataModel.MAIN_METHOD, true); - mainClassDataModel.getDefaultOperation().run(localMonitor); - dataModel.getUpdateManifestDataModel().setProperty(UpdateManifestDataModel.MAIN_CLASS, mainClassDataModel.getProperty(NewJavaClassDataModel.CLASS_NAME)); - } - } - }; - op.doRun(monitor); - } -}
\ No newline at end of file diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientComponentCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModel.java index c50386ddd..c46cbc252 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientComponentCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationDataModel.java @@ -8,17 +8,17 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.applicationclient.creation; +package org.eclipse.jst.j2ee.applicationclient.internal.creation; import org.eclipse.core.runtime.IPath; import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; /** diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationOperation.java index 65060b040..adcb717fa 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientComponentCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientComponentCreationOperation.java @@ -8,19 +8,19 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.applicationclient.creation; +package org.eclipse.jst.j2ee.applicationclient.internal.creation; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationOperation; import org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util.AppClientArtifactEdit; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionUtil; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; import org.eclipse.wst.common.modulecore.resources.IVirtualContainer; diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientModuleCreationDataModel.java index 49ec999e4..8e8778e1d 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientModuleCreationDataModel.java @@ -14,23 +14,23 @@ * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and * Comments */ -package org.eclipse.jst.j2ee.applicationclient.creation; +package org.eclipse.jst.j2ee.applicationclient.internal.creation; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; import org.eclipse.emf.ecore.EClass; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; - -import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; /** * This dataModel is used for to create Application Client Modules. diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationOperation.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientModuleCreationOperation.java index 0a1d863a5..46911380e 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientModuleCreationOperation.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.applicationclient.creation; +package org.eclipse.jst.j2ee.applicationclient.internal.creation; import java.lang.reflect.InvocationTargetException; @@ -22,11 +22,12 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; -import org.eclipse.jst.j2ee.application.operations.UpdateManifestDataModel; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModel; +import org.eclipse.jst.j2ee.applicationclient.creation.AppClientEditModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperation; public class AppClientModuleCreationOperation extends J2EEModuleCreationOperationOld { diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleImportDataModel.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientModuleImportDataModel.java index 3174dcae8..355aa8424 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/creation/AppClientModuleImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/creation/AppClientModuleImportDataModel.java @@ -6,19 +6,18 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.applicationclient.creation; +package org.eclipse.jst.j2ee.applicationclient.internal.creation; import java.lang.reflect.InvocationTargetException; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.internal.archive.operations.AppClientModuleImportOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; - -import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** * This dataModel is used for to import Application Client Modules (from Application Client jar diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientArtifactEditOperationDataModel.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientArtifactEditOperationDataModel.java index a21932654..2e112ae64 100644 --- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientArtifactEditOperationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/applicationclient/internal/modulecore/util/AppClientArtifactEditOperationDataModel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.applicationclient.internal.modulecore.util; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; public class AppClientArtifactEditOperationDataModel extends ArtifactEditOperationDataModel { diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java index 4a4fd9553..f5cfe15fb 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/ApplicationClientItemProvider.java @@ -22,6 +22,8 @@ import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -29,6 +31,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.client.ClientPackage; import org.eclipse.jst.j2ee.common.CommonFactory; @@ -39,8 +42,6 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.webservices.WebServicesManager; import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * This is the item provider adpater for a * {@link org.eclipse.jst.j2ee.internal.internal.client.ApplicationClient}object. diff --git a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java index d3af18097..ad4a7ffcc 100644 --- a/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/applicationedit/org/eclipse/jst/j2ee/internal/provider/J2EEItemProvider.java @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ItemProvider; - import org.eclipse.jem.util.emf.workbench.ProjectUtilities; public class J2EEItemProvider extends ItemProvider implements IAdaptable { diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleExportOperation.java index c92dadb26..6cd0ad426 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleExportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleExportOperation.java @@ -12,7 +12,7 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EPackage; -import org.eclipse.jst.j2ee.application.operations.AppClientModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AppClientModuleExportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleImportOperation.java index 65a685b33..a3b1b93a8 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/AppClientModuleImportOperation.java @@ -19,10 +19,10 @@ import java.lang.reflect.InvocationTargetException; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleImportDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleCreationDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleCreationDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleCreationOperation; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; public class AppClientModuleImportOperation extends J2EEArtifactImportOperation { diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java index f9e80fc52..6a0010774 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EARProjectSaveStrategyImpl.java @@ -37,8 +37,8 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter; import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.File; diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationExportOperation.java index 551b68c24..207525bf3 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationExportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationExportOperation.java @@ -29,8 +29,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationExportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; @@ -43,7 +43,7 @@ import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public final class EnterpriseApplicationExportOperation extends WTPOperation { diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationImportOperation.java index 628e1a50a..50ef7f3f3 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/EnterpriseApplicationImportOperation.java @@ -21,17 +21,17 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.j2ee.application.operations.AddArchiveToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.AddModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.AddUtilityProjectToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.AddWebModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationImportDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationDataModel; -import org.eclipse.jst.j2ee.application.operations.EnterpriseApplicationCreationOperation; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEUtilityJarImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddArchiveToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddUtilityProjectToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddWebModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.EnterpriseApplicationImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEUtilityJarImportDataModel; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; @@ -42,7 +42,7 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java index 99aa0bd04..0cd75345e 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/ImportOption.java @@ -11,9 +11,9 @@ package org.eclipse.jst.j2ee.internal.archive.operations; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; import org.eclipse.jst.j2ee.internal.project.IJ2EEProjectTypes; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java index a62ab233f..6f2d123ce 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactExportOperation.java @@ -25,12 +25,12 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactExportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException; import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public abstract class J2EEArtifactExportOperation extends WTPOperation { protected IProgressMonitor progressMonitor; diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java index e1445c9d4..bed623a47 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EEArtifactImportOperation.java @@ -27,15 +27,15 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.SaveFilter; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetOperation; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public abstract class J2EEArtifactImportOperation extends WTPOperation { public J2EEArtifactImportOperation(J2EEArtifactImportDataModel model) { diff --git a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java index 0c71d8112..83eda0ad1 100644 --- a/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee/archiveops/org/eclipse/jst/j2ee/internal/archive/operations/J2EELoadStrategyImpl.java @@ -31,7 +31,6 @@ import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.URIConverter; import org.eclipse.emf.ecore.resource.Resource.Factory.Registry; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverter; import org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.File; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java index d0629bc75..2999cc3b6 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/CMPJavaChangeSynchronizationAdapter.java @@ -23,10 +23,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jem.internal.adapters.jdom.JDOMAdaptor; import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory; import org.eclipse.jem.internal.java.adapters.ReadAdaptor; -import org.eclipse.jem.internal.java.adapters.ReflectionAdaptor; import org.eclipse.jem.java.Field; import org.eclipse.jem.java.JavaClass; import org.eclipse.jem.java.JavaVisibilityKind; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java index 1f0b9446c..f468dd9b1 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/ClasspathModel.java @@ -23,8 +23,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; -import org.eclipse.jst.j2ee.application.operations.ClasspathElement; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddSecurityRoleOperationDataModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddSecurityRoleOperationDataModel.java index 27921e2b7..a6dc2b2cf 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddSecurityRoleOperationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/AddSecurityRoleOperationDataModel.java @@ -24,7 +24,7 @@ import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages; import org.eclipse.jst.j2ee.webapplication.WebApp; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModel.java index d96d17db2..26dceccac 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyDataModel.java @@ -17,10 +17,10 @@ package org.eclipse.jst.j2ee.internal.common.operations; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.j2ee.application.operations.UpdateManifestDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java index c16295112..17e9ce387 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/JARDependencyOperation.java @@ -23,14 +23,14 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; -import org.eclipse.jst.j2ee.application.operations.UpdateManifestDataModel; -import org.eclipse.jst.j2ee.application.operations.UpdateManifestOperation; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestOperation; import org.eclipse.jst.j2ee.internal.common.ClasspathModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public class JARDependencyOperation extends WTPOperation { @@ -43,7 +43,7 @@ public class JARDependencyOperation extends WTPOperation { return; validateEdit(model); monitor.beginTask("", 2); //$NON-NLS-1$ - org.eclipse.jst.j2ee.application.operations.UpdateManifestOperation mfOperation = createManifestOperation(model); + org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestOperation mfOperation = createManifestOperation(model); IHeadlessRunnableWithProgress buildPathOperation = createBuildPathOperation(model); mfOperation.run(new SubProgressMonitor(monitor, 1)); buildPathOperation.run(new SubProgressMonitor(monitor, 1)); @@ -65,7 +65,7 @@ public class JARDependencyOperation extends WTPOperation { return new UpdateJavaBuildPathOperation(javaProject, model.getClassPathSelection()); } - private org.eclipse.jst.j2ee.application.operations.UpdateManifestOperation createManifestOperation(ClasspathModel model) { + private org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestOperation createManifestOperation(ClasspathModel model) { UpdateManifestDataModel updateManifestDataModel = new UpdateManifestDataModel(); updateManifestDataModel.setProperty(UpdateManifestDataModel.PROJECT_NAME, model.getProject().getName()); updateManifestDataModel.setBooleanProperty(UpdateManifestDataModel.MERGE, false); diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/common/operations/NewJavaClassDataModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModel.java index be8517609..673d49b0a 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/common/operations/NewJavaClassDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassDataModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.common.operations; +package org.eclipse.jst.j2ee.internal.common.operations; import java.lang.reflect.Modifier; import java.util.List; @@ -30,16 +30,14 @@ import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages; -import org.eclipse.jst.j2ee.internal.common.operations.JavaModelUtil; -import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; /** * This data model is a subclass of WTPOperationDataModel and follows the WTP Operation and WTP Wizard frameworks. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel * * This data model extends the EditModelOperationDataModel to get project name and edit model ID so * that during the operation, the edit model can be used to save changes. @@ -219,7 +217,7 @@ public class NewJavaClassDataModel extends ArtifactEditOperationDataModel { /** * Subclasses may extend this method to add their own data model's properties as valid base properties. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel#initValidBaseProperties() + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel#initValidBaseProperties() */ protected void initValidBaseProperties() { super.initValidBaseProperties(); diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java index 5f31b241d..eb3716220 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/NewJavaClassOperation.java @@ -34,18 +34,17 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * NewJavaClassOperation is a WTP operation that is used to create a default instance of a new java class * based on the input and properties set in the NewJavaClassDataModel. - * @see org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel + * @see org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel * * It is a subclass of WTPOperation and clients can invoke this operation as is or it may be subclassed to * add additional or modify behaviour. The execute() method can be extended to drive this behaviour. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperation + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation * * The new java class is generated through the use of adding a series of static tokens defined within to * an ongoing string buffer. diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleDataModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleDataModel.java index b66be6901..e38e73949 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/RemoveSecurityRoleDataModel.java @@ -16,7 +16,7 @@ */ package org.eclipse.jst.j2ee.internal.common.operations; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java index d8cc17309..3c90cc1eb 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/operations/UpdateJavaBuildPathOperation.java @@ -25,10 +25,10 @@ import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.j2ee.application.operations.ClassPathSelection; -import org.eclipse.jst.j2ee.application.operations.ClasspathElement; +import org.eclipse.jst.j2ee.application.internal.operations.ClassPathSelection; +import org.eclipse.jst.j2ee.application.internal.operations.ClasspathElement; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; /** diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java index 68434c600..55cdf8901 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceExtensionRegistry.java @@ -17,9 +17,8 @@ package org.eclipse.jst.j2ee.internal.webservices; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - import org.eclipse.jem.util.RegistryReader; +import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** * To change the template for this generated type comment go to diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java index 2eafc20bb..02a4c2169 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WSDLServiceHelper.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import org.eclipse.core.resources.IFile; -import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.resource.Resource; diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceEditModel.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceEditModel.java index 02ee18ed3..190ec10b1 100644 --- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceEditModel.java +++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/webservices/WebServiceEditModel.java @@ -23,6 +23,8 @@ import org.eclipse.core.resources.IFile; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.resource.impl.ResourceImpl; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEEditModel; @@ -34,9 +36,6 @@ import org.eclipse.jst.j2ee.webservice.wsdd.WebServices; import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource; import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase; - /** * @author jlanuti * diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java index 591bf3574..5ce25af48 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EjbRefItemProvider.java @@ -25,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.EJBLocalRef; diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java index 9c1ace733..e032a92c2 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/EnvEntryItemProvider.java @@ -25,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.EnvEntry; diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java index aeb5cf488..062ac87d5 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/ResourceEnvRefItemProvider.java @@ -25,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.ResourceEnvRef; diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java index d5e921dde..aea9efe14 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/RunAsSpecifiedIdentityItemProvider.java @@ -19,6 +19,8 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java index 36eb974cb..6139c3aae 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleItemProvider.java @@ -25,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.SecurityRole; diff --git a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java index a9de9e5ec..3a66f763e 100644 --- a/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java +++ b/plugins/org.eclipse.jst.j2ee/commonedit/org/eclipse/jst/j2ee/common/internal/provider/SecurityRoleRefItemProvider.java @@ -25,6 +25,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.SecurityRoleRef; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectToEAROperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveProjectToEAROperation.java index fac53e101..05945caa3 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectToEAROperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveProjectToEAROperation.java @@ -12,7 +12,7 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import java.util.Collections; @@ -46,7 +46,7 @@ import org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEditOperation; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperation; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.server.core.IRuntime; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectsToEARDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveProjectsToEARDataModel.java index 93fae5d49..462ab5ebf 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectsToEARDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveProjectsToEARDataModel.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and * Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; import java.util.Collections; @@ -22,7 +22,7 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectsToEAROperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveProjectsToEAROperation.java index 565ebca6b..028425e5f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveProjectsToEAROperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveProjectsToEAROperation.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveToEARDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveToEARDataModel.java index 337e6e512..04b3d5ae0 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddArchiveToEARDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddArchiveToEARDataModel.java @@ -13,11 +13,12 @@ * * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEdit; @@ -29,7 +30,6 @@ import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.eclipse.jem.util.logger.proxy.Logger; /** * @author DABERG diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddComponentToEnterpriseApplicationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModel.java index 05416fb7f..ffb2d0d62 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddComponentToEnterpriseApplicationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationDataModel.java @@ -1,10 +1,9 @@ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; -import java.util.Collections; import org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEditOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public class AddComponentToEnterpriseApplicationDataModel extends EARArtifactEditOperationDataModel { //Used for adding module components to an Enterprise Application during EAR component creation diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddComponentToEnterpriseApplicationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOperation.java index 57d92ce15..04bb6776f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddComponentToEnterpriseApplicationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddComponentToEnterpriseApplicationOperation.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import java.util.List; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddModuleToEARDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddModuleToEARDataModel.java index 13a393153..e29eacf67 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddModuleToEARDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddModuleToEARDataModel.java @@ -9,9 +9,9 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddUtilityProjectToEARDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddUtilityProjectToEARDataModel.java index 9562cb2c1..71ab6c929 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddUtilityProjectToEARDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddUtilityProjectToEARDataModel.java @@ -13,7 +13,7 @@ * * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; @@ -24,7 +24,7 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; import org.eclipse.wst.server.core.IRuntime; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddWebModuleToEARDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebModuleToEARDataModel.java index fb1b4fc98..229becff8 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AddWebModuleToEARDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AddWebModuleToEARDataModel.java @@ -9,7 +9,7 @@ * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.StringTokenizer; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AppClientModuleExportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientModuleExportDataModel.java index c2cd7a63a..20eb7273a 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/AppClientModuleExportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/AppClientModuleExportDataModel.java @@ -6,14 +6,14 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.internal.archive.operations.AppClientModuleExportOperation; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.jem.util.logger.proxy.Logger; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ClassPathSelection.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java index 39221e688..beaf8317b 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ClassPathSelection.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClassPathSelection.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; @@ -22,6 +22,7 @@ import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jdt.core.IClasspathEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.Container; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; @@ -34,8 +35,6 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.ModuleMapHelper; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jem.util.logger.proxy.Logger; - public class ClassPathSelection { protected Archive archive; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ClasspathElement.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java index 56450502f..0db4f2cc8 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ClasspathElement.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathElement.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ClasspathSelectionHelper.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathSelectionHelper.java index 44fc112c9..0f749f4dc 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ClasspathSelectionHelper.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/ClasspathSelectionHelper.java @@ -14,12 +14,13 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EPackage; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; @@ -33,8 +34,6 @@ import org.eclipse.jst.j2ee.internal.earcreation.EAREditModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @author jsholl * diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/DefaultModuleProjectCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultModuleProjectCreationDataModel.java index a61663afa..307c06ad1 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/DefaultModuleProjectCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultModuleProjectCreationDataModel.java @@ -13,7 +13,7 @@ * * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; @@ -22,7 +22,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleCreationDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleCreationDataModel; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager; @@ -30,9 +30,9 @@ import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension; import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension; import org.eclipse.jst.j2ee.internal.moduleextension.WebModuleExtension; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; /** diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/DefaultModuleProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultModuleProjectCreationOperation.java index d7012de35..4d9542a30 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/DefaultModuleProjectCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/DefaultModuleProjectCreationOperation.java @@ -14,19 +14,19 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleCreationDataModel; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleCreationOperation; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleCreationDataModel; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleCreationOperation; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleExtension; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager; import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension; import org.eclipse.wst.common.frameworks.internal.activities.WTPActivityBridge; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EARComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentCreationOperation.java index 854426e7e..f9caf3ea6 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EARComponentCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EARComponentCreationOperation.java @@ -4,11 +4,12 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Style - Code Templates */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import java.util.List; +import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; @@ -51,6 +52,12 @@ public class EARComponentCreationOperation extends J2EEComponentCreationOperatio } protected void createDeploymentDescriptor(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException { + String moduleName = (String)operationDataModel.getProperty(EARComponentCreationDataModel.COMPONENT_NAME); + IFolder moduleFolder = getProject().getFolder(moduleName); + if (!moduleFolder.exists()) { + moduleFolder.create(true, true, null); + } + //should cache wbmodule when created instead of searching ? ModuleCore moduleCore = null; EARArtifactEdit edit = null; @@ -61,7 +68,7 @@ public class EARComponentCreationOperation extends J2EEComponentCreationOperatio operationDataModel.getStringProperty(EARComponentCreationDataModel.COMPONENT_DEPLOY_NAME)); edit = EARArtifactEdit.getEARArtifactEditForWrite(earComp); int versionId = ((ComponentCreationDataModel)getOperationDataModel()).getIntProperty(ComponentCreationDataModel.COMPONENT_VERSION); - edit.createModelRoot(getModuleName(), versionId); + edit.createModelRoot(versionId); // set version to WorkbenchComponent String versionText = J2EEVersionUtil.getJ2EETextVersion(versionId); earComp.getComponentType().setVersion(versionText); diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationDataModel.java index a52e52d6d..db4c8538f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationDataModel.java @@ -12,25 +12,24 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * This dataModel is used for to create Enterprise Applications. * diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationDataModelOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationDataModelOld.java index 9a3cef0e3..972a1afd3 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationDataModelOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationDataModelOld.java @@ -12,25 +12,24 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IPath; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * This dataModel is used for to create Enterprise Applications. * diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationOperation.java index 0a11969f0..328e43a66 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationOperation.java @@ -12,7 +12,7 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationOperationOld.java index cc8cd4e57..f09d5871c 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationCreationOperationOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationCreationOperationOld.java @@ -12,7 +12,7 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationExportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationExportDataModel.java index 1417c8926..77b3642c1 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationExportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationExportDataModel.java @@ -6,16 +6,15 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.archive.operations.EnterpriseApplicationExportOperation; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; - -import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** * This dataModel is used to export Enterprise Applications to EAR files. diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationImportDataModel.java index c6be50af6..8e0915a42 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/EnterpriseApplicationImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/EnterpriseApplicationImportDataModel.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.io.FileNotFoundException; import java.io.IOException; @@ -27,8 +27,8 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.application.WebModule; -import org.eclipse.jst.j2ee.applicationclient.creation.AppClientModuleImportDataModel; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; +import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientModuleImportDataModel; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; @@ -54,10 +54,10 @@ import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelListener; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelListener; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibleJavaProjectCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModel.java index 22c2b13da..b68a13ce2 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibleJavaProjectCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleJavaProjectCreationDataModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibleProjectCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleProjectCreationDataModel.java index 6635c1407..5d8722adf 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibleProjectCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleProjectCreationDataModel.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; @@ -19,8 +19,8 @@ import org.eclipse.jst.j2ee.internal.common.J2EECommonMessages; import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModel; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; public class FlexibleProjectCreationDataModel extends WTPOperationDataModel { diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibleProjectCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleProjectCreationOperation.java index 332143087..7632d2354 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/FlexibleProjectCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/FlexibleProjectCreationOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; @@ -20,7 +20,7 @@ import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataMod import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetOperation; import org.eclipse.wst.common.frameworks.internal.WTPProjectUtilities; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.ProjectComponents; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/IAnnotationsDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java index f907d3f59..d636f870f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/IAnnotationsDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/IAnnotationsDataModel.java @@ -8,13 +8,13 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; /** * The IAnnotationsDataModel is data model interface used by other data models in * the WTP wizard and operation framework. - * @see org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel - * @see org.eclipse.wst.common.frameworks.operations.WTPOperation + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel + * @see org.eclipse.wst.common.frameworks.internal.operations.WTPOperation * * This provides the USE_ANNOTATIONS property which is used to determine whether or * not artifacts should be created using annotations or not. diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactCreationDataModelOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactCreationDataModelOld.java index 8993eca96..3cab96dfd 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactCreationDataModelOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactCreationDataModelOld.java @@ -12,15 +12,15 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; import org.eclipse.wst.common.internal.emfworkbench.operation.EditModelOperationDataModel; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactCreationOperationOld.java index 78bde6daf..6f12232bc 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactCreationOperationOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactCreationOperationOld.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** * @deprecated Use J2EECreationOperation diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactExportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModel.java index 5b61998e1..54ad15571 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactExportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactExportDataModel.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; import java.util.Arrays; @@ -20,16 +20,15 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonMessages; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * This dataModel is an common super class used to export J2EE components. * diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModel.java index b6f19a070..4318edc66 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEArtifactImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEArtifactImportDataModel.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.io.FileNotFoundException; import java.io.IOException; @@ -38,9 +38,9 @@ import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonMessages; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; import org.xml.sax.InputSource; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEComponentCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModel.java index f1b3fd981..999b0d728 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEComponentCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationDataModel.java @@ -7,7 +7,7 @@ * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; @@ -18,8 +18,8 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.modulecore.util.EARArtifactEdit; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.common.modulecore.internal.impl.WTPEntityResolver; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEComponentCreationOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationOperation.java index 7ba0ac197..109bd4ee9 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEComponentCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEComponentCreationOperation.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationDataModelOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleCreationDataModelOld.java index ff144913c..642a74249 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationDataModelOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleCreationDataModelOld.java @@ -12,7 +12,7 @@ * To change the template for this generated file go to Window>Preferences>Java>Code * Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; @@ -31,8 +31,8 @@ import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetDataModel; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonMessages; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleCreationOperationOld.java index d8198d588..ce54b404b 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleCreationOperationOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleCreationOperationOld.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleExportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleExportDataModel.java index 37a2829c7..288965525 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleExportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleExportDataModel.java @@ -6,7 +6,7 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; /** * This dataModel is a common super class used to export J2EE Modules. diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleImportDataModel.java index 30f5b85d3..6c38678e9 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEModuleImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEModuleImportDataModel.java @@ -6,11 +6,12 @@ * * Contributors: IBM Corporation - initial API and implementation **************************************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; +import org.eclipse.jst.j2ee.application.operations.ExtendedImportFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; import org.eclipse.wst.server.core.IRuntime; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModel.java index ce941aae0..682ea2fdb 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportDataModel.java @@ -14,11 +14,11 @@ * To change the template for this generated file go to Window - Preferences - * Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public final class J2EEUtilityJarImportDataModel extends J2EEArtifactImportDataModel { diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperation.java index 476a7fa61..122fbf227 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarImportOperation.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; @@ -27,7 +27,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException; import org.eclipse.jst.j2ee.internal.archive.operations.BinaryProjectHelper; import org.eclipse.jst.j2ee.internal.archive.operations.JavaProjectSaveStrategyImpl; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarListImportDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModel.java index fd6480d21..c20e6409a 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarListImportDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportDataModel.java @@ -14,7 +14,7 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.io.File; import java.util.ArrayList; @@ -28,15 +28,14 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.emf.workbench.nature.EMFNature; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; - -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jem.util.emf.workbench.nature.EMFNature; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; /** * @author mdelder diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarListImportOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportOperation.java index 4ce6b3674..4fe6d492c 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/J2EEUtilityJarListImportOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/J2EEUtilityJarListImportOperation.java @@ -14,7 +14,7 @@ * TODO To change the template for this generated file go to * Window - Preferences - Java - Code Generation - Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -48,8 +48,8 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.internal.earcreation.EARCreationResourceHandler; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author mdelder diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/JARDependencyTraverser.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/JARDependencyTraverser.java index d5a783767..476488a3d 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/JARDependencyTraverser.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/JARDependencyTraverser.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/JavaUtilityJARProjectCreationOperationOld.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/JavaUtilityJARProjectCreationOperationOld.java index 95c6685b1..4143925ac 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/JavaUtilityJARProjectCreationOperationOld.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/JavaUtilityJARProjectCreationOperationOld.java @@ -12,7 +12,7 @@ * To change the template for this generated file go to Window>Preferences>Java>Code Generation>Code * and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/UpdateManifestDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModel.java index 20a994cae..9b3b3e93f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/UpdateManifestDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestDataModel.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.util.ArrayList; import java.util.List; @@ -22,9 +22,9 @@ import java.util.StringTokenizer; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; /** * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/UpdateManifestOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java index a08eeb7c3..4d10acdaf 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/UpdateManifestOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/internal/operations/UpdateManifestOperation.java @@ -14,7 +14,7 @@ * To change the template for this generated file go to * Window>Preferences>Java>Code Generation>Code and Comments */ -package org.eclipse.jst.j2ee.application.operations; +package org.eclipse.jst.j2ee.application.internal.operations; import java.lang.reflect.InvocationTargetException; @@ -30,7 +30,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportFactory.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportFactory.java index f3a869cc4..84d80adc9 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportFactory.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportFactory.java @@ -17,6 +17,7 @@ package org.eclipse.jst.j2ee.application.operations; import java.lang.reflect.InvocationTargetException; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportRegistry.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportRegistry.java index b6e7cb9e8..c75481a8e 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportRegistry.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/application/operations/ExtendedImportRegistry.java @@ -19,10 +19,9 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - import org.eclipse.jem.util.RegistryReader; import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** * @author jsholl diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARComponentCreationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARComponentCreationDataModel.java index 980ee82c6..9462c101a 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARComponentCreationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EARComponentCreationDataModel.java @@ -14,15 +14,15 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EClass; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.j2ee.application.operations.AddComponentToEnterpriseApplicationDataModel; -import org.eclipse.jst.j2ee.application.operations.EARComponentCreationOperation; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.EARComponentCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModelEvent; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModelEvent; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.common.modulecore.WorkbenchComponent; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EAREditModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EAREditModel.java index 3dd83cc4b..5d5c08a05 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EAREditModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EAREditModel.java @@ -30,11 +30,12 @@ import org.eclipse.emf.common.util.WrappedException; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.resource.Resource; import org.eclipse.emf.ecore.xmi.XMIResource; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.ApplicationPackage; import org.eclipse.jst.j2ee.application.ApplicationResource; import org.eclipse.jst.j2ee.application.Module; -import org.eclipse.jst.j2ee.application.operations.DefaultModuleProjectCreationOperation; +import org.eclipse.jst.j2ee.application.internal.operations.DefaultModuleProjectCreationOperation; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap; @@ -44,10 +45,9 @@ import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager; import org.eclipse.wst.common.frameworks.internal.SaveFailedException; import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; +import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * * @deprecated diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/LooseConfigUpdateOperation.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/LooseConfigUpdateOperation.java index 5b55a5299..29ded7c0e 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/LooseConfigUpdateOperation.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/LooseConfigUpdateOperation.java @@ -37,7 +37,7 @@ import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public class LooseConfigUpdateOperation extends WTPOperation implements ILooseConfigConstants { diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ModuleMapHelper.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ModuleMapHelper.java index ff478a3cf..7af3bbfc8 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ModuleMapHelper.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/ModuleMapHelper.java @@ -17,6 +17,7 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile; @@ -24,8 +25,6 @@ import org.eclipse.jst.j2ee.internal.earcreation.modulemap.EARProjectMap; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModuleMapping; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @deprecated * Use diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/UtilityJARInEARProjectCommand.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/UtilityJARInEARProjectCommand.java index 6b49e8036..66a77249b 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/UtilityJARInEARProjectCommand.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/UtilityJARInEARProjectCommand.java @@ -15,13 +15,12 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.common.command.AbstractCommand; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; import org.eclipse.jst.j2ee.internal.plugin.LibCopyBuilder; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - public abstract class UtilityJARInEARProjectCommand extends AbstractCommand { protected EAREditModel editModel; protected IProject earProject; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EARArtifactEditOperationDataModel.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EARArtifactEditOperationDataModel.java index 4d68b74e2..b86c5d2ed 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EARArtifactEditOperationDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/modulecore/util/EARArtifactEditOperationDataModel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.internal.modulecore.util; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; public class EARArtifactEditOperationDataModel extends ArtifactEditOperationDataModel { diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java index b726bfdd7..fa64a20df 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtension.java @@ -16,9 +16,9 @@ */ package org.eclipse.jst.j2ee.internal.moduleextension; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java index d6a684c75..0d12ac68b 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionImpl.java @@ -15,8 +15,8 @@ package org.eclipse.jst.j2ee.internal.moduleextension; import org.eclipse.core.internal.resources.Project; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationOperationOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationOperationOld; import org.eclipse.jst.j2ee.internal.archive.operations.ImportOption; import org.eclipse.jst.j2ee.internal.project.J2EENature; diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java index 157fd377d..8ef204c62 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EarModuleExtensionRegistry.java @@ -18,9 +18,8 @@ package org.eclipse.jst.j2ee.internal.moduleextension; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; - import org.eclipse.jem.util.RegistryReader; +import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; /** * To change the template for this generated type comment go to diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java index 0a1897bac..5870dfa5f 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/moduleextension/EjbModuleExtension.java @@ -20,8 +20,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.internal.earcreation.UpdateModuleReferencesInEARProjectCommand; import org.eclipse.jst.j2ee.internal.project.J2EENature; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; /** diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleDependencyOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleDependencyOperation.java index 63ebfb6dc..4abd5df42 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleDependencyOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleDependencyOperation.java @@ -38,7 +38,7 @@ import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public class DeleteModuleDependencyOperation extends WTPOperation { diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java index 6870770c3..a582c21f0 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/delete/DeleteModuleOperation.java @@ -30,7 +30,7 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.RemoveModuleFromEARProjectCommand; import org.eclipse.jst.j2ee.internal.earcreation.RemoveUtilityJARMapCommand; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.common.internal.emfworkbench.integration.ComposedEditModel; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettings.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettings.java index 1749e4f90..d45eb8e32 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettings.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/J2EESettings.java @@ -38,6 +38,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.util.Util; +import org.eclipse.jem.util.logger.proxy.Logger; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -46,8 +47,6 @@ import org.w3c.dom.Text; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.eclipse.jem.util.logger.proxy.Logger; - public class J2EESettings { protected IFile fSettingsFile; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java index e8a92616b..8a5d7e717 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/project/WTPJETEmitter.java @@ -62,7 +62,6 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.core.ClasspathEntry; import org.eclipse.jdt.launching.JavaRuntime; - import org.eclipse.jem.util.logger.proxy.Logger; /** diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java index 2eaa34953..9fecfd5bc 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceCreationOperation.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.j2ee.application.operations.AddUtilityProjectToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddUtilityProjectToEARDataModel; import org.eclipse.jst.j2ee.common.CommonFactory; import org.eclipse.jst.j2ee.common.CommonPackage; import org.eclipse.jst.j2ee.common.Description; @@ -43,7 +43,7 @@ import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension; import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.integration.ModifierHelper; import org.eclipse.wst.common.internal.emfworkbench.operation.ModelModifierOperation; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java index 6e177d690..a710b5f6c 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/EJBReferenceDataModel.java @@ -25,7 +25,7 @@ import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.webapplication.WebApp; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceDataModel.java index dea6e9e81..28da73afd 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/MessageDestReferenceDataModel.java @@ -21,6 +21,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.applicationclient.creation.ApplicationClientNatureRuntime; import org.eclipse.jst.j2ee.client.ApplicationClient; import org.eclipse.jst.j2ee.common.MessageDestination; @@ -37,11 +38,9 @@ import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.jst.j2ee.webapplication.WebApp; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.eclipse.jem.util.logger.proxy.Logger; - public class MessageDestReferenceDataModel extends ReferenceDataModel { /** * Required, type String diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/PortComponentReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/PortComponentReferenceDataModel.java index 8b5768352..c121deb62 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/PortComponentReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/PortComponentReferenceDataModel.java @@ -19,7 +19,7 @@ package org.eclipse.jst.j2ee.internal.reference; import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.j2ee.internal.common.operations.J2EEModelModifierOperationDataModel; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceDataModel.java index c33487c71..b1b39fe02 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceEnvironmentReferenceDataModel.java @@ -10,7 +10,7 @@ package org.eclipse.jst.j2ee.internal.reference; import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceDataModel.java index a248fa8e8..b6406303e 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ResourceReferenceDataModel.java @@ -10,7 +10,7 @@ package org.eclipse.jst.j2ee.internal.reference; import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceDataModel.java index b545c0e1e..c58debf31 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/reference/ServiceReferenceDataModel.java @@ -9,17 +9,16 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jst.j2ee.common.XMLResource; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtManager; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceHelper; import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - public class ServiceReferenceDataModel extends ReferenceDataModel implements WebServicesClientDataHelper { /** * Required, type String diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleDependencyOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleDependencyOperation.java index 07fce1b01..da1c81176 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleDependencyOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleDependencyOperation.java @@ -44,7 +44,7 @@ import org.eclipse.jst.j2ee.internal.project.J2EEModuleNature; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities; import org.eclipse.wst.common.frameworks.internal.enablement.nonui.WFTWrappedException; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; public class RenameModuleDependencyOperation extends WTPOperation { diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleOperation.java index 97c600eda..87ff78b83 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameModuleOperation.java @@ -32,7 +32,7 @@ import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.RemoveModuleFromEARProjectCommand; import org.eclipse.jst.j2ee.internal.earcreation.UpdateModuleReferencesInEARProjectCommand; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.common.internal.emfworkbench.integration.ComposedEditModel; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameUtilityJarMetadataOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameUtilityJarMetadataOperation.java index 982518e95..85ad36438 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameUtilityJarMetadataOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/RenameUtilityJarMetadataOperation.java @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.j2ee.internal.earcreation.EAREditModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.UtilityJARMapping; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/UpdateWebContextRootMetadataOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/UpdateWebContextRootMetadataOperation.java index af1899973..14b7b5fdb 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/UpdateWebContextRootMetadataOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/rename/UpdateWebContextRootMetadataOperation.java @@ -28,7 +28,7 @@ import org.eclipse.jst.j2ee.application.WebModule; import org.eclipse.jst.j2ee.internal.earcreation.EAREditModel; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; import org.eclipse.jst.j2ee.internal.earcreation.modulemap.ModuleMapping; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModel.java index 5e38b22f7..7e6c9bce2 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetDataModel.java @@ -19,9 +19,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.internal.ResourceManager; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOperation.java index 7f551f1a0..147a20d93 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/J2EEProjectServerTargetOperation.java @@ -16,7 +16,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetDataModel.java index 70fbe798e..9db110065 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetDataModel.java @@ -27,9 +27,9 @@ import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.project.J2EECreationResourceHandler; import org.eclipse.jst.j2ee.internal.project.J2EENature; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPPropertyDescriptor; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPPropertyDescriptor; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.internal.ResourceManager; diff --git a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java index 4d653a07a..8dc97f99d 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eecreation/org/eclipse/jst/j2ee/internal/servertarget/ServerTargetOperation.java @@ -22,7 +22,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java index 7c51ea7cc..df22e23cb 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/DeployerRegistryReader.java @@ -21,11 +21,10 @@ import java.util.List; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IConfigurationElement; +import org.eclipse.jem.util.RegistryReader; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.wst.common.internal.emf.utilities.ICommand; -import org.eclipse.jem.util.RegistryReader; - /** * @author cbridgha * diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java index ed048a0fa..b837f8179 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deploy/J2EEDeployOperation.java @@ -27,18 +27,17 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.core.runtime.Status; import org.eclipse.emf.ecore.EObject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.internal.emf.utilities.CommandContext; import org.eclipse.wst.common.internal.emf.utilities.ICommand; import org.eclipse.wst.common.internal.emf.utilities.ICommandContext; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.jem.util.logger.proxy.Logger; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; - /** * @author cbridgha * diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java index 164b2d3bb..c88946f87 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/ApplicationClientDeployableFactory.java @@ -13,13 +13,12 @@ package org.eclipse.jst.j2ee.internal.deployables; import java.util.List; import org.eclipse.core.resources.IProject; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.applicationclient.creation.IApplicationClientNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.wst.common.modulecore.ModuleCoreNature; import org.eclipse.wst.server.core.IModule; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @version 1.0 * @author diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java index 3a6f1476b..c1c634b3e 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/EnterpriseApplicationDeployableFactory.java @@ -15,13 +15,12 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants; import org.eclipse.jst.j2ee.internal.project.J2EENature; import org.eclipse.wst.common.modulecore.ModuleCoreNature; import org.eclipse.wst.server.core.IModule; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * @version 1.0 * @author diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderDataModel.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderDataModel.java index 1a8f17061..47de766a1 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderDataModel.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderDataModel.java @@ -1,6 +1,6 @@ package org.eclipse.jst.j2ee.internal.deployables; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.internal.builder.DeployableModuleBuilderDataModel; public class JavaDeployableModuleBuilderDataModel extends DeployableModuleBuilderDataModel { diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderOperation.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderOperation.java index c12377d73..4a505eed8 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderOperation.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/JavaDeployableModuleBuilderOperation.java @@ -27,7 +27,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.internal.core.ClasspathEntry; import org.eclipse.jem.util.emf.workbench.JavaProjectUtilities; import org.eclipse.jst.j2ee.internal.plugin.J2EEPluginResourceHandler; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.common.modulecore.ComponentResource; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.WorkbenchComponent; diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java index 76f067b8f..442bf7429 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/deployables/LooseArchiveDeployableFactory.java @@ -10,9 +10,6 @@ package org.eclipse.jst.j2ee.internal.deployables; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.model.ModuleDelegate; import org.eclipse.wst.server.core.util.ProjectModuleFactoryDelegate; diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java index 93a0ce0c8..ffd2b8a87 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java @@ -54,12 +54,11 @@ import org.eclipse.jst.j2ee.internal.application.impl.ApplicationResourceFactory import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory; import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.internal.deployables.JavaDeployableModuleBuilderFactory; -import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory; import org.eclipse.jst.j2ee.internal.modulecore.util.EarEditAdapterFactory; import org.eclipse.jst.j2ee.internal.validation.ResourceUtil; import org.eclipse.jst.j2ee.internal.webservices.WSDLServiceExtensionRegistry; import org.eclipse.wst.common.frameworks.internal.WTPPlugin; -import org.eclipse.wst.common.frameworks.operations.IHeadlessRunnableWithProgress; +import org.eclipse.wst.common.frameworks.internal.operations.IHeadlessRunnableWithProgress; import org.eclipse.wst.common.internal.emf.resource.ReferencedXMIFactoryImpl; import org.eclipse.wst.common.internal.emfworkbench.integration.EditModel; import org.eclipse.wst.common.modulecore.ArtifactEditModel; diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java index 574a9416e..f2e624b00 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/AWorkbenchMOFHelper.java @@ -20,13 +20,12 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.emf.ecore.EObject; import org.eclipse.jem.internal.plugin.JavaEMFNature; +import org.eclipse.jem.util.logger.LogEntry; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.common.internal.emfworkbench.WorkbenchResourceHelper; import org.eclipse.wst.validation.internal.operations.AWorkbenchHelper; import org.eclipse.wst.validation.plugin.ValidationPlugin; -import org.eclipse.jem.util.logger.LogEntry; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Abstract base class for registration of symbolic model names, and also provides the mechanism for diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java index 60350bde8..a1b1f3afa 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/validation/DependencyUtil.java @@ -20,10 +20,9 @@ import org.eclipse.jdt.core.IJavaModel; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.wst.validation.plugin.ValidationPlugin; - import org.eclipse.jem.util.logger.LogEntry; import org.eclipse.jem.util.logger.proxy.Logger; +import org.eclipse.wst.validation.plugin.ValidationPlugin; /** * This singleton keeps an internal record of project dependencies. That is, every IProject can diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java index 277d14046..f90078b83 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/actions/ConvertToWebModuleTypeAction.java @@ -13,7 +13,7 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; import org.eclipse.jst.j2ee.internal.actions.AbstractOpenWizardWorkbenchAction; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleCreationDataModel; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java index 06a4caaa2..844d2531f 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizard.java @@ -10,13 +10,13 @@ *******************************************************************************/ package org.eclipse.jst.servlet.ui.internal.wizard; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; -import org.eclipse.jst.j2ee.web.operations.AddServletOperation; -import org.eclipse.jst.j2ee.web.operations.NewServletClassDataModel; +import org.eclipse.jst.j2ee.internal.web.operations.AddServletOperation; +import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel; import org.eclipse.jst.servlet.ui.IWebUIContextIds; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.util.IModuleConstants; /** diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java index fbafd5246..afdcf1778 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/AddServletWizardPage.java @@ -15,9 +15,9 @@ import java.util.List; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; +import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel; import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup; import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection; -import org.eclipse.jst.j2ee.web.operations.NewServletClassDataModel; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -26,7 +26,7 @@ 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.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.modulecore.internal.operation.ArtifactEditOperationDataModel; import org.eclispe.wst.common.frameworks.internal.plugin.WTPCommonPlugin; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java index 5d6c0b95d..99f7f954d 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/ConvertToWebComponentTypeWizard.java @@ -19,8 +19,8 @@ import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleCreationOpe import org.eclipse.jst.j2ee.internal.web.operations.ConvertWebProjectDataModel; import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages; import org.eclipse.ui.IWorkbench; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /* * Licensed Material - Property of IBM (C) Copyright IBM Corp. 2000, 2002 - All diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java index 7c9840118..9b2fa4bec 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/MultiSelectFilteredFileSelectionDialog.java @@ -26,12 +26,14 @@ import org.eclipse.jdt.internal.ui.JavaPluginImages; import org.eclipse.jdt.internal.ui.dialogs.StatusInfo; import org.eclipse.jdt.internal.ui.util.StringMatcher; import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableContext; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jst.j2ee.internal.dialogs.FilteredFileSelectionDialog; +import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter; import org.eclipse.jst.j2ee.internal.dialogs.TypedFileViewerFilter; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.web.providers.WebAppEditResourceHandler; @@ -54,12 +56,10 @@ import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.dialogs.ElementTreeSelectionDialog; import org.eclipse.ui.dialogs.ISelectionStatusValidator; -import org.eclipse.jst.j2ee.internal.dialogs.TwoArrayQuickSorter; import org.eclipse.ui.part.PageBook; -import org.eclipse.jem.util.logger.proxy.Logger; - /** * Insert the type's description here. * Creation date: (7/30/2001 11:16:36 AM) diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassOptionsWizardPage.java index 12cda13ed..dfe603537 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassOptionsWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassOptionsWizardPage.java @@ -32,7 +32,7 @@ import org.eclipse.jface.viewers.ListViewer; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.swt.SWT; @@ -46,8 +46,8 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.internal.Workbench; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; /** * @author jialin diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassWizardPage.java index 224a3152d..474d36670 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewJavaClassWizardPage.java @@ -38,12 +38,12 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.jface.window.Window; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; import org.eclipse.jst.j2ee.internal.dialogs.TypeSearchEngine; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper; +import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel; import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup; -import org.eclipse.jst.j2ee.web.operations.NewServletClassDataModel; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -65,7 +65,7 @@ import org.eclipse.ui.dialogs.ISelectionStatusValidator; import org.eclipse.ui.internal.Workbench; import org.eclipse.ui.model.WorkbenchContentProvider; import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.common.modulecore.ComponentResource; import org.eclipse.wst.common.modulecore.ModuleCore; import org.eclipse.wst.common.modulecore.WorkbenchComponent; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java index feb4bc77e..37d72dd3e 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassOptionsWizardPage.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.jst.servlet.ui.internal.wizard; -import org.eclipse.jst.j2ee.common.operations.NewJavaClassDataModel; -import org.eclipse.jst.j2ee.web.operations.NewServletClassDataModel; +import org.eclipse.jst.j2ee.internal.common.operations.NewJavaClassDataModel; +import org.eclipse.jst.j2ee.internal.web.operations.NewServletClassDataModel; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; @@ -20,7 +20,7 @@ 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.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * @author jialin diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java index 66b75e8c4..bc5d69330 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewWebWizard.java @@ -11,6 +11,7 @@ package org.eclipse.jst.servlet.ui.internal.wizard; import org.eclipse.core.resources.IProject; +import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; @@ -18,11 +19,8 @@ import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; - -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** * @author jlanuti diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARExportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARExportPage.java index 891a5272e..a458f1a58 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARExportPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARExportPage.java @@ -17,7 +17,7 @@ package org.eclipse.jst.servlet.ui.internal.wizard; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleExportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleExportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARImportPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARImportPage.java index 25fcd23f1..b349da89d 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARImportPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WARImportPage.java @@ -16,8 +16,8 @@ */ package org.eclipse.jst.servlet.ui.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants; @@ -27,7 +27,7 @@ import org.eclipse.jst.j2ee.internal.wizard.AnnotationsStandaloneGroup; import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportPage; import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages; import org.eclipse.swt.widgets.Composite; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; /** diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java index 31931a472..90bb84cbe 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizard.java @@ -11,7 +11,7 @@ package org.eclipse.jst.servlet.ui.internal.wizard; import org.eclipse.core.runtime.IExecutableExtension; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModel; @@ -19,8 +19,8 @@ import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreation import org.eclipse.jst.j2ee.internal.wizard.J2EEComponentCreationWizard; import org.eclipse.jst.servlet.ui.internal.plugin.WEBUIMessages; import org.eclipse.ui.INewWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java index 9e6b0c023..9069cec9f 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebComponentCreationWizardPage.java @@ -11,8 +11,8 @@ package org.eclipse.jst.servlet.ui.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.AddWebModuleToEARDataModel; -import org.eclipse.jst.j2ee.application.operations.J2EEComponentCreationDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.AddWebModuleToEARDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentCreationDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModel; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; import org.eclipse.wst.common.modulecore.internal.operation.ComponentCreationDataModel; /** diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleExportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleExportWizard.java index 3cb122bfb..d47cdc3c5 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleExportWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleExportWizard.java @@ -16,8 +16,8 @@ import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleExportDataM import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleExportOperation; import org.eclipse.jst.j2ee.internal.wizard.J2EEArtifactExportWizard; import org.eclipse.ui.IExportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleImportWizard.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleImportWizard.java index 18f4aebc7..e91f3330d 100644 --- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleImportWizard.java +++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/WebModuleImportWizard.java @@ -10,17 +10,17 @@ *******************************************************************************/ package org.eclipse.jst.servlet.ui.internal.wizard; -import org.eclipse.jst.j2ee.application.operations.J2EEArtifactCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleCreationDataModelOld; -import org.eclipse.jst.j2ee.application.operations.J2EEModuleImportDataModel; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEArtifactCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleCreationDataModelOld; +import org.eclipse.jst.j2ee.application.internal.operations.J2EEModuleImportDataModel; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIMessages; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPluginIcons; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleImportDataModel; import org.eclipse.jst.j2ee.internal.web.archive.operations.WebModuleImportOperation; import org.eclipse.jst.j2ee.internal.wizard.J2EEModuleImportWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; /** * <p> diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java index 4b13af989..67feaca51 100644 --- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java +++ b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleCreationWizard.java @@ -25,9 +25,9 @@ import org.eclipse.ui.wizards.IWizardDescriptor; import org.eclipse.ui.wizards.IWizardRegistry; import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; -import org.eclipse.wst.common.frameworks.operations.WTPOperationDataModel; -import org.eclipse.wst.common.frameworks.ui.WTPWizard; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperationDataModel; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizard; import org.eclipse.wst.web.internal.ResourceHandler; import org.eclipse.wst.web.internal.WSTWebPlugin; import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModel; diff --git a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java index ba03711ea..daec90be8 100644 --- a/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java +++ b/plugins/org.eclipse.wst.web.ui/static_web_ui/org/eclipse/wst/web/ui/internal/wizards/SimpleWebModuleWizardBasePage.java @@ -20,7 +20,7 @@ import org.eclipse.ui.help.WorkbenchHelp; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; import org.eclipse.wst.common.frameworks.internal.ui.NewProjectGroup; -import org.eclipse.wst.common.frameworks.ui.WTPWizardPage; +import org.eclipse.wst.common.frameworks.internal.ui.WTPWizardPage; import org.eclipse.wst.web.internal.ResourceHandler; import org.eclipse.wst.web.internal.WSTWebPlugin; import org.eclipse.wst.web.internal.operation.SimpleWebModuleCreationDataModel; diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java index c11505fbd..e9ca279cd 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/SimpleWebModuleCreationDataModel.java @@ -12,7 +12,7 @@ package org.eclipse.wst.web.internal.operation; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IStatus; import org.eclipse.wst.common.frameworks.internal.operations.ProjectCreationDataModel; -import org.eclipse.wst.common.frameworks.operations.WTPOperation; +import org.eclipse.wst.common.frameworks.internal.operations.WTPOperation; import org.eclipse.wst.web.internal.ISimpleWebNatureConstants; public class SimpleWebModuleCreationDataModel extends ProjectCreationDataModel diff --git a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java index 096a8a1da..071d9e92f 100644 --- a/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java +++ b/plugins/org.eclipse.wst.web/static_web_project/org/eclipse/wst/web/internal/operation/WebSettings.java @@ -35,6 +35,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.wst.web.internal.ISimpleWebNatureConstants; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,8 +45,6 @@ import org.w3c.dom.Text; import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import org.eclipse.jem.util.logger.proxy.Logger; - public class WebSettings{ protected IFile fSettingsFile; |