Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal')
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java248
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java376
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java354
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java98
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java259
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java139
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java99
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java499
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java241
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java676
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java207
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java394
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java239
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java469
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java521
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java94
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java29
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java426
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java1032
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java191
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties7
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java219
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java254
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java196
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java136
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java127
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java169
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java329
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java204
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java250
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java170
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java204
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java201
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java361
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java372
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java534
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java43
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java41
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java105
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java457
-rw-r--r--jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java579
42 files changed, 0 insertions, 11676 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
deleted file mode 100644
index 4124126d6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanInstanceSymbolImpl.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.HashMap;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBean Instance Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl#getProperties <em>Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanInstanceSymbolImpl#getMethods <em>Methods</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IBeanInstanceSymbolImpl extends IInstanceSymbolImpl implements IBeanInstanceSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * A detailed description (human readable) about this instance symbol
- */
- protected String _detailedDescription = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanInstanceSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the EClass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of bean properties
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getProperties()
- {
- return getJavaTypeDescriptor().getBeanProperties();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of methods
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getMethods() {
- return getJavaTypeDescriptor().getBeanMethods();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IJavaTypeDescriptor2 getJavaTypeDescriptor() {
- return (IJavaTypeDescriptor2) getTypeDescriptor();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public void setJavaTypeDescriptor(IJavaTypeDescriptor2 newTypeDescriptor) {
- setTypeDescriptor(newTypeDescriptor);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the object related to featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__PROPERTIES:
- return getProperties();
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__METHODS:
- return getMethods();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return whether the corresponding feature is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__PROPERTIES:
- return !getProperties().isEmpty();
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL__METHODS:
- return !getMethods().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- public String getDetailedDescription()
- {
- return _detailedDescription;
- }
-
- public void setDetailedDescription(String detailedDescription)
- {
- this._detailedDescription = detailedDescription;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isTypeResolved()
- * @generated NOT
- */
- // @Override
- public boolean isTypeResolved()
- {
- return getJavaTypeDescriptor() != null;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#setTypeDescriptor(org.eclipse.jst.jsf.context.symbol.ITypeDescriptor)
- * @generated NOT
- */
- public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor)
- {
- if (newTypeDescriptor instanceof IJavaTypeDescriptor2)
- {
- super.setTypeDescriptor(newTypeDescriptor);
- }
- else
- {
- throw new IllegalArgumentException("Bean instance symbol requires a IJavaTypeDescriptor2"); //$NON-NLS-1$
- }
- }
-
- public boolean isReadable()
- {
- // beans always readable
- return true;
- }
-
- public boolean isWritable()
- {
- // beans not writable
- return false;
- }
-
- public void setReadable(boolean value) {
- // do nothing
- }
-
- public void setWritable(boolean value) {
- // do nothing
- }
-
- /*
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature)
- {
- if (supportsCoercion(typeSignature))
- {
- if (TypeConstants.TYPE_MAP.equals(typeSignature))
- {
- IBoundedMapTypeDescriptor mapDesc =
- SymbolFactory.eINSTANCE.createIBoundedMapTypeDescriptor();
- // bean maps are generally writable
- mapDesc.setImmutable(true);
- mapDesc.setMapSource(new HashMap()); // give it an empty map
- return mapDesc;
- }
- else if (TypeConstants.TYPE_LIST.equals(typeSignature))
- {
- IBoundedListTypeDescriptor listDesc =
- SymbolFactory.eINSTANCE.createIBoundedListTypeDescriptor();
-
- // bean maps are generally writable
- listDesc.setListSource(new BasicEList()); // give it an empty list
- return listDesc;
- }
- }
-
- return null;
- }
-
- /** (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#call(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String)
- *
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments,
- String symbolName)
- {
- return Util.call(methodName, methodArguments, symbolName, getTypeDescriptor());
- }
-
-} //IBeanInstanceSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java
deleted file mode 100644
index 76505d083..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanMethodSymbolImpl.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBean Method Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getSignature <em>Signature</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanMethodSymbolImpl#getOwner <em>Owner</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IBeanMethodSymbolImpl extends EObjectImpl implements IBeanMethodSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected static final String SIGNATURE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected String signature = SIGNATURE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOwner()
- * @generated
- * @ordered
- */
- protected IJavaTypeDescriptor2 owner = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanMethodSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eclass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBEAN_METHOD_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the name of the method symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the signature in JVM/JDT form
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSignature() {
- return signature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newSignature
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSignature(String newSignature) {
- String oldSignature = signature;
- signature = newSignature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE, oldSignature, signature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the java type descriptor that owns this symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 getOwner() {
- if (owner != null && owner.eIsProxy()) {
- InternalEObject oldOwner = (InternalEObject)owner;
- owner = (IJavaTypeDescriptor2)eResolveProxy(oldOwner);
- if (owner != oldOwner) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER, oldOwner, owner));
- }
- }
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the java type descriptor that derives this symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 basicGetOwner() {
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newOwner
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOwner(IJavaTypeDescriptor2 newOwner) {
- IJavaTypeDescriptor2 oldOwner = owner;
- owner = newOwner;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER, oldOwner, owner));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the feature object for featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- return getSignature();
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- if (resolve) return getOwner();
- return basicGetOwner();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- setSignature((String)newValue);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- setSignature(SIGNATURE_EDEFAULT);
- return;
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature);
- case SymbolPackage.IBEAN_METHOD_SYMBOL__OWNER:
- return owner != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param derivedFeatureID
- * @param baseClass
- * @return the feature id
- * <!-- end-user-doc -->
- * @generated
- */
- public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
- if (baseClass == ISymbol.class) {
- switch (derivedFeatureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME: return SymbolPackage.ISYMBOL__NAME;
- default: return -1;
- }
- }
- if (baseClass == IMethodSymbol.class) {
- switch (derivedFeatureID) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE: return SymbolPackage.IMETHOD_SYMBOL__SIGNATURE;
- default: return -1;
- }
- }
- return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param baseFeatureID
- * @param baseClass
- * @return the feature id
- * <!-- end-user-doc -->
- * @generated
- */
- public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
- if (baseClass == ISymbol.class) {
- switch (baseFeatureID) {
- case SymbolPackage.ISYMBOL__NAME: return SymbolPackage.IBEAN_METHOD_SYMBOL__NAME;
- default: return -1;
- }
- }
- if (baseClass == IMethodSymbol.class) {
- switch (baseFeatureID) {
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE: return SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE;
- default: return -1;
- }
- }
- return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the default string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", signature: "); //$NON-NLS-1$
- result.append(signature);
- result.append(')');
- return result.toString();
- }
-
- public String getDetailedDescription() {
- StringBuffer descBuffer = new StringBuffer("<p><b>Signature:</b> ");
- descBuffer.append(Signature.toString(signature, getName(), null, false, true)).append("</p>");
- IMethod method = JavaUtil.findCorrespondingMethod(this);
- if (method != null) {
- String javadoc = JavaUtil.getMethodJavadoc(method);
- if (javadoc != null) {
- descBuffer.append("<p>").append(javadoc).append("</p>");
- }
- }
- return descBuffer.toString();
- }
-
- public void setDetailedDescription(String detailedDescription) {
- throw new UnsupportedOperationException("Detailed Description is derived on property symbols"); //$NON-NLS-1$
- }
-
-
-} //IBeanMethodSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
deleted file mode 100644
index e80a12342..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBeanPropertySymbolImpl.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.HashMap;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.util.JDTBeanProperty;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBean Property Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IBeanPropertySymbolImpl#getOwner <em>Owner</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IBeanPropertySymbolImpl extends IPropertySymbolImpl implements IBeanPropertySymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding") //$NON-NLS-1$
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
-
- /**
- * The cached value of the '{@link #getOwner() <em>Owner</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getOwner()
- * @generated
- * @ordered
- */
- protected IJavaTypeDescriptor2 owner = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanPropertySymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBEAN_PROPERTY_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the owner's type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 getOwner() {
- if (owner != null && owner.eIsProxy()) {
- InternalEObject oldOwner = (InternalEObject)owner;
- owner = (IJavaTypeDescriptor2)eResolveProxy(oldOwner);
- if (owner != oldOwner) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER, oldOwner, owner));
- }
- }
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the java type descriptor for this instance
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 basicGetOwner() {
- return owner;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newOwner
- * <!-- end-user-doc -->
- * @generated
- */
- public void setOwner(IJavaTypeDescriptor2 newOwner) {
- IJavaTypeDescriptor2 oldOwner = owner;
- owner = newOwner;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER, oldOwner, owner));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the value for the featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- if (resolve) return getOwner();
- return basicGetOwner();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- setOwner((IJavaTypeDescriptor2)null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL__OWNER:
- return owner != null;
- }
- return super.eIsSet(featureID);
- }
-
- public String getDetailedDescription()
- {
- return createDetailedDescription();
- }
-
- public void setDetailedDescription(String detailedDescription)
- {
- throw new UnsupportedOperationException("Detailed Description is derived on property symbols"); //$NON-NLS-1$
- }
-
- /**
- * @generated NOT
- */
- public ITypeDescriptor coerce(final String typeSignature)
- {
- // ensure that we have an erased version
- final String erasedTypeSignature = Signature.getTypeErasure(typeSignature);
-
- if (supportsCoercion(typeSignature))
- {
- if (TypeConstants.TYPE_MAP.equals(erasedTypeSignature))
- {
- IBoundedMapTypeDescriptor mapDesc =
- SymbolFactory.eINSTANCE.createIBoundedMapTypeDescriptor();
- // bean maps are generally writable
- mapDesc.setImmutable(true);
- mapDesc.setMapSource(new HashMap()); // give it an empty map
- return mapDesc;
- }
- else if (TypeConstants.TYPE_LIST.equals(erasedTypeSignature))
- {
- IBoundedListTypeDescriptor listDesc =
- SymbolFactory.eINSTANCE.createIBoundedListTypeDescriptor();
- listDesc.setJdtContext(deriveBestJdtContext());
-
- // bean maps are generally writable
- return listDesc;
- }
- }
-
- return null;
-
- }
-
- /**
- * @return the derived jdt element
- * @generated NOT
- */
- private IJavaElement deriveBestJdtContext()
- {
- IJavaElement contextElement = null;
- if (getTypeDescriptor() instanceof IJavaTypeDescriptor2)
- {
- contextElement =
- ((IJavaTypeDescriptor2)getTypeDescriptor()).getType();
- }
-
- if (contextElement == null)
- {
- contextElement = getTypeDescriptor().getJdtContext();
- }
-
- return contextElement;
- }
-
- /** (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#call(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String)
- *
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments,
- String symbolName)
- {
- return Util.call(methodName, methodArguments, symbolName, getTypeDescriptor());
- }
-
-
-// private List convertArgsToSignatures(List methodArgs)
-// {
-// List args = new ArrayList();
-//
-// for (final Iterator it = methodArgs.iterator(); it.hasNext();)
-// {
-// Object arg = it.next();
-// String className = arg.getClass().getName();
-// String resolvedName = Signature.createTypeSignature(className, true);
-// args.add(resolvedName);
-// }
-//
-// return args;
-// }
-
- /**
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature) {
- // first check that our type descriptor even thinks it is
- // an instanceof this type
- if (getTypeDescriptor().instanceOf(typeSignature))
- {
- // for java bean instances, we need to minimally support
- // Map, List and Array to conform to the basic spec
- // for JSF EL
- if (TypeConstants.TYPE_MAP.equals(Signature.getTypeErasure(typeSignature)))
- {
- return true;
- }
- else if (TypeConstants.TYPE_LIST.equals(Signature.getTypeErasure(typeSignature)))
- {
- return true;
- }
- }
-
- // otherwise, not supported
- return false;
- }
-
- /**
- * @return the detail description
- * @generated NOT
- */
- private String createDetailedDescription()
- {
- StringBuffer additionalInfo = new StringBuffer("<p><b>"); //$NON-NLS-1$
- ITypeDescriptor typeDescriptor_ = getTypeDescriptor();
- if (typeDescriptor_ != null) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.Type")); //$NON-NLS-1$
- additionalInfo.append("</b>"); //$NON-NLS-1$
- additionalInfo.append(Signature.toString(typeDescriptor_.getTypeSignature()));
- }
- additionalInfo.append("</p>"); //$NON-NLS-1$
- additionalInfo.append("<p><b>"); //$NON-NLS-1$
-
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.Access")); //$NON-NLS-1$
- additionalInfo.append("</b>"); //$NON-NLS-1$
- if (isReadable() && isWritable()) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.read_write")); //$NON-NLS-1$
- } else if (isReadable()) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.readonly")); //$NON-NLS-1$
- } else if (isWritable()) {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.writeonly")); //$NON-NLS-1$
- } else {
- additionalInfo.append(Messages.getString("IBeanPropertySymbolImpl.none")); //$NON-NLS-1$
- }
- additionalInfo.append("</p>"); //$NON-NLS-1$
- JDTBeanProperty property = JavaUtil.findCorrespondingJDTProperty(this);
- if (property != null) {
- String javaDoc = null;
- if (property.getGetter() != null) {
- javaDoc = JavaUtil.getMethodJavadoc(property.getGetter());
- }
- if (javaDoc == null && property.getSetter() != null) {
- javaDoc = JavaUtil.getMethodJavadoc(property.getSetter());
- }
- if (javaDoc != null) {
- additionalInfo.append("<p>").append(javaDoc).append("</p>"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- return additionalInfo.toString();
- }
-
-} //IBeanPropertySymbolImpl
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
deleted file mode 100644
index af1f404e6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedJavaTypeDescriptorImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.8 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBounded Java Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IBoundedJavaTypeDescriptorImpl extends IJavaTypeDescriptor2Impl implements IBoundedJavaTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedJavaTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBOUNDED_JAVA_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isUnboundedForType(String typeSignature) {
- // TODO: for now, return true if the type is a resolved object
- // need to add support for template checking (Java5) and
- // decide what to do with unresolved (Q) type signatures
- return typeSignature != null
- && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol getUnboundedProperty(Object name, String typeSignature) {
- ISymbol retValue = null;
-
- if (isUnboundedForType(typeSignature))
- {
- IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(name.toString());
- propSymbol.setReadable(true);
- IBoundedJavaTypeDescriptor typeDesc =
- SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-
- typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
- propSymbol.setTypeDescriptor(typeDesc);
- retValue = propSymbol;
- }
-
- return retValue;
- }
-
- public ISymbol calculateSyntheticCall(String methodName, EList methodArgs,
- String symbolName)
- {
- return getUnboundedProperty(symbolName, TypeConstants.TYPE_JAVAOBJECT);
- }
-} //IBoundedJavaTypeDescriptorImpl \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
deleted file mode 100644
index e6cb34b8a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedListTypeDescriptorImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedListTypeDescriptorImpl.java,v 1.6 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBounded List Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IBoundedListTypeDescriptorImpl extends IListTypeDescriptorImpl implements IBoundedListTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedListTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBOUNDED_LIST_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isUnboundedForType(String typeSignature)
- {
- // type signature must be a boxed integer
- // TODO: at this level, do we need to deal with coercion to
- // other integer types? list.get() takes an integer...
- return typeSignature != null && TypeConstants.TYPE_BOXED_INTEGER.equals(typeSignature);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol getUnboundedProperty(Object name, String typeSignature) {
- ISymbol retValue = null;
-
- if (isUnboundedForType(typeSignature)
- && name instanceof Number)
- {
- // get integer value
- int offset = ((Number)name).intValue();
-
- // first see if we have it in our map source
- // TODO: retValue = getFromMap(name.toString());
-
- if (retValue == null)
- {
- IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(name.toString());
- propSymbol.setReadable(true);
- propSymbol.setTypeDescriptor(getBoundsTypeDescriptor(offset));
- retValue = propSymbol;
- }
- }
-
- return retValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param methodName
- * @param methodArguments
- * @param symbolName
- * @return a symbol representing the return value of the method
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments, String symbolName)
- {
- ISymbol result = null;
- final IType type = resolveType(getTypeSignature());
-
- if (type != null)
- {
- final JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(type);
-
- final IMethod callMethod =
- matchMethod(methodName, methodArguments, introspector.getAllMethods());
-
- if (callMethod != null)
- {
- try
- {
- // resolve the method's return type; don't erase parameters
- final String retTypeSignature =
- TypeUtil.resolveTypeSignature
- (type, callMethod.getReturnType(), false) ;
-
- final IPropertySymbol propSymbol =
- SymbolFactory.eINSTANCE.createIPropertySymbol();
-
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(symbolName);
- propSymbol.setReadable(true);
- IJavaTypeDescriptor2 typeDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
-
- typeDesc.setArrayCount(Signature.getArrayCount(retTypeSignature));
-
- // may be null
- typeDesc.setType(resolveType(retTypeSignature));
- typeDesc.setTypeSignatureDelegate(retTypeSignature);
- propSymbol.setTypeDescriptor(typeDesc);
- result = propSymbol;
- }
- catch (JavaModelException e)
- {
- JSFCommonPlugin.log(e);
- // fall-through and return null result
- }
- }
- }
-
- return result;
- }
-
- private IMethod matchMethod(String name, List methodArguments, IMethod[] allMethods)
- {
- final List argSigs = convertArgsToSignatures(methodArguments);
- IMethod matchedMethod = null;
-
- for (int i = 0; i < allMethods.length; i++)
- {
- final IMethod method = allMethods[i];
-
- // check for names and argument count match
- if (method.getParameterTypes().length == argSigs.size()
- && method.getElementName().equals(name))
- {
- String[] methods = method.getParameterTypes();
- // need to verify argument matches
- boolean isMatched = true;
- CHECK_ARGUMENTS: for (int j = 0; j < methods.length; j++)
- {
- if (!methods[j].equals(argSigs.get(j)))
- {
- // not a match
- isMatched = false;
- break CHECK_ARGUMENTS;
- }
- }
-
- if (isMatched)
- {
- return method;
- }
- }
- }
-
- return matchedMethod;
- }
-
- private List convertArgsToSignatures(List methodArgs)
- {
- List args = new ArrayList();
-
- for (final Iterator it = methodArgs.iterator(); it.hasNext();)
- {
- Object arg = it.next();
- String className = arg.getClass().getName();
- String resolvedName = Signature.createTypeSignature(className, true);
- args.add(resolvedName);
- }
-
- return args;
- }
-
- /**
- * @return the ITypeDescriptor for this List's element type (bound type).
- * Defaults to java.lang.Object if no bounds or can't resolve bounds
- *
- * @generated NOT
- */
- private ITypeDescriptor getBoundsTypeDescriptor(int offset)
- {
- IJavaTypeDescriptor2 typeDesc = null;
-
- List typeParameters = getTypeParameterSignatures();
-
- // if no bounds at all, then default to bounded java object
- if (typeParameters.size() == 0)
- {
- typeDesc =
- SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-
- typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
- }
- else
- {
- // TODO: there should only be exactly one on a list...
- final String elementType = (String) typeParameters.get(0);
-
- typeDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
-
- typeDesc.setArrayCount(Signature.getArrayCount(elementType));
-
- // may be null
- typeDesc.setType(resolveType(elementType));
- typeDesc.setTypeSignatureDelegate(elementType);
- }
-
- return typeDesc;
- }
-} //IBoundedListTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
deleted file mode 100644
index 198999511..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IBoundedMapTypeDescriptorImpl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.7 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IBounded Map Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IBoundedMapTypeDescriptorImpl extends IMapTypeDescriptorImpl implements IBoundedMapTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedMapTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IBOUNDED_MAP_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isUnboundedForType(String typeSignature) {
- // TODO: for now, return true if the type is a resolved object
- // need to add support for template checking (Java5) and
- // decide what to do with unresolved (Q) type signatures
- return typeSignature != null
- && typeSignature.startsWith(Character.toString(Signature.C_RESOLVED));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol getUnboundedProperty(Object name, String typeSignature) {
- ISymbol retValue = null;
-
- if (isUnboundedForType(typeSignature))
- {
- // first see if we have it in our map source
- retValue = getFromMap(name.toString());
-
- if (retValue == null)
- {
- IPropertySymbol propSymbol = SymbolFactory.eINSTANCE.createIPropertySymbol();
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(name.toString());
- propSymbol.setReadable(true);
- IBoundedJavaTypeDescriptor typeDesc =
- SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
-
- typeDesc.setTypeSignatureDelegate(TypeConstants.TYPE_JAVAOBJECT);
- propSymbol.setTypeDescriptor(typeDesc);
- retValue = propSymbol;
- }
- }
-
- return retValue;
-
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#calculateSyntheticCall(java.lang.String, org.eclipse.emf.common.util.EList, java.lang.String)
- * @generated NOT
- */
- public ISymbol calculateSyntheticCall(String methodName, EList methodArgs,
- String symbolName) {
- if ("get".equals(methodName) //$NON-NLS-1$
- && methodArgs.size() == 1)
- {
- return getUnboundedProperty(symbolName, ((ValueType) methodArgs.get(0)).getSignature());
- }
-
- // default is return null
- return null;
- }
-
-
- /**
- * @generated NOT
- */
- private ISymbol getFromMap(final String name)
- {
- for (final Iterator it = getProperties().iterator(); it.hasNext();)
- {
- ISymbol symbol = (ISymbol) it.next();
-
- if (symbol.getName().equals(name))
- {
- return symbol;
- }
- }
-
- return null;
- }
-
-} //IBoundedMapTypeDescriptorImpl \ No newline at end of file
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
deleted file mode 100644
index 15a592ef9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IComponentSymbolImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IComponent Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class IComponentSymbolImpl extends IInstanceSymbolImpl implements IComponentSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * A human readable description of this symbol
- */
- protected String _detailedDescription = null;
-
- /**
- * true if this component symbol is readable
- */
- protected boolean _isReadable = READABLE_EDEFAULT;
-
- /**
- * true if this component symbol is writable
- */
- protected boolean _isWritable = WRITABLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IComponentSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.ICOMPONENT_SYMBOL;
- }
-
- public String getDetailedDescription() {
- return _detailedDescription;
- }
-
- public void setDetailedDescription(String detailedDescription) {
- _detailedDescription = detailedDescription;
- }
-
- /**
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature) {
- // TODO:
- return getTypeDescriptor();
- }
-
- /**
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature) {
- // TODO:
- if (getTypeDescriptor().instanceOf(typeSignature))
- {
- return true;
- }
- return false;
- }
-} //IComponentSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java
deleted file mode 100644
index bc868c512..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IInstanceSymbolImpl.java
+++ /dev/null
@@ -1,499 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IInstance Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getTypeDescriptor <em>Type Descriptor</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isReadable <em>Readable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isWritable <em>Writable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#isTypeResolved <em>Type Resolved</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#getRuntimeSource <em>Runtime Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IInstanceSymbolImpl extends EObjectImpl implements IInstanceSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypeDescriptor() <em>Type Descriptor</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeDescriptor()
- * @generated
- * @ordered
- */
- protected ITypeDescriptor typeDescriptor = null;
-
- /**
- * The default value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated NOT
- * @ordered
- */
- protected static final boolean READABLE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated
- * @ordered
- */
- protected boolean readable = READABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected static final boolean WRITABLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected boolean writable = WRITABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isTypeResolved() <em>Type Resolved</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isTypeResolved()
- * @generated
- * @ordered
- */
- protected static final boolean TYPE_RESOLVED_EDEFAULT = false;
-
- /**
- * The default value of the '{@link #getRuntimeSource() <em>Runtime Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRuntimeSource()
- * @generated
- * @ordered
- */
- protected static final ERuntimeSource RUNTIME_SOURCE_EDEFAULT = ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL;
-
- /**
- * The cached value of the '{@link #getRuntimeSource() <em>Runtime Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getRuntimeSource()
- * @generated
- * @ordered
- */
- protected ERuntimeSource runtimeSource = RUNTIME_SOURCE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IInstanceSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IINSTANCE_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the symbol name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the type descriptor for this instance
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor getTypeDescriptor() {
- if (typeDescriptor != null && typeDescriptor.eIsProxy()) {
- InternalEObject oldTypeDescriptor = (InternalEObject)typeDescriptor;
- typeDescriptor = (ITypeDescriptor)eResolveProxy(oldTypeDescriptor);
- if (typeDescriptor != oldTypeDescriptor) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
- }
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the instance type
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor basicGetTypeDescriptor() {
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeDescriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) {
- ITypeDescriptor oldTypeDescriptor = typeDescriptor;
- typeDescriptor = newTypeDescriptor;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if instance symbol is readable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isReadable() {
- return readable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newReadable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReadable(boolean newReadable) {
- boolean oldReadable = readable;
- readable = newReadable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__READABLE, oldReadable, readable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if instance is writable.
- *
- * Normally, instances should not be
- * considered writable, since the VariableResolver has no setter, however
- * this is included to allow for unforeseen cases that may require an
- * instance symbol to appear to be writable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isWritable() {
- return writable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newWritable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWritable(boolean newWritable) {
- boolean oldWritable = writable;
- writable = newWritable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__WRITABLE, oldWritable, writable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if the type descriptor has been resolved for this symbol
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isTypeResolved()
- {
- return getTypeDescriptor() != null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return return the symbol's runtime source
- * <!-- end-user-doc -->
- * @generated
- */
- public ERuntimeSource getRuntimeSource() {
- return runtimeSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newRuntimeSource
- * <!-- end-user-doc -->
- * @generated
- */
- public void setRuntimeSource(ERuntimeSource newRuntimeSource) {
- ERuntimeSource oldRuntimeSource = runtimeSource;
- runtimeSource = newRuntimeSource == null ? RUNTIME_SOURCE_EDEFAULT : newRuntimeSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE, oldRuntimeSource, runtimeSource));
- }
-
- /**
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature)
- {
- // first check that our type descriptor even thinks it is
- // an instanceof this type
- if (getTypeDescriptor().instanceOf(typeSignature))
- {
- // for java bean instances, we need to minimally support
- // Map, List and Array to conform to the basic spec
- // for JSF EL
- if (TypeConstants.TYPE_MAP.equals(typeSignature))
- {
- return true;
- }
- else if (TypeConstants.TYPE_LIST.equals(typeSignature)
- /*TODO: || isArray*/)
- {
- return true;
- }
- }
-
- // otherwise, not supported
- return false;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature) {
- // TODO:
- return getTypeDescriptor();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol call(String methodName, EList methodArguments, String symbolName) {
- return Util.call(methodName,methodArguments,symbolName,getTypeDescriptor());
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the value for the featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- if (resolve) return getTypeDescriptor();
- return basicGetTypeDescriptor();
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- return isReadable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- return isWritable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED:
- return isTypeResolved() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- return getRuntimeSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)newValue);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- setReadable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- setWritable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- setRuntimeSource((ERuntimeSource)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)null);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- setReadable(READABLE_EDEFAULT);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- setWritable(WRITABLE_EDEFAULT);
- return;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- setRuntimeSource(RUNTIME_SOURCE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_DESCRIPTOR:
- return typeDescriptor != null;
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- return readable != READABLE_EDEFAULT;
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- return writable != WRITABLE_EDEFAULT;
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED:
- return isTypeResolved() != TYPE_RESOLVED_EDEFAULT;
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- return runtimeSource != RUNTIME_SOURCE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", readable: "); //$NON-NLS-1$
- result.append(readable);
- result.append(", writable: "); //$NON-NLS-1$
- result.append(writable);
- result.append(", runtimeSource: "); //$NON-NLS-1$
- result.append(runtimeSource);
- result.append(')');
- return result.toString();
- }
-
-} //IInstanceSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java
deleted file mode 100644
index 32d8de6b8..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaSymbolImpl.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IJava Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaSymbolImpl#getJavaElement <em>Java Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IJavaSymbolImpl extends EObjectImpl implements IJavaSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJavaElement() <em>Java Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaElement()
- * @generated
- * @ordered
- */
- protected static final IJavaElement JAVA_ELEMENT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJavaElement() <em>Java Element</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJavaElement()
- * @generated
- * @ordered
- */
- protected IJavaElement javaElement = JAVA_ELEMENT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eclass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IJAVA_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the symbol name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the IJavaElement associated with this symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement getJavaElement() {
- return javaElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newJavaElement
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJavaElement(IJavaElement newJavaElement) {
- IJavaElement oldJavaElement = javaElement;
- javaElement = newJavaElement;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT, oldJavaElement, javaElement));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the feature
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- return getJavaElement();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- setJavaElement((IJavaElement)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- setJavaElement(JAVA_ELEMENT_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if featureID's feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- return JAVA_ELEMENT_EDEFAULT == null ? javaElement != null : !JAVA_ELEMENT_EDEFAULT.equals(javaElement);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the default string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", javaElement: "); //$NON-NLS-1$
- result.append(javaElement);
- result.append(')');
- return result.toString();
- }
-
-} //IJavaSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
deleted file mode 100644
index dde647c91..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IJavaTypeDescriptor2Impl.java
+++ /dev/null
@@ -1,676 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.core.Flags;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeInfoCache;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.JDTBeanProperty;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IJava Type Descriptor2</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getType <em>Type</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getBeanProperties <em>Bean Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getBeanMethods <em>Bean Methods</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IJavaTypeDescriptor2Impl#getArrayCount <em>Array Count</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IJavaTypeDescriptor2Impl extends ITypeDescriptorImpl implements IJavaTypeDescriptor2 {
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final IType TYPE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
- */
- protected IType type = TYPE_EDEFAULT;
-
- /**
- * The default value of the '{@link #getArrayCount() <em>Array Count</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getArrayCount()
- * @generated
- * @ordered
- */
- protected static final int ARRAY_COUNT_EDEFAULT = 0;
-
- /**
- * The cached value of the '{@link #getArrayCount() <em>Array Count</em>}' attribute.
- * <!-- begin-user-doc -->
- * records the array nesting of the type. IType doesn't encapsulate
- * array types. So if this type is an array then type will represent
- * the base element and this value will be > 0. If not an array, then
- * _arrayCount is always 0.
- * <!-- end-user-doc -->
- * @see #getArrayCount()
- * @generated
- * @ordered
- */
- protected int arrayCount = ARRAY_COUNT_EDEFAULT;
-
- /**
- * The default value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- @SuppressWarnings("hiding")
- protected static final IJavaElement JDT_CONTEXT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- @SuppressWarnings("hiding")
- protected IJavaElement jdtContext = JDT_CONTEXT_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaTypeDescriptor2Impl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the JDT type descriptor; if type is an array then this type
- * represent's the array base type only
- * <!-- end-user-doc -->
- * @generated
- */
- public IType getType() {
- return type;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newType
- * <!-- end-user-doc -->
- * @generated
- */
- public void setType(IType newType) {
- IType oldType = type;
- type = newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE, oldType, type));
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getInterfaceTypeSignatures()
- * @generated NOT
- */
- public EList getInterfaceTypeSignatures()
- {
- EList interfaces = new BasicEList();
-
- IType type_ = getType();
-
- if (type_ != null)
- {
- final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IType[] interfaceTypes = typeInfoCache.getCachedInterfaceTypes(type_);
- if (interfaceTypes == null) {
- interfaceTypes = typeInfoCache.cacheInterfaceTypesFor(type_);
- }
- copySignatures(interfaces, interfaceTypes);
- }
-
- return interfaces;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getSuperTypeSignatures()
- * @generated NOT
- */
- public EList getSuperTypeSignatures()
- {
- EList interfaces = new BasicEList();
-
- IType type_ = getType();
-
- if (type_ != null)
- {
- final TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IType[] interfaceTypes = typeInfoCache.getCachedSupertypes(type_);
-
- if (interfaceTypes == null)
- {
- interfaceTypes = typeInfoCache.cacheSupertypesFor(type_);
- }
- copySignatures(interfaces, interfaceTypes);
- }
-
- return interfaces;
- }
-
-
- private void copySignatures(List list, IType[] types)
- {
- for (int i = 0; i < types.length; i++)
- {
- final IType type_ = types[i];
- final String signature = TypeUtil.getSignature(type_);
-
- if (signature != null)
- {
- list.add(signature);
- }
- }
- }
-
- public EList getProperties()
- {
- return getBeanProperties();
- }
-
-
- public EList getMethods()
- {
- return getBeanMethods();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the bean props for this java type
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getBeanProperties()
- {
- TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IBeanPropertySymbol[] properties = typeInfoCache.getCachedPropertySymbols(type);
- Collection propertyColl;
- if (properties == null) {
- propertyColl = getPropertiesInternal();
- properties = (IBeanPropertySymbol[]) propertyColl.toArray(new IBeanPropertySymbol[propertyColl.size()]);
- typeInfoCache.cachePropertySymbols(type, properties);
- }
- else
- {
- propertyColl = new ArrayList(properties.length);
- Collections.addAll(propertyColl, (Object[])properties);
- }
- BasicEList list = new BasicEList(propertyColl);
- return list;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the bean methods for this type
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public EList getBeanMethods() {
- TypeInfoCache typeInfoCache = TypeInfoCache.getInstance();
- IBeanMethodSymbol[] methods = typeInfoCache.getCachedMethodSymbols(type);
- Collection methodColl;
- if (methods == null)
- {
- methodColl = getMethodsInternal();
- methods = (IBeanMethodSymbol[]) methodColl.toArray(new IBeanMethodSymbol[methodColl.size()]);
- typeInfoCache.cacheMethodSymbols(type, methods);
- } else {
- methodColl = new ArrayList(methods.length);
- Collections.addAll(methodColl, (Object[])methods);
- }
- BasicEList list = new BasicEList(methodColl);
- return list;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public int getArrayCount() {
- return arrayCount;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setArrayCount(int newArrayCount) {
- int oldArrayCount = arrayCount;
- arrayCount = newArrayCount;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT, oldArrayCount, arrayCount));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement getJdtContext() {
- return jdtContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJdtContext(IJavaElement newJdtContext) {
- IJavaElement oldJdtContext = jdtContext;
- jdtContext = newJdtContext;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__JDT_CONTEXT, oldJdtContext, jdtContext));
- }
-
- /**
- * <!-- begin-user-doc -->
- *
- * Tries to load an IType for a fully resolved (i.e. starts with L not Q)
- * type signature using the current jdtContext.
- *
- * @return the resolved IType or null if none could be resolved.
- *
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IType resolveType(String resolvedTypeSignature)
- {
- IType resolvedType = null;
-
- // we need to obtain an IJavaProject within which to resolve
- // the type.
- IJavaProject project = null;
-
- // first, see if we have an IType
- if (getType() != null)
- {
- // optimize: if the type sig is my type sig, then return getType()
- if (resolvedTypeSignature.equals(getTypeSignature()))
- {
- resolvedType = getType();
- }
- else
- {
- project = getType().getJavaProject();
-
- if (project != null)
- {
- resolvedType = TypeUtil.resolveType(project, resolvedTypeSignature);
- }
- }
- }
-
- // if not, see if a jdtContext hint has been set
- if (resolvedType == null && getJdtContext() != null)
- {
- resolvedType = super.resolveType(resolvedTypeSignature);
- }
-
- return resolvedType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- return getType();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- return getBeanProperties();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- return getBeanMethods();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- return Integer.valueOf(getArrayCount());
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- setType((IType)newValue);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- getBeanProperties().clear();
- getBeanProperties().addAll((Collection)newValue);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- getBeanMethods().clear();
- getBeanMethods().addAll((Collection)newValue);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- setArrayCount(((Integer)newValue).intValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- setType(TYPE_EDEFAULT);
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- getBeanProperties().clear();
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- getBeanMethods().clear();
- return;
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- setArrayCount(ARRAY_COUNT_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES:
- return !getBeanProperties().isEmpty();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS:
- return !getBeanMethods().isEmpty();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT:
- return arrayCount != ARRAY_COUNT_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- public boolean isArray()
- {
- return getArrayCount() > 0;
- }
-
- /**
- * @generated NOT
- */
- public IObjectSymbol getArrayElement()
- {
- if (isArray())
- {
- final String typeSignature = getTypeSignature();
- final int arrayCount_ = Signature.getArrayCount(typeSignature);
- final String baseType = Signature.getElementType(typeSignature);
- final String elementTypeSignature = Signature.createArraySignature(baseType, arrayCount_-1);
-
- final IJavaTypeDescriptor2 elementTypeDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- final String fullyQualifiedElementType = TypeUtil.getFullyQualifiedName(baseType);
-
- IType elementType = null;
-
- try
- {
- IType myType = getType();
- if (myType != null)
- {
- elementType = getType().getJavaProject()
- .findType(fullyQualifiedElementType);
- }
- }
- catch (JavaModelException e)
- {
- // suppress
- }
-
- if (elementType != null)
- {
- elementTypeDesc.setType(elementType);
- }
- else
- {
- elementTypeDesc.setTypeSignatureDelegate(elementTypeSignature);
- }
-
- elementTypeDesc.setArrayCount(Signature.getArrayCount(elementTypeSignature));
-
- IPropertySymbol newPropertySymbol =
- SymbolFactory.eINSTANCE.createIPropertySymbol();
- newPropertySymbol.setTypeDescriptor(elementTypeDesc);
- newPropertySymbol.setWritable(true);
- newPropertySymbol.setReadable(true);
- newPropertySymbol.setName(fullyQualifiedElementType);
- return newPropertySymbol;
- }
-
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature()
- * @generated NOT
- */
- public String getTypeSignature()
- {
- if (getType() == null)
- {
- if (eIsSet(SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE_SIGNATURE_DELEGATE))
- {
- return getTypeSignatureDelegate();
- }
-
- return null;
- }
-
- // make sure to array type nesting if using IType
- return Signature.createArraySignature(
- TypeUtil.getSignature(getType()), getArrayCount());
- }
-
- private Collection getPropertiesInternal()
- {
- // if I'm an array then I have no bean properties
- if (isArray())
- {
- return Collections.EMPTY_LIST;
- }
-
- final JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(getType());
-
- final Map<String, JDTBeanProperty> properties = introspector.getProperties();
-
- final Collection calculatedProps = new ArrayList(properties.size());
-
- for (final Iterator<Map.Entry<String, JDTBeanProperty>> it = properties.entrySet().iterator(); it.hasNext();)
- {
- Map.Entry<String, JDTBeanProperty> entry = it.next();
- final String propertyName = entry.getKey();
- final JDTBeanProperty property = entry.getValue();
-
- final IBeanPropertySymbol workingCopy =
- SymbolFactory.eINSTANCE.createIBeanPropertySymbol();
- workingCopy.setName(propertyName);
- workingCopy.setOwner(this);
-
- final IJavaTypeDescriptor2 workingCopyDesc =
- SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- workingCopy.setTypeDescriptor(workingCopyDesc);
- workingCopy.setReadable(property.isReadable());
- workingCopy.setWritable(property.isWritable());
-
- workingCopyDesc.setArrayCount(property.getArrayCount());
- workingCopyDesc.getTypeParameterSignatures().addAll(property.getTypeParameterSignatures());
- workingCopyDesc.setEnumType(property.isEnumType());
-
- final IType newType = property.getType();
- final String signature = property.getTypeSignature();
-
- if (newType != null)
- {
- workingCopyDesc.setType(newType);
- }
- else
- {
- workingCopyDesc.setTypeSignatureDelegate(signature);
- }
-
- calculatedProps.add(workingCopy);
- }
-
- return calculatedProps;
- }
-
- private Collection getMethodsInternal()
- {
- JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(getType());
-
- IMethod[] methods = introspector.getAllMethods();
-
- List methodSymbols = new ArrayList();
-
- for (int i = 0; i < methods.length; i++)
- {
- IMethod method = methods[i];
-
- try
- {
- // to be a bean method, it must not a constructor, must be public
- // and must not be static
- if (!method.isConstructor()
- && Flags.isPublic(method.getFlags())
- && !Flags.isStatic(method.getFlags()))
- {
- String methodName = method.getElementName();
- IBeanMethodSymbol workingCopy = SymbolFactory.eINSTANCE.createIBeanMethodSymbol();
- workingCopy.setName(methodName);
- workingCopy.setOwner(this);
- workingCopy.setSignature(TypeUtil.
- resolveMethodSignature
- (getType(),
- method.getSignature()));
- methodSymbols.add(workingCopy);
- }
- }
- catch (JavaModelException jme)
- {
- // error reading meta-data. Skip to next one
- JSFCommonPlugin.log(jme);
- }
- }
-
- return methodSymbols;
- }
-
-
- /**
- * <!-- begin-user-doc -->
- * @return the default string rep
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (type: "); //$NON-NLS-1$
- result.append(type);
- result.append(", arrayCount: "); //$NON-NLS-1$
- result.append(arrayCount);
- result.append(')');
- return result.toString();
- }
-
-} //IJavaTypeDescriptor2Impl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java
deleted file mode 100644
index 7046cee25..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IListTypeDescriptorImpl.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IListTypeDescriptorImpl.java,v 1.5 2007/10/01 04:29:44 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IList Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IListTypeDescriptorImpl#getListSource <em>List Source</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IListTypeDescriptorImpl extends ITypeDescriptorImpl implements IListTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getListSource() <em>List Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getListSource()
- * @generated
- * @ordered
- */
- protected static final EList LIST_SOURCE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getListSource() <em>List Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getListSource()
- * @generated
- * @ordered
- */
- protected EList listSource = LIST_SOURCE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IListTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.ILIST_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getListSource() {
- return listSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setListSource(EList newListSource) {
- EList oldListSource = listSource;
- listSource = newListSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE, oldListSource, listSource));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- return getListSource();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- setListSource((EList)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- setListSource(LIST_SOURCE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- return LIST_SOURCE_EDEFAULT == null ? listSource != null : !LIST_SOURCE_EDEFAULT.equals(listSource);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (listSource: "); //$NON-NLS-1$
- result.append(listSource);
- result.append(')');
- return result.toString();
- }
-
- /*
- * @generated NOT
- */
- public EList getInterfaceTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- public EList getMethods()
- {
- // TODO: should this return the methods on a List?
- return ECollections.EMPTY_ELIST;
- }
-
- public EList getProperties()
- {
- // TODO: a list has no properties as such. What to do here?
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @generated NOT
- */
- public EList getSuperTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @generated NOT
- */
- public String getTypeSignature()
- {
- return TypeConstants.TYPE_LIST;
- }
-
-} //IListTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
deleted file mode 100644
index 462d0cb22..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMapTypeDescriptorImpl.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.ECollections;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IMap Type Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl#getMapSource <em>Map Source</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMapTypeDescriptorImpl#isImmutable <em>Immutable</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IMapTypeDescriptorImpl extends ITypeDescriptorImpl implements IMapTypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getMapSource() <em>Map Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMapSource()
- * @generated
- * @ordered
- */
- protected static final Map MAP_SOURCE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getMapSource() <em>Map Source</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getMapSource()
- * @generated
- * @ordered
- */
- protected Map mapSource = MAP_SOURCE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isImmutable() <em>Immutable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImmutable()
- * @generated
- * @ordered
- */
- protected static final boolean IMMUTABLE_EDEFAULT = true;
-
- /**
- * The cached value of the '{@link #isImmutable() <em>Immutable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isImmutable()
- * @generated
- * @ordered
- */
- protected boolean immutable = IMMUTABLE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMapTypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eClass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the map source
- * <!-- end-user-doc -->
- * @generated
- */
- public Map getMapSource() {
- return mapSource;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newMapSource
- * <!-- end-user-doc -->
- * @generated
- */
- public void setMapSource(Map newMapSource) {
- Map oldMapSource = mapSource;
- mapSource = newMapSource;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE, oldMapSource, mapSource));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if this map is immutable as defined in the java.util.Map
- * interface.
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isImmutable() {
- return immutable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newImmutable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setImmutable(boolean newImmutable) {
- boolean oldImmutable = immutable;
- immutable = newImmutable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE, oldImmutable, immutable));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature()
- * @generated NOT
- */
- public String getTypeSignature()
- {
- // if the delegate has been set, use it
- if (eIsSet(SymbolPackage.IMAP_TYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE))
- {
- return getTypeSignatureDelegate();
- }
-
- // otherwise use Map
- return TypeConstants.TYPE_MAP;
- }
-
- public EList getInterfaceTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- public EList getSuperTypeSignatures() {
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getProperties()
- */
- public EList getProperties()
- {
- final BasicEList list = new BasicEList();
- final Map source = getMapSource();
- final Set keys = source.keySet();
- final Map segmentMap = processSegments(keys, source);
- list.addAll(segmentMap.values());
- return list;
- }
-
- public EList getMethods()
- {
- // TODO: should this return the methods on a Map?
- return ECollections.EMPTY_ELIST;
- }
-
- /**
- * @generated NOT
- */
- public IObjectSymbol getArrayElement() {
- return null;
- }
-
- /**
- * @generated NOT
- */
- public boolean isArray() {
- // a map is never an array
- return false;
- }
-
- private Map processSegments(final Set keys, final Map source)
- {
- final Map segmentMap = new HashMap();
-
- for (final Iterator it = keys.iterator(); it.hasNext();)
- {
- final String key = (String) it.next();
- final String segments[] = key.split("\\."); //$NON-NLS-1$
-
- IPropertySymbol property =
- (IPropertySymbol) segmentMap.get(segments[0]);
-
- if (property == null)
- {
- final Object propValue = source.get(key);
- property = SymbolFactory.eINSTANCE.createIPropertySymbol();
- property.setName(segments[0]);
- ITypeDescriptor typeDesc = null;
-
- // TODO: need wrapper object to rationalize
- if (propValue != null)
- {
- if (propValue instanceof IType)
- {
- typeDesc = SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- ((IJavaTypeDescriptor2)typeDesc).setType((IType)propValue);
- }
- else if (propValue instanceof IInstanceSymbol)
- {
- typeDesc = ((IInstanceSymbol)propValue).getTypeDescriptor();
- }
- else if (propValue instanceof IPropertySymbol)
- {
- typeDesc = ((IPropertySymbol)propValue).getTypeDescriptor();
- }
- else
- {
- String className = propValue.getClass().getName();
- String typeSignature = Signature.createTypeSignature(className, true);
- typeDesc = SymbolFactory.eINSTANCE.createIMapTypeDescriptor();
- ((IMapTypeDescriptor)typeDesc).setMapSource(new HashMap());
- ((IMapTypeDescriptor)typeDesc).setTypeSignatureDelegate(typeSignature);
- // inherit this descriptor's mutability
- ((IMapTypeDescriptor)typeDesc).setImmutable(isImmutable());
- property.setIntermediate(true); // set the property as intermediate until we find out different
- }
-
- property.setTypeDescriptor(typeDesc);
- property.setReadable(true);
- // is only writable if map is not immutable
- property.setWritable(!isImmutable());
- }
-
- segmentMap.put(segments[0], property);
- }
-
- final ITypeDescriptor typeDesc = property.getTypeDescriptor();
-
- if (typeDesc instanceof IMapTypeDescriptor)
- {
- if (segments.length == 1)
- {
- // TODO: not always allowed ((IMapTypeDescriptor)typeDesc).getMapSource().put(null, source.get(key));
- // property is more than simply intermediate
- property.setIntermediate(false);
- }
- else
- {
- ((IMapTypeDescriptor)typeDesc).getMapSource().
- put(key.substring(key.indexOf('.')+1), source.get(key));
- }
- }
- }
-
- return segmentMap;
- }
-
-
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the object for the feature id
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- return getMapSource();
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- return isImmutable() ? Boolean.TRUE : Boolean.FALSE;
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- setMapSource((Map)newValue);
- return;
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- setImmutable(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- setMapSource(MAP_SOURCE_EDEFAULT);
- return;
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- setImmutable(IMMUTABLE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- return MAP_SOURCE_EDEFAULT == null ? mapSource != null : !MAP_SOURCE_EDEFAULT.equals(mapSource);
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- return immutable != IMMUTABLE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (mapSource: "); //$NON-NLS-1$
- result.append(mapSource);
- result.append(", immutable: "); //$NON-NLS-1$
- result.append(immutable);
- result.append(')');
- return result.toString();
- }
-
-} //IMapTypeDescriptorImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java
deleted file mode 100644
index 2e9a75ed6..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IMethodSymbolImpl.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IMethod Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IMethodSymbolImpl#getSignature <em>Signature</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IMethodSymbolImpl extends EObjectImpl implements IMethodSymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The default value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected static final String SIGNATURE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getSignature() <em>Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getSignature()
- * @generated
- * @ordered
- */
- protected String signature = SIGNATURE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMethodSymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eclass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IMETHOD_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the method name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMETHOD_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the method signature in JVM/JDT form
- * <!-- end-user-doc -->
- * @generated
- */
- public String getSignature() {
- return signature;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newSignature
- * <!-- end-user-doc -->
- * @generated
- */
- public void setSignature(String newSignature) {
- String oldSignature = signature;
- signature = newSignature;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IMETHOD_SYMBOL__SIGNATURE, oldSignature, signature));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the property as a feature object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- return getSignature();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- setSignature((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- setSignature(SIGNATURE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if the feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- return SIGNATURE_EDEFAULT == null ? signature != null : !SIGNATURE_EDEFAULT.equals(signature);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the raw string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", signature: "); //$NON-NLS-1$
- result.append(signature);
- result.append(')');
- return result.toString();
- }
-
-} //IMethodSymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java
deleted file mode 100644
index 64d314e7e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/IPropertySymbolImpl.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IProperty Symbol</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#getTypeDescriptor <em>Type Descriptor</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isReadable <em>Readable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isWritable <em>Writable</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.IPropertySymbolImpl#isIntermediate <em>Intermediate</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class IPropertySymbolImpl extends EObjectImpl implements IPropertySymbol {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypeDescriptor() <em>Type Descriptor</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeDescriptor()
- * @generated
- * @ordered
- */
- protected ITypeDescriptor typeDescriptor = null;
-
-
- /**
- * Set to true if this property symbol is readable
- */
- protected boolean isReadable = READABLE_EDEFAULT;
-
- /**
- * Set to true if this property symbol is writable
- */
- protected boolean isWritable = WRITABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated
- * @ordered
- */
- protected static final boolean READABLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isReadable() <em>Readable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isReadable()
- * @generated
- * @ordered
- */
- protected boolean readable = READABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected static final boolean WRITABLE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isWritable() <em>Writable</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isWritable()
- * @generated
- * @ordered
- */
- protected boolean writable = WRITABLE_EDEFAULT;
-
- /**
- * The default value of the '{@link #isIntermediate() <em>Intermediate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntermediate()
- * @generated
- * @ordered
- */
- protected static final boolean INTERMEDIATE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isIntermediate() <em>Intermediate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isIntermediate()
- * @generated
- * @ordered
- */
- protected boolean intermediate = INTERMEDIATE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IPropertySymbolImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static eClass
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.IPROPERTY_SYMBOL;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return return the property name
- * <!-- end-user-doc -->
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newName the new name of the property
- * <!-- end-user-doc -->
- * @generated
- */
- public void setName(String newName) {
- String oldName = name;
- name = newName;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__NAME, oldName, name));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the property's type descriptor ?? can be null ??
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor getTypeDescriptor() {
- if (typeDescriptor != null && typeDescriptor.eIsProxy()) {
- InternalEObject oldTypeDescriptor = (InternalEObject)typeDescriptor;
- typeDescriptor = (ITypeDescriptor)eResolveProxy(oldTypeDescriptor);
- if (typeDescriptor != oldTypeDescriptor) {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
- }
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptor basicGetTypeDescriptor() {
- return typeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeDescriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeDescriptor(ITypeDescriptor newTypeDescriptor) {
- ITypeDescriptor oldTypeDescriptor = typeDescriptor;
- typeDescriptor = newTypeDescriptor;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR, oldTypeDescriptor, typeDescriptor));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if property is readable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isReadable() {
- return readable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newReadable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setReadable(boolean newReadable) {
- boolean oldReadable = readable;
- readable = newReadable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__READABLE, oldReadable, readable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if property is writable
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isWritable() {
- return writable;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newWritable
- * <!-- end-user-doc -->
- * @generated
- */
- public void setWritable(boolean newWritable) {
- boolean oldWritable = writable;
- writable = newWritable;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__WRITABLE, oldWritable, writable));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return true if this property is intermediate and has no value of it's own
- * besides as a path to it's own properties. This is used to support the
- * situation in JSF where a map-based property can have dots in it (i.e.
- * a loadBundle key my.property) and so creates a (discouraged) ambiguous
- * situation where a property like #{x.y.z) really corresponds to a key
- * "y.z" in a property file pointed to by "x" instead of there being an
- * actual y property on x that has value in and of itself (in this case
- * "#{x.y}" is invalid even though "#{x.y.z}" is valid).
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isIntermediate() {
- return intermediate;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newIntermediate
- * <!-- end-user-doc -->
- * @generated
- */
- public void setIntermediate(boolean newIntermediate) {
- boolean oldIntermediate = intermediate;
- intermediate = newIntermediate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE, oldIntermediate, intermediate));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean supportsCoercion(String typeSignature) {
- // TODO: for now, not supported on generic properties
- return false;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ITypeDescriptor coerce(String typeSignature)
- {
- // TODO: for now, no generic property type coercion
- return getTypeDescriptor();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ISymbol call(String methodName, EList methodArguments, String symbolName) {
- // TODO: implement this method
- // Ensure that you remove @generated or mark it @generated NOT
- throw new UnsupportedOperationException();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return the eObject for the featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- return getName();
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- if (resolve) return getTypeDescriptor();
- return basicGetTypeDescriptor();
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- return isReadable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- return isWritable() ? Boolean.TRUE : Boolean.FALSE;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- return isIntermediate() ? Boolean.TRUE : Boolean.FALSE;
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID -- set the feature
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- setName((String)newValue);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)newValue);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- setReadable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- setWritable(((Boolean)newValue).booleanValue());
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- setIntermediate(((Boolean)newValue).booleanValue());
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID -- unset the feature
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- setName(NAME_EDEFAULT);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- setTypeDescriptor((ITypeDescriptor)null);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- setReadable(READABLE_EDEFAULT);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- setWritable(WRITABLE_EDEFAULT);
- return;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- setIntermediate(INTERMEDIATE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if is set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case SymbolPackage.IPROPERTY_SYMBOL__TYPE_DESCRIPTOR:
- return typeDescriptor != null;
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- return readable != READABLE_EDEFAULT;
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- return writable != WRITABLE_EDEFAULT;
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- return intermediate != INTERMEDIATE_EDEFAULT;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the string representation
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", readable: "); //$NON-NLS-1$
- result.append(readable);
- result.append(", writable: "); //$NON-NLS-1$
- result.append(writable);
- result.append(", intermediate: "); //$NON-NLS-1$
- result.append(intermediate);
- result.append(')');
- return result.toString();
- }
-
-} //IPropertySymbolImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java
deleted file mode 100644
index b23a30329..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/ITypeDescriptorImpl.java
+++ /dev/null
@@ -1,521 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>IType Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getProperties <em>Properties</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignature <em>Type Signature</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getSuperTypeSignatures <em>Super Type Signatures</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getTypeSignatureDelegate <em>Type Signature Delegate</em>}</li>
- * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.impl.ITypeDescriptorImpl#getMethods <em>Methods</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ITypeDescriptorImpl extends EObjectImpl implements ITypeDescriptor {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getTypeSignature() <em>Type Signature</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeSignature()
- * @generated
- * @ordered
- */
- protected static final String TYPE_SIGNATURE_EDEFAULT = ""; //$NON-NLS-1$
-
- /**
- * The default value of the '{@link #getTypeSignatureDelegate() <em>Type Signature Delegate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeSignatureDelegate()
- * @generated
- * @ordered
- */
- protected static final String TYPE_SIGNATURE_DELEGATE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypeSignatureDelegate() <em>Type Signature Delegate</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeSignatureDelegate()
- * @generated
- * @ordered
- */
- protected String typeSignatureDelegate = TYPE_SIGNATURE_DELEGATE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypeParameterSignatures() <em>Type Parameter Signatures</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getTypeParameterSignatures()
- * @generated
- * @ordered
- */
- protected EList typeParameterSignatures;
-
- /**
- * The default value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- protected static final IJavaElement JDT_CONTEXT_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getJdtContext() <em>Jdt Context</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getJdtContext()
- * @generated
- * @ordered
- */
- protected IJavaElement jdtContext = JDT_CONTEXT_EDEFAULT;
-
- /**
- * The default value of the '{@link #isEnumType() <em>Enum Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isEnumType()
- * @generated
- * @ordered
- */
- protected static final boolean ENUM_TYPE_EDEFAULT = false;
-
- /**
- * The cached value of the '{@link #isEnumType() <em>Enum Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #isEnumType()
- * @generated
- * @ordered
- */
- protected boolean enumType = ENUM_TYPE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ITypeDescriptorImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the static class
- * <!-- end-user-doc -->
- * @generated
- */
- protected EClass eStaticClass() {
- return SymbolPackage.Literals.ITYPE_DESCRIPTOR;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return get properties for this type
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getProperties();
-
- /**
- * <!-- begin-user-doc -->
- * @return the type signature in JVM/JDT signature form
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract String getTypeSignature();
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of super types
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getSuperTypeSignatures();
-
- /**
- * <!-- begin-user-doc -->
- * @return the list of implemented interfaces
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getInterfaceTypeSignatures();
-
- /**
- * <!-- begin-user-doc -->
- * @return the type signature delegate. The descriptor may choose to use
- * this delegate it if it is set and it cannot derive this information
- * from other properties
- * <!-- end-user-doc -->
- * @generated
- */
- public String getTypeSignatureDelegate() {
- return typeSignatureDelegate;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param newTypeSignatureDelegate
- * <!-- end-user-doc -->
- * @generated
- */
- public void setTypeSignatureDelegate(String newTypeSignatureDelegate) {
- String oldTypeSignatureDelegate = typeSignatureDelegate;
- typeSignatureDelegate = newTypeSignatureDelegate;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE, oldTypeSignatureDelegate, typeSignatureDelegate));
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the methods for this type or empty list if none exist
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public abstract EList getMethods();
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList getTypeParameterSignatures() {
- if (typeParameterSignatures == null) {
- typeParameterSignatures = new EDataTypeEList(String.class, this, SymbolPackage.ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES);
- }
- return typeParameterSignatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement getJdtContext() {
- return jdtContext;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setJdtContext(IJavaElement newJdtContext) {
- IJavaElement oldJdtContext = jdtContext;
- jdtContext = newJdtContext;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__JDT_CONTEXT, oldJdtContext, jdtContext));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isEnumType() {
- return enumType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setEnumType(boolean newEnumType) {
- boolean oldEnumType = enumType;
- enumType = newEnumType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SymbolPackage.ITYPE_DESCRIPTOR__ENUM_TYPE, oldEnumType, enumType));
- }
-
- /**
- * <!-- begin-user-doc -->
- * Note about generics:
- *
- * This call mimics the runtime instanceOf to the degree possible.
- * Therefore, any type parameters (<...>) in typeSignature will be
- * deleted using Signature.getTypeErasure() since this data won't be
- * available at runtime.
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean instanceOf(final String typeSignature)
- {
- final String typeErasedSignature = Signature.getTypeErasure(typeSignature);
-
- if (Signature.getTypeErasure(getTypeSignature()) != null
- && Signature.getTypeErasure(getTypeSignature()).equals(typeErasedSignature))
- {
- return true;
- }
-
- for (final Iterator it = getSuperTypeSignatures().iterator(); it.hasNext();)
- {
- final String superType = (String) it.next();
-
- if (Signature.getTypeErasure(superType).equals(typeErasedSignature))
- {
- return true;
- }
- }
-
- for (final Iterator it = getInterfaceTypeSignatures().iterator(); it.hasNext();)
- {
- final String superType = (String) it.next();
-
- if (Signature.getTypeErasure(superType).equals(typeErasedSignature))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public boolean isArray()
- {
- return Signature.getArrayCount(getTypeSignature()) > 0;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IObjectSymbol getArrayElement()
- {
- if (isArray())
- {
- // sub-class of ITypeDescriptor must implement this if they which to provide
- // array element support
- throw new UnsupportedOperationException("Base type descriptor does not support this function"); //$NON-NLS-1$
- }
-
- // shouldn't be called if not an array
- return null;
- }
-
- /**
- /**
- * <!-- begin-user-doc -->
- *
- * Tries to load an IType for a fully resolved (i.e. starts with L not Q)
- * type signature using the current jdtContext.
- *
- * @return the resolved IType or null if none could be resolved.
- *
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public IType resolveType(String resolvedTypeSignature)
- {
- // we need to obtain an IJavaProject within which to resolve
- // the type.
- IJavaProject project = null;
-
- // see if a jdtContext hint has been set
- if (getJdtContext() != null)
- {
- project = getJdtContext().getJavaProject();
- }
-
- if (project != null)
- {
- return TypeUtil.resolveType(project, resolvedTypeSignature);
- }
-
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public ISymbol calculateSyntheticCall(String methodName, EList methodArgs, String symbolName) {
- // sub-classes need only implement if they have something meaningful
- // the want to do here
- // by default return null to indicate this type descriptor doesn't
- // wish to handle calls
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param resolve
- * @param coreType
- * @return get the feature
- * <!-- end-user-doc -->
- * @generated
- */
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- return getProperties();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE:
- return getTypeSignature();
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- return getSuperTypeSignatures();
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- return getInterfaceTypeSignatures();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- return getTypeSignatureDelegate();
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- return getMethods();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @param newValue
- * <!-- end-user-doc -->
- * @generated
- */
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- getProperties().clear();
- getProperties().addAll((Collection)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- getSuperTypeSignatures().clear();
- getSuperTypeSignatures().addAll((Collection)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- getInterfaceTypeSignatures().clear();
- getInterfaceTypeSignatures().addAll((Collection)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- setTypeSignatureDelegate((String)newValue);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- getMethods().clear();
- getMethods().addAll((Collection)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * <!-- end-user-doc -->
- * @generated
- */
- public void eUnset(int featureID) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- getProperties().clear();
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- getSuperTypeSignatures().clear();
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- getInterfaceTypeSignatures().clear();
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- setTypeSignatureDelegate(TYPE_SIGNATURE_DELEGATE_EDEFAULT);
- return;
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- getMethods().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param featureID
- * @return true if feature has been set
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case SymbolPackage.ITYPE_DESCRIPTOR__PROPERTIES:
- return !getProperties().isEmpty();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE:
- return TYPE_SIGNATURE_EDEFAULT == null ? getTypeSignature() != null : !TYPE_SIGNATURE_EDEFAULT.equals(getTypeSignature());
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- return !getSuperTypeSignatures().isEmpty();
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- return !getInterfaceTypeSignatures().isEmpty();
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- return TYPE_SIGNATURE_DELEGATE_EDEFAULT == null ? typeSignatureDelegate != null : !TYPE_SIGNATURE_DELEGATE_EDEFAULT.equals(typeSignatureDelegate);
- case SymbolPackage.ITYPE_DESCRIPTOR__METHODS:
- return !getMethods().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the debug string format of the type signature
- * <!-- end-user-doc -->
- * @generated
- */
- public String toString() {
- if (eIsProxy()) return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (typeSignatureDelegate: "); //$NON-NLS-1$
- result.append(typeSignatureDelegate);
- result.append(')');
- return result.toString();
- }
-} //ITypeDescriptorImpl
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java
deleted file mode 100644
index 40c1b3549..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/JavaUtil.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.ui.JavadocContentAccess;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.JDTBeanProperty;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-
-/**
- * Utility class for accessing jdt elements for jsf el symbols
- */
-public class JavaUtil {
-
- private JavaUtil() {
- // utility class
- }
-
- /**
- * @param method
- * @return the javadoc text for the given method. Will return null if no javadoc is found
- */
- public static String getMethodJavadoc(final IMethod method) {
- try {
- final Reader contentReader = JavadocContentAccess.getHTMLContentReader(method, true, true);
- if (contentReader != null) {
- return read(contentReader);
- }
- } catch (final JavaModelException e) {
- JSFCommonPlugin.log(IStatus.WARNING, "error reading javadoc for method '" + method.getElementName() + "'.", e); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return null;
- }
-
- private static String read(final Reader rd) {
- final StringBuffer buffer= new StringBuffer();
- final char[] readBuffer= new char[2048];
-
- try {
- int n= rd.read(readBuffer);
- while (n > 0) {
- buffer.append(readBuffer, 0, n);
- n= rd.read(readBuffer);
- }
- return buffer.toString();
- } catch (final IOException x) {
- // should not happen, but otherwise simply ignore
- }
-
- return null;
- }
-
- /**
- * @param symbol - the method symbol to look for
- * @return the IMethod for the given method symbol. Will return <code>null</code>, if none is found.
- */
- public static IMethod findCorrespondingMethod(final IBeanMethodSymbol symbol) {
- final IType type = symbol.getOwner().getType();
- final JDTBeanIntrospector introspector = new JDTBeanIntrospector(type);
- final IMethod[] methods = introspector.getAllMethods();
- for (final IMethod method : methods) {
- if (method.getElementName().equals(symbol.getName())) {
- try {
- final String currentMethodsSignature = TypeUtil.resolveMethodSignature(method.getDeclaringType(),
- method.getSignature());
- if (currentMethodsSignature.equals(symbol.getSignature())) {
- return method;
- }
- } catch (final JavaModelException e) {
- JSFCommonPlugin.log(IStatus.WARNING, "error determining for method '" //$NON-NLS-1$
- + method.getElementName() + "'.", e); //$NON-NLS-1$
- }
- }
- }
- return null;
- }
-
- /**
- * @param propertySymbol - the property symbol to look for
- * @return a JDTBeanProperty for the given property symbol
- */
- public static JDTBeanProperty findCorrespondingJDTProperty(final IBeanPropertySymbol propertySymbol) {
- final JDTBeanIntrospector introspector = new JDTBeanIntrospector(propertySymbol.getOwner().getType());
- return introspector.getProperties().get(propertySymbol.getName());
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java
deleted file mode 100644
index 915b3b5ef..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Messages.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/*package*/ class Messages
-{
- private static final String BUNDLE_NAME = "org.eclipse.jst.jsf.context.symbol.internal.impl.messages"; //$NON-NLS-1$
-
- private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle
- .getBundle(BUNDLE_NAME);
-
- private Messages()
- {
- // no external instantiation
- }
-
- public static String getString(String key)
- {
- try
- {
- return RESOURCE_BUNDLE.getString(key);
- }
- catch (MissingResourceException e)
- {
- return '!' + key + '!';
- }
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java
deleted file mode 100644
index 75c59b868..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolFactoryImpl.java
+++ /dev/null
@@ -1,426 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SymbolFactoryImpl extends EFactoryImpl implements SymbolFactory {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * @return the SymbolFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public static SymbolFactory init() {
- try {
- SymbolFactory theSymbolFactory = (SymbolFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/jst/jsf/context/symbol.ecore"); //$NON-NLS-1$
- if (theSymbolFactory != null) {
- return theSymbolFactory;
- }
- }
- catch (Exception exception) {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new SymbolFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eClass
- * @return the model instace for the model class
- * <!-- end-user-doc -->
- * @generated
- */
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID()) {
- case SymbolPackage.IBEAN_INSTANCE_SYMBOL: return createIBeanInstanceSymbol();
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL: return createIBeanPropertySymbol();
- case SymbolPackage.IINSTANCE_SYMBOL: return createIInstanceSymbol();
- case SymbolPackage.IJAVA_SYMBOL: return createIJavaSymbol();
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2: return createIJavaTypeDescriptor2();
- case SymbolPackage.IBEAN_METHOD_SYMBOL: return createIBeanMethodSymbol();
- case SymbolPackage.ICOMPONENT_SYMBOL: return createIComponentSymbol();
- case SymbolPackage.IPROPERTY_SYMBOL: return createIPropertySymbol();
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR: return createIMapTypeDescriptor();
- case SymbolPackage.IMETHOD_SYMBOL: return createIMethodSymbol();
- case SymbolPackage.IBOUNDED_MAP_TYPE_DESCRIPTOR: return createIBoundedMapTypeDescriptor();
- case SymbolPackage.IBOUNDED_JAVA_TYPE_DESCRIPTOR: return createIBoundedJavaTypeDescriptor();
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR: return createIListTypeDescriptor();
- case SymbolPackage.IBOUNDED_LIST_TYPE_DESCRIPTOR: return createIBoundedListTypeDescriptor();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return an object constructed from the initialValue string
- * <!-- end-user-doc -->
- * @generated
- */
- public Object createFromString(EDataType eDataType, String initialValue) {
- switch (eDataType.getClassifierID()) {
- case SymbolPackage.ERUNTIME_SOURCE:
- return createERuntimeSourceFromString(eDataType, initialValue);
- case SymbolPackage.ITYPE:
- return createITypeFromString(eDataType, initialValue);
- case SymbolPackage.IJAVA_ELEMENT:
- return createIJavaElementFromString(eDataType, initialValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the string equivelent of eDataType for the instance
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertToString(EDataType eDataType, Object instanceValue) {
- switch (eDataType.getClassifierID()) {
- case SymbolPackage.ERUNTIME_SOURCE:
- return convertERuntimeSourceToString(eDataType, instanceValue);
- case SymbolPackage.ITYPE:
- return convertITypeToString(eDataType, instanceValue);
- case SymbolPackage.IJAVA_ELEMENT:
- return convertIJavaElementToString(eDataType, instanceValue);
- default:
- throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new bean instance symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanInstanceSymbol createIBeanInstanceSymbol() {
- IBeanInstanceSymbolImpl iBeanInstanceSymbol = new IBeanInstanceSymbolImpl();
- return iBeanInstanceSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new bean property symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanPropertySymbol createIBeanPropertySymbol() {
- IBeanPropertySymbolImpl iBeanPropertySymbol = new IBeanPropertySymbolImpl();
- return iBeanPropertySymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IInstanceSymbol createIInstanceSymbol() {
- IInstanceSymbolImpl iInstanceSymbol = new IInstanceSymbolImpl();
- return iInstanceSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new java symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaSymbol createIJavaSymbol() {
- IJavaSymbolImpl iJavaSymbol = new IJavaSymbolImpl();
- return iJavaSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new java type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2 createIJavaTypeDescriptor2() {
- IJavaTypeDescriptor2Impl iJavaTypeDescriptor2 = new IJavaTypeDescriptor2Impl();
- return iJavaTypeDescriptor2;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new bean method symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanMethodSymbol createIBeanMethodSymbol() {
- IBeanMethodSymbolImpl iBeanMethodSymbol = new IBeanMethodSymbolImpl();
- return iBeanMethodSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new component derived symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IComponentSymbol createIComponentSymbol() {
- IComponentSymbolImpl iComponentSymbol = new IComponentSymbolImpl();
- return iComponentSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return a new property symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IPropertySymbol createIPropertySymbol() {
- IPropertySymbolImpl iPropertySymbol = new IPropertySymbolImpl();
- return iPropertySymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return create map type descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public IMapTypeDescriptor createIMapTypeDescriptor() {
- IMapTypeDescriptorImpl iMapTypeDescriptor = new IMapTypeDescriptorImpl();
- return iMapTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the method symbol
- * <!-- end-user-doc -->
- * @generated
- */
- public IMethodSymbol createIMethodSymbol() {
- IMethodSymbolImpl iMethodSymbol = new IMethodSymbolImpl();
- return iMethodSymbol;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedMapTypeDescriptor createIBoundedMapTypeDescriptor() {
- IBoundedMapTypeDescriptorImpl iBoundedMapTypeDescriptor = new IBoundedMapTypeDescriptorImpl();
- return iBoundedMapTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedJavaTypeDescriptor createIBoundedJavaTypeDescriptor() {
- IBoundedJavaTypeDescriptorImpl iBoundedJavaTypeDescriptor = new IBoundedJavaTypeDescriptorImpl();
- return iBoundedJavaTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IListTypeDescriptor createIListTypeDescriptor() {
- IListTypeDescriptorImpl iListTypeDescriptor = new IListTypeDescriptorImpl();
- return iListTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedListTypeDescriptor createIBoundedListTypeDescriptor() {
- IBoundedListTypeDescriptorImpl iBoundedListTypeDescriptor = new IBoundedListTypeDescriptorImpl();
- return iBoundedListTypeDescriptor;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public ERuntimeSource createERuntimeSourceFromString(EDataType eDataType, String initialValue) {
- ERuntimeSource result = ERuntimeSource.get(initialValue);
- if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- return result;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the converted runtime source
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertERuntimeSourceToString(EDataType eDataType, Object instanceValue) {
- return instanceValue == null ? null : instanceValue.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public IType createITypeFromString(EDataType eDataType, String initialValue) {
- return (IType)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the converted string
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertITypeToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return return the java element
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaElement createIJavaElementFromString(EDataType eDataType, String initialValue) {
- return (IJavaElement)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the converted string
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertIJavaElementToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param initialValue
- * @return the value type for the data type
- * <!-- end-user-doc -->
- * @generated
- */
- public ValueType createValueTypeFromString(EDataType eDataType, String initialValue) {
- return (ValueType)super.createFromString(eDataType, initialValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param eDataType
- * @param instanceValue
- * @return the string for the value type
- * <!-- end-user-doc -->
- * @generated
- */
- public String convertValueTypeToString(EDataType eDataType, Object instanceValue) {
- return super.convertToString(eDataType, instanceValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return the symbol package
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolPackage getSymbolPackage() {
- return (SymbolPackage)getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * @return get the symbol package
- * <!-- end-user-doc -->
- * @deprecated
- * @generated
- */
- public static SymbolPackage getPackage() {
- return SymbolPackage.eINSTANCE;
- }
-
-} //SymbolFactoryImpl
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java
deleted file mode 100644
index 707b17673..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/SymbolPackageImpl.java
+++ /dev/null
@@ -1,1032 +0,0 @@
-/**
- * Copyright 2006 Oracle
- *
- * $Id: SymbolPackageImpl.java,v 1.7 2007/09/24 23:25:39 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SymbolPackageImpl extends EPackageImpl implements SymbolPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle";
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBeanInstanceSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBeanPropertySymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iInstanceSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iDescribedInDetailEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iJavaTypeDescriptor2EClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBeanMethodSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iComponentSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iPropertySymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iMapTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iMethodSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iObjectSymbolEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedMapTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedJavaTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iListTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass iBoundedListTypeDescriptorEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EEnum eRuntimeSourceEEnum = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iTypeEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType iJavaElementEDataType = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EDataType valueTypeEDataType = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with
- * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
- * package URI value.
- * <p>Note: the correct way to create the package is via the static
- * factory method {@link #init init()}, which also performs
- * initialization of the package, or returns the registered package,
- * if one already exists.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private SymbolPackageImpl() {
- super(eNS_URI, SymbolFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
- * <!-- begin-user-doc -->
- * @return the symbols package
- * <!-- end-user-doc -->
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static SymbolPackage init() {
- if (isInited) return (SymbolPackage)EPackage.Registry.INSTANCE.getEPackage(SymbolPackage.eNS_URI);
-
- // Obtain or create and register package
- SymbolPackageImpl theSymbolPackage = (SymbolPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SymbolPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SymbolPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theSymbolPackage.createPackageContents();
-
- // Initialize created meta-data
- theSymbolPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theSymbolPackage.freeze();
-
- return theSymbolPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBeanInstanceSymbol() {
- return iBeanInstanceSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanInstanceSymbol_Properties() {
- return (EReference)iBeanInstanceSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanInstanceSymbol_Methods() {
- return (EReference)iBeanInstanceSymbolEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBeanPropertySymbol() {
- return iBeanPropertySymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanPropertySymbol_Owner() {
- return (EReference)iBeanPropertySymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIInstanceSymbol() {
- return iInstanceSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIInstanceSymbol_TypeResolved() {
- return (EAttribute)iInstanceSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIInstanceSymbol_RuntimeSource() {
- return (EAttribute)iInstanceSymbolEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaSymbol() {
- return iJavaSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaSymbol_JavaElement() {
- return (EAttribute)iJavaSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getISymbol() {
- return iSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getISymbol_Name() {
- return (EAttribute)iSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getITypeDescriptor() {
- return iTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getITypeDescriptor_Properties() {
- return (EReference)iTypeDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_TypeSignature() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_SuperTypeSignatures() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_InterfaceTypeSignatures() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_TypeSignatureDelegate() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getITypeDescriptor_Methods() {
- return (EReference)iTypeDescriptorEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_TypeParameterSignatures() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_JdtContext() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getITypeDescriptor_EnumType() {
- return (EAttribute)iTypeDescriptorEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIDescribedInDetail() {
- return iDescribedInDetailEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIJavaTypeDescriptor2() {
- return iJavaTypeDescriptor2EClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaTypeDescriptor2_Type() {
- return (EAttribute)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIJavaTypeDescriptor2_BeanProperties() {
- return (EReference)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIJavaTypeDescriptor2_BeanMethods() {
- return (EReference)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIJavaTypeDescriptor2_ArrayCount() {
- return (EAttribute)iJavaTypeDescriptor2EClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBeanMethodSymbol() {
- return iBeanMethodSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIBeanMethodSymbol_Owner() {
- return (EReference)iBeanMethodSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIComponentSymbol() {
- return iComponentSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIPropertySymbol() {
- return iPropertySymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIPropertySymbol_Intermediate() {
- return (EAttribute)iPropertySymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIMapTypeDescriptor() {
- return iMapTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIMapTypeDescriptor_MapSource() {
- return (EAttribute)iMapTypeDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIMapTypeDescriptor_Immutable() {
- return (EAttribute)iMapTypeDescriptorEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIMethodSymbol() {
- return iMethodSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIMethodSymbol_Signature() {
- return (EAttribute)iMethodSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIObjectSymbol() {
- return iObjectSymbolEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getIObjectSymbol_TypeDescriptor() {
- return (EReference)iObjectSymbolEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIObjectSymbol_Readable() {
- return (EAttribute)iObjectSymbolEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIObjectSymbol_Writable() {
- return (EAttribute)iObjectSymbolEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedTypeDescriptor() {
- return iBoundedTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedMapTypeDescriptor() {
- return iBoundedMapTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedJavaTypeDescriptor() {
- return iBoundedJavaTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIListTypeDescriptor() {
- return iListTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getIListTypeDescriptor_ListSource() {
- return (EAttribute)iListTypeDescriptorEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EClass getIBoundedListTypeDescriptor() {
- return iBoundedListTypeDescriptorEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EEnum getERuntimeSource() {
- return eRuntimeSourceEEnum;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIType() {
- return iTypeEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getIJavaElement() {
- return iJavaElementEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EDataType getValueType() {
- return valueTypeEDataType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolFactory getSymbolFactory() {
- return (SymbolFactory)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
- iBeanInstanceSymbolEClass = createEClass(IBEAN_INSTANCE_SYMBOL);
- createEReference(iBeanInstanceSymbolEClass, IBEAN_INSTANCE_SYMBOL__PROPERTIES);
- createEReference(iBeanInstanceSymbolEClass, IBEAN_INSTANCE_SYMBOL__METHODS);
-
- iBeanPropertySymbolEClass = createEClass(IBEAN_PROPERTY_SYMBOL);
- createEReference(iBeanPropertySymbolEClass, IBEAN_PROPERTY_SYMBOL__OWNER);
-
- iInstanceSymbolEClass = createEClass(IINSTANCE_SYMBOL);
- createEAttribute(iInstanceSymbolEClass, IINSTANCE_SYMBOL__TYPE_RESOLVED);
- createEAttribute(iInstanceSymbolEClass, IINSTANCE_SYMBOL__RUNTIME_SOURCE);
-
- iJavaSymbolEClass = createEClass(IJAVA_SYMBOL);
- createEAttribute(iJavaSymbolEClass, IJAVA_SYMBOL__JAVA_ELEMENT);
-
- iSymbolEClass = createEClass(ISYMBOL);
- createEAttribute(iSymbolEClass, ISYMBOL__NAME);
-
- iTypeDescriptorEClass = createEClass(ITYPE_DESCRIPTOR);
- createEReference(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__PROPERTIES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_SIGNATURE);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE);
- createEReference(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__METHODS);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__JDT_CONTEXT);
- createEAttribute(iTypeDescriptorEClass, ITYPE_DESCRIPTOR__ENUM_TYPE);
-
- iDescribedInDetailEClass = createEClass(IDESCRIBED_IN_DETAIL);
-
- iJavaTypeDescriptor2EClass = createEClass(IJAVA_TYPE_DESCRIPTOR2);
- createEAttribute(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__TYPE);
- createEReference(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES);
- createEReference(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS);
- createEAttribute(iJavaTypeDescriptor2EClass, IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT);
-
- iBeanMethodSymbolEClass = createEClass(IBEAN_METHOD_SYMBOL);
- createEReference(iBeanMethodSymbolEClass, IBEAN_METHOD_SYMBOL__OWNER);
-
- iComponentSymbolEClass = createEClass(ICOMPONENT_SYMBOL);
-
- iPropertySymbolEClass = createEClass(IPROPERTY_SYMBOL);
- createEAttribute(iPropertySymbolEClass, IPROPERTY_SYMBOL__INTERMEDIATE);
-
- iMapTypeDescriptorEClass = createEClass(IMAP_TYPE_DESCRIPTOR);
- createEAttribute(iMapTypeDescriptorEClass, IMAP_TYPE_DESCRIPTOR__MAP_SOURCE);
- createEAttribute(iMapTypeDescriptorEClass, IMAP_TYPE_DESCRIPTOR__IMMUTABLE);
-
- iMethodSymbolEClass = createEClass(IMETHOD_SYMBOL);
- createEAttribute(iMethodSymbolEClass, IMETHOD_SYMBOL__SIGNATURE);
-
- iObjectSymbolEClass = createEClass(IOBJECT_SYMBOL);
- createEReference(iObjectSymbolEClass, IOBJECT_SYMBOL__TYPE_DESCRIPTOR);
- createEAttribute(iObjectSymbolEClass, IOBJECT_SYMBOL__READABLE);
- createEAttribute(iObjectSymbolEClass, IOBJECT_SYMBOL__WRITABLE);
-
- iBoundedTypeDescriptorEClass = createEClass(IBOUNDED_TYPE_DESCRIPTOR);
-
- iBoundedMapTypeDescriptorEClass = createEClass(IBOUNDED_MAP_TYPE_DESCRIPTOR);
-
- iBoundedJavaTypeDescriptorEClass = createEClass(IBOUNDED_JAVA_TYPE_DESCRIPTOR);
-
- iListTypeDescriptorEClass = createEClass(ILIST_TYPE_DESCRIPTOR);
- createEAttribute(iListTypeDescriptorEClass, ILIST_TYPE_DESCRIPTOR__LIST_SOURCE);
-
- iBoundedListTypeDescriptorEClass = createEClass(IBOUNDED_LIST_TYPE_DESCRIPTOR);
-
- // Create enums
- eRuntimeSourceEEnum = createEEnum(ERUNTIME_SOURCE);
-
- // Create data types
- iTypeEDataType = createEDataType(ITYPE);
- iJavaElementEDataType = createEDataType(IJAVA_ELEMENT);
- valueTypeEDataType = createEDataType(VALUE_TYPE);
- }
-
- /**
- * <!-- 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
- iBeanInstanceSymbolEClass.getESuperTypes().add(this.getIInstanceSymbol());
- iBeanInstanceSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iBeanPropertySymbolEClass.getESuperTypes().add(this.getIPropertySymbol());
- iBeanPropertySymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iInstanceSymbolEClass.getESuperTypes().add(this.getIObjectSymbol());
- iJavaSymbolEClass.getESuperTypes().add(this.getISymbol());
- iJavaTypeDescriptor2EClass.getESuperTypes().add(this.getITypeDescriptor());
- iBeanMethodSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iBeanMethodSymbolEClass.getESuperTypes().add(this.getIMethodSymbol());
- iComponentSymbolEClass.getESuperTypes().add(this.getIInstanceSymbol());
- iComponentSymbolEClass.getESuperTypes().add(this.getIDescribedInDetail());
- iPropertySymbolEClass.getESuperTypes().add(this.getIObjectSymbol());
- iMapTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor());
- iMethodSymbolEClass.getESuperTypes().add(this.getISymbol());
- iObjectSymbolEClass.getESuperTypes().add(this.getISymbol());
- iBoundedTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor());
- iBoundedMapTypeDescriptorEClass.getESuperTypes().add(this.getIMapTypeDescriptor());
- iBoundedMapTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor());
- iBoundedJavaTypeDescriptorEClass.getESuperTypes().add(this.getIJavaTypeDescriptor2());
- iBoundedJavaTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor());
- iListTypeDescriptorEClass.getESuperTypes().add(this.getITypeDescriptor());
- iBoundedListTypeDescriptorEClass.getESuperTypes().add(this.getIListTypeDescriptor());
- iBoundedListTypeDescriptorEClass.getESuperTypes().add(this.getIBoundedTypeDescriptor());
-
- // Initialize classes and features; add operations and parameters
- initEClass(iBeanInstanceSymbolEClass, IBeanInstanceSymbol.class, "IBeanInstanceSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getIBeanInstanceSymbol_Properties(), this.getIBeanPropertySymbol(), null, "properties", null, 0, -1, IBeanInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getIBeanInstanceSymbol_Methods(), this.getIBeanMethodSymbol(), null, "methods", null, 0, -1, IBeanInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- addEOperation(iBeanInstanceSymbolEClass, this.getIJavaTypeDescriptor2(), "getJavaTypeDescriptor", 0, 1);
-
- EOperation op = addEOperation(iBeanInstanceSymbolEClass, null, "setJavaTypeDescriptor");
- addEParameter(op, this.getIJavaTypeDescriptor2(), "newTypeDescriptor", 0, 1);
-
- initEClass(iBeanPropertySymbolEClass, IBeanPropertySymbol.class, "IBeanPropertySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getIBeanPropertySymbol_Owner(), this.getIJavaTypeDescriptor2(), null, "owner", null, 0, 1, IBeanPropertySymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iInstanceSymbolEClass, IInstanceSymbol.class, "IInstanceSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIInstanceSymbol_TypeResolved(), ecorePackage.getEBoolean(), "typeResolved", null, 0, 1, IInstanceSymbol.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getIInstanceSymbol_RuntimeSource(), this.getERuntimeSource(), "runtimeSource", "TAG_INSTANTIATED_SYMBOL", 0, 1, IInstanceSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iJavaSymbolEClass, IJavaSymbol.class, "IJavaSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIJavaSymbol_JavaElement(), this.getIJavaElement(), "javaElement", null, 0, 1, IJavaSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iSymbolEClass, ISymbol.class, "ISymbol", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getISymbol_Name(), ecorePackage.getEString(), "name", null, 0, 1, ISymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iTypeDescriptorEClass, ITypeDescriptor.class, "ITypeDescriptor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getITypeDescriptor_Properties(), this.getIPropertySymbol(), null, "properties", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_TypeSignature(), ecorePackage.getEString(), "typeSignature", "", 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_SuperTypeSignatures(), ecorePackage.getEString(), "superTypeSignatures", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_InterfaceTypeSignatures(), ecorePackage.getEString(), "interfaceTypeSignatures", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_TypeSignatureDelegate(), ecorePackage.getEString(), "typeSignatureDelegate", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getITypeDescriptor_Methods(), this.getIMethodSymbol(), null, "methods", null, 0, -1, ITypeDescriptor.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_TypeParameterSignatures(), ecorePackage.getEString(), "typeParameterSignatures", null, 0, -1, ITypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_JdtContext(), this.getIJavaElement(), "jdtContext", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getITypeDescriptor_EnumType(), ecorePackage.getEBoolean(), "enumType", null, 0, 1, ITypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(iTypeDescriptorEClass, ecorePackage.getEBoolean(), "instanceOf", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1);
-
- addEOperation(iTypeDescriptorEClass, ecorePackage.getEBoolean(), "isArray", 0, 1);
-
- addEOperation(iTypeDescriptorEClass, this.getIObjectSymbol(), "getArrayElement", 0, 1);
-
- op = addEOperation(iTypeDescriptorEClass, this.getIType(), "resolveType", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "resolvedTypeSignature", 0, 1);
-
- op = addEOperation(iTypeDescriptorEClass, this.getISymbol(), "calculateSyntheticCall", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1);
- addEParameter(op, this.getValueType(), "methodArgs", 0, -1);
- addEParameter(op, ecorePackage.getEString(), "symbolName", 0, 1);
-
- initEClass(iDescribedInDetailEClass, IDescribedInDetail.class, "IDescribedInDetail", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(iJavaTypeDescriptor2EClass, IJavaTypeDescriptor2.class, "IJavaTypeDescriptor2", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIJavaTypeDescriptor2_Type(), this.getIType(), "type", null, 0, 1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getIJavaTypeDescriptor2_BeanProperties(), this.getIBeanPropertySymbol(), null, "beanProperties", null, 0, -1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getIJavaTypeDescriptor2_BeanMethods(), this.getIBeanPropertySymbol(), null, "beanMethods", null, 0, -1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getIJavaTypeDescriptor2_ArrayCount(), ecorePackage.getEInt(), "arrayCount", null, 0, 1, IJavaTypeDescriptor2.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iBeanMethodSymbolEClass, IBeanMethodSymbol.class, "IBeanMethodSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getIBeanMethodSymbol_Owner(), this.getIJavaTypeDescriptor2(), null, "owner", null, 0, 1, IBeanMethodSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iComponentSymbolEClass, IComponentSymbol.class, "IComponentSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(iPropertySymbolEClass, IPropertySymbol.class, "IPropertySymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIPropertySymbol_Intermediate(), ecorePackage.getEBoolean(), "intermediate", null, 0, 1, IPropertySymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iMapTypeDescriptorEClass, IMapTypeDescriptor.class, "IMapTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIMapTypeDescriptor_MapSource(), ecorePackage.getEMap(), "mapSource", null, 0, 1, IMapTypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getIMapTypeDescriptor_Immutable(), ecorePackage.getEBoolean(), "immutable", "true", 0, 1, IMapTypeDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iMethodSymbolEClass, IMethodSymbol.class, "IMethodSymbol", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIMethodSymbol_Signature(), ecorePackage.getEString(), "signature", null, 0, 1, IMethodSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iObjectSymbolEClass, IObjectSymbol.class, "IObjectSymbol", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getIObjectSymbol_TypeDescriptor(), this.getITypeDescriptor(), null, "typeDescriptor", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getIObjectSymbol_Readable(), ecorePackage.getEBoolean(), "readable", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getIObjectSymbol_Writable(), ecorePackage.getEBoolean(), "writable", null, 0, 1, IObjectSymbol.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- op = addEOperation(iObjectSymbolEClass, ecorePackage.getEBoolean(), "supportsCoercion", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1);
-
- op = addEOperation(iObjectSymbolEClass, this.getITypeDescriptor(), "coerce", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1);
-
- op = addEOperation(iObjectSymbolEClass, this.getISymbol(), "call", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "methodName", 0, 1);
- addEParameter(op, this.getValueType(), "methodArguments", 0, -1);
- addEParameter(op, ecorePackage.getEString(), "symbolName", 0, 1);
-
- initEClass(iBoundedTypeDescriptorEClass, IBoundedTypeDescriptor.class, "IBoundedTypeDescriptor", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- op = addEOperation(iBoundedTypeDescriptorEClass, ecorePackage.getEBoolean(), "isUnboundedForType", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1);
-
- op = addEOperation(iBoundedTypeDescriptorEClass, this.getISymbol(), "getUnboundedProperty", 0, 1);
- addEParameter(op, ecorePackage.getEJavaObject(), "name", 0, 1);
- addEParameter(op, ecorePackage.getEString(), "typeSignature", 0, 1);
-
- initEClass(iBoundedMapTypeDescriptorEClass, IBoundedMapTypeDescriptor.class, "IBoundedMapTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(iBoundedJavaTypeDescriptorEClass, IBoundedJavaTypeDescriptor.class, "IBoundedJavaTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(iListTypeDescriptorEClass, IListTypeDescriptor.class, "IListTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getIListTypeDescriptor_ListSource(), ecorePackage.getEEList(), "listSource", null, 0, 1, IListTypeDescriptor.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(iBoundedListTypeDescriptorEClass, IBoundedListTypeDescriptor.class, "IBoundedListTypeDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- // Initialize enums and add enum literals
- initEEnum(eRuntimeSourceEEnum, ERuntimeSource.class, "ERuntimeSource");
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.BUILT_IN_SYMBOL_LITERAL);
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.MANAGED_BEAN_SYMBOL_LITERAL);
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL);
- addEEnumLiteral(eRuntimeSourceEEnum, ERuntimeSource.OTHER_LITERAL);
-
- // Initialize data types
- initEDataType(iTypeEDataType, IType.class, "IType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(iJavaElementEDataType, IJavaElement.class, "IJavaElement", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
- initEDataType(valueTypeEDataType, ValueType.class, "ValueType", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
- // Create resource
- createResource(eNS_URI);
- }
-
-} //SymbolPackageImpl
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java
deleted file mode 100644
index 0c2f288e3..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/Util.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jdt.core.IMethod;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.Signature;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.common.internal.types.TypeConstants;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector;
-import org.eclipse.jst.jsf.common.util.TypeUtil;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolFactory;
-
-final class Util
-{
- static ISymbol call(String methodName, EList methodArguments,
- String symbolName, ITypeDescriptor typeDesc)
- {
- // first, see if the type descriptor wants to handle the call
- ISymbol result = typeDesc.calculateSyntheticCall(methodName, methodArguments, symbolName);
-
- final IType type= typeDesc.resolveType(typeDesc.getTypeSignature());
-
- // if the type is resolved and the typeDesc didn't already handle
- // the call then do this the hard way...
- if (type != null && result == null)
- {
- final JDTBeanIntrospector introspector =
- new JDTBeanIntrospector(type);
-
- final IMethod callMethod =
- Util.matchMethod(methodName, methodArguments, introspector.getAllMethods(),typeDesc.getTypeParameterSignatures());
-
- if (callMethod != null)
- {
- try
- {
- // resolve the method's return type; don't erase parameters
- String retTypeSignature = callMethod.getReturnType();
-
- // if we have a type variable, try to parameter match it
- if (Signature.getTypeSignatureKind(retTypeSignature) == Signature.TYPE_VARIABLE_SIGNATURE)
- {
- retTypeSignature = TypeUtil.matchTypeParameterToArgument
- (type
- , retTypeSignature, typeDesc.getTypeParameterSignatures());
-
- if (retTypeSignature == null)
- {
- retTypeSignature = TypeConstants.TYPE_JAVAOBJECT;
- }
- }
- // otherwise, try and resolve it in type
- else
- {
- retTypeSignature = TypeUtil.resolveTypeSignature
- (type, callMethod.getReturnType(), false);
- }
-
- final IPropertySymbol propSymbol =
- SymbolFactory.eINSTANCE.createIPropertySymbol();
-
- // TODO: there is a possible problem here for non-string keyed maps
- propSymbol.setName(symbolName);
- propSymbol.setReadable(true);
-
- {
- IJavaTypeDescriptor2 newTypeDesc = null;
-
- if (retTypeSignature.equals(TypeConstants.TYPE_JAVAOBJECT))
- {
- newTypeDesc = SymbolFactory.eINSTANCE.createIBoundedJavaTypeDescriptor();
- }
- else
- {
- newTypeDesc = SymbolFactory.eINSTANCE.createIJavaTypeDescriptor2();
- }
-
- newTypeDesc.setArrayCount(Signature.getArrayCount(retTypeSignature));
-
- // may be null
- newTypeDesc.setType(typeDesc.resolveType(retTypeSignature));
- newTypeDesc.setTypeSignatureDelegate(retTypeSignature);
- propSymbol.setTypeDescriptor(newTypeDesc);
- }
-
- result = propSymbol;
- }
- catch (JavaModelException e)
- {
- JSFCommonPlugin.log(e);
- // fall-through and return null result
- }
- }
- }
-
- return result;
- }
-
- static IMethod matchMethod(String methodName, List methodArguments, IMethod[] allMethods, List typeParameterSignatures)
- {
-// final List argSigs = convertArgsToSignatures(methodArguments);
- IMethod matchedMethod = null;
-
- for (int i = 0; i < allMethods.length; i++)
- {
- final IMethod method = allMethods[i];
-
- // check for names and argument count match
- if (method.getParameterTypes().length == methodArguments.size()
- && method.getElementName().equals(methodName))
- {
- List<String> methods = resolveMethodParameters(method, typeParameterSignatures);
-
- // need to verify argument matches
- boolean isMatched = true;
- CHECK_ARGUMENTS: for (int j = 0; j < methods.size(); j++)
- {
- final ValueType valueType = (ValueType) methodArguments.get(j);
-
- // if the parameters match, or if the method expects an object
- // and we have a class
- // TODO: there are some cases not supported here like:
- // - method name overloading
- // - autoboxing primitives
- // - certain kinds of parameterized args
- if (!methods.get(j).equals(valueType.getSignature())
- && !(methods.get(j).equals(TypeConstants.TYPE_JAVAOBJECT)
- && Signature.getTypeSignatureKind(valueType.getSignature())==Signature.CLASS_TYPE_SIGNATURE))
- {
- // not a match
- isMatched = false;
- break CHECK_ARGUMENTS;
- }
- }
-
- if (isMatched)
- {
- return method;
- }
- }
- }
-
- return matchedMethod;
- }
-
- static List<String> resolveMethodParameters(IMethod method, List typeParametersSignatures)
- {
- List<String> resolved = new ArrayList<String>();
- String[] parameterTypes = method.getParameterTypes();
- for (String parameter : parameterTypes)
- {
- parameter = TypeUtil.resolveTypeSignature(method.getDeclaringType()
- , parameter, false);
-
- if (Signature.getTypeSignatureKind(parameter) == Signature.TYPE_VARIABLE_SIGNATURE)
- {
- parameter = TypeUtil.matchTypeParameterToArgument
- (method.getDeclaringType(), parameter, typeParametersSignatures);
- }
-
- if (parameter == null)
- {
- parameter = TypeConstants.TYPE_JAVAOBJECT;
- }
-
- resolved.add(parameter);
- }
-
- return resolved;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties
deleted file mode 100644
index de61b2f0d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/impl/messages.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-IBeanPropertySymbolImpl.Access=Access:
-IBeanPropertySymbolImpl.hiding=hiding
-IBeanPropertySymbolImpl.none=none
-IBeanPropertySymbolImpl.read_write=read/write
-IBeanPropertySymbolImpl.readonly=read-only
-IBeanPropertySymbolImpl.Type=Type:
-IBeanPropertySymbolImpl.writeonly=write-only
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
deleted file mode 100644
index ee8e4b9ad..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanInstanceSymbolItemProvider.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBeanInstanceSymbolItemProvider
- extends IInstanceSymbolItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IContentProposalProvider
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanInstanceSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPropertiesPropertyDescriptor(object);
- addMethodsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Properties feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addPropertiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanInstanceSymbol_properties_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanInstanceSymbol_properties_feature", "_UI_IBeanInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL__PROPERTIES,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Methods feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMethodsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanInstanceSymbol_methods_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanInstanceSymbol_methods_feature", "_UI_IBeanInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_INSTANCE_SYMBOL__METHODS,
- false,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This returns IBeanInstanceSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBeanInstanceSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IBeanInstanceSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IBeanInstanceSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- /**
- * @param target_
- * @param proposalFactory
- * @return a completion proposal for target at offset
- */
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IBeanInstanceSymbol symbol = (IBeanInstanceSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(symbol);
- final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- additionalText,
- displayImage,
- target_)
- };
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java
deleted file mode 100644
index ed4eaae3a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanMethodSymbolItemProvider.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBeanMethodSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanMethodSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addSignaturePropertyDescriptor(object);
- addOwnerPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Signature feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSignaturePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMethodSymbol_signature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMethodSymbol_signature_feature", "_UI_IMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMETHOD_SYMBOL__SIGNATURE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Owner feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addOwnerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanMethodSymbol_owner_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanMethodSymbol_owner_feature", "_UI_IBeanMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_METHOD_SYMBOL__OWNER,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This returns IBeanMethodSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if no found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBeanMethodSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with label or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IBeanMethodSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IBeanMethodSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IBeanMethodSymbol.class)) {
- case SymbolPackage.IBEAN_METHOD_SYMBOL__NAME:
- case SymbolPackage.IBEAN_METHOD_SYMBOL__SIGNATURE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IBeanMethodSymbol symbol = (IBeanMethodSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(target_);
- final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- additionalText,
- displayImage,
- target_)
- };
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
deleted file mode 100644
index 200d69471..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBeanPropertySymbolItemProvider.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBeanPropertySymbolItemProvider
- extends IPropertySymbolItemProvider
- implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IContentProposalProvider
-{
- private static final String PROPERTY_SYMBOL_WO = "full/obj16/IBeanPropertySymbol_wo";
- private static final String PROPERTY_SYMBOL_RO = "full/obj16/IBeanPropertySymbol_ro";
- private static final String PROPERTY_SYMBOL_RW = "full/obj16/IBeanPropertySymbol_rw";
- private static final String PROPERTY_SYMBOL_WO_INDEXABLE = "full/obj16/IBeanPropertySymbol_wo_indexable";
- private static final String PROPERTY_SYMBOL_RO_INDEXABLE = "full/obj16/IBeanPropertySymbol_ro_indexable";
- private static final String PROPERTY_SYMBOL_RW_INDEXABLE = "full/obj16/IBeanPropertySymbol_rw_indexable";
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
- public IBeanPropertySymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addOwnerPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Owner feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addOwnerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IBeanPropertySymbol_owner_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IBeanPropertySymbol_owner_feature", "_UI_IBeanPropertySymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IBEAN_PROPERTY_SYMBOL__OWNER,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This returns IBeanPropertySymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public Object getImage(Object object) {
- IBeanPropertySymbol propertySymbol = (IBeanPropertySymbol) object;
- String imageFile = null;
- ITypeDescriptor typeDescriptor = propertySymbol.getTypeDescriptor();
- if (typeDescriptor != null && (typeDescriptor.isArray() || typeDescriptor.instanceOf("Ljava.util.List;") || typeDescriptor.instanceOf("Ljava.util.Map;"))) {
- // property is somehow "indexable" by int/String:
- if (propertySymbol.isReadable() && propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_RW_INDEXABLE;
- } else if (propertySymbol.isReadable()) {
- imageFile = PROPERTY_SYMBOL_RO_INDEXABLE;
- } else if (propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_WO_INDEXABLE;
- }
- } else {
- if (propertySymbol.isReadable() && propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_RW;
- } else if (propertySymbol.isReadable()) {
- imageFile = PROPERTY_SYMBOL_RO;
- } else if (propertySymbol.isWritable()) {
- imageFile = PROPERTY_SYMBOL_WO;
- }
- }
- return imageFile == null? null : overlayImage(object, getResourceLocator().getImage(imageFile));
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBeanPropertySymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IBeanPropertySymbol_type") : //$NON-NLS-1$
- getString("_UI_IBeanPropertySymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
deleted file mode 100644
index 1c85e05dc..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedJavaTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.7 2007/10/01 04:29:43 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBoundedJavaTypeDescriptorItemProvider
- extends IJavaTypeDescriptor2ItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedJavaTypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IBoundedJavaTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedJavaTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBoundedJavaTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IBoundedJavaTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IBoundedJavaTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java
deleted file mode 100644
index 4bee1ad98..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedListTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBoundedListTypeDescriptorItemProvider
- extends IListTypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param adapterFactory
- * @generated
- */
- public IBoundedListTypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IBoundedListTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedListTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBoundedListTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IBoundedListTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IBoundedListTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
deleted file mode 100644
index 02b1a2409..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IBoundedMapTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.7 2007/10/01 04:29:43 cbateman Exp $
- */
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IBoundedMapTypeDescriptorItemProvider
- extends IMapTypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IBoundedMapTypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IBoundedMapTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IBoundedMapTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IBoundedMapTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IBoundedMapTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IBoundedMapTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
deleted file mode 100644
index 96b04f747..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IComponentSymbolItemProvider.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IComponentSymbolItemProvider
- extends IInstanceSymbolItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider
-{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IComponentSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the property descriptor list
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This returns IComponentSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IComponentSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label for object or null if not found
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IComponentSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IComponentSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IComponentSymbol symbol = (IComponentSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(symbol);
- final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- additionalText,
- displayImage,
- target_)
- };
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java
deleted file mode 100644
index 155bfb186..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IInstanceSymbolItemProvider.java
+++ /dev/null
@@ -1,329 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IInstanceSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IInstanceSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the EMF property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addTypeDescriptorPropertyDescriptor(object);
- addReadablePropertyDescriptor(object);
- addWritablePropertyDescriptor(object);
- addTypeResolvedPropertyDescriptor(object);
- addRuntimeSourcePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Descriptor feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeDescriptorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_typeDescriptor_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_typeDescriptor_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__TYPE_DESCRIPTOR,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Readable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addReadablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_readable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_readable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__READABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Writable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addWritablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_writable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_writable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__WRITABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Resolved feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeResolvedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IInstanceSymbol_typeResolved_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IInstanceSymbol_typeResolved_feature", "_UI_IInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IINSTANCE_SYMBOL__TYPE_RESOLVED,
- false,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Runtime Source feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addRuntimeSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IInstanceSymbol_runtimeSource_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IInstanceSymbol_runtimeSource_feature", "_UI_IInstanceSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IINSTANCE_SYMBOL__RUNTIME_SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IInstanceSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image adaption for object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IInstanceSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text representation of object
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IInstanceSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IInstanceSymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IInstanceSymbol.class)) {
- case SymbolPackage.IINSTANCE_SYMBOL__NAME:
- case SymbolPackage.IINSTANCE_SYMBOL__READABLE:
- case SymbolPackage.IINSTANCE_SYMBOL__WRITABLE:
- case SymbolPackage.IINSTANCE_SYMBOL__TYPE_RESOLVED:
- case SymbolPackage.IINSTANCE_SYMBOL__RUNTIME_SOURCE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- public ICompletionProposal[] getProposals(Object target_,
- IProposalCreationFactory proposalFactory)
- {
- IInstanceSymbol symbol = (IInstanceSymbol) target_;
-
- final String replacementText = symbol.getName();
- final String displayText = getText(symbol);
- //final String additionalText = symbol.getDetailedDescription();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- return new ICompletionProposal[]
- {
- proposalFactory.createProposal(replacementText,
- displayText,
- null,
- displayImage,
- target_)
- };
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java
deleted file mode 100644
index 021cd5bed..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaSymbolItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IJavaSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addJavaElementPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Java Element feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addJavaElementPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaSymbol_javaElement_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaSymbol_javaElement_feature", "_UI_IJavaSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_SYMBOL__JAVA_ELEMENT,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IJavaSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object or null if no found
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IJavaSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IJavaSymbol_type") : //$NON-NLS-1$
- getString("_UI_IJavaSymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IJavaSymbol.class)) {
- case SymbolPackage.IJAVA_SYMBOL__NAME:
- case SymbolPackage.IJAVA_SYMBOL__JAVA_ELEMENT:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
deleted file mode 100644
index 201abe48d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IJavaTypeDescriptor2ItemProvider.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IJavaTypeDescriptor2ItemProvider
- extends ITypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IJavaTypeDescriptor2ItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the emf property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addTypePropertyDescriptor(object);
- addBeanPropertiesPropertyDescriptor(object);
- addBeanMethodsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Type feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_type_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_type_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__TYPE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Bean Properties feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addBeanPropertiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_beanProperties_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_beanProperties_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__BEAN_PROPERTIES,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Bean Methods feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addBeanMethodsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_beanMethods_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_beanMethods_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__BEAN_METHODS,
- true,
- false,
- false,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Array Count feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param object
- * @generated
- */
- protected void addArrayCountPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IJavaTypeDescriptor2_arrayCount_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IJavaTypeDescriptor2_arrayCount_feature", "_UI_IJavaTypeDescriptor2_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IJAVA_TYPE_DESCRIPTOR2__ARRAY_COUNT,
- true,
- false,
- false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null,
- null));
- }
-
-
- /**
- * This returns IJavaTypeDescriptor2.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image adaption for object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IJavaTypeDescriptor2")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text representation of object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IJavaTypeDescriptor2)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IJavaTypeDescriptor2_type") : //$NON-NLS-1$
- getString("_UI_IJavaTypeDescriptor2_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IJavaTypeDescriptor2.class)) {
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2__TYPE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java
deleted file mode 100644
index 76d3eb3ed..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IListTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IListTypeDescriptorItemProvider
- extends ITypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IListTypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addListSourcePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the List Source feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addListSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IListTypeDescriptor_listSource_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IListTypeDescriptor_listSource_feature", "_UI_IListTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IListTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IListTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IListTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IListTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IListTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IListTypeDescriptor.class)) {
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR__LIST_SOURCE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
- * that can be created under this object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
deleted file mode 100644
index 165629ca9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMapTypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IMapTypeDescriptorItemProvider
- extends ITypeDescriptorItemProvider
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IMapTypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the prop descriptor
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addMapSourcePropertyDescriptor(object);
- addImmutablePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Map Source feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMapSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMapTypeDescriptor_mapSource_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMapTypeDescriptor_mapSource_feature", "_UI_IMapTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Immutable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addImmutablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMapTypeDescriptor_immutable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMapTypeDescriptor_immutable_feature", "_UI_IMapTypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMAP_TYPE_DESCRIPTOR__IMMUTABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IMapTypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image adaptation of the object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IMapTypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text rep of the object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IMapTypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_IMapTypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_IMapTypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IMapTypeDescriptor.class)) {
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__MAP_SOURCE:
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR__IMMUTABLE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java
deleted file mode 100644
index 0d2902168..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IMethodSymbolItemProvider.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class IMethodSymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IMethodSymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the property sheet descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addSignaturePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Signature feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSignaturePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IMethodSymbol_signature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IMethodSymbol_signature_feature", "_UI_IMethodSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IMETHOD_SYMBOL__SIGNATURE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IMethodSymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image representatino of object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IMethodSymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text represention of object
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((IMethodSymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IMethodSymbol_type") : //$NON-NLS-1$
- getString("_UI_IMethodSymbol_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IMethodSymbol.class)) {
- case SymbolPackage.IMETHOD_SYMBOL__NAME:
- case SymbolPackage.IMETHOD_SYMBOL__SIGNATURE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the EMF resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java
deleted file mode 100644
index 3958147ad..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/IPropertySymbolItemProvider.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol} object.
- * <!-- begin-user-doc -->
- * @extends IContentProposalProvider
- * <!-- end-user-doc -->
- * @generated
- */
-public class IPropertySymbolItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource,
- IContentProposalProvider{
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public IPropertySymbolItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addNamePropertyDescriptor(object);
- addTypeDescriptorPropertyDescriptor(object);
- addReadablePropertyDescriptor(object);
- addWritablePropertyDescriptor(object);
- addIntermediatePropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Name feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ISymbol_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ISymbol_name_feature", "_UI_ISymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ISYMBOL__NAME,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Descriptor feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeDescriptorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_typeDescriptor_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_typeDescriptor_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__TYPE_DESCRIPTOR,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Readable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addReadablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_readable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_readable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__READABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Writable feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addWritablePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IObjectSymbol_writable_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IObjectSymbol_writable_feature", "_UI_IObjectSymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IOBJECT_SYMBOL__WRITABLE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Intermediate feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addIntermediatePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_IPropertySymbol_intermediate_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_IPropertySymbol_intermediate_feature", "_UI_IPropertySymbol_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.IPROPERTY_SYMBOL__INTERMEDIATE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns IPropertySymbol.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image rep of object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/IPropertySymbol")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text representation of the object
- * <!-- end-user-doc -->
- * @generated NOT
- */
- public String getText(Object object) {
- String label = ((IPropertySymbol)object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_IPropertySymbol_type") : //$NON-NLS-1$
- label;
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(IPropertySymbol.class)) {
- case SymbolPackage.IPROPERTY_SYMBOL__NAME:
- case SymbolPackage.IPROPERTY_SYMBOL__READABLE:
- case SymbolPackage.IPROPERTY_SYMBOL__WRITABLE:
- case SymbolPackage.IPROPERTY_SYMBOL__INTERMEDIATE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
- /**
- * @see org.eclipse.emf.edit.provider.ItemProviderAdapter#getChildren(java.lang.Object)
- */
- public Collection getChildren(Object object)
- {
- final List childSymbols = new ArrayList();
- childSymbols.addAll(((IPropertySymbol)object).getTypeDescriptor().getProperties());
- return Collections.unmodifiableList(childSymbols);
- }
-
- /**
- * @see org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider#getProposals(Object, org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory)
- */
- public ICompletionProposal[] getProposals(Object target1, IProposalCreationFactory proposalFactory)
- {
- return getProposalsInternal((IPropertySymbol) target1, proposalFactory, ""); //$NON-NLS-1$
- }
-
- private ICompletionProposal[] getProposalsInternal(IPropertySymbol symbol, IProposalCreationFactory proposalFactory, String intermediatePrefix)
- {
- final List completions = new ArrayList();
- final Image displayImage =
- ExtendedImageRegistry.getInstance().getImage(getImage(symbol));
-
- if (symbol.isIntermediate())
- {
- // see if there's something using this as intermediate completion
- List props = symbol.getTypeDescriptor().getProperties();
-
- for (final Iterator it = props.iterator(); it.hasNext();)
- {
- final IPropertySymbol propSymbol = (IPropertySymbol) it.next();
-
- if (!propSymbol.isIntermediate())
- {
- final String replacementText = "['" + intermediatePrefix + symbol.getName() + "." + propSymbol.getName() + "']"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- completions.add(proposalFactory.createProposal(
- replacementText,
- replacementText,
- null,
- displayImage, symbol));
- }
- else
- {
- completions.addAll(Arrays.asList(getProposalsInternal(propSymbol, proposalFactory, intermediatePrefix+symbol.getName()+"."))); //$NON-NLS-1$
- }
- }
- }
- else
- {
- final String replacementText = intermediatePrefix + symbol.getName();
- final String displayText = symbol.getName();
-
- completions.add(createProposal(symbol, replacementText, displayText, displayImage,
- proposalFactory));
- }
-
- return (ICompletionProposal[]) completions.toArray(new CustomCompletionProposal[0]);
-
- }
-
- private ICompletionProposal createProposal(IPropertySymbol symbol,
- final String replacementText, final String displayText,
- final Image displayImage, IProposalCreationFactory proposalFactory) {
- String additionalText = null; // TODO: put property value here where possible?
- if (symbol instanceof IDescribedInDetail) {
- additionalText = ((IDescribedInDetail) symbol).getDetailedDescription();
- }
- return proposalFactory.createProposal(
- replacementText,
- displayText,
- additionalText,
- displayImage, symbol);
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java
deleted file mode 100644
index 247422a5e..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/ITypeDescriptorItemProvider.java
+++ /dev/null
@@ -1,372 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.jst.jsf.common.JSFCommonPlugin;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ITypeDescriptorItemProvider
- extends ItemProviderAdapter
- implements
- IEditingDomainItemProvider,
- IStructuredItemContentProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This constructs an instance from a factory and a notifier.
- * <!-- begin-user-doc -->
- * @param adapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public ITypeDescriptorItemProvider(AdapterFactory adapterFactory) {
- super(adapterFactory);
- }
-
- /**
- * This returns the property descriptors for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the list of property descriptors
- * <!-- end-user-doc -->
- * @generated
- */
- public List getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null) {
- super.getPropertyDescriptors(object);
-
- addPropertiesPropertyDescriptor(object);
- addTypeSignaturePropertyDescriptor(object);
- addSuperTypeSignaturesPropertyDescriptor(object);
- addInterfaceTypeSignaturesPropertyDescriptor(object);
- addTypeSignatureDelegatePropertyDescriptor(object);
- addMethodsPropertyDescriptor(object);
- }
- return itemPropertyDescriptors;
- }
-
- /**
- * This adds a property descriptor for the Properties feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addPropertiesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_properties_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_properties_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__PROPERTIES,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Signature feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeSignaturePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_typeSignature_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeSignature_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_SIGNATURE,
- false,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Super Type Signatures feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addSuperTypeSignaturesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_superTypeSignatures_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_superTypeSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Interface Type Signatures feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addInterfaceTypeSignaturesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_interfaceTypeSignatures_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_interfaceTypeSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Signature Delegate feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeSignatureDelegatePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_typeSignatureDelegate_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeSignatureDelegate_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Methods feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addMethodsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_methods_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_methods_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__METHODS,
- true,
- false,
- true,
- null,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Type Parameter Signatures feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addTypeParameterSignaturesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_typeParameterSignatures_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_typeParameterSignatures_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__TYPE_PARAMETER_SIGNATURES,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Jdt Context feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addJdtContextPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_jdtContext_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_jdtContext_feature", "_UI_ITypeDescriptor_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__JDT_CONTEXT,
- true,
- false,
- false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This adds a property descriptor for the Enum Type feature.
- * <!-- begin-user-doc -->
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void addEnumTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ITypeDescriptor_enumType_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_ITypeDescriptor_enumType_feature", "_UI_ITypeDescriptor_type"),
- SymbolPackage.Literals.ITYPE_DESCRIPTOR__ENUM_TYPE,
- true,
- false,
- false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
- null,
- null));
- }
-
- /**
- * This returns ITypeDescriptor.gif.
- * <!-- begin-user-doc -->
- * @param object
- * @return the image associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/ITypeDescriptor")); //$NON-NLS-1$
- }
-
- /**
- * This returns the label text for the adapted class.
- * <!-- begin-user-doc -->
- * @param object
- * @return the text label associated with object or null if not found
- * <!-- end-user-doc -->
- * @generated
- */
- public String getText(Object object) {
- String label = ((ITypeDescriptor)object).getTypeSignature();
- return label == null || label.length() == 0 ?
- getString("_UI_ITypeDescriptor_type") : //$NON-NLS-1$
- getString("_UI_ITypeDescriptor_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
- }
-
- /**
- * This handles model notifications by calling {@link #updateChildren(Notification)} to update any cached
- * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged(Notification)}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void notifyChanged(Notification notification) {
- updateChildren(notification);
-
- switch (notification.getFeatureID(ITypeDescriptor.class)) {
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE:
- case SymbolPackage.ITYPE_DESCRIPTOR__SUPER_TYPE_SIGNATURES:
- case SymbolPackage.ITYPE_DESCRIPTOR__INTERFACE_TYPE_SIGNATURES:
- case SymbolPackage.ITYPE_DESCRIPTOR__TYPE_SIGNATURE_DELEGATE:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
- }
- super.notifyChanged(notification);
- }
-
- /**
- * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
- * describing all of the children that can be created under this object.
- * <!-- begin-user-doc -->
- * @param newChildDescriptors
- * @param object
- * <!-- end-user-doc -->
- * @generated
- */
- protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
- super.collectNewChildDescriptors(newChildDescriptors, object);
- }
-
- /**
- * Return the resource locator for this item provider's resources.
- * <!-- begin-user-doc -->
- * @return the resource locator
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceLocator getResourceLocator() {
- return JSFCommonPlugin.INSTANCE;
- }
-
-}
-
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
deleted file mode 100644
index 6dc9171c9..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provider/SymbolItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,534 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.jst.jsf.context.symbol.internal.util.SymbolAdapterFactory;
-import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("hiding")
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * This keeps track of the root adapter factory that delegates to this adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedAdapterFactory parentAdapterFactory;
-
- /**
- * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
- /**
- * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection supportedTypes = new ArrayList();
-
- /**
- * This constructs an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * TODO: try to got to Gen function to add custom adapters
- * instead of a NOT
- * @generated NOT
- */
- public SymbolItemProviderAdapterFactory() {
- supportedTypes.add(IEditingDomainItemProvider.class);
- supportedTypes.add(IStructuredItemContentProvider.class);
- supportedTypes.add(ITreeItemContentProvider.class);
- supportedTypes.add(IItemLabelProvider.class);
- supportedTypes.add(IItemPropertySource.class);
- supportedTypes.add(IContentProposalProvider.class);
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanInstanceSymbolItemProvider iBeanInstanceSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBeanInstanceSymbolAdapter() {
- if (iBeanInstanceSymbolItemProvider == null) {
- iBeanInstanceSymbolItemProvider = new IBeanInstanceSymbolItemProvider(this);
- }
-
- return iBeanInstanceSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanPropertySymbolItemProvider iBeanPropertySymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBeanPropertySymbolAdapter() {
- if (iBeanPropertySymbolItemProvider == null) {
- iBeanPropertySymbolItemProvider = new IBeanPropertySymbolItemProvider(this);
- }
-
- return iBeanPropertySymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IInstanceSymbolItemProvider iInstanceSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIInstanceSymbolAdapter() {
- if (iInstanceSymbolItemProvider == null) {
- iInstanceSymbolItemProvider = new IInstanceSymbolItemProvider(this);
- }
-
- return iInstanceSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaSymbolItemProvider iJavaSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIJavaSymbolAdapter() {
- if (iJavaSymbolItemProvider == null) {
- iJavaSymbolItemProvider = new IJavaSymbolItemProvider(this);
- }
-
- return iJavaSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IJavaTypeDescriptor2ItemProvider iJavaTypeDescriptor2ItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIJavaTypeDescriptor2Adapter() {
- if (iJavaTypeDescriptor2ItemProvider == null) {
- iJavaTypeDescriptor2ItemProvider = new IJavaTypeDescriptor2ItemProvider(this);
- }
-
- return iJavaTypeDescriptor2ItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBeanMethodSymbolItemProvider iBeanMethodSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBeanMethodSymbolAdapter() {
- if (iBeanMethodSymbolItemProvider == null) {
- iBeanMethodSymbolItemProvider = new IBeanMethodSymbolItemProvider(this);
- }
-
- return iBeanMethodSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IComponentSymbolItemProvider iComponentSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIComponentSymbolAdapter() {
- if (iComponentSymbolItemProvider == null) {
- iComponentSymbolItemProvider = new IComponentSymbolItemProvider(this);
- }
-
- return iComponentSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IPropertySymbolItemProvider iPropertySymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol}.
- * <!-- begin-user-doc -->
- * @return the property symbol adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIPropertySymbolAdapter() {
- if (iPropertySymbolItemProvider == null) {
- iPropertySymbolItemProvider = new IPropertySymbolItemProvider(this);
- }
-
- return iPropertySymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMapTypeDescriptorItemProvider iMapTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor}.
- * <!-- begin-user-doc -->
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIMapTypeDescriptorAdapter() {
- if (iMapTypeDescriptorItemProvider == null) {
- iMapTypeDescriptorItemProvider = new IMapTypeDescriptorItemProvider(this);
- }
-
- return iMapTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMethodSymbolItemProvider iMethodSymbolItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol}.
- * <!-- begin-user-doc -->
- * @return the adapter for method symbols
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIMethodSymbolAdapter() {
- if (iMethodSymbolItemProvider == null) {
- iMethodSymbolItemProvider = new IMethodSymbolItemProvider(this);
- }
-
- return iMethodSymbolItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedMapTypeDescriptorItemProvider iBoundedMapTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBoundedMapTypeDescriptorAdapter() {
- if (iBoundedMapTypeDescriptorItemProvider == null) {
- iBoundedMapTypeDescriptorItemProvider = new IBoundedMapTypeDescriptorItemProvider(this);
- }
-
- return iBoundedMapTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedJavaTypeDescriptorItemProvider iBoundedJavaTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBoundedJavaTypeDescriptorAdapter() {
- if (iBoundedJavaTypeDescriptorItemProvider == null) {
- iBoundedJavaTypeDescriptorItemProvider = new IBoundedJavaTypeDescriptorItemProvider(this);
- }
-
- return iBoundedJavaTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IListTypeDescriptorItemProvider iListTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIListTypeDescriptorAdapter() {
- if (iListTypeDescriptorItemProvider == null) {
- iListTypeDescriptorItemProvider = new IListTypeDescriptorItemProvider(this);
- }
-
- return iListTypeDescriptorItemProvider;
- }
-
- /**
- * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor} instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IBoundedListTypeDescriptorItemProvider iBoundedListTypeDescriptorItemProvider;
-
- /**
- * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter createIBoundedListTypeDescriptorAdapter() {
- if (iBoundedListTypeDescriptorItemProvider == null) {
- iBoundedListTypeDescriptorItemProvider = new IBoundedListTypeDescriptorItemProvider(this);
- }
-
- return iBoundedListTypeDescriptorItemProvider;
- }
-
- /**
- * This returns the root adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * @return the adapter factory
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposeableAdapterFactory getRootAdapterFactory() {
- return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
- }
-
- /**
- * This sets the composed adapter factory that contains this factory.
- * <!-- begin-user-doc -->
- * @param parentAdapterFactory
- * <!-- end-user-doc -->
- * @generated
- */
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
- this.parentAdapterFactory = parentAdapterFactory;
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param type
- * @return true if the factory supports the adapter type
- * <!-- end-user-doc -->
- * @generated
- */
- public boolean isFactoryForType(Object type) {
- return supportedTypes.contains(type) || super.isFactoryForType(type);
- }
-
- /**
- * This implementation substitutes the factory itself as the key for the adapter.
- * <!-- begin-user-doc -->
- * @param notifier
- * @param type
- * @return the adapter
- * <!-- end-user-doc -->
- * @generated
- */
- public Adapter adapt(Notifier notifier, Object type) {
- return super.adapt(notifier, this);
- }
-
- /**
- * <!-- begin-user-doc -->
- * @param object
- * @param type
- * @return the adapted object
- * <!-- end-user-doc -->
- * @generated
- */
- public Object adapt(Object object, Object type) {
- if (isFactoryForType(type)) {
- Object adapter = super.adapt(object, type);
- if (!(type instanceof Class) || (((Class)type).isInstance(adapter))) {
- return adapter;
- }
- }
-
- return null;
- }
-
- /**
- * This adds a listener.
- * <!-- begin-user-doc -->
- * @param notifyChangedListener
- * <!-- end-user-doc -->
- * @generated
- */
- public void addListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.addListener(notifyChangedListener);
- }
-
- /**
- * This removes a listener.
- * <!-- begin-user-doc -->
- * @param notifyChangedListener
- * <!-- end-user-doc -->
- * @generated
- */
- public void removeListener(INotifyChangedListener notifyChangedListener) {
- changeNotifier.removeListener(notifyChangedListener);
- }
-
- /**
- * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
- * <!-- begin-user-doc -->
- * @param notification
- * <!-- end-user-doc -->
- * @generated
- */
- public void fireNotifyChanged(Notification notification) {
- changeNotifier.fireNotifyChanged(notification);
-
- if (parentAdapterFactory != null) {
- parentAdapterFactory.fireNotifyChanged(notification);
- }
- }
-
- /**
- * This disposes all of the item providers created by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void dispose() {
- if (iBeanInstanceSymbolItemProvider != null) iBeanInstanceSymbolItemProvider.dispose();
- if (iBeanPropertySymbolItemProvider != null) iBeanPropertySymbolItemProvider.dispose();
- if (iInstanceSymbolItemProvider != null) iInstanceSymbolItemProvider.dispose();
- if (iJavaSymbolItemProvider != null) iJavaSymbolItemProvider.dispose();
- if (iJavaTypeDescriptor2ItemProvider != null) iJavaTypeDescriptor2ItemProvider.dispose();
- if (iBeanMethodSymbolItemProvider != null) iBeanMethodSymbolItemProvider.dispose();
- if (iComponentSymbolItemProvider != null) iComponentSymbolItemProvider.dispose();
- if (iPropertySymbolItemProvider != null) iPropertySymbolItemProvider.dispose();
- if (iMapTypeDescriptorItemProvider != null) iMapTypeDescriptorItemProvider.dispose();
- if (iMethodSymbolItemProvider != null) iMethodSymbolItemProvider.dispose();
- if (iBoundedMapTypeDescriptorItemProvider != null) iBoundedMapTypeDescriptorItemProvider.dispose();
- if (iBoundedJavaTypeDescriptorItemProvider != null) iBoundedJavaTypeDescriptorItemProvider.dispose();
- }
-
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java
deleted file mode 100644
index 2be2d159a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/source/UnknownTypeContextSymbolFactory.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.jsf.context.symbol.internal.source;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jst.jsf.context.symbol.ERuntimeSource;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.InitializedSymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory;
-import org.eclipse.jst.jsf.context.symbol.source.IAdditionalContextSymbolInfo;
-
-/**
- * Returns an unknown component symbol.
- *
- * @author cbateman
- *
- */
-public final class UnknownTypeContextSymbolFactory extends
-AbstractContextSymbolFactory
-{
- private final InitializedSymbolFactory _factory = new InitializedSymbolFactory();
-
- @Override
- protected ISymbol internalCreate(final String symbolName, final int scope,
- final IAdaptable context, final List problems)
- {
- return internalCreate(symbolName, scope, context, null);
- }
-
- @Override
- protected ISymbol internalCreate(final String symbolName, final int scope,
- final IAdaptable context, final List problems,
- final IAdditionalContextSymbolInfo info)
- {
- return _factory.createUnknownComponentSymbol(symbolName,
- ERuntimeSource.TAG_INSTANTIATED_SYMBOL_LITERAL);
- }
- @Override
- public boolean supports(final IAdaptable context)
- {
- return true;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java
deleted file mode 100644
index ae764bed7..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IMethodSymbolBasedType.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle 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:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.util;
-
-import org.eclipse.jst.jsf.common.internal.types.MethodType;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-
-/**
- *
- * @author cbateman
- *
- */
-public class IMethodSymbolBasedType extends MethodType
-{
- private final IMethodSymbol _methodSymbol;
-
- /**
- * @param methodSymbol
- */
- public IMethodSymbolBasedType(IMethodSymbol methodSymbol)
- {
- super(methodSymbol.getName(), methodSymbol.getSignature());
- _methodSymbol = methodSymbol;
- }
-
- /**
- * @return the method symbol
- */
- public IMethodSymbol getSymbol()
- {
- return _methodSymbol;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java
deleted file mode 100644
index 04fbe527d..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/IObjectSymbolBasedValueType.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 Oracle 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:
- * Oracle Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.util;
-
-import org.eclipse.jst.jsf.common.internal.types.IAssignable;
-import org.eclipse.jst.jsf.common.internal.types.ValueType;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-
-/**
- * A value type adapter class for IObjectSymbol's
- *
- * @author cbateman
- *
- */
-public class IObjectSymbolBasedValueType extends ValueType
-{
- private final IObjectSymbol _symbol;
-
- /**
- * @param symbol
- * @return a properly configured instance based on the sub-type of symbol.
- * Returns null if symbol is not of an appropriate IObjectSymbol type
- */
- public static IObjectSymbolBasedValueType getInstance(ISymbol symbol)
- {
- if (symbol instanceof IInstanceSymbol)
- {
- if (((IInstanceSymbol)symbol).getTypeDescriptor() != null)
- {
- return new IObjectSymbolBasedValueType((IInstanceSymbol) symbol);
- }
- }
- else if (symbol instanceof IPropertySymbol)
- {
- if (((IPropertySymbol)symbol).getTypeDescriptor() != null)
- {
- return new IObjectSymbolBasedValueType((IPropertySymbol) symbol);
- }
- }
-
- return null;
- }
-
- /**
- * Constructor for instance symbols (model objects)
- * @param symbol
- */
- public IObjectSymbolBasedValueType(final IInstanceSymbol symbol)
- {
- this(symbol.getTypeDescriptor().getTypeSignature(),
- (String[])symbol.getTypeDescriptor().getTypeParameterSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getSuperTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getInterfaceTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- symbol.getTypeDescriptor().isEnumType(),
- IAssignable.ASSIGNMENT_TYPE_RHS /* variables are not assignable */
- , symbol);
- }
-
- /**
- * Constructor for property symbols
- *
- * @param symbol
- */
- public IObjectSymbolBasedValueType(final IPropertySymbol symbol)
- {
- this(symbol.getTypeDescriptor().getTypeSignature(),
- (String[])symbol.getTypeDescriptor().getTypeParameterSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getSuperTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- (String[])symbol.getTypeDescriptor().getInterfaceTypeSignatures().toArray(EMPTY_STRING_ARRAY),
- symbol.getTypeDescriptor().isEnumType(),
- ASSIGNMENT_TYPE_NONE | (symbol.isReadable()?IAssignable.ASSIGNMENT_TYPE_RHS:ASSIGNMENT_TYPE_NONE)|(symbol.isWritable()?IAssignable.ASSIGNMENT_TYPE_LHS:ASSIGNMENT_TYPE_NONE)
- , symbol);
- }
-
- private IObjectSymbolBasedValueType(final String signature,
- final String[] typeArgs,
- final String[] superTypes,
- final String[] interfaceTypes,
- final boolean isEnumType,
- final int assignmentMask,
- final IObjectSymbol symbol)
- {
- super(signature, typeArgs, superTypes, interfaceTypes, isEnumType, assignmentMask);
- _symbol = symbol;
- }
-
- /**
- * @return the underlying IObjectSymbol
- */
- public IObjectSymbol getSymbol()
- {
- return _symbol;
- }
-}
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java
deleted file mode 100644
index dcecf364a..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolAdapterFactory.java
+++ /dev/null
@@ -1,457 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.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.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage
- * @generated
- */
-public class SymbolAdapterFactory extends AdapterFactoryImpl {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static SymbolPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolAdapterFactory() {
- if (modelPackage == null) {
- modelPackage = SymbolPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
- * @param object
- * <!-- end-user-doc -->
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage) {
- return true;
- }
- if (object instanceof EObject) {
- return ((EObject)object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch the delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SymbolSwitch modelSwitch =
- new SymbolSwitch() {
- public Object caseIBeanInstanceSymbol(IBeanInstanceSymbol object) {
- return createIBeanInstanceSymbolAdapter();
- }
- public Object caseIBeanPropertySymbol(IBeanPropertySymbol object) {
- return createIBeanPropertySymbolAdapter();
- }
- public Object caseIInstanceSymbol(IInstanceSymbol object) {
- return createIInstanceSymbolAdapter();
- }
- public Object caseIJavaSymbol(IJavaSymbol object) {
- return createIJavaSymbolAdapter();
- }
- public Object caseISymbol(ISymbol object) {
- return createISymbolAdapter();
- }
- public Object caseITypeDescriptor(ITypeDescriptor object) {
- return createITypeDescriptorAdapter();
- }
- public Object caseIDescribedInDetail(IDescribedInDetail object) {
- return createIDescribedInDetailAdapter();
- }
- public Object caseIJavaTypeDescriptor2(IJavaTypeDescriptor2 object) {
- return createIJavaTypeDescriptor2Adapter();
- }
- public Object caseIBeanMethodSymbol(IBeanMethodSymbol object) {
- return createIBeanMethodSymbolAdapter();
- }
- public Object caseIComponentSymbol(IComponentSymbol object) {
- return createIComponentSymbolAdapter();
- }
- public Object caseIPropertySymbol(IPropertySymbol object) {
- return createIPropertySymbolAdapter();
- }
- public Object caseIMapTypeDescriptor(IMapTypeDescriptor object) {
- return createIMapTypeDescriptorAdapter();
- }
- public Object caseIMethodSymbol(IMethodSymbol object) {
- return createIMethodSymbolAdapter();
- }
- public Object caseIObjectSymbol(IObjectSymbol object) {
- return createIObjectSymbolAdapter();
- }
- public Object caseIBoundedTypeDescriptor(IBoundedTypeDescriptor object) {
- return createIBoundedTypeDescriptorAdapter();
- }
- public Object caseIBoundedMapTypeDescriptor(IBoundedMapTypeDescriptor object) {
- return createIBoundedMapTypeDescriptorAdapter();
- }
- public Object caseIBoundedJavaTypeDescriptor(IBoundedJavaTypeDescriptor object) {
- return createIBoundedJavaTypeDescriptorAdapter();
- }
- public Object caseIListTypeDescriptor(IListTypeDescriptor object) {
- return createIListTypeDescriptorAdapter();
- }
- public Object caseIBoundedListTypeDescriptor(IBoundedListTypeDescriptor object) {
- return createIBoundedListTypeDescriptorAdapter();
- }
- public Object defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- public Adapter createAdapter(Notifier target) {
- return (Adapter)modelSwitch.doSwitch((EObject)target);
- }
-
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol
- * @generated
- */
- public Adapter createIBeanInstanceSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol <em>IBean Property Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol
- * @generated
- */
- public Adapter createIBeanPropertySymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol <em>IInstance Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol
- * @generated
- */
- public Adapter createIInstanceSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol <em>IJava Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol
- * @generated
- */
- public Adapter createIJavaSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.ISymbol
- * @generated
- */
- public Adapter createISymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor <em>IType Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor
- * @generated
- */
- public Adapter createITypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail
- * @generated
- */
- public Adapter createIDescribedInDetailAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2
- * @generated
- */
- public Adapter createIJavaTypeDescriptor2Adapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol <em>IBean Method Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol
- * @generated
- */
- public Adapter createIBeanMethodSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol <em>IComponent Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IComponentSymbol
- * @generated
- */
- public Adapter createIComponentSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol <em>IProperty Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol
- * @generated
- */
- public Adapter createIPropertySymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor
- * @generated
- */
- public Adapter createIMapTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol <em>IMethod Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol
- * @generated
- */
- public Adapter createIMethodSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol
- * @generated
- */
- public Adapter createIObjectSymbolAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedMapTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedJavaTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor <em>IList Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor
- * @generated
- */
- public Adapter createIListTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @see org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor
- * @generated
- */
- public Adapter createIBoundedListTypeDescriptorAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} //SymbolAdapterFactory
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java
deleted file mode 100644
index 92c774619..000000000
--- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/util/SymbolSwitch.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 Oracle Corporation.
- * 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:
- * Cameron Bateman/Oracle - initial API and implementation
- *
- ********************************************************************************/
-package org.eclipse.jst.jsf.context.symbol.internal.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IComponentSymbol;
-import org.eclipse.jst.jsf.context.symbol.IDescribedInDetail;
-import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaSymbol;
-import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
-import org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.IMethodSymbol;
-import org.eclipse.jst.jsf.context.symbol.IObjectSymbol;
-import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
-import org.eclipse.jst.jsf.context.symbol.ISymbol;
-import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor;
-import org.eclipse.jst.jsf.context.symbol.SymbolPackage;
-
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage
- * @generated
- */
-public class SymbolSwitch {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String copyright = "Copyright 2006 Oracle"; //$NON-NLS-1$
-
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected static SymbolPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SymbolSwitch() {
- if (modelPackage == null) {
- modelPackage = SymbolPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * @param theEObject
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- 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 -->
- * @param theEClass
- * @param theEObject
- * <!-- 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);
- }
- 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 -->
- * @param classifierID
- * @param theEObject
- * <!-- 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 SymbolPackage.IBEAN_INSTANCE_SYMBOL: {
- IBeanInstanceSymbol iBeanInstanceSymbol = (IBeanInstanceSymbol)theEObject;
- Object result = caseIBeanInstanceSymbol(iBeanInstanceSymbol);
- if (result == null) result = caseIInstanceSymbol(iBeanInstanceSymbol);
- if (result == null) result = caseIDescribedInDetail(iBeanInstanceSymbol);
- if (result == null) result = caseIObjectSymbol(iBeanInstanceSymbol);
- if (result == null) result = caseISymbol(iBeanInstanceSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBEAN_PROPERTY_SYMBOL: {
- IBeanPropertySymbol iBeanPropertySymbol = (IBeanPropertySymbol)theEObject;
- Object result = caseIBeanPropertySymbol(iBeanPropertySymbol);
- if (result == null) result = caseIPropertySymbol(iBeanPropertySymbol);
- if (result == null) result = caseIDescribedInDetail(iBeanPropertySymbol);
- if (result == null) result = caseIObjectSymbol(iBeanPropertySymbol);
- if (result == null) result = caseISymbol(iBeanPropertySymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IINSTANCE_SYMBOL: {
- IInstanceSymbol iInstanceSymbol = (IInstanceSymbol)theEObject;
- Object result = caseIInstanceSymbol(iInstanceSymbol);
- if (result == null) result = caseIObjectSymbol(iInstanceSymbol);
- if (result == null) result = caseISymbol(iInstanceSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IJAVA_SYMBOL: {
- IJavaSymbol iJavaSymbol = (IJavaSymbol)theEObject;
- Object result = caseIJavaSymbol(iJavaSymbol);
- if (result == null) result = caseISymbol(iJavaSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ISYMBOL: {
- ISymbol iSymbol = (ISymbol)theEObject;
- Object result = caseISymbol(iSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ITYPE_DESCRIPTOR: {
- ITypeDescriptor iTypeDescriptor = (ITypeDescriptor)theEObject;
- Object result = caseITypeDescriptor(iTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IDESCRIBED_IN_DETAIL: {
- IDescribedInDetail iDescribedInDetail = (IDescribedInDetail)theEObject;
- Object result = caseIDescribedInDetail(iDescribedInDetail);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IJAVA_TYPE_DESCRIPTOR2: {
- IJavaTypeDescriptor2 iJavaTypeDescriptor2 = (IJavaTypeDescriptor2)theEObject;
- Object result = caseIJavaTypeDescriptor2(iJavaTypeDescriptor2);
- if (result == null) result = caseITypeDescriptor(iJavaTypeDescriptor2);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBEAN_METHOD_SYMBOL: {
- IBeanMethodSymbol iBeanMethodSymbol = (IBeanMethodSymbol)theEObject;
- Object result = caseIBeanMethodSymbol(iBeanMethodSymbol);
- if (result == null) result = caseIDescribedInDetail(iBeanMethodSymbol);
- if (result == null) result = caseIMethodSymbol(iBeanMethodSymbol);
- if (result == null) result = caseISymbol(iBeanMethodSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ICOMPONENT_SYMBOL: {
- IComponentSymbol iComponentSymbol = (IComponentSymbol)theEObject;
- Object result = caseIComponentSymbol(iComponentSymbol);
- if (result == null) result = caseIInstanceSymbol(iComponentSymbol);
- if (result == null) result = caseIDescribedInDetail(iComponentSymbol);
- if (result == null) result = caseIObjectSymbol(iComponentSymbol);
- if (result == null) result = caseISymbol(iComponentSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IPROPERTY_SYMBOL: {
- IPropertySymbol iPropertySymbol = (IPropertySymbol)theEObject;
- Object result = caseIPropertySymbol(iPropertySymbol);
- if (result == null) result = caseIObjectSymbol(iPropertySymbol);
- if (result == null) result = caseISymbol(iPropertySymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IMAP_TYPE_DESCRIPTOR: {
- IMapTypeDescriptor iMapTypeDescriptor = (IMapTypeDescriptor)theEObject;
- Object result = caseIMapTypeDescriptor(iMapTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iMapTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IMETHOD_SYMBOL: {
- IMethodSymbol iMethodSymbol = (IMethodSymbol)theEObject;
- Object result = caseIMethodSymbol(iMethodSymbol);
- if (result == null) result = caseISymbol(iMethodSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IOBJECT_SYMBOL: {
- IObjectSymbol iObjectSymbol = (IObjectSymbol)theEObject;
- Object result = caseIObjectSymbol(iObjectSymbol);
- if (result == null) result = caseISymbol(iObjectSymbol);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_TYPE_DESCRIPTOR: {
- IBoundedTypeDescriptor iBoundedTypeDescriptor = (IBoundedTypeDescriptor)theEObject;
- Object result = caseIBoundedTypeDescriptor(iBoundedTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_MAP_TYPE_DESCRIPTOR: {
- IBoundedMapTypeDescriptor iBoundedMapTypeDescriptor = (IBoundedMapTypeDescriptor)theEObject;
- Object result = caseIBoundedMapTypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = caseIMapTypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = caseIBoundedTypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedMapTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_JAVA_TYPE_DESCRIPTOR: {
- IBoundedJavaTypeDescriptor iBoundedJavaTypeDescriptor = (IBoundedJavaTypeDescriptor)theEObject;
- Object result = caseIBoundedJavaTypeDescriptor(iBoundedJavaTypeDescriptor);
- if (result == null) result = caseIJavaTypeDescriptor2(iBoundedJavaTypeDescriptor);
- if (result == null) result = caseIBoundedTypeDescriptor(iBoundedJavaTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedJavaTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.ILIST_TYPE_DESCRIPTOR: {
- IListTypeDescriptor iListTypeDescriptor = (IListTypeDescriptor)theEObject;
- Object result = caseIListTypeDescriptor(iListTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iListTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case SymbolPackage.IBOUNDED_LIST_TYPE_DESCRIPTOR: {
- IBoundedListTypeDescriptor iBoundedListTypeDescriptor = (IBoundedListTypeDescriptor)theEObject;
- Object result = caseIBoundedListTypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = caseIListTypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = caseIBoundedTypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = caseITypeDescriptor(iBoundedListTypeDescriptor);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- default: return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBean Instance Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBean Instance Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBeanInstanceSymbol(IBeanInstanceSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBean Property Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBean Property Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBeanPropertySymbol(IBeanPropertySymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IInstance Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IInstance Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIInstanceSymbol(IInstanceSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IJava Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IJava Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIJavaSymbol(IJavaSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>ISymbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>ISymbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseISymbol(ISymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IType Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IType Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseITypeDescriptor(ITypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IDescribed In Detail</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IDescribed In Detail</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIDescribedInDetail(IDescribedInDetail object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IJava Type Descriptor2</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IJava Type Descriptor2</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIJavaTypeDescriptor2(IJavaTypeDescriptor2 object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBean Method Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBean Method Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBeanMethodSymbol(IBeanMethodSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IComponent Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IComponent Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIComponentSymbol(IComponentSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IProperty Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IProperty Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIPropertySymbol(IPropertySymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IMap Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IMap Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIMapTypeDescriptor(IMapTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IMethod Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IMethod Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIMethodSymbol(IMethodSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IObject Symbol</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IObject Symbol</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIObjectSymbol(IObjectSymbol object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedTypeDescriptor(IBoundedTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded Map Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded Map Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedMapTypeDescriptor(IBoundedMapTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded Java Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded Java Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedJavaTypeDescriptor(IBoundedJavaTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IList Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IList Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIListTypeDescriptor(IListTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>IBounded List Type Descriptor</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>IBounded List Type Descriptor</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public Object caseIBoundedListTypeDescriptor(IBoundedListTypeDescriptor object) {
- return null;
- }
-
- /**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- * @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public Object defaultCase(EObject object) {
- return null;
- }
-
-} //SymbolSwitch
-

Back to the top