diff options
| author | cbridgha | 2005-08-23 03:38:38 +0000 |
|---|---|---|
| committer | cbridgha | 2005-08-23 03:38:38 +0000 |
| commit | ebce0dfcf980c405fd07c019b6f4466152262cb7 (patch) | |
| tree | 94710f85cd80fabb35d4cc6e9a0a38f6cadab60f /plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse | |
| parent | f311fe2fafd30c5fd43274afbf6ff3769b332bd1 (diff) | |
| download | webtools.javaee-ebce0dfcf980c405fd07c019b6f4466152262cb7.tar.gz webtools.javaee-ebce0dfcf980c405fd07c019b6f4466152262cb7.tar.xz webtools.javaee-ebce0dfcf980c405fd07c019b6f4466152262cb7.zip | |
[nobug] Restructuring Model classes
Diffstat (limited to 'plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse')
55 files changed, 2133 insertions, 2350 deletions
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..99a1d6f07 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 @@ -30,14 +30,15 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; 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; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; /** * @generated */ -public interface Archive extends Container { +public interface Archive extends Container{ public static final int EXPAND_NONE = 0; public static final int EXPAND_WAR_FILES = 1 << 1; @@ -449,16 +450,16 @@ public interface Archive extends Container { public boolean shouldUseJavaReflection(); /** - * Returns the value of the '<em><b>Types</b></em>' attribute list. The list contents are - * of type {@link java.lang.String}. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Types</b></em>' attribute list. + * The list contents are of type {@link java.lang.String}. + * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Types</em>' attribute list isn't clear, there really should be * more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Types</em>' attribute list. - * @see org.eclipse.jst.j2ee.internal.commonarchivecore.CommonarchivePackage#getArchive_Types() + * @see org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage#getArchive_Types() * @model type="java.lang.String" * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java index 3b80abbd3..f5af0aac8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchiveFactory.java @@ -19,18 +19,18 @@ import java.util.Set; import org.eclipse.emf.ecore.EFactory; 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.looseconfig.LooseArchive; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; /** * @generated */ -public interface CommonarchiveFactory extends EFactory { +public interface CommonarchiveFactory extends EFactory{ /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ CommonarchiveFactory eINSTANCE = new org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactoryImpl(); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java index 83111e661..a0c64d19b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/CommonarchivePackage.java @@ -20,10 +20,10 @@ import org.eclipse.emf.ecore.EReference; /** * @lastgen interface CommonarchivePackage extends EPackage {} */ -public interface CommonarchivePackage extends EPackage { +public interface CommonarchivePackage extends EPackage{ /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "commonarchivecore"; //$NON-NLS-1$ @@ -102,9 +102,9 @@ public interface CommonarchivePackage extends EPackage { */ int FILE__SIZE = 2; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -124,9 +124,9 @@ public interface CommonarchivePackage extends EPackage { int FILE__CONTAINER = 6; /** - * The number of structural features of the the '<em>File</em>' class. <!-- begin-user-doc + * The number of structural features of the the '<em>File</em>' class. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -145,9 +145,9 @@ public interface CommonarchivePackage extends EPackage { */ int CONTAINER__SIZE = FILE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -192,9 +192,9 @@ public interface CommonarchivePackage extends EPackage { */ int ARCHIVE__SIZE = CONTAINER__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -218,9 +218,9 @@ public interface CommonarchivePackage extends EPackage { */ int ARCHIVE__FILES = CONTAINER__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -248,9 +248,9 @@ public interface CommonarchivePackage extends EPackage { */ int MODULE_FILE__SIZE = ARCHIVE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -274,9 +274,9 @@ public interface CommonarchivePackage extends EPackage { */ int MODULE_FILE__FILES = ARCHIVE__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -304,9 +304,9 @@ public interface CommonarchivePackage extends EPackage { */ int EJB_JAR_FILE__SIZE = MODULE_FILE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -330,9 +330,9 @@ public interface CommonarchivePackage extends EPackage { */ int EJB_JAR_FILE__FILES = MODULE_FILE__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -364,9 +364,9 @@ public interface CommonarchivePackage extends EPackage { */ int WAR_FILE__SIZE = MODULE_FILE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -390,9 +390,9 @@ public interface CommonarchivePackage extends EPackage { */ int WAR_FILE__FILES = MODULE_FILE__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -424,9 +424,9 @@ public interface CommonarchivePackage extends EPackage { */ int EAR_FILE__SIZE = MODULE_FILE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -450,9 +450,9 @@ public interface CommonarchivePackage extends EPackage { */ int EAR_FILE__FILES = MODULE_FILE__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -488,9 +488,9 @@ public interface CommonarchivePackage extends EPackage { */ int APPLICATION_CLIENT_FILE__SIZE = MODULE_FILE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -514,9 +514,9 @@ public interface CommonarchivePackage extends EPackage { */ int APPLICATION_CLIENT_FILE__FILES = MODULE_FILE__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -529,7 +529,6 @@ public interface CommonarchivePackage extends EPackage { /** * The number of structural features of the the '<em>Application Client File</em>' class. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -552,9 +551,9 @@ public interface CommonarchivePackage extends EPackage { */ int READ_ONLY_DIRECTORY__SIZE = CONTAINER__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -600,9 +599,9 @@ public interface CommonarchivePackage extends EPackage { */ int RAR_FILE__SIZE = MODULE_FILE__SIZE; /** - * The feature id for the '<em><b>Directory Entry</b></em>' attribute. <!-- begin-user-doc + * The feature id for the '<em><b>Directory Entry</b></em>' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated * @ordered */ @@ -626,9 +625,9 @@ public interface CommonarchivePackage extends EPackage { */ int RAR_FILE__FILES = MODULE_FILE__FILES; /** - * The feature id for the '<em><b>Types</b></em>' attribute list. <!-- begin-user-doc --> + * The feature id for the '<em><b>Types</b></em>' attribute list. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated * @ordered */ @@ -662,9 +661,9 @@ public interface CommonarchivePackage extends EPackage { int MODULE_REF__EAR_FILE = 1; /** - * The feature id for the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * + * The feature id for the '<em><b>Module</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated * @ordered */ @@ -689,9 +688,9 @@ public interface CommonarchivePackage extends EPackage { int EJB_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE; /** - * The feature id for the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * + * The feature id for the '<em><b>Module</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated * @ordered */ @@ -716,9 +715,9 @@ public interface CommonarchivePackage extends EPackage { int WEB_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE; /** - * The feature id for the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * + * The feature id for the '<em><b>Module</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated * @ordered */ @@ -743,9 +742,9 @@ public interface CommonarchivePackage extends EPackage { int CLIENT_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE; /** - * The feature id for the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * + * The feature id for the '<em><b>Module</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated * @ordered */ @@ -770,9 +769,9 @@ public interface CommonarchivePackage extends EPackage { int CONNECTOR_MODULE_REF__EAR_FILE = MODULE_REF__EAR_FILE; /** - * The feature id for the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> <!-- - * end-user-doc --> - * + * The feature id for the '<em><b>Module</b></em>' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated * @ordered */ @@ -792,15 +791,15 @@ public interface CommonarchivePackage extends EPackage { */ String eNS_URI = "commonarchive.xmi"; //$NON-NLS-1$ /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.commonarchivecore"; //$NON-NLS-1$ + String eNS_PREFIX = "org.eclipse.jst.j2ee.commonarchivecore"; //$NON-NLS-1$ /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ CommonarchivePackage eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl.init(); @@ -866,12 +865,11 @@ public interface CommonarchivePackage extends EPackage { EReference getModuleRef_EarFile(); /** - * Returns the meta object for the reference ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.ModuleRef#getModule <em>Module</em>}'. <!-- - * begin-user-doc --> <!-- end-user-doc --> - * + * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef#getModule <em>Module</em>}'. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @return the meta object for the reference '<em>Module</em>'. - * @see org.eclipse.jst.j2ee.internal.commonarchivecore.ModuleRef#getModule() + * @see org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef#getModule() * @see #getModuleRef() * @generated */ @@ -930,12 +928,10 @@ public interface CommonarchivePackage extends EPackage { EClass getRARFile(); /** - * Returns the meta object for the reference ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.RARFile#getDeploymentDescriptor <em>Deployment Descriptor</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile#getDeploymentDescriptor <em>Deployment Descriptor</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the reference '<em>Deployment Descriptor</em>'. - * @see org.eclipse.jst.j2ee.internal.commonarchivecore.RARFile#getDeploymentDescriptor() + * @see org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile#getDeploymentDescriptor() * @see #getRARFile() * @generated */ @@ -981,12 +977,10 @@ public interface CommonarchivePackage extends EPackage { EAttribute getFile_Size(); /** - * Returns the meta object for the attribute ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#isDirectoryEntry <em>Directory Entry</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}'. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return the meta object for the attribute '<em>Directory Entry</em>'. - * @see org.eclipse.jst.j2ee.internal.commonarchivecore.File#isDirectoryEntry() + * @see org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry() * @see #getFile() * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java index 650d9f140..5814e0c2f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/File.java @@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EObject; /** * @generated */ -public interface File extends EObject { +public interface File extends EObject{ /** * Return the path up to the filename; e.g., from com/ibm/foo/bar.class, com/ibm/foo @@ -73,12 +73,9 @@ public interface File extends EObject { long getLastModified(); /** - * Sets the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getLastModified <em>Last Modified</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Last Modified</em>' attribute. + * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getLastModified <em>Last Modified</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Last Modified</em>' attribute. * @see #isSetLastModified() * @see #unsetLastModified() * @see #getLastModified() @@ -87,10 +84,8 @@ public interface File extends EObject { void setLastModified(long value); /** - * Unsets the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getLastModified <em>Last Modified</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Unsets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getLastModified <em>Last Modified</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #isSetLastModified() * @see #getLastModified() * @see #setLastModified(long) @@ -99,10 +94,8 @@ public interface File extends EObject { void unsetLastModified(); /** - * Returns whether the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getLastModified <em>Last Modified</em>}' - * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns whether the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getLastModified <em>Last Modified</em>}' attribute is set. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return whether the value of the '<em>Last Modified</em>' attribute is set. * @see #unsetLastModified() * @see #getLastModified() @@ -144,10 +137,8 @@ public interface File extends EObject { void unsetSize(); /** - * Returns whether the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#getSize <em>Size</em>}' attribute is set. + * Returns whether the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#getSize <em>Size</em>}' attribute is set. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @return whether the value of the '<em>Size</em>' attribute is set. * @see #unsetSize() * @see #getSize() @@ -176,12 +167,9 @@ public interface File extends EObject { boolean isDirectoryEntry(); /** - * Sets the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#isDirectoryEntry <em>Directory Entry</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Directory Entry</em>' attribute. + * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Directory Entry</em>' attribute. * @see #isSetDirectoryEntry() * @see #unsetDirectoryEntry() * @see #isDirectoryEntry() @@ -190,10 +178,8 @@ public interface File extends EObject { void setDirectoryEntry(boolean value); /** - * Unsets the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#isDirectoryEntry <em>Directory Entry</em>}' - * attribute. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Unsets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}' attribute. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #isSetDirectoryEntry() * @see #isDirectoryEntry() * @see #setDirectoryEntry(boolean) @@ -202,10 +188,8 @@ public interface File extends EObject { void unsetDirectoryEntry(); /** - * Returns whether the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.File#isDirectoryEntry <em>Directory Entry</em>}' - * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Returns whether the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.File#isDirectoryEntry <em>Directory Entry</em>}' attribute is set. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @return whether the value of the '<em>Directory Entry</em>' attribute is set. * @see #unsetDirectoryEntry() * @see #isDirectoryEntry() diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java index 65678da1f..c9d8f7ac9 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/ModuleRef.java @@ -21,9 +21,10 @@ import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ArchiveWrappedException; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException; +import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; -public interface ModuleRef extends EObject { +public interface ModuleRef extends EObject{ /** * Return the parsed local deployment descriptor from the ModuleFile @@ -145,28 +146,26 @@ public interface ModuleRef extends EObject { void setEarFile(EARFile value); /** - * Returns the value of the '<em><b>Module</b></em>' reference. <!-- begin-user-doc --> + * Returns the value of the '<em><b>Module</b></em>' reference. + * <!-- begin-user-doc --> * <p> - * If the meaning of the '<em>Module</em>' reference isn't clear, there really should be - * more of a description here... + * If the meaning of the '<em>Module</em>' reference isn't clear, + * there really should be more of a description here... * </p> * <!-- end-user-doc --> - * * @return the value of the '<em>Module</em>' reference. * @see #setModule(Module) - * @see org.eclipse.jst.j2ee.internal.commonarchivecore.CommonarchivePackage#getModuleRef_Module() + * @see org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage#getModuleRef_Module() * @model required="true" * @generated */ Module getModule(); /** - * Sets the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.ModuleRef#getModule <em>Module</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Module</em>' reference. + * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef#getModule <em>Module</em>}' reference. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @param value the new value of the '<em>Module</em>' reference. * @see #getModule() * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java index 22a3e5f9d..56ddf53ae 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/RARFile.java @@ -19,7 +19,7 @@ import org.eclipse.jst.j2ee.jca.Connector; /** * @generated */ -public interface RARFile extends ModuleFile { +public interface RARFile extends ModuleFile{ /** * Returns the value of the '<em><b>Deployment Descriptor</b></em>' reference. <!-- @@ -39,12 +39,9 @@ public interface RARFile extends ModuleFile { Connector getDeploymentDescriptor(); /** - * Sets the value of the ' - * {@link org.eclipse.jst.j2ee.internal.commonarchivecore.RARFile#getDeploymentDescriptor <em>Deployment Descriptor</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @param value - * the new value of the '<em>Deployment Descriptor</em>' reference. + * Sets the value of the '{@link org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile#getDeploymentDescriptor <em>Deployment Descriptor</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @param value the new value of the '<em>Deployment Descriptor</em>' reference. * @see #getDeploymentDescriptor() * @generated */ 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/exception/UncontainedModuleFileException.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.java index 5f69ebeb5..70981719a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/exception/UncontainedModuleFileException.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.jst.j2ee.commonarchivecore.internal.exception; +import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile; + /** * @deprecated Exception no longer thrown; check for null instead. Exception which may be thrown diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java index 17992efc0..49cf69d88 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/helpers/ArchiveInit.java @@ -13,7 +13,7 @@ package org.eclipse.jst.j2ee.commonarchivecore.internal.helpers; import org.eclipse.emf.ecore.EPackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; import org.eclipse.jst.j2ee.internal.J2EEInit; import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil; 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/ApplicationClientFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java index d7ada6b70..0e7e25cb6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ApplicationClientFileImpl.java @@ -22,15 +22,14 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jst.j2ee.client.ApplicationClient; +import org.eclipse.jst.j2ee.client.ClientPackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.Container; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException; import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.internal.client.ClientPackage; import org.eclipse.jst.j2ee.internal.common.XMLResource; @@ -53,7 +52,6 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -121,19 +119,18 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER, msgs); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -144,17 +141,16 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER, msgs); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -163,15 +159,14 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -180,34 +175,31 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI: return getURI(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: return getContainer(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES: return getFiles(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES: return getTypes(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR : - if (resolve) - return getDeploymentDescriptor(); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR: + if (resolve) return getDeploymentDescriptor(); return basicGetDeploymentDescriptor(); } return eDynamicGet(eFeature, resolve); @@ -218,25 +210,25 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE: return isSetSize(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES: return types != null && !types.isEmpty(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR: return deploymentDescriptor != null; } return eDynamicIsSet(eFeature); @@ -247,37 +239,37 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((ApplicationClient) newValue); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((ApplicationClient)newValue); return; } eDynamicSet(eFeature, newValue); @@ -288,35 +280,35 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__FILES: getFiles().clear(); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES : + case CommonarchivePackage.APPLICATION_CLIENT_FILE__TYPES: getTypes().clear(); return; - case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((ApplicationClient) null); + case CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((ApplicationClient)null); return; } eDynamicUnset(eFeature); @@ -328,7 +320,7 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica public ApplicationClient getDeploymentDescriptorGen() { if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) { ApplicationClient oldDeploymentDescriptor = deploymentDescriptor; - deploymentDescriptor = (ApplicationClient) EcoreUtil.resolve(deploymentDescriptor, this); + deploymentDescriptor = (ApplicationClient)eResolveProxy((InternalEObject)deploymentDescriptor); if (deploymentDescriptor != oldDeploymentDescriptor) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.APPLICATION_CLIENT_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor)); @@ -339,7 +331,6 @@ public class ApplicationClientFileImpl extends ModuleFileImpl implements Applica /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ApplicationClient basicGetDeploymentDescriptor() { diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java index 95f69034b..a51cc1527 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveCopyUtility.java @@ -23,6 +23,7 @@ import java.util.List; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.jst.j2ee.common.internal.util.Defaultable; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; @@ -36,7 +37,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.internal.common.util.Defaultable; import org.eclipse.jst.j2ee.webapplication.FilterMapping; import org.eclipse.wst.common.internal.emf.utilities.CopyGroup; import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopySession; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java index 8d53a8031..df5fd6085 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ArchiveImpl.java @@ -56,7 +56,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntryImpl; 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.DirectorySaveStrategyImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.LoadStrategy; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.SaveStrategy; @@ -64,6 +63,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ZipStreamSaveStr import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveFileDynamicClassLoader; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ClasspathUtil; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility; import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil; @@ -117,7 +117,6 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -126,7 +125,6 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EList getTypes() { @@ -138,19 +136,18 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.ARCHIVE__CONTAINER : + case CommonarchivePackage.ARCHIVE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.ARCHIVE__CONTAINER, msgs); - case CommonarchivePackage.ARCHIVE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.ARCHIVE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -161,17 +158,16 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.ARCHIVE__CONTAINER : + case CommonarchivePackage.ARCHIVE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.ARCHIVE__CONTAINER, msgs); - case CommonarchivePackage.ARCHIVE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.ARCHIVE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -180,15 +176,14 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.ARCHIVE__CONTAINER : + case CommonarchivePackage.ARCHIVE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -197,30 +192,28 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.ARCHIVE__URI : + case CommonarchivePackage.ARCHIVE__URI: return getURI(); - case CommonarchivePackage.ARCHIVE__LAST_MODIFIED : + case CommonarchivePackage.ARCHIVE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.ARCHIVE__SIZE : + case CommonarchivePackage.ARCHIVE__SIZE: return new Long(getSize()); - case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY : + case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.ARCHIVE__ORIGINAL_URI : + case CommonarchivePackage.ARCHIVE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.ARCHIVE__CONTAINER : + case CommonarchivePackage.ARCHIVE__CONTAINER: return getContainer(); - case CommonarchivePackage.ARCHIVE__FILES : + case CommonarchivePackage.ARCHIVE__FILES: return getFiles(); - case CommonarchivePackage.ARCHIVE__TYPES : + case CommonarchivePackage.ARCHIVE__TYPES: return getTypes(); } return eDynamicGet(eFeature, resolve); @@ -228,39 +221,38 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.ARCHIVE__URI : - setURI((String) newValue); + case CommonarchivePackage.ARCHIVE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.ARCHIVE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.ARCHIVE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.ARCHIVE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.ARCHIVE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.ARCHIVE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.ARCHIVE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.ARCHIVE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.ARCHIVE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.ARCHIVE__FILES : + case CommonarchivePackage.ARCHIVE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.ARCHIVE__TYPES : + case CommonarchivePackage.ARCHIVE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -268,36 +260,35 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.ARCHIVE__URI : + case CommonarchivePackage.ARCHIVE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.ARCHIVE__LAST_MODIFIED : + case CommonarchivePackage.ARCHIVE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.ARCHIVE__SIZE : + case CommonarchivePackage.ARCHIVE__SIZE: unsetSize(); return; - case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY : + case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.ARCHIVE__ORIGINAL_URI : + case CommonarchivePackage.ARCHIVE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.ARCHIVE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.ARCHIVE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.ARCHIVE__FILES : + case CommonarchivePackage.ARCHIVE__FILES: getFiles().clear(); return; - case CommonarchivePackage.ARCHIVE__TYPES : + case CommonarchivePackage.ARCHIVE__TYPES: getTypes().clear(); return; } @@ -306,28 +297,27 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.ARCHIVE__URI : + case CommonarchivePackage.ARCHIVE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.ARCHIVE__LAST_MODIFIED : + case CommonarchivePackage.ARCHIVE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.ARCHIVE__SIZE : + case CommonarchivePackage.ARCHIVE__SIZE: return isSetSize(); - case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY : + case CommonarchivePackage.ARCHIVE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.ARCHIVE__ORIGINAL_URI : + case CommonarchivePackage.ARCHIVE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER : + case CommonarchivePackage.ARCHIVE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.ARCHIVE__CONTAINER : + case CommonarchivePackage.ARCHIVE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.ARCHIVE__FILES : + case CommonarchivePackage.ARCHIVE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.ARCHIVE__TYPES : + case CommonarchivePackage.ARCHIVE__TYPES: return types != null && !types.isEmpty(); } return eDynamicIsSet(eFeature); @@ -335,15 +325,13 @@ public class ArchiveImpl extends ContainerImpl implements Archive { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public String toString() { - if (eIsProxy()) - return super.toString(); + if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (types: "); //$NON-NLS-1$ + result.append(" (types: "); result.append(types); result.append(')'); return result.toString(); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java index ae274d6c1..946cec93e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ClientModuleRefImpl.java @@ -35,7 +35,6 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -44,17 +43,16 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -65,15 +63,14 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: return eBasicSetContainer(null, CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -82,15 +79,14 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -99,20 +95,17 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE : - if (resolve) - return getModuleFile(); + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE: + if (resolve) return getModuleFile(); return basicGetModuleFile(); - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: return getEarFile(); - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE : - if (resolve) - return getModule(); + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE: + if (resolve) return getModule(); return basicGetModule(); } return eDynamicGet(eFeature, resolve); @@ -120,19 +113,18 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) newValue); + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)newValue); return; - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : - setEarFile((EARFile) newValue); + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: + setEarFile((EARFile)newValue); return; - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE : - setModule((Module) newValue); + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE: + setModule((Module)newValue); return; } eDynamicSet(eFeature, newValue); @@ -140,19 +132,18 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) null); + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)null); return; - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : - setEarFile((EARFile) null); + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: + setEarFile((EARFile)null); return; - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE : - setModule((Module) null); + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE: + setModule((Module)null); return; } eDynamicUnset(eFeature); @@ -160,16 +151,15 @@ public class ClientModuleRefImpl extends ModuleRefImpl implements ClientModuleRe /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE : + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE_FILE: return moduleFile != null; - case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CLIENT_MODULE_REF__EAR_FILE: return getEarFile() != null; - case CommonarchivePackage.CLIENT_MODULE_REF__MODULE : + case CommonarchivePackage.CLIENT_MODULE_REF__MODULE: return module != null; } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java index b20034dc7..50987bbec 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchiveFactoryImpl.java @@ -51,7 +51,6 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef; 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.helpers.ArchiveTypeDiscriminator; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.AppClient12ImportStrategyImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.DirectoryArchiveLoadStrategy; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.DirectoryArchiveLoadStrategyImpl; @@ -65,6 +64,7 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.ReadOnlyDirector import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.TempZipFileLoadStrategyImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.strategy.War22ImportStrategyImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; /** @@ -140,37 +140,24 @@ public class CommonarchiveFactoryImpl extends EFactoryImpl implements Commonarch /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { - case CommonarchivePackage.FILE : - return createFile(); - case CommonarchivePackage.ARCHIVE : - return createArchive(); - case CommonarchivePackage.EJB_JAR_FILE : - return createEJBJarFile(); - case CommonarchivePackage.WAR_FILE : - return createWARFile(); - case CommonarchivePackage.EAR_FILE : - return createEARFile(); - case CommonarchivePackage.APPLICATION_CLIENT_FILE : - return createApplicationClientFile(); - case CommonarchivePackage.READ_ONLY_DIRECTORY : - return createReadOnlyDirectory(); - case CommonarchivePackage.RAR_FILE : - return createRARFile(); - case CommonarchivePackage.EJB_MODULE_REF : - return createEJBModuleRef(); - case CommonarchivePackage.WEB_MODULE_REF : - return createWebModuleRef(); - case CommonarchivePackage.CLIENT_MODULE_REF : - return createClientModuleRef(); - case CommonarchivePackage.CONNECTOR_MODULE_REF : - return createConnectorModuleRef(); - default : - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + case CommonarchivePackage.FILE: return createFile(); + case CommonarchivePackage.ARCHIVE: return createArchive(); + case CommonarchivePackage.EJB_JAR_FILE: return createEJBJarFile(); + case CommonarchivePackage.WAR_FILE: return createWARFile(); + case CommonarchivePackage.EAR_FILE: return createEARFile(); + case CommonarchivePackage.APPLICATION_CLIENT_FILE: return createApplicationClientFile(); + case CommonarchivePackage.READ_ONLY_DIRECTORY: return createReadOnlyDirectory(); + case CommonarchivePackage.RAR_FILE: return createRARFile(); + case CommonarchivePackage.EJB_MODULE_REF: return createEJBModuleRef(); + case CommonarchivePackage.WEB_MODULE_REF: return createWebModuleRef(); + case CommonarchivePackage.CLIENT_MODULE_REF: return createClientModuleRef(); + case CommonarchivePackage.CONNECTOR_MODULE_REF: return createConnectorModuleRef(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } @@ -938,12 +925,12 @@ public class CommonarchiveFactoryImpl extends EFactoryImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public CommonarchivePackage getCommonarchivePackage() { - return (CommonarchivePackage) getEPackage(); + return (CommonarchivePackage)getEPackage(); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * @deprecated * @generated */ public static CommonarchivePackage getPackage() { diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java index b6413825d..fd9310b92 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/CommonarchivePackageImpl.java @@ -17,7 +17,14 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.impl.EcorePackageImpl; +import org.eclipse.jem.java.JavaRefPackage; import org.eclipse.jem.java.impl.JavaRefPackageImpl; +import org.eclipse.jst.j2ee.application.ApplicationPackage; +import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.client.ClientPackage; +import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.common.CommonPackage; +import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.ClientModuleRef; @@ -35,21 +42,18 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory; import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigPackageImpl; -import org.eclipse.jst.j2ee.internal.application.ApplicationPackage; -import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; -import org.eclipse.jst.j2ee.internal.client.ClientPackage; -import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; -import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; -import org.eclipse.jst.j2ee.internal.ejb.EjbPackage; -import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; -import org.eclipse.jst.j2ee.internal.jca.JcaPackage; -import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; -import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; -import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage; -import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; -import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl; +import org.eclipse.jst.j2ee.ejb.EjbPackage; +import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.jca.JcaPackage; +import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.jsp.JspPackage; +import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; +import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; +import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl; /** @@ -59,105 +63,90 @@ import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientP public class CommonarchivePackageImpl extends EPackageImpl implements CommonarchivePackage { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass fileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass archiveEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass ejbJarFileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass warFileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass earFileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass applicationClientFileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass moduleFileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass containerEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass readOnlyDirectoryEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass rarFileEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass moduleRefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass ejbModuleRefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass webModuleRefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass clientModuleRefEClass = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private EClass connectorModuleRefEClass = null; @@ -171,7 +160,6 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private static boolean isInited = false; @@ -180,36 +168,56 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public static CommonarchivePackage init() { - if (isInited) - return (CommonarchivePackage) EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI); + if (isInited) return (CommonarchivePackage)EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI); - // Obtain or create and register package. - CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CommonarchivePackageImpl()); + // Obtain or create and register package + CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof CommonarchivePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new CommonarchivePackageImpl()); isInited = true; // Initialize simple dependencies - JcaPackageImpl.init(); - Webservice_clientPackageImpl.init(); EcorePackageImpl.init(); - JavaRefPackageImpl.init(); - CommonPackageImpl.init(); - ClientPackageImpl.init(); - WebapplicationPackageImpl.init(); - EjbPackageImpl.init(); - JspPackageImpl.init(); - ApplicationPackageImpl.init(); // Obtain or create and register interdependencies - LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) : LooseconfigPackage.eINSTANCE); - - // Step 1: create meta-model objects + ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE); + ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE); + EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE); + WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE); + LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) instanceof LooseconfigPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI) : LooseconfigPackage.eINSTANCE); + JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI) instanceof JavaRefPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI) : JavaRefPackage.eINSTANCE); + CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE); + JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE); + Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE); + JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE); + + // Create package meta-data objects theCommonarchivePackage.createPackageContents(); + theApplicationPackage.createPackageContents(); + theClientPackage.createPackageContents(); + theEjbPackage.createPackageContents(); + theWebapplicationPackage.createPackageContents(); theLooseconfigPackage.createPackageContents(); + theJavaRefPackage.createPackageContents(); + theCommonPackage.createPackageContents(); + theJcaPackage.createPackageContents(); + theWebservice_clientPackage.createPackageContents(); + theJspPackage.createPackageContents(); - // Step 2: complete initialization + // Initialize created meta-data theCommonarchivePackage.initializePackageContents(); + theApplicationPackage.initializePackageContents(); + theClientPackage.initializePackageContents(); + theEjbPackage.initializePackageContents(); + theWebapplicationPackage.initializePackageContents(); theLooseconfigPackage.initializePackageContents(); + theJavaRefPackage.initializePackageContents(); + theCommonPackage.initializePackageContents(); + theJcaPackage.initializePackageContents(); + theWebservice_clientPackage.initializePackageContents(); + theJspPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theCommonarchivePackage.freeze(); return theCommonarchivePackage; } @@ -225,7 +233,7 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EReference getContainer_Files() { - return (EReference) containerEClass.getEReferences().get(0); + return (EReference)containerEClass.getEStructuralFeatures().get(0); } /** @@ -239,7 +247,7 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EReference getWARFile_DeploymentDescriptor() { - return (EReference) warFileEClass.getEReferences().get(0); + return (EReference)warFileEClass.getEStructuralFeatures().get(0); } /** @@ -260,14 +268,14 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EReference getEARFile_DeploymentDescriptor() { - return (EReference) earFileEClass.getEReferences().get(1); + return (EReference)earFileEClass.getEStructuralFeatures().get(1); } /** * @generated This field/method will be replaced during code generation. */ public EReference getEARFile_ModuleRefs() { - return (EReference) earFileEClass.getEReferences().get(0); + return (EReference)earFileEClass.getEStructuralFeatures().get(0); } /** @@ -281,23 +289,23 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EReference getModuleRef_ModuleFile() { - return (EReference) moduleRefEClass.getEReferences().get(0); + return (EReference)moduleRefEClass.getEStructuralFeatures().get(0); } /** * @generated This field/method will be replaced during code generation. */ public EReference getModuleRef_EarFile() { - return (EReference) moduleRefEClass.getEReferences().get(1); + return (EReference)moduleRefEClass.getEStructuralFeatures().get(1); } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ public EReference getModuleRef_Module() { - return (EReference) moduleRefEClass.getEReferences().get(2); + return (EReference)moduleRefEClass.getEStructuralFeatures().get(2); } /** @@ -339,7 +347,7 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EReference getApplicationClientFile_DeploymentDescriptor() { - return (EReference) applicationClientFileEClass.getEReferences().get(0); + return (EReference)applicationClientFileEClass.getEStructuralFeatures().get(0); } /** @@ -353,7 +361,7 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EReference getEJBJarFile_DeploymentDescriptor() { - return (EReference) ejbJarFileEClass.getEReferences().get(0); + return (EReference)ejbJarFileEClass.getEStructuralFeatures().get(0); } /** @@ -365,11 +373,10 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EReference getRARFile_DeploymentDescriptor() { - return (EReference) rarFileEClass.getEReferences().get(0); + return (EReference)rarFileEClass.getEStructuralFeatures().get(0); } /** @@ -381,11 +388,10 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getArchive_Types() { - return (EAttribute) archiveEClass.getEAttributes().get(0); + return (EAttribute)archiveEClass.getEStructuralFeatures().get(0); } /** @@ -399,51 +405,50 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public EAttribute getFile_URI() { - return (EAttribute) fileEClass.getEAttributes().get(0); + return (EAttribute)fileEClass.getEStructuralFeatures().get(0); } /** * @generated This field/method will be replaced during code generation. */ public EAttribute getFile_LastModified() { - return (EAttribute) fileEClass.getEAttributes().get(1); + return (EAttribute)fileEClass.getEStructuralFeatures().get(1); } /** * @generated This field/method will be replaced during code generation. */ public EAttribute getFile_Size() { - return (EAttribute) fileEClass.getEAttributes().get(2); + return (EAttribute)fileEClass.getEStructuralFeatures().get(2); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EAttribute getFile_DirectoryEntry() { - return (EAttribute) fileEClass.getEAttributes().get(3); + return (EAttribute)fileEClass.getEStructuralFeatures().get(3); } /** * @generated This field/method will be replaced during code generation. */ public EAttribute getFile_OriginalURI() { - return (EAttribute) fileEClass.getEAttributes().get(4); + return (EAttribute)fileEClass.getEStructuralFeatures().get(4); } /** * @generated This field/method will be replaced during code generation. */ public EReference getFile_LoadingContainer() { - return (EReference) fileEClass.getEReferences().get(0); + return (EReference)fileEClass.getEStructuralFeatures().get(5); } /** * @generated This field/method will be replaced during code generation. */ public EReference getFile_Container() { - return (EReference) fileEClass.getEReferences().get(1); + return (EReference)fileEClass.getEStructuralFeatures().get(6); } /** @@ -457,25 +462,23 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch * @generated This field/method will be replaced during code generation. */ public CommonarchiveFactory getCommonarchiveFactory() { - return (CommonarchiveFactory) getEFactoryInstance(); + return (CommonarchiveFactory)getEFactoryInstance(); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isCreated = false; /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on - * any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void createPackageContents() { - if (isCreated) - return; + if (isCreated) return; isCreated = true; // Create classes and their features @@ -530,20 +533,18 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ private boolean isInitialized = false; /** - * Complete the initialization of the package and its meta-model. This method is guarded to have - * no affect on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ public void initializePackageContents() { - if (isInitialized) - return; + if (isInitialized) return; isInitialized = true; // Initialize package @@ -552,12 +553,12 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch setNsURI(eNS_URI); // Obtain other dependent packages - LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl) EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI); - EjbPackageImpl theEjbPackage = (EjbPackageImpl) EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI); - WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl) EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI); - ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl) EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI); - ClientPackageImpl theClientPackage = (ClientPackageImpl) EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI); - JcaPackageImpl theJcaPackage = (JcaPackageImpl) EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI); + LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl)EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI); + EjbPackageImpl theEjbPackage = (EjbPackageImpl)EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI); + WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI); + ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI); + ClientPackageImpl theClientPackage = (ClientPackageImpl)EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI); + JcaPackageImpl theJcaPackage = (JcaPackageImpl)EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI); // Add subpackages getESubpackages().add(theLooseconfigPackage); @@ -578,57 +579,58 @@ public class CommonarchivePackageImpl extends EPackageImpl implements Commonarch connectorModuleRefEClass.getESuperTypes().add(this.getModuleRef()); // Initialize classes and features; add operations and parameters - initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEAttribute(getFile_URI(), ecorePackage.getEString(), "URI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEAttribute(getFile_LastModified(), ecorePackage.getELong(), "lastModified", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEAttribute(getFile_Size(), ecorePackage.getELong(), "size", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEAttribute(getFile_DirectoryEntry(), ecorePackage.getEBoolean(), "directoryEntry", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEAttribute(getFile_OriginalURI(), ecorePackage.getEString(), "originalURI", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEReference(getFile_LoadingContainer(), this.getContainer(), null, "loadingContainer", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - initEReference(getFile_Container(), this.getContainer(), this.getContainer_Files(), "container", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(fileEClass, File.class, "File", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getFile_URI(), ecorePackage.getEString(), "URI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFile_LastModified(), ecorePackage.getELong(), "lastModified", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFile_Size(), ecorePackage.getELong(), "size", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFile_DirectoryEntry(), ecorePackage.getEBoolean(), "directoryEntry", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getFile_OriginalURI(), ecorePackage.getEString(), "originalURI", null, 0, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getFile_LoadingContainer(), this.getContainer(), null, "loadingContainer", null, 1, 1, File.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getFile_Container(), this.getContainer(), this.getContainer_Files(), "container", null, 0, 1, File.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(archiveEClass, Archive.class, "Archive", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEAttribute(getArchive_Types(), ecorePackage.getEString(), "types", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(archiveEClass, Archive.class, "Archive", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getArchive_Types(), ecorePackage.getEString(), "types", null, 0, -1, Archive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(ejbJarFileEClass, EJBJarFile.class, "EJBJarFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getEJBJarFile_DeploymentDescriptor(), theEjbPackage.getEJBJar(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(ejbJarFileEClass, EJBJarFile.class, "EJBJarFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getEJBJarFile_DeploymentDescriptor(), theEjbPackage.getEJBJar(), null, "deploymentDescriptor", null, 1, 1, EJBJarFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(warFileEClass, WARFile.class, "WARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getWARFile_DeploymentDescriptor(), theWebapplicationPackage.getWebApp(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(warFileEClass, WARFile.class, "WARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getWARFile_DeploymentDescriptor(), theWebapplicationPackage.getWebApp(), null, "deploymentDescriptor", null, 1, 1, WARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(earFileEClass, EARFile.class, "EARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getEARFile_ModuleRefs(), this.getModuleRef(), this.getModuleRef_EarFile(), "moduleRefs", null, 1, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - initEReference(getEARFile_DeploymentDescriptor(), theApplicationPackage.getApplication(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(earFileEClass, EARFile.class, "EARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getEARFile_ModuleRefs(), this.getModuleRef(), this.getModuleRef_EarFile(), "moduleRefs", null, 1, -1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getEARFile_DeploymentDescriptor(), theApplicationPackage.getApplication(), null, "deploymentDescriptor", null, 1, 1, EARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(applicationClientFileEClass, ApplicationClientFile.class, "ApplicationClientFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getApplicationClientFile_DeploymentDescriptor(), theClientPackage.getApplicationClient(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(applicationClientFileEClass, ApplicationClientFile.class, "ApplicationClientFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getApplicationClientFile_DeploymentDescriptor(), theClientPackage.getApplicationClient(), null, "deploymentDescriptor", null, 1, 1, ApplicationClientFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(moduleFileEClass, ModuleFile.class, "ModuleFile", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ + initEClass(moduleFileEClass, ModuleFile.class, "ModuleFile", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(containerEClass, Container.class, "Container", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getContainer_Files(), this.getFile(), this.getFile_Container(), "files", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(containerEClass, Container.class, "Container", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getContainer_Files(), this.getFile(), this.getFile_Container(), "files", null, 0, -1, Container.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(readOnlyDirectoryEClass, ReadOnlyDirectory.class, "ReadOnlyDirectory", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ + initEClass(readOnlyDirectoryEClass, ReadOnlyDirectory.class, "ReadOnlyDirectory", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(rarFileEClass, RARFile.class, "RARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getRARFile_DeploymentDescriptor(), theJcaPackage.getConnector(), null, "deploymentDescriptor", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(rarFileEClass, RARFile.class, "RARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getRARFile_DeploymentDescriptor(), theJcaPackage.getConnector(), null, "deploymentDescriptor", null, 1, 1, RARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(moduleRefEClass, ModuleRef.class, "ModuleRef", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getModuleRef_ModuleFile(), this.getModuleFile(), null, "moduleFile", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - initEReference(getModuleRef_EarFile(), this.getEARFile(), this.getEARFile_ModuleRefs(), "earFile", null, 1, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - initEReference(getModuleRef_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ + initEClass(moduleRefEClass, ModuleRef.class, "ModuleRef", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getModuleRef_ModuleFile(), this.getModuleFile(), null, "moduleFile", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getModuleRef_EarFile(), this.getEARFile(), this.getEARFile_ModuleRefs(), "earFile", null, 1, 1, ModuleRef.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getModuleRef_Module(), theApplicationPackage.getModule(), null, "module", null, 1, 1, ModuleRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(ejbModuleRefEClass, EJBModuleRef.class, "EJBModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ + initEClass(ejbModuleRefEClass, EJBModuleRef.class, "EJBModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(webModuleRefEClass, WebModuleRef.class, "WebModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ + initEClass(webModuleRefEClass, WebModuleRef.class, "WebModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(clientModuleRefEClass, ClientModuleRef.class, "ClientModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ + initEClass(clientModuleRefEClass, ClientModuleRef.class, "ClientModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(connectorModuleRefEClass, ConnectorModuleRef.class, "ConnectorModuleRef", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ + initEClass(connectorModuleRefEClass, ConnectorModuleRef.class, "ConnectorModuleRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); // Create resource createResource(eNS_URI); } + } //CommonarchivePackageImpl diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java index dff058cea..9653d6e85 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ConnectorModuleRefImpl.java @@ -35,7 +35,6 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -44,17 +43,16 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -65,15 +63,14 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: return eBasicSetContainer(null, CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -82,15 +79,14 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -99,20 +95,17 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE : - if (resolve) - return getModuleFile(); + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE: + if (resolve) return getModuleFile(); return basicGetModuleFile(); - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: return getEarFile(); - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE : - if (resolve) - return getModule(); + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE: + if (resolve) return getModule(); return basicGetModule(); } return eDynamicGet(eFeature, resolve); @@ -120,19 +113,18 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) newValue); + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)newValue); return; - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : - setEarFile((EARFile) newValue); + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: + setEarFile((EARFile)newValue); return; - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE : - setModule((Module) newValue); + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE: + setModule((Module)newValue); return; } eDynamicSet(eFeature, newValue); @@ -140,19 +132,18 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) null); + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)null); return; - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : - setEarFile((EARFile) null); + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: + setEarFile((EARFile)null); return; - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE : - setModule((Module) null); + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE: + setModule((Module)null); return; } eDynamicUnset(eFeature); @@ -160,16 +151,15 @@ public class ConnectorModuleRefImpl extends ModuleRefImpl implements ConnectorMo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE_FILE: return moduleFile != null; - case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__EAR_FILE: return getEarFile() != null; - case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE : + case CommonarchivePackage.CONNECTOR_MODULE_REF__MODULE: return module != null; } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java index d20d834ac..5aca84c37 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ContainerImpl.java @@ -169,7 +169,6 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -316,19 +315,18 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.CONTAINER__CONTAINER : + case CommonarchivePackage.CONTAINER__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.CONTAINER__CONTAINER, msgs); - case CommonarchivePackage.CONTAINER__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.CONTAINER__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -339,17 +337,16 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.CONTAINER__CONTAINER : + case CommonarchivePackage.CONTAINER__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.CONTAINER__CONTAINER, msgs); - case CommonarchivePackage.CONTAINER__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.CONTAINER__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -358,15 +355,14 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.CONTAINER__CONTAINER : + case CommonarchivePackage.CONTAINER__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -375,28 +371,26 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONTAINER__URI : + case CommonarchivePackage.CONTAINER__URI: return getURI(); - case CommonarchivePackage.CONTAINER__LAST_MODIFIED : + case CommonarchivePackage.CONTAINER__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.CONTAINER__SIZE : + case CommonarchivePackage.CONTAINER__SIZE: return new Long(getSize()); - case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY : + case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.CONTAINER__ORIGINAL_URI : + case CommonarchivePackage.CONTAINER__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.CONTAINER__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.CONTAINER__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.CONTAINER__CONTAINER : + case CommonarchivePackage.CONTAINER__CONTAINER: return getContainer(); - case CommonarchivePackage.CONTAINER__FILES : + case CommonarchivePackage.CONTAINER__FILES: return getFiles(); } return eDynamicGet(eFeature, resolve); @@ -404,35 +398,34 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONTAINER__URI : - setURI((String) newValue); + case CommonarchivePackage.CONTAINER__URI: + setURI((String)newValue); return; - case CommonarchivePackage.CONTAINER__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.CONTAINER__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.CONTAINER__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.CONTAINER__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.CONTAINER__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.CONTAINER__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.CONTAINER__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.CONTAINER__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.CONTAINER__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.CONTAINER__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.CONTAINER__FILES : + case CommonarchivePackage.CONTAINER__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -440,33 +433,32 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONTAINER__URI : + case CommonarchivePackage.CONTAINER__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.CONTAINER__LAST_MODIFIED : + case CommonarchivePackage.CONTAINER__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.CONTAINER__SIZE : + case CommonarchivePackage.CONTAINER__SIZE: unsetSize(); return; - case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY : + case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.CONTAINER__ORIGINAL_URI : + case CommonarchivePackage.CONTAINER__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.CONTAINER__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.CONTAINER__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.CONTAINER__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.CONTAINER__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.CONTAINER__FILES : + case CommonarchivePackage.CONTAINER__FILES: getFiles().clear(); return; } @@ -475,26 +467,25 @@ public abstract class ContainerImpl extends FileImpl implements Container { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.CONTAINER__URI : + case CommonarchivePackage.CONTAINER__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.CONTAINER__LAST_MODIFIED : + case CommonarchivePackage.CONTAINER__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.CONTAINER__SIZE : + case CommonarchivePackage.CONTAINER__SIZE: return isSetSize(); - case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY : + case CommonarchivePackage.CONTAINER__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.CONTAINER__ORIGINAL_URI : + case CommonarchivePackage.CONTAINER__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.CONTAINER__LOADING_CONTAINER : + case CommonarchivePackage.CONTAINER__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.CONTAINER__CONTAINER : + case CommonarchivePackage.CONTAINER__CONTAINER: return getContainer() != null; - case CommonarchivePackage.CONTAINER__FILES : + case CommonarchivePackage.CONTAINER__FILES: return files != null && !files.isEmpty(); } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java index f24c11216..a150a9c52 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EARFileImpl.java @@ -33,18 +33,20 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jst.j2ee.application.Application; import org.eclipse.jst.j2ee.application.ApplicationFactory; +import org.eclipse.jst.j2ee.application.ApplicationPackage; import org.eclipse.jst.j2ee.application.ConnectorModule; import org.eclipse.jst.j2ee.application.EjbModule; import org.eclipse.jst.j2ee.application.JavaClientModule; import org.eclipse.jst.j2ee.application.Module; import org.eclipse.jst.j2ee.application.WebModule; import org.eclipse.jst.j2ee.client.ApplicationClient; +import org.eclipse.jst.j2ee.client.internal.impl.ApplicationClientResourceFactory; import org.eclipse.jst.j2ee.common.EjbRef; import org.eclipse.jst.j2ee.common.SecurityRole; +import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; @@ -62,24 +64,21 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ObjectNotFoundE import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; -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.util.ArchiveUtil; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor; import org.eclipse.jst.j2ee.ejb.EJBJar; import org.eclipse.jst.j2ee.ejb.EJBResource; +import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; +import org.eclipse.jst.j2ee.ejb.internal.impl.EJBJarResourceFactory; import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.internal.application.ApplicationPackage; -import org.eclipse.jst.j2ee.internal.client.impl.ApplicationClientResourceFactory; import org.eclipse.jst.j2ee.internal.common.XMLResource; -import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; -import org.eclipse.jst.j2ee.internal.ejb.EjbPackage; -import org.eclipse.jst.j2ee.internal.ejb.impl.EJBJarResourceFactory; -import org.eclipse.jst.j2ee.internal.jca.impl.ConnectorResourceFactory; -import org.eclipse.jst.j2ee.internal.webapplication.impl.WebAppResourceFactory; import org.eclipse.jst.j2ee.jca.Connector; +import org.eclipse.jst.j2ee.jca.internal.impl.ConnectorResourceFactory; import org.eclipse.jst.j2ee.webapplication.WebApp; +import org.eclipse.jst.j2ee.webapplication.internal.impl.WebAppResourceFactory; import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility; @@ -125,7 +124,6 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -848,27 +846,27 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EAR_FILE__URI : + case CommonarchivePackage.EAR_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.EAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.EAR_FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.EAR_FILE__SIZE : + case CommonarchivePackage.EAR_FILE__SIZE: return isSetSize(); - case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.EAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.EAR_FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER : + case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.EAR_FILE__CONTAINER : + case CommonarchivePackage.EAR_FILE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.EAR_FILE__FILES : + case CommonarchivePackage.EAR_FILE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.EAR_FILE__TYPES : + case CommonarchivePackage.EAR_FILE__TYPES: return types != null && !types.isEmpty(); - case CommonarchivePackage.EAR_FILE__MODULE_REFS : + case CommonarchivePackage.EAR_FILE__MODULE_REFS: return moduleRefs != null && !moduleRefs.isEmpty(); - case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR : + case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR: return deploymentDescriptor != null; } return eDynamicIsSet(eFeature); @@ -879,41 +877,41 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EAR_FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.EAR_FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.EAR_FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.EAR_FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.EAR_FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.EAR_FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.EAR_FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.EAR_FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.EAR_FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.EAR_FILE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.EAR_FILE__FILES : + case CommonarchivePackage.EAR_FILE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.EAR_FILE__TYPES : + case CommonarchivePackage.EAR_FILE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; - case CommonarchivePackage.EAR_FILE__MODULE_REFS : + case CommonarchivePackage.EAR_FILE__MODULE_REFS: getModuleRefs().clear(); - getModuleRefs().addAll((Collection) newValue); + getModuleRefs().addAll((Collection)newValue); return; - case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((Application) newValue); + case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((Application)newValue); return; } eDynamicSet(eFeature, newValue); @@ -924,38 +922,38 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EAR_FILE__URI : + case CommonarchivePackage.EAR_FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.EAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.EAR_FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.EAR_FILE__SIZE : + case CommonarchivePackage.EAR_FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.EAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.EAR_FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.EAR_FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.EAR_FILE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.EAR_FILE__FILES : + case CommonarchivePackage.EAR_FILE__FILES: getFiles().clear(); return; - case CommonarchivePackage.EAR_FILE__TYPES : + case CommonarchivePackage.EAR_FILE__TYPES: getTypes().clear(); return; - case CommonarchivePackage.EAR_FILE__MODULE_REFS : + case CommonarchivePackage.EAR_FILE__MODULE_REFS: getModuleRefs().clear(); return; - case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((Application) null); + case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((Application)null); return; } eDynamicUnset(eFeature); @@ -967,7 +965,7 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { public Application getDeploymentDescriptorGen() { if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) { Application oldDeploymentDescriptor = deploymentDescriptor; - deploymentDescriptor = (Application) EcoreUtil.resolve(deploymentDescriptor, this); + deploymentDescriptor = (Application)eResolveProxy((InternalEObject)deploymentDescriptor); if (deploymentDescriptor != oldDeploymentDescriptor) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor)); @@ -978,7 +976,6 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Application basicGetDeploymentDescriptor() { @@ -1016,21 +1013,20 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.EAR_FILE__CONTAINER : + case CommonarchivePackage.EAR_FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.EAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.EAR_FILE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - case CommonarchivePackage.EAR_FILE__MODULE_REFS : - return ((InternalEList) getModuleRefs()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.EAR_FILE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + case CommonarchivePackage.EAR_FILE__MODULE_REFS: + return ((InternalEList)getModuleRefs()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -1041,19 +1037,18 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.EAR_FILE__CONTAINER : + case CommonarchivePackage.EAR_FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.EAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.EAR_FILE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - case CommonarchivePackage.EAR_FILE__MODULE_REFS : - return ((InternalEList) getModuleRefs()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.EAR_FILE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + case CommonarchivePackage.EAR_FILE__MODULE_REFS: + return ((InternalEList)getModuleRefs()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -1062,15 +1057,14 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.EAR_FILE__CONTAINER : + case CommonarchivePackage.EAR_FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -1079,36 +1073,33 @@ public class EARFileImpl extends ModuleFileImpl implements EARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EAR_FILE__URI : + case CommonarchivePackage.EAR_FILE__URI: return getURI(); - case CommonarchivePackage.EAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.EAR_FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.EAR_FILE__SIZE : + case CommonarchivePackage.EAR_FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.EAR_FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.EAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.EAR_FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.EAR_FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.EAR_FILE__CONTAINER : + case CommonarchivePackage.EAR_FILE__CONTAINER: return getContainer(); - case CommonarchivePackage.EAR_FILE__FILES : + case CommonarchivePackage.EAR_FILE__FILES: return getFiles(); - case CommonarchivePackage.EAR_FILE__TYPES : + case CommonarchivePackage.EAR_FILE__TYPES: return getTypes(); - case CommonarchivePackage.EAR_FILE__MODULE_REFS : + case CommonarchivePackage.EAR_FILE__MODULE_REFS: return getModuleRefs(); - case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR : - if (resolve) - return getDeploymentDescriptor(); + case CommonarchivePackage.EAR_FILE__DEPLOYMENT_DESCRIPTOR: + if (resolve) return getDeploymentDescriptor(); return basicGetDeploymentDescriptor(); } return eDynamicGet(eFeature, resolve); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java index 81b8404b7..c39c87d1e 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBJarFileImpl.java @@ -24,19 +24,18 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.Container; import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException; import org.eclipse.jst.j2ee.ejb.EJBJar; +import org.eclipse.jst.j2ee.ejb.EjbPackage; import org.eclipse.jst.j2ee.ejb.EnterpriseBean; import org.eclipse.jst.j2ee.ejb.Entity; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.common.XMLResource; -import org.eclipse.jst.j2ee.internal.ejb.EjbPackage; /** @@ -58,7 +57,6 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -183,25 +181,25 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_JAR_FILE__URI : + case CommonarchivePackage.EJB_JAR_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.EJB_JAR_FILE__SIZE : + case CommonarchivePackage.EJB_JAR_FILE__SIZE: return isSetSize(); - case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER : + case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.EJB_JAR_FILE__FILES : + case CommonarchivePackage.EJB_JAR_FILE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.EJB_JAR_FILE__TYPES : + case CommonarchivePackage.EJB_JAR_FILE__TYPES: return types != null && !types.isEmpty(); - case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR : + case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR: return deploymentDescriptor != null; } return eDynamicIsSet(eFeature); @@ -212,37 +210,37 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_JAR_FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.EJB_JAR_FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.EJB_JAR_FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.EJB_JAR_FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.EJB_JAR_FILE__FILES : + case CommonarchivePackage.EJB_JAR_FILE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.EJB_JAR_FILE__TYPES : + case CommonarchivePackage.EJB_JAR_FILE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; - case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((EJBJar) newValue); + case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((EJBJar)newValue); return; } eDynamicSet(eFeature, newValue); @@ -253,35 +251,35 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_JAR_FILE__URI : + case CommonarchivePackage.EJB_JAR_FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.EJB_JAR_FILE__SIZE : + case CommonarchivePackage.EJB_JAR_FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.EJB_JAR_FILE__FILES : + case CommonarchivePackage.EJB_JAR_FILE__FILES: getFiles().clear(); return; - case CommonarchivePackage.EJB_JAR_FILE__TYPES : + case CommonarchivePackage.EJB_JAR_FILE__TYPES: getTypes().clear(); return; - case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((EJBJar) null); + case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((EJBJar)null); return; } eDynamicUnset(eFeature); @@ -293,7 +291,7 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { public EJBJar getDeploymentDescriptorGen() { if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) { EJBJar oldDeploymentDescriptor = deploymentDescriptor; - deploymentDescriptor = (EJBJar) EcoreUtil.resolve(deploymentDescriptor, this); + deploymentDescriptor = (EJBJar)eResolveProxy((InternalEObject)deploymentDescriptor); if (deploymentDescriptor != oldDeploymentDescriptor) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor)); @@ -304,7 +302,6 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EJBJar basicGetDeploymentDescriptor() { @@ -323,19 +320,18 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.EJB_JAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.EJB_JAR_FILE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.EJB_JAR_FILE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -346,17 +342,16 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.EJB_JAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.EJB_JAR_FILE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.EJB_JAR_FILE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -365,15 +360,14 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -382,34 +376,31 @@ public class EJBJarFileImpl extends ModuleFileImpl implements EJBJarFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_JAR_FILE__URI : + case CommonarchivePackage.EJB_JAR_FILE__URI: return getURI(); - case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.EJB_JAR_FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.EJB_JAR_FILE__SIZE : + case CommonarchivePackage.EJB_JAR_FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.EJB_JAR_FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.EJB_JAR_FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.EJB_JAR_FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.EJB_JAR_FILE__CONTAINER : + case CommonarchivePackage.EJB_JAR_FILE__CONTAINER: return getContainer(); - case CommonarchivePackage.EJB_JAR_FILE__FILES : + case CommonarchivePackage.EJB_JAR_FILE__FILES: return getFiles(); - case CommonarchivePackage.EJB_JAR_FILE__TYPES : + case CommonarchivePackage.EJB_JAR_FILE__TYPES: return getTypes(); - case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR : - if (resolve) - return getDeploymentDescriptor(); + case CommonarchivePackage.EJB_JAR_FILE__DEPLOYMENT_DESCRIPTOR: + if (resolve) return getDeploymentDescriptor(); return basicGetDeploymentDescriptor(); } return eDynamicGet(eFeature, resolve); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java index c1d6efaa2..5ca9ab2fd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/EJBModuleRefImpl.java @@ -37,7 +37,6 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -46,17 +45,16 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.EJB_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -67,15 +65,14 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: return eBasicSetContainer(null, CommonarchivePackage.EJB_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -84,15 +81,14 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -101,20 +97,17 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE : - if (resolve) - return getModuleFile(); + case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE: + if (resolve) return getModuleFile(); return basicGetModuleFile(); - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: return getEarFile(); - case CommonarchivePackage.EJB_MODULE_REF__MODULE : - if (resolve) - return getModule(); + case CommonarchivePackage.EJB_MODULE_REF__MODULE: + if (resolve) return getModule(); return basicGetModule(); } return eDynamicGet(eFeature, resolve); @@ -122,19 +115,18 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) newValue); + case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)newValue); return; - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : - setEarFile((EARFile) newValue); + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: + setEarFile((EARFile)newValue); return; - case CommonarchivePackage.EJB_MODULE_REF__MODULE : - setModule((Module) newValue); + case CommonarchivePackage.EJB_MODULE_REF__MODULE: + setModule((Module)newValue); return; } eDynamicSet(eFeature, newValue); @@ -142,19 +134,18 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) null); + case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)null); return; - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : - setEarFile((EARFile) null); + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: + setEarFile((EARFile)null); return; - case CommonarchivePackage.EJB_MODULE_REF__MODULE : - setModule((Module) null); + case CommonarchivePackage.EJB_MODULE_REF__MODULE: + setModule((Module)null); return; } eDynamicUnset(eFeature); @@ -162,16 +153,15 @@ public class EJBModuleRefImpl extends ModuleRefImpl implements EJBModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE : + case CommonarchivePackage.EJB_MODULE_REF__MODULE_FILE: return moduleFile != null; - case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.EJB_MODULE_REF__EAR_FILE: return getEarFile() != null; - case CommonarchivePackage.EJB_MODULE_REF__MODULE : + case CommonarchivePackage.EJB_MODULE_REF__MODULE: return module != null; } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java index 9ba124a06..1f761ee11 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/FileImpl.java @@ -21,7 +21,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry; -import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.Container; @@ -36,9 +35,9 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; public class FileImpl extends EObjectImpl implements File { /** - * The default value of the '{@link #getURI() <em>URI</em>}' attribute. <!-- begin-user-doc + * The default value of the '{@link #getURI() <em>URI</em>}' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getURI() * @generated * @ordered @@ -55,7 +54,6 @@ public class FileImpl extends EObjectImpl implements File { /** * The default value of the '{@link #getLastModified() <em>Last Modified</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see #getLastModified() * @generated * @ordered @@ -67,18 +65,18 @@ public class FileImpl extends EObjectImpl implements File { */ protected long lastModified = LAST_MODIFIED_EDEFAULT; /** - * This is true if the Last Modified attribute has been set. <!-- begin-user-doc --> <!-- + * This is true if the Last Modified attribute has been set. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ protected boolean lastModifiedESet = false; /** - * The default value of the '{@link #getSize() <em>Size</em>}' attribute. <!-- begin-user-doc + * The default value of the '{@link #getSize() <em>Size</em>}' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getSize() * @generated * @ordered @@ -101,7 +99,6 @@ public class FileImpl extends EObjectImpl implements File { /** * The default value of the '{@link #isDirectoryEntry() <em>Directory Entry</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see #isDirectoryEntry() * @generated * @ordered @@ -111,7 +108,6 @@ public class FileImpl extends EObjectImpl implements File { /** * The cached value of the '{@link #isDirectoryEntry() <em>Directory Entry</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see #isDirectoryEntry() * @generated * @ordered @@ -119,9 +115,9 @@ public class FileImpl extends EObjectImpl implements File { protected boolean directoryEntry = DIRECTORY_ENTRY_EDEFAULT; /** - * This is true if the Directory Entry attribute has been set. <!-- begin-user-doc --> <!-- + * This is true if the Directory Entry attribute has been set. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated * @ordered */ @@ -152,7 +148,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -270,7 +265,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setLastModified(long newLastModified) { @@ -284,7 +278,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void unsetLastModified() { @@ -298,7 +291,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isSetLastModified() { @@ -314,7 +306,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setSize(long newSize) { @@ -328,7 +319,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void unsetSize() { @@ -342,7 +332,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isSetSize() { @@ -351,7 +340,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isDirectoryEntry() { @@ -360,7 +348,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void setDirectoryEntry(boolean newDirectoryEntry) { @@ -374,7 +361,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void unsetDirectoryEntry() { @@ -388,7 +374,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean isSetDirectoryEntry() { @@ -418,7 +403,7 @@ public class FileImpl extends EObjectImpl implements File { public Container getLoadingContainer() { if (loadingContainer != null && loadingContainer.eIsProxy()) { Container oldLoadingContainer = loadingContainer; - loadingContainer = (Container) EcoreUtil.resolve(loadingContainer, this); + loadingContainer = (Container)eResolveProxy((InternalEObject)loadingContainer); if (loadingContainer != oldLoadingContainer) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.FILE__LOADING_CONTAINER, oldLoadingContainer, loadingContainer)); @@ -429,7 +414,6 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Container basicGetLoadingContainer() { @@ -450,9 +434,8 @@ public class FileImpl extends EObjectImpl implements File { * @generated This field/method will be replaced during code generation */ public Container getContainer() { - if (eContainerFeatureID != CommonarchivePackage.FILE__CONTAINER) - return null; - return (Container) eContainer; + if (eContainerFeatureID != CommonarchivePackage.FILE__CONTAINER) return null; + return (Container)eContainer; } /** @@ -461,32 +444,31 @@ public class FileImpl extends EObjectImpl implements File { public void setContainer(Container newContainer) { if (newContainer != eContainer || (eContainerFeatureID != CommonarchivePackage.FILE__CONTAINER && newContainer != null)) { if (EcoreUtil.isAncestor(this, newContainer)) - throw new IllegalArgumentException(CommonArchiveResourceHandler.getString("FileImpl._Error_0") + toString()); //$NON-NLS-1$ + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); if (newContainer != null) - msgs = ((InternalEObject) newContainer).eInverseAdd(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - msgs = eBasicSetContainer((InternalEObject) newContainer, CommonarchivePackage.FILE__CONTAINER, msgs); - if (msgs != null) - msgs.dispatch(); - } else if (eNotificationRequired()) + msgs = ((InternalEObject)newContainer).eInverseAdd(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); + msgs = eBasicSetContainer((InternalEObject)newContainer, CommonarchivePackage.FILE__CONTAINER, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.FILE__CONTAINER, newContainer, newContainer)); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.FILE__CONTAINER : + case CommonarchivePackage.FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.FILE__CONTAINER, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -497,15 +479,14 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.FILE__CONTAINER : + case CommonarchivePackage.FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.FILE__CONTAINER, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -514,15 +495,14 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.FILE__CONTAINER : + case CommonarchivePackage.FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -531,26 +511,24 @@ public class FileImpl extends EObjectImpl implements File { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.FILE__URI : + case CommonarchivePackage.FILE__URI: return getURI(); - case CommonarchivePackage.FILE__LAST_MODIFIED : + case CommonarchivePackage.FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.FILE__SIZE : + case CommonarchivePackage.FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.FILE__ORIGINAL_URI : + case CommonarchivePackage.FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.FILE__CONTAINER : + case CommonarchivePackage.FILE__CONTAINER: return getContainer(); } return eDynamicGet(eFeature, resolve); @@ -561,19 +539,19 @@ public class FileImpl extends EObjectImpl implements File { */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.FILE__URI : + case CommonarchivePackage.FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.FILE__LAST_MODIFIED : + case CommonarchivePackage.FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.FILE__SIZE : + case CommonarchivePackage.FILE__SIZE: return isSetSize(); - case CommonarchivePackage.FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.FILE__ORIGINAL_URI : + case CommonarchivePackage.FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.FILE__LOADING_CONTAINER : + case CommonarchivePackage.FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.FILE__CONTAINER : + case CommonarchivePackage.FILE__CONTAINER: return getContainer() != null; } return eDynamicIsSet(eFeature); @@ -584,26 +562,26 @@ public class FileImpl extends EObjectImpl implements File { */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.FILE__CONTAINER: + setContainer((Container)newValue); return; } eDynamicSet(eFeature, newValue); @@ -614,26 +592,26 @@ public class FileImpl extends EObjectImpl implements File { */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.FILE__URI : + case CommonarchivePackage.FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.FILE__LAST_MODIFIED : + case CommonarchivePackage.FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.FILE__SIZE : + case CommonarchivePackage.FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.FILE__ORIGINAL_URI : + case CommonarchivePackage.FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.FILE__CONTAINER: + setContainer((Container)null); return; } eDynamicUnset(eFeature); @@ -643,28 +621,18 @@ public class FileImpl extends EObjectImpl implements File { * @generated This field/method will be replaced during code generation. */ public String toString() { - if (eIsProxy()) - return super.toString(); + if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (URI: "); //$NON-NLS-1$ + result.append(" (URI: "); result.append(uri); - result.append(", lastModified: "); //$NON-NLS-1$ - if (lastModifiedESet) - result.append(lastModified); - else - result.append("<unset>"); //$NON-NLS-1$ - result.append(", size: "); //$NON-NLS-1$ - if (sizeESet) - result.append(size); - else - result.append("<unset>"); //$NON-NLS-1$ - result.append(", directoryEntry: "); //$NON-NLS-1$ - if (directoryEntryESet) - result.append(directoryEntry); - else - result.append("<unset>"); //$NON-NLS-1$ - result.append(", originalURI: "); //$NON-NLS-1$ + result.append(", lastModified: "); + if (lastModifiedESet) result.append(lastModified); else result.append("<unset>"); + result.append(", size: "); + if (sizeESet) result.append(size); else result.append("<unset>"); + result.append(", directoryEntry: "); + if (directoryEntryESet) result.append(directoryEntry); else result.append("<unset>"); + result.append(", originalURI: "); result.append(originalURI); result.append(')'); return result.toString(); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java index b5909a331..75ec846d8 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ModuleFileImpl.java @@ -52,7 +52,6 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -61,19 +60,18 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.MODULE_FILE__CONTAINER : + case CommonarchivePackage.MODULE_FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.MODULE_FILE__CONTAINER, msgs); - case CommonarchivePackage.MODULE_FILE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.MODULE_FILE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -84,17 +82,16 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.MODULE_FILE__CONTAINER : + case CommonarchivePackage.MODULE_FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.MODULE_FILE__CONTAINER, msgs); - case CommonarchivePackage.MODULE_FILE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.MODULE_FILE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -103,15 +100,14 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.MODULE_FILE__CONTAINER : + case CommonarchivePackage.MODULE_FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -120,30 +116,28 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_FILE__URI : + case CommonarchivePackage.MODULE_FILE__URI: return getURI(); - case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED : + case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.MODULE_FILE__SIZE : + case CommonarchivePackage.MODULE_FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI : + case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.MODULE_FILE__CONTAINER : + case CommonarchivePackage.MODULE_FILE__CONTAINER: return getContainer(); - case CommonarchivePackage.MODULE_FILE__FILES : + case CommonarchivePackage.MODULE_FILE__FILES: return getFiles(); - case CommonarchivePackage.MODULE_FILE__TYPES : + case CommonarchivePackage.MODULE_FILE__TYPES: return getTypes(); } return eDynamicGet(eFeature, resolve); @@ -151,39 +145,38 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.MODULE_FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.MODULE_FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.MODULE_FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.MODULE_FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.MODULE_FILE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.MODULE_FILE__FILES : + case CommonarchivePackage.MODULE_FILE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.MODULE_FILE__TYPES : + case CommonarchivePackage.MODULE_FILE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -191,36 +184,35 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_FILE__URI : + case CommonarchivePackage.MODULE_FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED : + case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.MODULE_FILE__SIZE : + case CommonarchivePackage.MODULE_FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI : + case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.MODULE_FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.MODULE_FILE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.MODULE_FILE__FILES : + case CommonarchivePackage.MODULE_FILE__FILES: getFiles().clear(); return; - case CommonarchivePackage.MODULE_FILE__TYPES : + case CommonarchivePackage.MODULE_FILE__TYPES: getTypes().clear(); return; } @@ -229,28 +221,27 @@ public abstract class ModuleFileImpl extends ArchiveImpl implements ModuleFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_FILE__URI : + case CommonarchivePackage.MODULE_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED : + case CommonarchivePackage.MODULE_FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.MODULE_FILE__SIZE : + case CommonarchivePackage.MODULE_FILE__SIZE: return isSetSize(); - case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.MODULE_FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI : + case CommonarchivePackage.MODULE_FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER : + case CommonarchivePackage.MODULE_FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.MODULE_FILE__CONTAINER : + case CommonarchivePackage.MODULE_FILE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.MODULE_FILE__FILES : + case CommonarchivePackage.MODULE_FILE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.MODULE_FILE__TYPES : + case CommonarchivePackage.MODULE_FILE__TYPES: return types != null && !types.isEmpty(); } return eDynamicIsSet(eFeature); 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 4d12cbb9b..934e2bc9a 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; @@ -54,7 +55,6 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { * begin-user-doc --> <!-- end-user-doc --> * * @see #getModule() - * @generated * @ordered */ protected Module module = null; @@ -68,7 +68,6 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -92,7 +91,7 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { public ModuleFile getModuleFileGen() { if (moduleFile != null && moduleFile.eIsProxy()) { ModuleFile oldModuleFile = moduleFile; - moduleFile = (ModuleFile) EcoreUtil.resolve(moduleFile, this); + moduleFile = (ModuleFile)eResolveProxy((InternalEObject)moduleFile); if (moduleFile != oldModuleFile) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.MODULE_REF__MODULE_FILE, oldModuleFile, moduleFile)); @@ -109,7 +108,6 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ModuleFile basicGetModuleFile() { @@ -151,11 +149,11 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_REF__MODULE_FILE : + case CommonarchivePackage.MODULE_REF__MODULE_FILE: return moduleFile != null; - case CommonarchivePackage.MODULE_REF__EAR_FILE : + case CommonarchivePackage.MODULE_REF__EAR_FILE: return getEarFile() != null; - case CommonarchivePackage.MODULE_REF__MODULE : + case CommonarchivePackage.MODULE_REF__MODULE: return module != null; } return eDynamicIsSet(eFeature); @@ -166,14 +164,14 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) newValue); + case CommonarchivePackage.MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)newValue); return; - case CommonarchivePackage.MODULE_REF__EAR_FILE : - setEarFile((EARFile) newValue); + case CommonarchivePackage.MODULE_REF__EAR_FILE: + setEarFile((EARFile)newValue); return; - case CommonarchivePackage.MODULE_REF__MODULE : - setModule((Module) newValue); + case CommonarchivePackage.MODULE_REF__MODULE: + setModule((Module)newValue); return; } eDynamicSet(eFeature, newValue); @@ -184,14 +182,14 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) null); + case CommonarchivePackage.MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)null); return; - case CommonarchivePackage.MODULE_REF__EAR_FILE : - setEarFile((EARFile) null); + case CommonarchivePackage.MODULE_REF__EAR_FILE: + setEarFile((EARFile)null); return; - case CommonarchivePackage.MODULE_REF__MODULE : - setModule((Module) null); + case CommonarchivePackage.MODULE_REF__MODULE: + setModule((Module)null); return; } eDynamicUnset(eFeature); @@ -273,9 +271,8 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { * @generated This field/method will be replaced during code generation */ public EARFile getEarFile() { - if (eContainerFeatureID != CommonarchivePackage.MODULE_REF__EAR_FILE) - return null; - return (EARFile) eContainer; + if (eContainerFeatureID != CommonarchivePackage.MODULE_REF__EAR_FILE) return null; + return (EARFile)eContainer; } /** @@ -284,24 +281,19 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { public void setEarFile(EARFile newEarFile) { if (newEarFile != eContainer || (eContainerFeatureID != CommonarchivePackage.MODULE_REF__EAR_FILE && newEarFile != null)) { if (EcoreUtil.isAncestor(this, newEarFile)) - throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); if (newEarFile != null) - msgs = ((InternalEObject) newEarFile).eInverseAdd(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); - msgs = eBasicSetContainer((InternalEObject) newEarFile, CommonarchivePackage.MODULE_REF__EAR_FILE, msgs); - if (msgs != null) - msgs.dispatch(); - } else if (eNotificationRequired()) + msgs = ((InternalEObject)newEarFile).eInverseAdd(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); + msgs = eBasicSetContainer((InternalEObject)newEarFile, CommonarchivePackage.MODULE_REF__EAR_FILE, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, CommonarchivePackage.MODULE_REF__EAR_FILE, newEarFile, newEarFile)); } - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ public Module getModule() { if (module != null && module.eIsProxy()) { Module oldModule = module; @@ -315,8 +307,8 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ public Module basicGetModule() { @@ -324,8 +316,8 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { } /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * + * <!-- begin-user-doc --> + * <!-- end-user-doc --> * @generated */ public void setModule(Module newModule) { @@ -337,17 +329,16 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.MODULE_REF__EAR_FILE : + case CommonarchivePackage.MODULE_REF__EAR_FILE: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -358,15 +349,14 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.MODULE_REF__EAR_FILE : + case CommonarchivePackage.MODULE_REF__EAR_FILE: return eBasicSetContainer(null, CommonarchivePackage.MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -375,15 +365,14 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.MODULE_REF__EAR_FILE : + case CommonarchivePackage.MODULE_REF__EAR_FILE: return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -392,20 +381,17 @@ public class ModuleRefImpl extends EObjectImpl implements ModuleRef, EObject { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.MODULE_REF__MODULE_FILE : - if (resolve) - return getModuleFile(); + case CommonarchivePackage.MODULE_REF__MODULE_FILE: + if (resolve) return getModuleFile(); return basicGetModuleFile(); - case CommonarchivePackage.MODULE_REF__EAR_FILE : + case CommonarchivePackage.MODULE_REF__EAR_FILE: return getEarFile(); - case CommonarchivePackage.MODULE_REF__MODULE : - if (resolve) - return getModule(); + case CommonarchivePackage.MODULE_REF__MODULE: + if (resolve) return getModule(); return basicGetModule(); } return eDynamicGet(eFeature, resolve); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java index 947cdd471..5dd23e1d6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/RARFileImpl.java @@ -36,9 +36,9 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.RarFileDynamicClassLoader; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.common.XMLResource; -import org.eclipse.jst.j2ee.internal.jca.JcaPackage; import org.eclipse.jst.j2ee.jca.Connector; import org.eclipse.jst.j2ee.jca.JcaFactory; +import org.eclipse.jst.j2ee.jca.JcaPackage; /** @@ -47,9 +47,8 @@ import org.eclipse.jst.j2ee.jca.JcaFactory; public class RARFileImpl extends ModuleFileImpl implements RARFile { /** - * The cached value of the '{@link #getDeploymentDescriptor() <em>Deployment Descriptor</em>}' - * reference. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached value of the '{@link #getDeploymentDescriptor() <em>Deployment Descriptor</em>}' reference. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @see #getDeploymentDescriptor() * @generated * @ordered @@ -62,7 +61,6 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -137,7 +135,6 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Connector basicGetDeploymentDescriptor() { @@ -194,19 +191,18 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.RAR_FILE__CONTAINER : + case CommonarchivePackage.RAR_FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.RAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.RAR_FILE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.RAR_FILE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -217,17 +213,16 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.RAR_FILE__CONTAINER : + case CommonarchivePackage.RAR_FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.RAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.RAR_FILE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.RAR_FILE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -236,15 +231,14 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.RAR_FILE__CONTAINER : + case CommonarchivePackage.RAR_FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -253,34 +247,31 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.RAR_FILE__URI : + case CommonarchivePackage.RAR_FILE__URI: return getURI(); - case CommonarchivePackage.RAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.RAR_FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.RAR_FILE__SIZE : + case CommonarchivePackage.RAR_FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.RAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.RAR_FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.RAR_FILE__CONTAINER : + case CommonarchivePackage.RAR_FILE__CONTAINER: return getContainer(); - case CommonarchivePackage.RAR_FILE__FILES : + case CommonarchivePackage.RAR_FILE__FILES: return getFiles(); - case CommonarchivePackage.RAR_FILE__TYPES : + case CommonarchivePackage.RAR_FILE__TYPES: return getTypes(); - case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR : - if (resolve) - return getDeploymentDescriptor(); + case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR: + if (resolve) return getDeploymentDescriptor(); return basicGetDeploymentDescriptor(); } return eDynamicGet(eFeature, resolve); @@ -291,25 +282,25 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.RAR_FILE__URI : + case CommonarchivePackage.RAR_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.RAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.RAR_FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.RAR_FILE__SIZE : + case CommonarchivePackage.RAR_FILE__SIZE: return isSetSize(); - case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.RAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.RAR_FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER : + case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.RAR_FILE__CONTAINER : + case CommonarchivePackage.RAR_FILE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.RAR_FILE__FILES : + case CommonarchivePackage.RAR_FILE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.RAR_FILE__TYPES : + case CommonarchivePackage.RAR_FILE__TYPES: return types != null && !types.isEmpty(); - case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR : + case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR: return deploymentDescriptor != null; } return eDynamicIsSet(eFeature); @@ -320,37 +311,37 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.RAR_FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.RAR_FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.RAR_FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.RAR_FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.RAR_FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.RAR_FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.RAR_FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.RAR_FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.RAR_FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.RAR_FILE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.RAR_FILE__FILES : + case CommonarchivePackage.RAR_FILE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.RAR_FILE__TYPES : + case CommonarchivePackage.RAR_FILE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; - case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((Connector) newValue); + case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((Connector)newValue); return; } eDynamicSet(eFeature, newValue); @@ -361,35 +352,35 @@ public class RARFileImpl extends ModuleFileImpl implements RARFile { */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.RAR_FILE__URI : + case CommonarchivePackage.RAR_FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.RAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.RAR_FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.RAR_FILE__SIZE : + case CommonarchivePackage.RAR_FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.RAR_FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.RAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.RAR_FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.RAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.RAR_FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.RAR_FILE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.RAR_FILE__FILES : + case CommonarchivePackage.RAR_FILE__FILES: getFiles().clear(); return; - case CommonarchivePackage.RAR_FILE__TYPES : + case CommonarchivePackage.RAR_FILE__TYPES: getTypes().clear(); return; - case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((Connector) null); + case CommonarchivePackage.RAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((Connector)null); return; } eDynamicUnset(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java index c87e1e8fd..86e36234c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/ReadOnlyDirectoryImpl.java @@ -37,7 +37,6 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -46,19 +45,18 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER, msgs); - case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -69,17 +67,16 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER, msgs); - case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -88,15 +85,14 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -105,28 +101,26 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__URI : + case CommonarchivePackage.READ_ONLY_DIRECTORY__URI: return getURI(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED : + case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE : + case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE: return new Long(getSize()); - case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY : + case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI : + case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: return getContainer(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES : + case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES: return getFiles(); } return eDynamicGet(eFeature, resolve); @@ -134,35 +128,34 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__URI : - setURI((String) newValue); + case CommonarchivePackage.READ_ONLY_DIRECTORY__URI: + setURI((String)newValue); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES : + case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -170,33 +163,32 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__URI : + case CommonarchivePackage.READ_ONLY_DIRECTORY__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED : + case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE : + case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE: unsetSize(); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY : + case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI : + case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES : + case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES: getFiles().clear(); return; } @@ -205,26 +197,25 @@ public class ReadOnlyDirectoryImpl extends ContainerImpl implements ReadOnlyDire /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.READ_ONLY_DIRECTORY__URI : + case CommonarchivePackage.READ_ONLY_DIRECTORY__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED : + case CommonarchivePackage.READ_ONLY_DIRECTORY__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE : + case CommonarchivePackage.READ_ONLY_DIRECTORY__SIZE: return isSetSize(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY : + case CommonarchivePackage.READ_ONLY_DIRECTORY__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI : + case CommonarchivePackage.READ_ONLY_DIRECTORY__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER : + case CommonarchivePackage.READ_ONLY_DIRECTORY__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER : + case CommonarchivePackage.READ_ONLY_DIRECTORY__CONTAINER: return getContainer() != null; - case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES : + case CommonarchivePackage.READ_ONLY_DIRECTORY__FILES: return files != null && !files.isEmpty(); } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java index 5bf215e29..83080cb55 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WARFileImpl.java @@ -28,7 +28,6 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; @@ -39,14 +38,14 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescr import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.WarFileDynamicClassLoader; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.jst.j2ee.internal.common.XMLResource; -import org.eclipse.jst.j2ee.internal.webapplication.WebapplicationPackage; import org.eclipse.jst.j2ee.webapplication.WebApp; +import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; /** @@ -69,7 +68,6 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -350,25 +348,25 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WAR_FILE__URI : + case CommonarchivePackage.WAR_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case CommonarchivePackage.WAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.WAR_FILE__LAST_MODIFIED: return isSetLastModified(); - case CommonarchivePackage.WAR_FILE__SIZE : + case CommonarchivePackage.WAR_FILE__SIZE: return isSetSize(); - case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY: return isSetDirectoryEntry(); - case CommonarchivePackage.WAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.WAR_FILE__ORIGINAL_URI: return ORIGINAL_URI_EDEFAULT == null ? originalURI != null : !ORIGINAL_URI_EDEFAULT.equals(originalURI); - case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER : + case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER: return loadingContainer != null; - case CommonarchivePackage.WAR_FILE__CONTAINER : + case CommonarchivePackage.WAR_FILE__CONTAINER: return getContainer() != null; - case CommonarchivePackage.WAR_FILE__FILES : + case CommonarchivePackage.WAR_FILE__FILES: return files != null && !files.isEmpty(); - case CommonarchivePackage.WAR_FILE__TYPES : + case CommonarchivePackage.WAR_FILE__TYPES: return types != null && !types.isEmpty(); - case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR : + case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR: return deploymentDescriptor != null; } return eDynamicIsSet(eFeature); @@ -379,37 +377,37 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WAR_FILE__URI : - setURI((String) newValue); + case CommonarchivePackage.WAR_FILE__URI: + setURI((String)newValue); return; - case CommonarchivePackage.WAR_FILE__LAST_MODIFIED : - setLastModified(((Long) newValue).longValue()); + case CommonarchivePackage.WAR_FILE__LAST_MODIFIED: + setLastModified(((Long)newValue).longValue()); return; - case CommonarchivePackage.WAR_FILE__SIZE : - setSize(((Long) newValue).longValue()); + case CommonarchivePackage.WAR_FILE__SIZE: + setSize(((Long)newValue).longValue()); return; - case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY : - setDirectoryEntry(((Boolean) newValue).booleanValue()); + case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY: + setDirectoryEntry(((Boolean)newValue).booleanValue()); return; - case CommonarchivePackage.WAR_FILE__ORIGINAL_URI : - setOriginalURI((String) newValue); + case CommonarchivePackage.WAR_FILE__ORIGINAL_URI: + setOriginalURI((String)newValue); return; - case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) newValue); + case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)newValue); return; - case CommonarchivePackage.WAR_FILE__CONTAINER : - setContainer((Container) newValue); + case CommonarchivePackage.WAR_FILE__CONTAINER: + setContainer((Container)newValue); return; - case CommonarchivePackage.WAR_FILE__FILES : + case CommonarchivePackage.WAR_FILE__FILES: getFiles().clear(); - getFiles().addAll((Collection) newValue); + getFiles().addAll((Collection)newValue); return; - case CommonarchivePackage.WAR_FILE__TYPES : + case CommonarchivePackage.WAR_FILE__TYPES: getTypes().clear(); - getTypes().addAll((Collection) newValue); + getTypes().addAll((Collection)newValue); return; - case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((WebApp) newValue); + case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((WebApp)newValue); return; } eDynamicSet(eFeature, newValue); @@ -420,35 +418,35 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WAR_FILE__URI : + case CommonarchivePackage.WAR_FILE__URI: setURI(URI_EDEFAULT); return; - case CommonarchivePackage.WAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.WAR_FILE__LAST_MODIFIED: unsetLastModified(); return; - case CommonarchivePackage.WAR_FILE__SIZE : + case CommonarchivePackage.WAR_FILE__SIZE: unsetSize(); return; - case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY: unsetDirectoryEntry(); return; - case CommonarchivePackage.WAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.WAR_FILE__ORIGINAL_URI: setOriginalURI(ORIGINAL_URI_EDEFAULT); return; - case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER : - setLoadingContainer((Container) null); + case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER: + setLoadingContainer((Container)null); return; - case CommonarchivePackage.WAR_FILE__CONTAINER : - setContainer((Container) null); + case CommonarchivePackage.WAR_FILE__CONTAINER: + setContainer((Container)null); return; - case CommonarchivePackage.WAR_FILE__FILES : + case CommonarchivePackage.WAR_FILE__FILES: getFiles().clear(); return; - case CommonarchivePackage.WAR_FILE__TYPES : + case CommonarchivePackage.WAR_FILE__TYPES: getTypes().clear(); return; - case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR : - setDeploymentDescriptor((WebApp) null); + case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR: + setDeploymentDescriptor((WebApp)null); return; } eDynamicUnset(eFeature); @@ -460,7 +458,7 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { public WebApp getDeploymentDescriptorGen() { if (deploymentDescriptor != null && deploymentDescriptor.eIsProxy()) { WebApp oldDeploymentDescriptor = deploymentDescriptor; - deploymentDescriptor = (WebApp) EcoreUtil.resolve(deploymentDescriptor, this); + deploymentDescriptor = (WebApp)eResolveProxy((InternalEObject)deploymentDescriptor); if (deploymentDescriptor != oldDeploymentDescriptor) { if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.RESOLVE, CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR, oldDeploymentDescriptor, deploymentDescriptor)); @@ -471,7 +469,6 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public WebApp basicGetDeploymentDescriptor() { @@ -490,19 +487,18 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.WAR_FILE__CONTAINER : + case CommonarchivePackage.WAR_FILE__CONTAINER: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.WAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.WAR_FILE__FILES : - return ((InternalEList) getFiles()).basicAdd(otherEnd, msgs); - default : + case CommonarchivePackage.WAR_FILE__FILES: + return ((InternalEList)getFiles()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -513,17 +509,16 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.WAR_FILE__CONTAINER : + case CommonarchivePackage.WAR_FILE__CONTAINER: return eBasicSetContainer(null, CommonarchivePackage.WAR_FILE__CONTAINER, msgs); - case CommonarchivePackage.WAR_FILE__FILES : - return ((InternalEList) getFiles()).basicRemove(otherEnd, msgs); - default : + case CommonarchivePackage.WAR_FILE__FILES: + return ((InternalEList)getFiles()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -532,15 +527,14 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.WAR_FILE__CONTAINER : + case CommonarchivePackage.WAR_FILE__CONTAINER: return eContainer.eInverseRemove(this, CommonarchivePackage.CONTAINER__FILES, Container.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -549,34 +543,31 @@ public class WARFileImpl extends ModuleFileImpl implements WARFile { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WAR_FILE__URI : + case CommonarchivePackage.WAR_FILE__URI: return getURI(); - case CommonarchivePackage.WAR_FILE__LAST_MODIFIED : + case CommonarchivePackage.WAR_FILE__LAST_MODIFIED: return new Long(getLastModified()); - case CommonarchivePackage.WAR_FILE__SIZE : + case CommonarchivePackage.WAR_FILE__SIZE: return new Long(getSize()); - case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY : + case CommonarchivePackage.WAR_FILE__DIRECTORY_ENTRY: return isDirectoryEntry() ? Boolean.TRUE : Boolean.FALSE; - case CommonarchivePackage.WAR_FILE__ORIGINAL_URI : + case CommonarchivePackage.WAR_FILE__ORIGINAL_URI: return getOriginalURI(); - case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER : - if (resolve) - return getLoadingContainer(); + case CommonarchivePackage.WAR_FILE__LOADING_CONTAINER: + if (resolve) return getLoadingContainer(); return basicGetLoadingContainer(); - case CommonarchivePackage.WAR_FILE__CONTAINER : + case CommonarchivePackage.WAR_FILE__CONTAINER: return getContainer(); - case CommonarchivePackage.WAR_FILE__FILES : + case CommonarchivePackage.WAR_FILE__FILES: return getFiles(); - case CommonarchivePackage.WAR_FILE__TYPES : + case CommonarchivePackage.WAR_FILE__TYPES: return getTypes(); - case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR : - if (resolve) - return getDeploymentDescriptor(); + case CommonarchivePackage.WAR_FILE__DEPLOYMENT_DESCRIPTOR: + if (resolve) return getDeploymentDescriptor(); return basicGetDeploymentDescriptor(); } return eDynamicGet(eFeature, resolve); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java index 17c5e4ee8..649246c4d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/impl/WebModuleRefImpl.java @@ -37,7 +37,6 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -46,17 +45,16 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, CommonarchivePackage.WEB_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -67,15 +65,14 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: return eBasicSetContainer(null, CommonarchivePackage.WEB_MODULE_REF__EAR_FILE, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -84,15 +81,14 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: return eContainer.eInverseRemove(this, CommonarchivePackage.EAR_FILE__MODULE_REFS, EARFile.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -101,20 +97,17 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE : - if (resolve) - return getModuleFile(); + case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE: + if (resolve) return getModuleFile(); return basicGetModuleFile(); - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: return getEarFile(); - case CommonarchivePackage.WEB_MODULE_REF__MODULE : - if (resolve) - return getModule(); + case CommonarchivePackage.WEB_MODULE_REF__MODULE: + if (resolve) return getModule(); return basicGetModule(); } return eDynamicGet(eFeature, resolve); @@ -122,19 +115,18 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) newValue); + case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)newValue); return; - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : - setEarFile((EARFile) newValue); + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: + setEarFile((EARFile)newValue); return; - case CommonarchivePackage.WEB_MODULE_REF__MODULE : - setModule((Module) newValue); + case CommonarchivePackage.WEB_MODULE_REF__MODULE: + setModule((Module)newValue); return; } eDynamicSet(eFeature, newValue); @@ -142,19 +134,18 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE : - setModuleFile((ModuleFile) null); + case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE: + setModuleFile((ModuleFile)null); return; - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : - setEarFile((EARFile) null); + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: + setEarFile((EARFile)null); return; - case CommonarchivePackage.WEB_MODULE_REF__MODULE : - setModule((Module) null); + case CommonarchivePackage.WEB_MODULE_REF__MODULE: + setModule((Module)null); return; } eDynamicUnset(eFeature); @@ -162,16 +153,15 @@ public class WebModuleRefImpl extends ModuleRefImpl implements WebModuleRef, Mod /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE : + case CommonarchivePackage.WEB_MODULE_REF__MODULE_FILE: return moduleFile != null; - case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE : + case CommonarchivePackage.WEB_MODULE_REF__EAR_FILE: return getEarFile() != null; - case CommonarchivePackage.WEB_MODULE_REF__MODULE : + case CommonarchivePackage.WEB_MODULE_REF__MODULE: return module != null; } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java deleted file mode 100644 index 6de7641df..000000000 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigPackageImpl.java +++ /dev/null @@ -1,349 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; - - -import org.eclipse.emf.ecore.EAttribute; -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EPackage; -import org.eclipse.emf.ecore.EReference; -import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.emf.ecore.impl.EcorePackageImpl; -import org.eclipse.jem.java.impl.JavaRefPackageImpl; -import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; -import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigFactory; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; -import org.eclipse.jst.j2ee.internal.application.impl.ApplicationPackageImpl; -import org.eclipse.jst.j2ee.internal.client.impl.ClientPackageImpl; -import org.eclipse.jst.j2ee.internal.common.impl.CommonPackageImpl; -import org.eclipse.jst.j2ee.internal.ejb.impl.EjbPackageImpl; -import org.eclipse.jst.j2ee.internal.jca.impl.JcaPackageImpl; -import org.eclipse.jst.j2ee.internal.jsp.impl.JspPackageImpl; -import org.eclipse.jst.j2ee.internal.webapplication.impl.WebapplicationPackageImpl; -import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientPackageImpl; - - -/** - * @lastgen class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage, - * EPackage {} - */ -public class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage { - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass looseApplicationEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass looseArchiveEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass looseLibraryEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass looseModuleEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass looseConfigurationEClass = null; - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private EClass looseWARFileEClass = null; - - /** - * @generated This field/method will be replaced during code generation. - */ - private LooseconfigPackageImpl() { - super(eNS_URI, LooseconfigFactory.eINSTANCE); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private static boolean isInited = false; - - /** - * @generated This field/method will be replaced during code generation. - */ - public static LooseconfigPackage init() { - if (isInited) - return (LooseconfigPackage) EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI); - - // Obtain or create and register package. - LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LooseconfigPackageImpl()); - - isInited = true; - - // Initialize simple dependencies - JcaPackageImpl.init(); - Webservice_clientPackageImpl.init(); - EcorePackageImpl.init(); - JavaRefPackageImpl.init(); - CommonPackageImpl.init(); - ClientPackageImpl.init(); - WebapplicationPackageImpl.init(); - EjbPackageImpl.init(); - JspPackageImpl.init(); - ApplicationPackageImpl.init(); - - // Obtain or create and register interdependencies - CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl) (EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) instanceof EPackage ? EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) : CommonarchivePackage.eINSTANCE); - - // Step 1: create meta-model objects - theLooseconfigPackage.createPackageContents(); - theCommonarchivePackage.createPackageContents(); - - // Step 2: complete initialization - theLooseconfigPackage.initializePackageContents(); - theCommonarchivePackage.initializePackageContents(); - - return theLooseconfigPackage; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EClass getLooseApplication() { - return looseApplicationEClass; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EReference getLooseApplication_LooseArchives() { - return (EReference) looseApplicationEClass.getEReferences().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EClass getLooseArchive() { - return looseArchiveEClass; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EAttribute getLooseArchive_Uri() { - return (EAttribute) looseArchiveEClass.getEAttributes().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EAttribute getLooseArchive_BinariesPath() { - return (EAttribute) looseArchiveEClass.getEAttributes().get(1); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EAttribute getLooseArchive_ResourcesPath() { - return (EAttribute) looseArchiveEClass.getEAttributes().get(2); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EReference getLooseArchive_LooseApp() { - return (EReference) looseArchiveEClass.getEReferences().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EClass getLooseLibrary() { - return looseLibraryEClass; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EReference getLooseLibrary_LooseWAR() { - return (EReference) looseLibraryEClass.getEReferences().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EClass getLooseWARFile() { - return looseWARFileEClass; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EReference getLooseWARFile_LooseLibs() { - return (EReference) looseWARFileEClass.getEReferences().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EClass getLooseModule() { - return looseModuleEClass; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EAttribute getLooseModule_AltDD() { - return (EAttribute) looseModuleEClass.getEAttributes().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EClass getLooseConfiguration() { - return looseConfigurationEClass; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public EReference getLooseConfiguration_Applications() { - return (EReference) looseConfigurationEClass.getEReferences().get(0); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public LooseconfigFactory getLooseconfigFactory() { - return (LooseconfigFactory) getEFactoryInstance(); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private boolean isCreated = false; - - /** - * Creates the meta-model objects for the package. This method is guarded to have no affect on - * any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void createPackageContents() { - if (isCreated) - return; - isCreated = true; - - // Create classes and their features - looseApplicationEClass = createEClass(LOOSE_APPLICATION); - createEReference(looseApplicationEClass, LOOSE_APPLICATION__LOOSE_ARCHIVES); - - looseArchiveEClass = createEClass(LOOSE_ARCHIVE); - createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__URI); - createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__BINARIES_PATH); - createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__RESOURCES_PATH); - createEReference(looseArchiveEClass, LOOSE_ARCHIVE__LOOSE_APP); - - looseLibraryEClass = createEClass(LOOSE_LIBRARY); - createEReference(looseLibraryEClass, LOOSE_LIBRARY__LOOSE_WAR); - - looseModuleEClass = createEClass(LOOSE_MODULE); - createEAttribute(looseModuleEClass, LOOSE_MODULE__ALT_DD); - - looseConfigurationEClass = createEClass(LOOSE_CONFIGURATION); - createEReference(looseConfigurationEClass, LOOSE_CONFIGURATION__APPLICATIONS); - - looseWARFileEClass = createEClass(LOOSE_WAR_FILE); - createEReference(looseWARFileEClass, LOOSE_WAR_FILE__LOOSE_LIBS); - } - - /** - * <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - private boolean isInitialized = false; - - /** - * Complete the initialization of the package and its meta-model. This method is guarded to have - * no affect on any invocation but its first. <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - public void initializePackageContents() { - if (isInitialized) - return; - isInitialized = true; - - // Initialize package - setName(eNAME); - setNsPrefix(eNS_PREFIX); - setNsURI(eNS_URI); - - // Add supertypes to classes - looseApplicationEClass.getESuperTypes().add(this.getLooseArchive()); - looseLibraryEClass.getESuperTypes().add(this.getLooseArchive()); - looseModuleEClass.getESuperTypes().add(this.getLooseArchive()); - looseWARFileEClass.getESuperTypes().add(this.getLooseModule()); - - // Initialize classes and features; add operations and parameters - initEClass(looseApplicationEClass, LooseApplication.class, "LooseApplication", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getLooseApplication_LooseArchives(), this.getLooseArchive(), this.getLooseArchive_LooseApp(), "looseArchives", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - - initEClass(looseArchiveEClass, LooseArchive.class, "LooseArchive", IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEAttribute(getLooseArchive_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEAttribute(getLooseArchive_BinariesPath(), ecorePackage.getEString(), "binariesPath", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEAttribute(getLooseArchive_ResourcesPath(), ecorePackage.getEString(), "resourcesPath", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - initEReference(getLooseArchive_LooseApp(), this.getLooseApplication(), this.getLooseApplication_LooseArchives(), "looseApp", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - - addEOperation(looseArchiveEClass, ecorePackage.getEBoolean(), "isModule"); //$NON-NLS-1$ - - initEClass(looseLibraryEClass, LooseLibrary.class, "LooseLibrary", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getLooseLibrary_LooseWAR(), this.getLooseWARFile(), this.getLooseWARFile_LooseLibs(), "looseWAR", null, 0, 1, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - - initEClass(looseModuleEClass, LooseModule.class, "LooseModule", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEAttribute(getLooseModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, false); //$NON-NLS-1$ - - initEClass(looseConfigurationEClass, LooseConfiguration.class, "LooseConfiguration", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getLooseConfiguration_Applications(), this.getLooseApplication(), null, "applications", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - - initEClass(looseWARFileEClass, LooseWARFile.class, "LooseWARFile", !IS_ABSTRACT, !IS_INTERFACE); //$NON-NLS-1$ - initEReference(getLooseWARFile_LooseLibs(), this.getLooseLibrary(), this.getLooseLibrary_LooseWAR(), "looseLibs", null, 0, -1, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, false); //$NON-NLS-1$ - } -} //LooseconfigPackageImpl - - - diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigSwitch.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigSwitch.java deleted file mode 100644 index 5e1933ea5..000000000 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigSwitch.java +++ /dev/null @@ -1,156 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.util; - - -import org.eclipse.emf.ecore.EClass; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; - - -/** - * @lastgen class LooseconfigSwitch {} - */ -public class LooseconfigSwitch { - /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * - * @generated - */ - protected static LooseconfigPackage modelPackage; - - /** - * @generated This field/method will be replaced during code generation. - */ - public LooseconfigSwitch() { - if (modelPackage == null) { - modelPackage = LooseconfigPackage.eINSTANCE; - } - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object doSwitch(EObject theEObject) { - EClass theEClass = theEObject.eClass(); - if (theEClass.eContainer() == modelPackage) { - switch (theEClass.getClassifierID()) { - case LooseconfigPackage.LOOSE_APPLICATION : { - LooseApplication looseApplication = (LooseApplication) theEObject; - Object result = caseLooseApplication(looseApplication); - if (result == null) - result = caseLooseArchive(looseApplication); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case LooseconfigPackage.LOOSE_LIBRARY : { - LooseLibrary looseLibrary = (LooseLibrary) theEObject; - Object result = caseLooseLibrary(looseLibrary); - if (result == null) - result = caseLooseArchive(looseLibrary); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case LooseconfigPackage.LOOSE_MODULE : { - LooseModule looseModule = (LooseModule) theEObject; - Object result = caseLooseModule(looseModule); - if (result == null) - result = caseLooseArchive(looseModule); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case LooseconfigPackage.LOOSE_CONFIGURATION : { - LooseConfiguration looseConfiguration = (LooseConfiguration) theEObject; - Object result = caseLooseConfiguration(looseConfiguration); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case LooseconfigPackage.LOOSE_WAR_FILE : { - LooseWARFile looseWARFile = (LooseWARFile) theEObject; - Object result = caseLooseWARFile(looseWARFile); - if (result == null) - result = caseLooseModule(looseWARFile); - if (result == null) - result = caseLooseArchive(looseWARFile); - if (result == null) - result = defaultCase(theEObject); - return result; - } - default : - return defaultCase(theEObject); - } - } - return defaultCase(theEObject); - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object caseLooseApplication(LooseApplication object) { - return null; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object caseLooseArchive(LooseArchive object) { - return null; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object caseLooseLibrary(LooseLibrary object) { - return null; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object caseLooseWARFile(LooseWARFile object) { - return null; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object caseLooseModule(LooseModule object) { - return null; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object caseLooseConfiguration(LooseConfiguration object) { - return null; - } - - /** - * @generated This field/method will be replaced during code generation. - */ - public Object defaultCase(EObject object) { - return null; - } - -} //LooseconfigSwitch - - - diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java index 4ce76d89f..e50602d25 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryArchiveLoadStrategyImpl.java @@ -12,9 +12,9 @@ package org.eclipse.jst.j2ee.commonarchivecore.internal.strategy; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfigRegister; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java index 634c1d382..31b90758f 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/DirectoryLoadStrategyImpl.java @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java index 81a70371b..c45cf1afd 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/strategy/LoadStrategy.java @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet; import org.eclipse.jst.j2ee.commonarchivecore.internal.Container; import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; /** 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 0b42d603e..93a707317 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 @@ -35,6 +35,9 @@ 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.common.internal.impl.J2EEResouceFactorySaxRegistry; +import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryDomRegistry; +import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveFactoryRegistry; import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonArchiveResourceHandler; @@ -48,12 +51,9 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveURIConverterImpl; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIterator; import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.FileIteratorImpl; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfigRegister; import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil; -import org.eclipse.jst.j2ee.internal.common.impl.J2EEResouceFactorySaxRegistry; -import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryDomRegistry; -import org.eclipse.jst.j2ee.internal.common.impl.J2EEResourceFactoryRegistry; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister; import org.eclipse.wst.common.internal.emf.utilities.ExtendedEcoreUtil; /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java index 19c6bef65..bdfba582b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveAdapterFactory.java @@ -196,9 +196,9 @@ public class CommonarchiveAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default * implementation returns null. <!-- end-user-doc --> - * * @return the new adapter. * @generated */ @@ -214,88 +214,74 @@ public class CommonarchiveAdapterFactory extends AdapterFactoryImpl { return true; } if (object instanceof EObject) { - return ((EObject) object).eClass().getEPackage() == modelPackage; + return ((EObject)object).eClass().getEPackage() == modelPackage; } return false; } /** - * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> + * The switch the delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ - protected CommonarchiveSwitch modelSwitch = new CommonarchiveSwitch() { - public Object caseFile(File object) { - return createFileAdapter(); - } - - public Object caseArchive(Archive object) { - return createArchiveAdapter(); - } - - public Object caseEJBJarFile(EJBJarFile object) { - return createEJBJarFileAdapter(); - } - - public Object caseWARFile(WARFile object) { - return createWARFileAdapter(); - } - - public Object caseEARFile(EARFile object) { - return createEARFileAdapter(); - } - - public Object caseApplicationClientFile(ApplicationClientFile object) { - return createApplicationClientFileAdapter(); - } - - public Object caseModuleFile(ModuleFile object) { - return createModuleFileAdapter(); - } - - public Object caseContainer(Container object) { - return createContainerAdapter(); - } - - public Object caseReadOnlyDirectory(ReadOnlyDirectory object) { - return createReadOnlyDirectoryAdapter(); - } - - public Object caseRARFile(RARFile object) { - return createRARFileAdapter(); - } - - public Object caseModuleRef(ModuleRef object) { - return createModuleRefAdapter(); - } - - public Object caseEJBModuleRef(EJBModuleRef object) { - return createEJBModuleRefAdapter(); - } - - public Object caseWebModuleRef(WebModuleRef object) { - return createWebModuleRefAdapter(); - } - - public Object caseClientModuleRef(ClientModuleRef object) { - return createClientModuleRefAdapter(); - } - - public Object caseConnectorModuleRef(ConnectorModuleRef object) { - return createConnectorModuleRefAdapter(); - } - - public Object defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; + protected CommonarchiveSwitch modelSwitch = + new CommonarchiveSwitch() { + public Object caseFile(File object) { + return createFileAdapter(); + } + public Object caseArchive(Archive object) { + return createArchiveAdapter(); + } + public Object caseEJBJarFile(EJBJarFile object) { + return createEJBJarFileAdapter(); + } + public Object caseWARFile(WARFile object) { + return createWARFileAdapter(); + } + public Object caseEARFile(EARFile object) { + return createEARFileAdapter(); + } + public Object caseApplicationClientFile(ApplicationClientFile object) { + return createApplicationClientFileAdapter(); + } + public Object caseModuleFile(ModuleFile object) { + return createModuleFileAdapter(); + } + public Object caseContainer(Container object) { + return createContainerAdapter(); + } + public Object caseReadOnlyDirectory(ReadOnlyDirectory object) { + return createReadOnlyDirectoryAdapter(); + } + public Object caseRARFile(RARFile object) { + return createRARFileAdapter(); + } + public Object caseModuleRef(ModuleRef object) { + return createModuleRefAdapter(); + } + public Object caseEJBModuleRef(EJBModuleRef object) { + return createEJBModuleRefAdapter(); + } + public Object caseWebModuleRef(WebModuleRef object) { + return createWebModuleRefAdapter(); + } + public Object caseClientModuleRef(ClientModuleRef object) { + return createClientModuleRefAdapter(); + } + public Object caseConnectorModuleRef(ConnectorModuleRef object) { + return createConnectorModuleRefAdapter(); + } + public Object defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * @generated This field/method will be replaced during code generation. */ public Adapter createAdapterGen(Notifier target) { - return (Adapter) modelSwitch.doSwitch((EObject) target); + return (Adapter)modelSwitch.doSwitch((EObject)target); } diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java index 1fb6e52b3..31b66f2cb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/util/CommonarchiveSwitch.java @@ -11,6 +11,8 @@ package org.eclipse.jst.j2ee.commonarchivecore.internal.util; +import java.util.List; + import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile; @@ -35,8 +37,8 @@ import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchiveFactory public class CommonarchiveSwitch { /** - * The cached model package <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ protected static CommonarchivePackage modelPackage; @@ -246,154 +248,162 @@ public class CommonarchiveSwitch { * @generated This field/method will be replaced during code generation. */ public Object doSwitchGen(EObject theEObject) { - EClass theEClass = theEObject.eClass(); + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected Object doSwitch(EClass theEClass, EObject theEObject) { if (theEClass.eContainer() == modelPackage) { - switch (theEClass.getClassifierID()) { - case CommonarchivePackage.FILE : { - File file = (File) theEObject; - Object result = caseFile(file); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.ARCHIVE : { - Archive archive = (Archive) theEObject; - Object result = caseArchive(archive); - if (result == null) - result = caseContainer(archive); - if (result == null) - result = caseFile(archive); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.EJB_JAR_FILE : { - EJBJarFile ejbJarFile = (EJBJarFile) theEObject; - Object result = caseEJBJarFile(ejbJarFile); - if (result == null) - result = caseModuleFile(ejbJarFile); - if (result == null) - result = caseArchive(ejbJarFile); - if (result == null) - result = caseContainer(ejbJarFile); - if (result == null) - result = caseFile(ejbJarFile); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.WAR_FILE : { - WARFile warFile = (WARFile) theEObject; - Object result = caseWARFile(warFile); - if (result == null) - result = caseModuleFile(warFile); - if (result == null) - result = caseArchive(warFile); - if (result == null) - result = caseContainer(warFile); - if (result == null) - result = caseFile(warFile); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.EAR_FILE : { - EARFile earFile = (EARFile) theEObject; - Object result = caseEARFile(earFile); - if (result == null) - result = caseModuleFile(earFile); - if (result == null) - result = caseArchive(earFile); - if (result == null) - result = caseContainer(earFile); - if (result == null) - result = caseFile(earFile); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.APPLICATION_CLIENT_FILE : { - ApplicationClientFile applicationClientFile = (ApplicationClientFile) theEObject; - Object result = caseApplicationClientFile(applicationClientFile); - if (result == null) - result = caseModuleFile(applicationClientFile); - if (result == null) - result = caseArchive(applicationClientFile); - if (result == null) - result = caseContainer(applicationClientFile); - if (result == null) - result = caseFile(applicationClientFile); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.READ_ONLY_DIRECTORY : { - ReadOnlyDirectory readOnlyDirectory = (ReadOnlyDirectory) theEObject; - Object result = caseReadOnlyDirectory(readOnlyDirectory); - if (result == null) - result = caseContainer(readOnlyDirectory); - if (result == null) - result = caseFile(readOnlyDirectory); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.RAR_FILE : { - RARFile rarFile = (RARFile) theEObject; - Object result = caseRARFile(rarFile); - if (result == null) - result = caseModuleFile(rarFile); - if (result == null) - result = caseArchive(rarFile); - if (result == null) - result = caseContainer(rarFile); - if (result == null) - result = caseFile(rarFile); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.EJB_MODULE_REF : { - EJBModuleRef ejbModuleRef = (EJBModuleRef) theEObject; - Object result = caseEJBModuleRef(ejbModuleRef); - if (result == null) - result = caseModuleRef(ejbModuleRef); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.WEB_MODULE_REF : { - WebModuleRef webModuleRef = (WebModuleRef) theEObject; - Object result = caseWebModuleRef(webModuleRef); - if (result == null) - result = caseModuleRef(webModuleRef); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.CLIENT_MODULE_REF : { - ClientModuleRef clientModuleRef = (ClientModuleRef) theEObject; - Object result = caseClientModuleRef(clientModuleRef); - if (result == null) - result = caseModuleRef(clientModuleRef); - if (result == null) - result = defaultCase(theEObject); - return result; - } - case CommonarchivePackage.CONNECTOR_MODULE_REF : { - ConnectorModuleRef connectorModuleRef = (ConnectorModuleRef) theEObject; - Object result = caseConnectorModuleRef(connectorModuleRef); - if (result == null) - result = caseModuleRef(connectorModuleRef); - if (result == null) - result = defaultCase(theEObject); - return result; - } - default : - return defaultCase(theEObject); + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch((EClass)eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected Object doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case CommonarchivePackage.FILE: { + File file = (File)theEObject; + Object result = caseFile(file); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.ARCHIVE: { + Archive archive = (Archive)theEObject; + Object result = caseArchive(archive); + if (result == null) result = caseContainer(archive); + if (result == null) result = caseFile(archive); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.EJB_JAR_FILE: { + EJBJarFile ejbJarFile = (EJBJarFile)theEObject; + Object result = caseEJBJarFile(ejbJarFile); + if (result == null) result = caseModuleFile(ejbJarFile); + if (result == null) result = caseArchive(ejbJarFile); + if (result == null) result = caseContainer(ejbJarFile); + if (result == null) result = caseFile(ejbJarFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.WAR_FILE: { + WARFile warFile = (WARFile)theEObject; + Object result = caseWARFile(warFile); + if (result == null) result = caseModuleFile(warFile); + if (result == null) result = caseArchive(warFile); + if (result == null) result = caseContainer(warFile); + if (result == null) result = caseFile(warFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.EAR_FILE: { + EARFile earFile = (EARFile)theEObject; + Object result = caseEARFile(earFile); + if (result == null) result = caseModuleFile(earFile); + if (result == null) result = caseArchive(earFile); + if (result == null) result = caseContainer(earFile); + if (result == null) result = caseFile(earFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.APPLICATION_CLIENT_FILE: { + ApplicationClientFile applicationClientFile = (ApplicationClientFile)theEObject; + Object result = caseApplicationClientFile(applicationClientFile); + if (result == null) result = caseModuleFile(applicationClientFile); + if (result == null) result = caseArchive(applicationClientFile); + if (result == null) result = caseContainer(applicationClientFile); + if (result == null) result = caseFile(applicationClientFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.MODULE_FILE: { + ModuleFile moduleFile = (ModuleFile)theEObject; + Object result = caseModuleFile(moduleFile); + if (result == null) result = caseArchive(moduleFile); + if (result == null) result = caseContainer(moduleFile); + if (result == null) result = caseFile(moduleFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.CONTAINER: { + Container container = (Container)theEObject; + Object result = caseContainer(container); + if (result == null) result = caseFile(container); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.READ_ONLY_DIRECTORY: { + ReadOnlyDirectory readOnlyDirectory = (ReadOnlyDirectory)theEObject; + Object result = caseReadOnlyDirectory(readOnlyDirectory); + if (result == null) result = caseContainer(readOnlyDirectory); + if (result == null) result = caseFile(readOnlyDirectory); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.RAR_FILE: { + RARFile rarFile = (RARFile)theEObject; + Object result = caseRARFile(rarFile); + if (result == null) result = caseModuleFile(rarFile); + if (result == null) result = caseArchive(rarFile); + if (result == null) result = caseContainer(rarFile); + if (result == null) result = caseFile(rarFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.MODULE_REF: { + ModuleRef moduleRef = (ModuleRef)theEObject; + Object result = caseModuleRef(moduleRef); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.EJB_MODULE_REF: { + EJBModuleRef ejbModuleRef = (EJBModuleRef)theEObject; + Object result = caseEJBModuleRef(ejbModuleRef); + if (result == null) result = caseModuleRef(ejbModuleRef); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.WEB_MODULE_REF: { + WebModuleRef webModuleRef = (WebModuleRef)theEObject; + Object result = caseWebModuleRef(webModuleRef); + if (result == null) result = caseModuleRef(webModuleRef); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.CLIENT_MODULE_REF: { + ClientModuleRef clientModuleRef = (ClientModuleRef)theEObject; + Object result = caseClientModuleRef(clientModuleRef); + if (result == null) result = caseModuleRef(clientModuleRef); + if (result == null) result = defaultCase(theEObject); + return result; + } + case CommonarchivePackage.CONNECTOR_MODULE_REF: { + ConnectorModuleRef connectorModuleRef = (ConnectorModuleRef)theEObject; + Object result = caseConnectorModuleRef(connectorModuleRef); + if (result == null) result = caseModuleRef(connectorModuleRef); + if (result == null) result = defaultCase(theEObject); + return result; } + default: return defaultCase(theEObject); } - return defaultCase(theEObject); } /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseApplication.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseApplication.java index 738464ae2..76e143c53 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseApplication.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseApplication.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseArchive.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseArchive.java index 2fb9bc734..a2d30e21c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseArchive.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseArchive.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfigRegister.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfigRegister.java index 530cdbe3b..e0bdcbcbe 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfigRegister.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfigRegister.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; import java.util.Collections; import java.util.HashMap; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfiguration.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfiguration.java index 67056494c..8243cdb9c 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseConfiguration.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseConfiguration.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseLibrary.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseLibrary.java index 9d3d86ca4..b73429b4a 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseLibrary.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseLibrary.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseModule.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseModule.java index 3f5b3913c..61970f702 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseModule.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseModule.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseWARFile.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseWARFile.java index 53b224adb..3b979cdfb 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseWARFile.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseWARFile.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigFactory.java index c6f94e7fe..1e77942ab 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigFactory.java @@ -8,19 +8,19 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; import org.eclipse.emf.ecore.EFactory; -public interface LooseconfigFactory extends EFactory { +public interface LooseconfigFactory extends EFactory{ /** - * The singleton instance of the factory. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the factory. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - LooseconfigFactory eINSTANCE = new org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigFactoryImpl(); + LooseconfigFactory eINSTANCE = new org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigFactoryImpl(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigPackage.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigPackage.java index a4949c569..09d84268d 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/LooseconfigPackage.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/LooseconfigPackage.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal; @@ -21,10 +21,10 @@ import org.eclipse.emf.ecore.EReference; /** * @lastgen interface LooseconfigPackage extends EPackage {} */ -public interface LooseconfigPackage extends EPackage { +public interface LooseconfigPackage extends EPackage{ /** - * The package name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ String eNAME = "looseconfig"; //$NON-NLS-1$ @@ -229,18 +229,18 @@ public interface LooseconfigPackage extends EPackage { */ String eNS_URI = "commonarchive.looseconfig.xmi"; //$NON-NLS-1$ /** - * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The package namespace name. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - String eNS_PREFIX = "org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig"; //$NON-NLS-1$ + String eNS_PREFIX = "org.eclipse.jst.j2ee.commonarchivecore.looseconfig"; //$NON-NLS-1$ /** - * The singleton instance of the package. <!-- begin-user-doc --> <!-- end-user-doc --> - * + * The singleton instance of the package. + * <!-- begin-user-doc --> <!-- end-user-doc --> * @generated */ - LooseconfigPackage eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl.LooseconfigPackageImpl.init(); + LooseconfigPackage eINSTANCE = org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl.LooseconfigPackageImpl.init(); /** * @generated This field/method will be replaced during code generation diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseApplicationImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseApplicationImpl.java index 0575f3e5b..ca05caab6 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseApplicationImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseApplicationImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import java.util.Collection; @@ -20,9 +20,9 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseApplicationImpl extends LooseArchiveImpl implements LooseApplication, LooseArchive { /** @@ -42,7 +42,6 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -61,19 +60,18 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP, msgs); - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES : - return ((InternalEList) getLooseArchives()).basicAdd(otherEnd, msgs); - default : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES: + return ((InternalEList)getLooseArchives()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -84,17 +82,16 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: return eBasicSetContainer(null, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP, msgs); - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES : - return ((InternalEList) getLooseArchives()).basicRemove(otherEnd, msgs); - default : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES: + return ((InternalEList)getLooseArchives()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -103,15 +100,14 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -120,20 +116,19 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_APPLICATION__URI : + case LooseconfigPackage.LOOSE_APPLICATION__URI: return getUri(); - case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH : + case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH: return getBinariesPath(); - case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH: return getResourcesPath(); - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: return getLooseApp(); - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES: return getLooseArchives(); } return eDynamicGet(eFeature, resolve); @@ -141,26 +136,25 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_APPLICATION__URI : - setUri((String) newValue); + case LooseconfigPackage.LOOSE_APPLICATION__URI: + setUri((String)newValue); return; - case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH : - setBinariesPath((String) newValue); + case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH: + setBinariesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH : - setResourcesPath((String) newValue); + case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH: + setResourcesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : - setLooseApp((LooseApplication) newValue); + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: + setLooseApp((LooseApplication)newValue); return; - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES: getLooseArchives().clear(); - getLooseArchives().addAll((Collection) newValue); + getLooseArchives().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -168,24 +162,23 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_APPLICATION__URI : + case LooseconfigPackage.LOOSE_APPLICATION__URI: setUri(URI_EDEFAULT); return; - case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH : + case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH: setBinariesPath(BINARIES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH: setResourcesPath(RESOURCES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : - setLooseApp((LooseApplication) null); + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: + setLooseApp((LooseApplication)null); return; - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES: getLooseArchives().clear(); return; } @@ -194,20 +187,19 @@ public class LooseApplicationImpl extends LooseArchiveImpl implements LooseAppli /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_APPLICATION__URI : + case LooseconfigPackage.LOOSE_APPLICATION__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH : + case LooseconfigPackage.LOOSE_APPLICATION__BINARIES_PATH: return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath); - case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_APPLICATION__RESOURCES_PATH: return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath); - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_APP: return getLooseApp() != null; - case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES : + case LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES: return looseArchives != null && !looseArchives.isEmpty(); } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseArchiveImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseArchiveImpl.java index 0449059dc..de6ef9a94 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseArchiveImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseArchiveImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import org.eclipse.emf.common.notify.Notification; @@ -20,15 +20,15 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObject { /** - * The default value of the '{@link #getUri() <em>Uri</em>}' attribute. <!-- begin-user-doc + * The default value of the '{@link #getUri() <em>Uri</em>}' attribute. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @see #getUri() * @generated * @ordered @@ -45,7 +45,6 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * The default value of the '{@link #getBinariesPath() <em>Binaries Path</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see #getBinariesPath() * @generated * @ordered @@ -59,7 +58,6 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * The default value of the '{@link #getResourcesPath() <em>Resources Path</em>}' attribute. * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see #getResourcesPath() * @generated * @ordered @@ -80,7 +78,6 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -150,9 +147,8 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje * @generated This field/method will be replaced during code generation */ public LooseApplication getLooseApp() { - if (eContainerFeatureID != LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP) - return null; - return (LooseApplication) eContainer; + if (eContainerFeatureID != LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP) return null; + return (LooseApplication)eContainer; } /** @@ -161,16 +157,16 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje public void setLooseApp(LooseApplication newLooseApp) { if (newLooseApp != eContainer || (eContainerFeatureID != LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP && newLooseApp != null)) { if (EcoreUtil.isAncestor(this, newLooseApp)) - throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); if (newLooseApp != null) - msgs = ((InternalEObject) newLooseApp).eInverseAdd(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); - msgs = eBasicSetContainer((InternalEObject) newLooseApp, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, msgs); - if (msgs != null) - msgs.dispatch(); - } else if (eNotificationRequired()) + msgs = ((InternalEObject)newLooseApp).eInverseAdd(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); + msgs = eBasicSetContainer((InternalEObject)newLooseApp, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, newLooseApp, newLooseApp)); } @@ -180,17 +176,16 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -201,15 +196,14 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: return eBasicSetContainer(null, LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -218,15 +212,14 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -235,18 +228,17 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_ARCHIVE__URI : + case LooseconfigPackage.LOOSE_ARCHIVE__URI: return getUri(); - case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH: return getBinariesPath(); - case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH: return getResourcesPath(); - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: return getLooseApp(); } return eDynamicGet(eFeature, resolve); @@ -257,13 +249,13 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_ARCHIVE__URI : + case LooseconfigPackage.LOOSE_ARCHIVE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH: return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath); - case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH: return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath); - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: return getLooseApp() != null; } return eDynamicIsSet(eFeature); @@ -274,17 +266,17 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_ARCHIVE__URI : - setUri((String) newValue); + case LooseconfigPackage.LOOSE_ARCHIVE__URI: + setUri((String)newValue); return; - case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH : - setBinariesPath((String) newValue); + case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH: + setBinariesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH : - setResourcesPath((String) newValue); + case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH: + setResourcesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : - setLooseApp((LooseApplication) newValue); + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: + setLooseApp((LooseApplication)newValue); return; } eDynamicSet(eFeature, newValue); @@ -295,17 +287,17 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_ARCHIVE__URI : + case LooseconfigPackage.LOOSE_ARCHIVE__URI: setUri(URI_EDEFAULT); return; - case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_ARCHIVE__BINARIES_PATH: setBinariesPath(BINARIES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_ARCHIVE__RESOURCES_PATH: setResourcesPath(RESOURCES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP : - setLooseApp((LooseApplication) null); + case LooseconfigPackage.LOOSE_ARCHIVE__LOOSE_APP: + setLooseApp((LooseApplication)null); return; } eDynamicUnset(eFeature); @@ -315,15 +307,14 @@ public class LooseArchiveImpl extends EObjectImpl implements LooseArchive, EObje * @generated This field/method will be replaced during code generation. */ public String toString() { - if (eIsProxy()) - return super.toString(); + if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (uri: "); //$NON-NLS-1$ + result.append(" (uri: "); result.append(uri); - result.append(", binariesPath: "); //$NON-NLS-1$ + result.append(", binariesPath: "); result.append(binariesPath); - result.append(", resourcesPath: "); //$NON-NLS-1$ + result.append(", resourcesPath: "); result.append(resourcesPath); result.append(')'); return result.toString(); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseConfigurationImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseConfigurationImpl.java index 880a318b7..17bde6cd3 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseConfigurationImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseConfigurationImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import java.util.Collection; @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseConfigurationImpl extends EObjectImpl implements LooseConfiguration, EObject { @@ -45,7 +45,6 @@ public class LooseConfigurationImpl extends EObjectImpl implements LooseConfigur /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -64,15 +63,14 @@ public class LooseConfigurationImpl extends EObjectImpl implements LooseConfigur /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS : - return ((InternalEList) getApplications()).basicRemove(otherEnd, msgs); - default : + case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS: + return ((InternalEList)getApplications()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -81,12 +79,11 @@ public class LooseConfigurationImpl extends EObjectImpl implements LooseConfigur /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS : + case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS: return getApplications(); } return eDynamicGet(eFeature, resolve); @@ -94,14 +91,13 @@ public class LooseConfigurationImpl extends EObjectImpl implements LooseConfigur /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS : + case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS: getApplications().clear(); - getApplications().addAll((Collection) newValue); + getApplications().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -109,12 +105,11 @@ public class LooseConfigurationImpl extends EObjectImpl implements LooseConfigur /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS : + case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS: getApplications().clear(); return; } @@ -123,12 +118,11 @@ public class LooseConfigurationImpl extends EObjectImpl implements LooseConfigur /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS : + case LooseconfigPackage.LOOSE_CONFIGURATION__APPLICATIONS: return applications != null && !applications.isEmpty(); } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseLibraryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseLibraryImpl.java index 5485f541c..c2e2d17e4 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseLibraryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseLibraryImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import org.eclipse.emf.common.notify.Notification; @@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.util.EcoreUtil; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, LooseArchive { @@ -35,7 +35,6 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -46,9 +45,8 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, * @generated This field/method will be replaced during code generation */ public LooseWARFile getLooseWAR() { - if (eContainerFeatureID != LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR) - return null; - return (LooseWARFile) eContainer; + if (eContainerFeatureID != LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR) return null; + return (LooseWARFile)eContainer; } /** @@ -57,36 +55,35 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, public void setLooseWAR(LooseWARFile newLooseWAR) { if (newLooseWAR != eContainer || (eContainerFeatureID != LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR && newLooseWAR != null)) { if (EcoreUtil.isAncestor(this, newLooseWAR)) - throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$ + throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); NotificationChain msgs = null; if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); if (newLooseWAR != null) - msgs = ((InternalEObject) newLooseWAR).eInverseAdd(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.class, msgs); - msgs = eBasicSetContainer((InternalEObject) newLooseWAR, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, msgs); - if (msgs != null) - msgs.dispatch(); - } else if (eNotificationRequired()) + msgs = ((InternalEObject)newLooseWAR).eInverseAdd(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.class, msgs); + msgs = eBasicSetContainer((InternalEObject)newLooseWAR, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, msgs); + if (msgs != null) msgs.dispatch(); + } + else if (eNotificationRequired()) eNotify(new ENotificationImpl(this, Notification.SET, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, newLooseWAR, newLooseWAR)); } /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP, msgs); - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -97,17 +94,16 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: return eBasicSetContainer(null, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP, msgs); - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: return eBasicSetContainer(null, LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -116,17 +112,16 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS, LooseWARFile.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -135,20 +130,19 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_LIBRARY__URI : + case LooseconfigPackage.LOOSE_LIBRARY__URI: return getUri(); - case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH : + case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH: return getBinariesPath(); - case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH: return getResourcesPath(); - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: return getLooseApp(); - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: return getLooseWAR(); } return eDynamicGet(eFeature, resolve); @@ -159,15 +153,15 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_LIBRARY__URI : + case LooseconfigPackage.LOOSE_LIBRARY__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH : + case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH: return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath); - case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH: return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath); - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: return getLooseApp() != null; - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: return getLooseWAR() != null; } return eDynamicIsSet(eFeature); @@ -178,20 +172,20 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_LIBRARY__URI : - setUri((String) newValue); + case LooseconfigPackage.LOOSE_LIBRARY__URI: + setUri((String)newValue); return; - case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH : - setBinariesPath((String) newValue); + case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH: + setBinariesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH : - setResourcesPath((String) newValue); + case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH: + setResourcesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : - setLooseApp((LooseApplication) newValue); + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: + setLooseApp((LooseApplication)newValue); return; - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : - setLooseWAR((LooseWARFile) newValue); + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: + setLooseWAR((LooseWARFile)newValue); return; } eDynamicSet(eFeature, newValue); @@ -202,20 +196,20 @@ public class LooseLibraryImpl extends LooseArchiveImpl implements LooseLibrary, */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_LIBRARY__URI : + case LooseconfigPackage.LOOSE_LIBRARY__URI: setUri(URI_EDEFAULT); return; - case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH : + case LooseconfigPackage.LOOSE_LIBRARY__BINARIES_PATH: setBinariesPath(BINARIES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_LIBRARY__RESOURCES_PATH: setResourcesPath(RESOURCES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP : - setLooseApp((LooseApplication) null); + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_APP: + setLooseApp((LooseApplication)null); return; - case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR : - setLooseWAR((LooseWARFile) null); + case LooseconfigPackage.LOOSE_LIBRARY__LOOSE_WAR: + setLooseWAR((LooseWARFile)null); return; } eDynamicUnset(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseModuleImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseModuleImpl.java index b9463c4a4..f96b01140 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseModuleImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseModuleImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import org.eclipse.emf.common.notify.Notification; @@ -17,10 +17,10 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, LooseArchive { /** @@ -50,7 +50,6 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -76,17 +75,16 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_MODULE__LOOSE_APP, msgs); - default : + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -97,15 +95,14 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: return eBasicSetContainer(null, LooseconfigPackage.LOOSE_MODULE__LOOSE_APP, msgs); - default : + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -114,15 +111,14 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -131,20 +127,19 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_MODULE__URI : + case LooseconfigPackage.LOOSE_MODULE__URI: return getUri(); - case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH: return getBinariesPath(); - case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH: return getResourcesPath(); - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: return getLooseApp(); - case LooseconfigPackage.LOOSE_MODULE__ALT_DD : + case LooseconfigPackage.LOOSE_MODULE__ALT_DD: return getAltDD(); } return eDynamicGet(eFeature, resolve); @@ -155,15 +150,15 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_MODULE__URI : + case LooseconfigPackage.LOOSE_MODULE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH: return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath); - case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH: return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath); - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: return getLooseApp() != null; - case LooseconfigPackage.LOOSE_MODULE__ALT_DD : + case LooseconfigPackage.LOOSE_MODULE__ALT_DD: return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD); } return eDynamicIsSet(eFeature); @@ -174,20 +169,20 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_MODULE__URI : - setUri((String) newValue); + case LooseconfigPackage.LOOSE_MODULE__URI: + setUri((String)newValue); return; - case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH : - setBinariesPath((String) newValue); + case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH: + setBinariesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH : - setResourcesPath((String) newValue); + case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH: + setResourcesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : - setLooseApp((LooseApplication) newValue); + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: + setLooseApp((LooseApplication)newValue); return; - case LooseconfigPackage.LOOSE_MODULE__ALT_DD : - setAltDD((String) newValue); + case LooseconfigPackage.LOOSE_MODULE__ALT_DD: + setAltDD((String)newValue); return; } eDynamicSet(eFeature, newValue); @@ -198,19 +193,19 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_MODULE__URI : + case LooseconfigPackage.LOOSE_MODULE__URI: setUri(URI_EDEFAULT); return; - case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_MODULE__BINARIES_PATH: setBinariesPath(BINARIES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_MODULE__RESOURCES_PATH: setResourcesPath(RESOURCES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP : - setLooseApp((LooseApplication) null); + case LooseconfigPackage.LOOSE_MODULE__LOOSE_APP: + setLooseApp((LooseApplication)null); return; - case LooseconfigPackage.LOOSE_MODULE__ALT_DD : + case LooseconfigPackage.LOOSE_MODULE__ALT_DD: setAltDD(ALT_DD_EDEFAULT); return; } @@ -221,11 +216,10 @@ public class LooseModuleImpl extends LooseArchiveImpl implements LooseModule, Lo * @generated This field/method will be replaced during code generation. */ public String toString() { - if (eIsProxy()) - return super.toString(); + if (eIsProxy()) return super.toString(); StringBuffer result = new StringBuffer(super.toString()); - result.append(" (altDD: "); //$NON-NLS-1$ + result.append(" (altDD: "); result.append(altDD); result.append(')'); return result.toString(); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseWARFileImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseWARFileImpl.java index 7aa670b2a..2830dc1fa 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseWARFileImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseWARFileImpl.java @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import java.util.Collection; @@ -20,11 +20,11 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, LooseModule { @@ -45,7 +45,6 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ protected EClass eStaticClass() { @@ -68,19 +67,18 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: if (eContainer != null) msgs = eBasicRemoveFromContainer(msgs); return eBasicSetContainer(otherEnd, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP, msgs); - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS : - return ((InternalEList) getLooseLibs()).basicAdd(otherEnd, msgs); - default : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS: + return ((InternalEList)getLooseLibs()).basicAdd(otherEnd, msgs); + default: return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs); } } @@ -91,17 +89,16 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs) { if (featureID >= 0) { switch (eDerivedStructuralFeatureID(featureID, baseClass)) { - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: return eBasicSetContainer(null, LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP, msgs); - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS : - return ((InternalEList) getLooseLibs()).basicRemove(otherEnd, msgs); - default : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS: + return ((InternalEList)getLooseLibs()).basicRemove(otherEnd, msgs); + default: return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs); } } @@ -110,15 +107,14 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public NotificationChain eBasicRemoveFromContainer(NotificationChain msgs) { if (eContainerFeatureID >= 0) { switch (eContainerFeatureID) { - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: return eContainer.eInverseRemove(this, LooseconfigPackage.LOOSE_APPLICATION__LOOSE_ARCHIVES, LooseApplication.class, msgs); - default : + default: return eDynamicBasicRemoveFromContainer(msgs); } } @@ -127,22 +123,21 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public Object eGet(EStructuralFeature eFeature, boolean resolve) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_WAR_FILE__URI : + case LooseconfigPackage.LOOSE_WAR_FILE__URI: return getUri(); - case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH: return getBinariesPath(); - case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH: return getResourcesPath(); - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: return getLooseApp(); - case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD : + case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD: return getAltDD(); - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS: return getLooseLibs(); } return eDynamicGet(eFeature, resolve); @@ -150,29 +145,28 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eSet(EStructuralFeature eFeature, Object newValue) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_WAR_FILE__URI : - setUri((String) newValue); + case LooseconfigPackage.LOOSE_WAR_FILE__URI: + setUri((String)newValue); return; - case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH : - setBinariesPath((String) newValue); + case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH: + setBinariesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH : - setResourcesPath((String) newValue); + case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH: + setResourcesPath((String)newValue); return; - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : - setLooseApp((LooseApplication) newValue); + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: + setLooseApp((LooseApplication)newValue); return; - case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD : - setAltDD((String) newValue); + case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD: + setAltDD((String)newValue); return; - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS: getLooseLibs().clear(); - getLooseLibs().addAll((Collection) newValue); + getLooseLibs().addAll((Collection)newValue); return; } eDynamicSet(eFeature, newValue); @@ -180,27 +174,26 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public void eUnset(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_WAR_FILE__URI : + case LooseconfigPackage.LOOSE_WAR_FILE__URI: setUri(URI_EDEFAULT); return; - case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH: setBinariesPath(BINARIES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH: setResourcesPath(RESOURCES_PATH_EDEFAULT); return; - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : - setLooseApp((LooseApplication) null); + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: + setLooseApp((LooseApplication)null); return; - case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD : + case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD: setAltDD(ALT_DD_EDEFAULT); return; - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS: getLooseLibs().clear(); return; } @@ -209,22 +202,21 @@ public class LooseWARFileImpl extends LooseModuleImpl implements LooseWARFile, L /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public boolean eIsSet(EStructuralFeature eFeature) { switch (eDerivedStructuralFeatureID(eFeature)) { - case LooseconfigPackage.LOOSE_WAR_FILE__URI : + case LooseconfigPackage.LOOSE_WAR_FILE__URI: return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri); - case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH : + case LooseconfigPackage.LOOSE_WAR_FILE__BINARIES_PATH: return BINARIES_PATH_EDEFAULT == null ? binariesPath != null : !BINARIES_PATH_EDEFAULT.equals(binariesPath); - case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH : + case LooseconfigPackage.LOOSE_WAR_FILE__RESOURCES_PATH: return RESOURCES_PATH_EDEFAULT == null ? resourcesPath != null : !RESOURCES_PATH_EDEFAULT.equals(resourcesPath); - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_APP: return getLooseApp() != null; - case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD : + case LooseconfigPackage.LOOSE_WAR_FILE__ALT_DD: return ALT_DD_EDEFAULT == null ? altDD != null : !ALT_DD_EDEFAULT.equals(altDD); - case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS : + case LooseconfigPackage.LOOSE_WAR_FILE__LOOSE_LIBS: return looseLibs != null && !looseLibs.isEmpty(); } return eDynamicIsSet(eFeature); diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigFactoryImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigFactoryImpl.java index 6ed7676fe..fddd34195 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/impl/LooseconfigFactoryImpl.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigFactoryImpl.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.impl; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EFactory; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.impl.EFactoryImpl; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigFactory; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; public class LooseconfigFactoryImpl extends EFactoryImpl implements LooseconfigFactory, EFactory { @@ -34,23 +34,17 @@ public class LooseconfigFactoryImpl extends EFactoryImpl implements LooseconfigF /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public EObject create(EClass eClass) { switch (eClass.getClassifierID()) { - case LooseconfigPackage.LOOSE_APPLICATION : - return createLooseApplication(); - case LooseconfigPackage.LOOSE_LIBRARY : - return createLooseLibrary(); - case LooseconfigPackage.LOOSE_MODULE : - return createLooseModule(); - case LooseconfigPackage.LOOSE_CONFIGURATION : - return createLooseConfiguration(); - case LooseconfigPackage.LOOSE_WAR_FILE : - return createLooseWARFile(); - default : - throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$ + case LooseconfigPackage.LOOSE_APPLICATION: return createLooseApplication(); + case LooseconfigPackage.LOOSE_LIBRARY: return createLooseLibrary(); + case LooseconfigPackage.LOOSE_MODULE: return createLooseModule(); + case LooseconfigPackage.LOOSE_CONFIGURATION: return createLooseConfiguration(); + case LooseconfigPackage.LOOSE_WAR_FILE: return createLooseWARFile(); + default: + throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); } } @@ -98,7 +92,7 @@ public class LooseconfigFactoryImpl extends EFactoryImpl implements LooseconfigF * @generated This field/method will be replaced during code generation. */ public LooseconfigPackage getLooseconfigPackage() { - return (LooseconfigPackage) getEPackage(); + return (LooseconfigPackage)getEPackage(); } /** diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java new file mode 100644 index 000000000..2d979ca0d --- /dev/null +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/impl/LooseconfigPackageImpl.java @@ -0,0 +1,368 @@ +/******************************************************************************* + * Copyright (c) 2001, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.impl; + + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EPackage; +import org.eclipse.emf.ecore.EReference; +import org.eclipse.emf.ecore.impl.EPackageImpl; +import org.eclipse.emf.ecore.impl.EcorePackageImpl; +import org.eclipse.jem.java.JavaRefPackage; +import org.eclipse.jem.java.impl.JavaRefPackageImpl; +import org.eclipse.jst.j2ee.application.ApplicationPackage; +import org.eclipse.jst.j2ee.application.internal.impl.ApplicationPackageImpl; +import org.eclipse.jst.j2ee.client.ClientPackage; +import org.eclipse.jst.j2ee.client.internal.impl.ClientPackageImpl; +import org.eclipse.jst.j2ee.common.CommonPackage; +import org.eclipse.jst.j2ee.common.internal.impl.CommonPackageImpl; +import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage; +import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.CommonarchivePackageImpl; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; +import org.eclipse.jst.j2ee.ejb.EjbPackage; +import org.eclipse.jst.j2ee.ejb.internal.impl.EjbPackageImpl; +import org.eclipse.jst.j2ee.jca.JcaPackage; +import org.eclipse.jst.j2ee.jca.internal.impl.JcaPackageImpl; +import org.eclipse.jst.j2ee.jsp.JspPackage; +import org.eclipse.jst.j2ee.jsp.internal.impl.JspPackageImpl; +import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage; +import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationPackageImpl; +import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientPackage; +import org.eclipse.jst.j2ee.webservice.wsclient.internal.impl.Webservice_clientPackageImpl; + + +/** + * @lastgen class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage, + * EPackage {} + */ +public class LooseconfigPackageImpl extends EPackageImpl implements LooseconfigPackage { + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private EClass looseApplicationEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private EClass looseArchiveEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private EClass looseLibraryEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private EClass looseModuleEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private EClass looseConfigurationEClass = null; + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private EClass looseWARFileEClass = null; + + /** + * @generated This field/method will be replaced during code generation. + */ + private LooseconfigPackageImpl() { + super(eNS_URI, LooseconfigFactory.eINSTANCE); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private static boolean isInited = false; + + /** + * @generated This field/method will be replaced during code generation. + */ + public static LooseconfigPackage init() { + if (isInited) return (LooseconfigPackage)EPackage.Registry.INSTANCE.getEPackage(LooseconfigPackage.eNS_URI); + + // Obtain or create and register package + LooseconfigPackageImpl theLooseconfigPackage = (LooseconfigPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof LooseconfigPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new LooseconfigPackageImpl()); + + isInited = true; + + // Initialize simple dependencies + EcorePackageImpl.init(); + + // Obtain or create and register interdependencies + ApplicationPackageImpl theApplicationPackage = (ApplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) instanceof ApplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ApplicationPackage.eNS_URI) : ApplicationPackage.eINSTANCE); + ClientPackageImpl theClientPackage = (ClientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) instanceof ClientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(ClientPackage.eNS_URI) : ClientPackage.eINSTANCE); + EjbPackageImpl theEjbPackage = (EjbPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) instanceof EjbPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(EjbPackage.eNS_URI) : EjbPackage.eINSTANCE); + WebapplicationPackageImpl theWebapplicationPackage = (WebapplicationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) instanceof WebapplicationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WebapplicationPackage.eNS_URI) : WebapplicationPackage.eINSTANCE); + CommonarchivePackageImpl theCommonarchivePackage = (CommonarchivePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) instanceof CommonarchivePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonarchivePackage.eNS_URI) : CommonarchivePackage.eINSTANCE); + JavaRefPackageImpl theJavaRefPackage = (JavaRefPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI) instanceof JavaRefPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JavaRefPackage.eNS_URI) : JavaRefPackage.eINSTANCE); + CommonPackageImpl theCommonPackage = (CommonPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) instanceof CommonPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(CommonPackage.eNS_URI) : CommonPackage.eINSTANCE); + JcaPackageImpl theJcaPackage = (JcaPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) instanceof JcaPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JcaPackage.eNS_URI) : JcaPackage.eINSTANCE); + Webservice_clientPackageImpl theWebservice_clientPackage = (Webservice_clientPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) instanceof Webservice_clientPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(Webservice_clientPackage.eNS_URI) : Webservice_clientPackage.eINSTANCE); + JspPackageImpl theJspPackage = (JspPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) instanceof JspPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(JspPackage.eNS_URI) : JspPackage.eINSTANCE); + + // Create package meta-data objects + theLooseconfigPackage.createPackageContents(); + theApplicationPackage.createPackageContents(); + theClientPackage.createPackageContents(); + theEjbPackage.createPackageContents(); + theWebapplicationPackage.createPackageContents(); + theCommonarchivePackage.createPackageContents(); + theJavaRefPackage.createPackageContents(); + theCommonPackage.createPackageContents(); + theJcaPackage.createPackageContents(); + theWebservice_clientPackage.createPackageContents(); + theJspPackage.createPackageContents(); + + // Initialize created meta-data + theLooseconfigPackage.initializePackageContents(); + theApplicationPackage.initializePackageContents(); + theClientPackage.initializePackageContents(); + theEjbPackage.initializePackageContents(); + theWebapplicationPackage.initializePackageContents(); + theCommonarchivePackage.initializePackageContents(); + theJavaRefPackage.initializePackageContents(); + theCommonPackage.initializePackageContents(); + theJcaPackage.initializePackageContents(); + theWebservice_clientPackage.initializePackageContents(); + theJspPackage.initializePackageContents(); + + // Mark meta-data to indicate it can't be changed + theLooseconfigPackage.freeze(); + + return theLooseconfigPackage; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EClass getLooseApplication() { + return looseApplicationEClass; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EReference getLooseApplication_LooseArchives() { + return (EReference)looseApplicationEClass.getEStructuralFeatures().get(0); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EClass getLooseArchive() { + return looseArchiveEClass; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EAttribute getLooseArchive_Uri() { + return (EAttribute)looseArchiveEClass.getEStructuralFeatures().get(0); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EAttribute getLooseArchive_BinariesPath() { + return (EAttribute)looseArchiveEClass.getEStructuralFeatures().get(1); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EAttribute getLooseArchive_ResourcesPath() { + return (EAttribute)looseArchiveEClass.getEStructuralFeatures().get(2); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EReference getLooseArchive_LooseApp() { + return (EReference)looseArchiveEClass.getEStructuralFeatures().get(3); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EClass getLooseLibrary() { + return looseLibraryEClass; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EReference getLooseLibrary_LooseWAR() { + return (EReference)looseLibraryEClass.getEStructuralFeatures().get(0); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EClass getLooseWARFile() { + return looseWARFileEClass; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EReference getLooseWARFile_LooseLibs() { + return (EReference)looseWARFileEClass.getEStructuralFeatures().get(0); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EClass getLooseModule() { + return looseModuleEClass; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EAttribute getLooseModule_AltDD() { + return (EAttribute)looseModuleEClass.getEStructuralFeatures().get(0); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EClass getLooseConfiguration() { + return looseConfigurationEClass; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public EReference getLooseConfiguration_Applications() { + return (EReference)looseConfigurationEClass.getEStructuralFeatures().get(0); + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public LooseconfigFactory getLooseconfigFactory() { + return (LooseconfigFactory)getEFactoryInstance(); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private boolean isCreated = false; + + /** + * Creates the meta-model objects for the package. This method is + * guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + public void createPackageContents() { + if (isCreated) return; + isCreated = true; + + // Create classes and their features + looseApplicationEClass = createEClass(LOOSE_APPLICATION); + createEReference(looseApplicationEClass, LOOSE_APPLICATION__LOOSE_ARCHIVES); + + looseArchiveEClass = createEClass(LOOSE_ARCHIVE); + createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__URI); + createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__BINARIES_PATH); + createEAttribute(looseArchiveEClass, LOOSE_ARCHIVE__RESOURCES_PATH); + createEReference(looseArchiveEClass, LOOSE_ARCHIVE__LOOSE_APP); + + looseLibraryEClass = createEClass(LOOSE_LIBRARY); + createEReference(looseLibraryEClass, LOOSE_LIBRARY__LOOSE_WAR); + + looseModuleEClass = createEClass(LOOSE_MODULE); + createEAttribute(looseModuleEClass, LOOSE_MODULE__ALT_DD); + + looseConfigurationEClass = createEClass(LOOSE_CONFIGURATION); + createEReference(looseConfigurationEClass, LOOSE_CONFIGURATION__APPLICATIONS); + + looseWARFileEClass = createEClass(LOOSE_WAR_FILE); + createEReference(looseWARFileEClass, LOOSE_WAR_FILE__LOOSE_LIBS); + } + + /** + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + private boolean isInitialized = false; + + /** + * Complete the initialization of the package and its meta-model. This + * method is guarded to have no affect on any invocation but its first. + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + public void initializePackageContents() { + if (isInitialized) return; + isInitialized = true; + + // Initialize package + setName(eNAME); + setNsPrefix(eNS_PREFIX); + setNsURI(eNS_URI); + + // Add supertypes to classes + looseApplicationEClass.getESuperTypes().add(this.getLooseArchive()); + looseLibraryEClass.getESuperTypes().add(this.getLooseArchive()); + looseModuleEClass.getESuperTypes().add(this.getLooseArchive()); + looseWARFileEClass.getESuperTypes().add(this.getLooseModule()); + + // Initialize classes and features; add operations and parameters + initEClass(looseApplicationEClass, LooseApplication.class, "LooseApplication", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getLooseApplication_LooseArchives(), this.getLooseArchive(), this.getLooseArchive_LooseApp(), "looseArchives", null, 0, -1, LooseApplication.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(looseArchiveEClass, LooseArchive.class, "LooseArchive", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getLooseArchive_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLooseArchive_BinariesPath(), ecorePackage.getEString(), "binariesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEAttribute(getLooseArchive_ResourcesPath(), ecorePackage.getEString(), "resourcesPath", null, 0, 1, LooseArchive.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + initEReference(getLooseArchive_LooseApp(), this.getLooseApplication(), this.getLooseApplication_LooseArchives(), "looseApp", null, 0, 1, LooseArchive.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + addEOperation(looseArchiveEClass, ecorePackage.getEBoolean(), "isModule"); + + initEClass(looseLibraryEClass, LooseLibrary.class, "LooseLibrary", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getLooseLibrary_LooseWAR(), this.getLooseWARFile(), this.getLooseWARFile_LooseLibs(), "looseWAR", null, 0, 1, LooseLibrary.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(looseModuleEClass, LooseModule.class, "LooseModule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEAttribute(getLooseModule_AltDD(), ecorePackage.getEString(), "altDD", null, 0, 1, LooseModule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(looseConfigurationEClass, LooseConfiguration.class, "LooseConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getLooseConfiguration_Applications(), this.getLooseApplication(), null, "applications", null, 0, -1, LooseConfiguration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + + initEClass(looseWARFileEClass, LooseWARFile.class, "LooseWARFile", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + initEReference(getLooseWARFile_LooseLibs(), this.getLooseLibrary(), this.getLooseLibrary_LooseWAR(), "looseLibs", null, 0, -1, LooseWARFile.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + } + +} //LooseconfigPackageImpl + + + diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigAdapterFactory.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigAdapterFactory.java index 5bb720ca0..7adfa028b 100644 --- a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/internal/looseconfig/util/LooseconfigAdapterFactory.java +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigAdapterFactory.java @@ -8,20 +8,20 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.util; +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.util; import org.eclipse.emf.common.notify.Adapter; import org.eclipse.emf.common.notify.Notifier; import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseApplication; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseArchive; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseConfiguration; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseLibrary; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseModule; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseWARFile; -import org.eclipse.jst.j2ee.commonarchivecore.internal.looseconfig.LooseconfigPackage; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; /** @@ -54,52 +54,47 @@ public class LooseconfigAdapterFactory extends AdapterFactoryImpl { return true; } if (object instanceof EObject) { - return ((EObject) object).eClass().getEPackage() == modelPackage; + return ((EObject)object).eClass().getEPackage() == modelPackage; } return false; } /** - * The switch the delegates to the <code>createXXX</code> methods. <!-- begin-user-doc --> + * The switch the delegates to the <code>createXXX</code> methods. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ - protected LooseconfigSwitch modelSwitch = new LooseconfigSwitch() { - public Object caseLooseApplication(LooseApplication object) { - return createLooseApplicationAdapter(); - } - - public Object caseLooseArchive(LooseArchive object) { - return createLooseArchiveAdapter(); - } - - public Object caseLooseLibrary(LooseLibrary object) { - return createLooseLibraryAdapter(); - } - - public Object caseLooseModule(LooseModule object) { - return createLooseModuleAdapter(); - } - - public Object caseLooseConfiguration(LooseConfiguration object) { - return createLooseConfigurationAdapter(); - } - - public Object caseLooseWARFile(LooseWARFile object) { - return createLooseWARFileAdapter(); - } - - public Object defaultCase(EObject object) { - return createEObjectAdapter(); - } - }; + protected LooseconfigSwitch modelSwitch = + new LooseconfigSwitch() { + public Object caseLooseApplication(LooseApplication object) { + return createLooseApplicationAdapter(); + } + public Object caseLooseArchive(LooseArchive object) { + return createLooseArchiveAdapter(); + } + public Object caseLooseLibrary(LooseLibrary object) { + return createLooseLibraryAdapter(); + } + public Object caseLooseModule(LooseModule object) { + return createLooseModuleAdapter(); + } + public Object caseLooseConfiguration(LooseConfiguration object) { + return createLooseConfigurationAdapter(); + } + public Object caseLooseWARFile(LooseWARFile object) { + return createLooseWARFileAdapter(); + } + public Object defaultCase(EObject object) { + return createEObjectAdapter(); + } + }; /** * @generated This field/method will be replaced during code generation. */ public Adapter createAdapter(Notifier target) { - return (Adapter) modelSwitch.doSwitch((EObject) target); + return (Adapter)modelSwitch.doSwitch((EObject)target); } @@ -138,9 +133,9 @@ public class LooseconfigAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for the default case. <!-- begin-user-doc --> This default + * Creates a new adapter for the default case. + * <!-- begin-user-doc --> This default * implementation returns null. <!-- end-user-doc --> - * * @return the new adapter. * @generated */ diff --git a/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigSwitch.java b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigSwitch.java new file mode 100644 index 000000000..412257d92 --- /dev/null +++ b/plugins/org.eclipse.jst.j2ee.core/commonArchive/org/eclipse/jst/j2ee/commonarchivecore/looseconfig/internal/util/LooseconfigSwitch.java @@ -0,0 +1,180 @@ +/******************************************************************************* + * Copyright (c) 2001, 2004 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ +package org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.util; + + +import java.util.List; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseArchive; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile; +import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage; + + +/** + * @lastgen class LooseconfigSwitch {} + */ +public class LooseconfigSwitch { + /** + * The cached model package + * <!-- begin-user-doc --> <!-- end-user-doc --> + * @generated + */ + protected static LooseconfigPackage modelPackage; + + /** + * @generated This field/method will be replaced during code generation. + */ + public LooseconfigSwitch() { + if (modelPackage == null) { + modelPackage = LooseconfigPackage.eINSTANCE; + } + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object doSwitch(EObject theEObject) { + return doSwitch(theEObject.eClass(), theEObject); + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected Object doSwitch(EClass theEClass, EObject theEObject) { + if (theEClass.eContainer() == modelPackage) { + return doSwitch(theEClass.getClassifierID(), theEObject); + } + else { + List eSuperTypes = theEClass.getESuperTypes(); + return + eSuperTypes.isEmpty() ? + defaultCase(theEObject) : + doSwitch((EClass)eSuperTypes.get(0), theEObject); + } + } + + /** + * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @return the first non-null result returned by a <code>caseXXX</code> call. + * @generated + */ + protected Object doSwitch(int classifierID, EObject theEObject) { + switch (classifierID) { + case LooseconfigPackage.LOOSE_APPLICATION: { + LooseApplication looseApplication = (LooseApplication)theEObject; + Object result = caseLooseApplication(looseApplication); + if (result == null) result = caseLooseArchive(looseApplication); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LooseconfigPackage.LOOSE_ARCHIVE: { + LooseArchive looseArchive = (LooseArchive)theEObject; + Object result = caseLooseArchive(looseArchive); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LooseconfigPackage.LOOSE_LIBRARY: { + LooseLibrary looseLibrary = (LooseLibrary)theEObject; + Object result = caseLooseLibrary(looseLibrary); + if (result == null) result = caseLooseArchive(looseLibrary); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LooseconfigPackage.LOOSE_MODULE: { + LooseModule looseModule = (LooseModule)theEObject; + Object result = caseLooseModule(looseModule); + if (result == null) result = caseLooseArchive(looseModule); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LooseconfigPackage.LOOSE_CONFIGURATION: { + LooseConfiguration looseConfiguration = (LooseConfiguration)theEObject; + Object result = caseLooseConfiguration(looseConfiguration); + if (result == null) result = defaultCase(theEObject); + return result; + } + case LooseconfigPackage.LOOSE_WAR_FILE: { + LooseWARFile looseWARFile = (LooseWARFile)theEObject; + Object result = caseLooseWARFile(looseWARFile); + if (result == null) result = caseLooseModule(looseWARFile); + if (result == null) result = caseLooseArchive(looseWARFile); + if (result == null) result = defaultCase(theEObject); + return result; + } + default: return defaultCase(theEObject); + } + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object caseLooseApplication(LooseApplication object) { + return null; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object caseLooseArchive(LooseArchive object) { + return null; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object caseLooseLibrary(LooseLibrary object) { + return null; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object caseLooseWARFile(LooseWARFile object) { + return null; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object caseLooseModule(LooseModule object) { + return null; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object caseLooseConfiguration(LooseConfiguration object) { + return null; + } + + /** + * @generated This field/method will be replaced during code generation. + */ + public Object defaultCase(EObject object) { + return null; + } + +} //LooseconfigSwitch + + + |